diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index bcc9f52838fca2f0a995ebd54e0a84b64a4c5ebb..a83963c3295c59e9565ac49078d4d23a4d3393c5 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -372,21 +372,21 @@ public class Util {
     public static String getTimeSpanString(long duration) {
         duration /= 1000;
         if(duration<60)
-            return combine(duration,"second");
+            return Messages.Util_second(duration);
         duration /= 60;
         if(duration<60)
-            return combine(duration,"minute");
+            return Messages.Util_minute(duration);
         duration /= 60;
         if(duration<24)
-            return combine(duration,"hour");
+            return Messages.Util_hour(duration);
         duration /= 24;
         if(duration<30)
-            return combine(duration,"day");
+            return Messages.Util_day(duration);
         duration /= 30;
         if(duration<12)
-            return combine(duration,"month");
+            return Messages.Util_month(duration);
         duration /= 12;
-        return combine(duration,"year");
+        return Messages.Util_year(duration);
     }
 
     /**
diff --git a/core/src/main/resources/hudson/Messages.properties b/core/src/main/resources/hudson/Messages.properties
new file mode 100644
index 0000000000000000000000000000000000000000..0a6173e0c3e57fb3af0dc7f7e6d0a2aab88a5ea6
--- /dev/null
+++ b/core/src/main/resources/hudson/Messages.properties
@@ -0,0 +1,6 @@
+Util.second={0} {0,choice,0#seconds|1#second|1<seconds}
+Util.minute={0} {0,choice,0#minutes|1#minute|1<minutes}
+Util.hour  ={0} {0,choice,0#hours|1#hour|1<hours}
+Util.day   ={0} {0,choice,0#days|1#day|1<days}
+Util.month ={0} {0,choice,0#months|1#month|1<months}
+Util.year  ={0} {0,choice,0#years|1#year|1<years}
diff --git a/core/src/main/resources/hudson/Messages_ja.properties b/core/src/main/resources/hudson/Messages_ja.properties
new file mode 100644
index 0000000000000000000000000000000000000000..a3d7b1b31ea1cf9925d3083facae6465502c0313
--- /dev/null
+++ b/core/src/main/resources/hudson/Messages_ja.properties
@@ -0,0 +1,6 @@
+Util.second={0}\u79d2
+Util.minute={0}\u5206
+Util.hour  ={0}\u6642\u9593
+Util.day   ={0}\u65e5
+Util.month ={0}\u6708
+Util.year  ={0}\u5e74
diff --git a/core/src/main/resources/lib/hudson/projectView.jelly b/core/src/main/resources/lib/hudson/projectView.jelly
index 3d61d1aa0d470589c4aaf7239d749b52354f11ed..e7f427cd08906bbf3d723abff622a9427a393f3a 100644
--- a/core/src/main/resources/lib/hudson/projectView.jelly
+++ b/core/src/main/resources/lib/hudson/projectView.jelly
@@ -85,7 +85,7 @@
                   (<a href="${jobBaseUrl}${job.shortUrl}lastSuccessfulBuild/">#${lsBuild.number}</a>)
                 </j:when>
                 <j:otherwise>
-                  N/A
+                  ${%N/A}
                 </j:otherwise>
               </j:choose>
             </td>
@@ -96,7 +96,7 @@
                   (<a href="${jobBaseUrl}${job.shortUrl}lastFailedBuild/">#${lfBuild.number}</a>)
                 </j:when>
                 <j:otherwise>
-                  N/A
+                  ${%N/A}
                 </j:otherwise>
               </j:choose>
             </td>
@@ -109,7 +109,7 @@
                   ${lfBuild.durationString}
                 </j:when>
                 <j:otherwise>
-                  N/A
+                  ${%N/A}
                 </j:otherwise>
               </j:choose>
             </td>