Merge remote-tracking branch 'upstream/pull/2207'

[rails.git] / config / locales / ja.yml

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 0f466bbc0586bbb18039d1e4096cb3b3abcae6a3..bd6a5bd339f019c01bdb76b4bdfc9a0a75be133b 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -37,6 +37,7 @@
 # Author: Wrightbus
 # Author: Yusuke1109
 # Author: ネイ
+# Author: 神樂坂秀吉
 # Author: 青子守歌
 # Author: 아라
 ---
@@ -140,6 +141,45 @@ ja:
         description: 説明
         languages: 言語
         pass_crypt: パスワード
+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: 約1時間前
+        other: 約%{count}時間前
+      about_x_months:
+        one: 約1ヶ月前
+        other: 約%{count}ヶ月前
+      about_x_years:
+        one: 約1年
+        other: 約%{count}年前
+      almost_x_years:
+        one: ほぼ1年前
+        other: ほぼ%{count}年前
+      half_a_minute: 30秒前
+      less_than_x_seconds:
+        one: 1秒前以内に
+        other: '%{count}秒前以内に'
+      less_than_x_minutes:
+        one: 1分前以内に
+        other: '%{count}分前以内に'
+      over_x_years:
+        one: 1年前以上
+        other: '%{count}年前以上'
+      x_seconds:
+        one: 1秒
+        other: '%{count}秒前'
+      x_minutes:
+        one: 1分前
+        other: '%{count}分前'
+      x_days:
+        one: 1日前
+        other: '%{count}日前'
+      x_months:
+        one: 1ヶ月前
+        other: '%{count}ヶ月前'
+      x_years:
+        one: 1年前
+        other: '%{count}年前'
   editor:
     default: 既定 (現在は %{name})
     potlatch: