Merge branch 'master' into terms

[rails.git] / vendor / plugins / rails-i18n / locale / ja.yml

diff --git a/vendor/plugins/rails-i18n/locale/ja.yml b/vendor/plugins/rails-i18n/locale/ja.yml
index dbd01fbf16704ec5adae3fd23e79a293f74c8d78..ea7eb1df81788eeab5cfb75622bb631a345eb0ea 100644 (file)
--- a/vendor/plugins/rails-i18n/locale/ja.yml
+++ b/vendor/plugins/rails-i18n/locale/ja.yml
@@ -1,4 +1,4 @@
-# Japanese translations for Ruby on Rails 
+# Japanese translations for Ruby on Rails
 # by Akira Matsuda (ronnie@dio.jp)
 # AR error messages are basically taken from Ruby-GetText-Package. Thanks to Masao Mutoh.
 
@@ -33,6 +33,9 @@ ja:
       two_words_connector: "と"
       last_word_connector: "と"
 
+    select:
+      prompt: "選択してください。"
+
   number:
     format:
       separator: "."
@@ -72,14 +75,14 @@ ja:
     distance_in_words:
       half_a_minute: "30秒前後"
       less_than_x_seconds:
-        one:   "1秒以下"
-        other: "{{count}}秒以下"
+        one:   "1秒以内"
+        other: "{{count}}秒以内"
       x_seconds:
         one:   "1秒"
         other: "{{count}}秒"
       less_than_x_minutes:
-        one:   "1分以下"
-        other: "{{count}}分以下"
+        one:   "1分以内"
+        other: "{{count}}分以内"
       x_minutes:
         one:   "1分"
         other: "{{count}}分"
@@ -96,16 +99,14 @@ ja:
         one:   "1ヶ月"
         other: "{{count}}ヶ月"
       about_x_years:
-        one:   "約{{count}}年以上"
-        other: "約{{count}}年以上"
+        one:   "約{{count}}年"
+        other: "約{{count}}年"
       over_x_years:
         one:   "{{count}}年以上"
         other: "{{count}}年以上"
 
   activerecord:
     errors:
-      format:
-        separator: ""
       template:
         header:
           one:   "{{model}}にエラーが発生しました。"
@@ -132,4 +133,7 @@ ja:
         less_than_or_equal_to: "は{{count}}以下の値にしてください。"
         odd: "は奇数にしてください。"
         even: "は偶数にしてください。"
+        record_invalid: "バリデーションに失敗しました。 {{errors}}"
 
+      full_messages:
+        format: "{{attribute}}{{message}}"