Merge branch 'master' of git://git.openstreetmap.org/rails into openID

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

diff --git a/vendor/plugins/rails-i18n/locale/zh-TW.yml b/vendor/plugins/rails-i18n/locale/zh-TW.yml
index 2cb462cbf2d340bd96ad2f74e4c69167f836bf87..31a3712608957d76e759118e6f391803e42d81ba 100644 (file)
--- a/vendor/plugins/rails-i18n/locale/zh-TW.yml
+++ b/vendor/plugins/rails-i18n/locale/zh-TW.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: "ä¸\80ç§\92å\86\85"
-        other: "少於 {{count}} 秒"
+        one: "ä¸\8då\88°ä¸\80ç§\92"
+        other: "不到 {{count}} 秒"
       x_seconds:
         one: "一秒"
         other: "{{count}} 秒"
       less_than_x_minutes:
-        one: "ä¸\80å\88\86é\90\98å\86\85"
-        other: "少於 {{count}} 分鐘"
+        one: "ä¸\8då\88°ä¸\80å\88\86é\90\98"
+        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:  "月"
@@ -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: "下面欄位有問題："
@@ -104,7 +118,7 @@
         exclusion: "是被保留的"
         invalid: "是無效的"
         confirmation: "不符合確認值"
-        accepted: "å¿\85é¡»是可被接受的"
+        accepted: "å¿\85é \88是可被接受的"
         empty: "不能留空"
         blank: "不能是空白字元"
         too_long: "過長（最長是 {{count}} 個字）"
@@ -119,5 +133,14 @@
         less_than_or_equal_to: "必須小於或等於 {{count}}"
         odd: "必須是奇數"
         even: "必須是偶數"
+        record_invalid: "校驗失敗: {{errors}}"
+  
+  activemodel:
+    errors:
+      template:
+        header:
+          one: "有 1 個錯誤發生使得「{{model}}」無法被儲存。"
+          other: "有 {{count}} 個錯誤發生使得「{{model}}」無法被儲存。"
+        body: "下面欄位有問題："