X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d0b845fc6025f2fb84a4cf4fa10cbb71084843a7..b2c3c8e71010977e06e21fd4ce5e564ab72527ca:/vendor/plugins/rails-i18n/locale/zh-CN.yml

diff --git a/vendor/plugins/rails-i18n/locale/zh-CN.yml b/vendor/plugins/rails-i18n/locale/zh-CN.yml
index 2208b8043..81e318df3 100644
--- a/vendor/plugins/rails-i18n/locale/zh-CN.yml
+++ b/vendor/plugins/rails-i18n/locale/zh-CN.yml
@@ -7,7 +7,7 @@
       default: "%Y-%m-%d"
       short: "%b%d日"
       long: "%Y年%b%d日"
-    day_names: [星期天, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
+    day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
     abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
     month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
     abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
@@ -25,14 +25,14 @@
     distance_in_words:
       half_a_minute: "半分钟"
       less_than_x_seconds:
-        one: "一秒内"
-        other: "少于 {{count}} 秒"
+        one: "不到一秒"
+        other: "不到 {{count}} 秒"
       x_seconds:
         one: "一秒"
         other: "{{count}} 秒"
       less_than_x_minutes:
-        one: "一分钟内"
-        other: "少于 {{count}} 分钟"
+        one: "不到一分钟"
+        other: "不到 {{count}} 分钟"
       x_minutes:
         one: "一分钟"
         other: "{{count}} 分钟"
@@ -52,8 +52,11 @@
         one: "大约一年"
         other: "大约 {{count}} 年"
       over_x_years:
-        one: "一年以上"
-        other: "{{count}} 年以上"
+        one: "一年多"
+        other: "{{count}} 年多"
+      almost_x_years:
+        one:   "接近一年"
+        other: "接近 {{count}} 年"
     prompts:
       year:   "å¹´"
       month:  "月"
@@ -70,7 +73,7 @@
     currency:
       format:
         format: "%u %n"
-        unit: "CNY"
+        unit: "CNÂ¥"
         separator: "."
         delimiter: ","
         precision: 2
@@ -84,18 +87,29 @@
       format:
         delimiter: ""
         precision: 1
-      storage_units: [Bytes, KB, MB, GB, TB]
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
   
   support:
     array:
       words_connector: ", "
       two_words_connector: " 和 "
       last_word_connector: ", 和 "
+    select:
+      prompt: "请选择"
   
   activerecord:
     errors:
-      template:
-        header: 
+      template: # ~ 2.3.5 backward compatible
+        header:
           one: "有 1 个错误发生导致「{{model}}」无法被保存。"
           other: "有 {{count}} 个错误发生导致「{{model}}」无法被保存。"
         body: "如下字段出现错误："
@@ -108,7 +122,7 @@
         empty: "不能留空"
         blank: "不能为空字符"
         too_long: "过长（最长为 {{count}} 个字符）"
-        too_short: "過短（最短为 {{count}} 个字符）"
+        too_short: "过短（最短为 {{count}} 个字符）"
         wrong_length: "长度非法（必须为 {{count}} 个字符）"
         taken: "已经被使用"
         not_a_number: "不是数字"
@@ -119,6 +133,14 @@
         less_than_or_equal_to: "必须小于或等于 {{count}}"
         odd: "必须为单数"
         even: "必须为双数"
+        record_invalid: "校验失败: {{errors}}"
+  
+  activemodel:
+    errors:
+      template:
+        header:
+          one: "有 1 个错误发生导致「{{model}}」无法被保存。"
+          other: "有 {{count}} 个错误发生导致「{{model}}」无法被保存。"
+        body: "如下字段出现错误："
   
 
-  
\ No newline at end of file