X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e7b47374e79e14c315360ff23332a8559080301b..872c0fff63a79ee796cf7e45ffff5c5a934e40a8:/vendor/rails-locales/zh-TW.yml?ds=sidebyside

diff --git a/vendor/rails-locales/zh-TW.yml b/vendor/rails-locales/zh-TW.yml
index 2137e1634..3c3fc2b37 100644
--- a/vendor/rails-locales/zh-TW.yml
+++ b/vendor/rails-locales/zh-TW.yml
@@ -1,3 +1,4 @@
+
 # Chinese (Taiwan) translations for Ruby on Rails
 # by tsechingho (http://github.com/tsechingho)
 
@@ -149,20 +150,7 @@ zh-TW:
       decimal_units:
         format: "%n %u"
         units:
-          # 10^-21 zepto, 10^-24 yocto
-          atto: "渺"  # 10^-18
-          femto: "飛" # 10^-15 毫微微
-          pico: "漠"  # 10^-12 微微
-          nano: "奈"  # 10^-9 毫微
-          micro: "å¾®" # 10^-6
-          mili: "毫"  # 10^-3 milli
-          centi: "厘" # 10^-2
-          deci: "分"  # 10^-1
           unit: ""
-          ten:
-            one: "十"
-            other: "十"  # 10^1
-          hundred: "百"  # 10^2
           thousand: "千" # 10^3 kilo
           million: "百萬" # 10^6 mega
           billion: "十億" # 10^9 giga
@@ -178,49 +166,9 @@ zh-TW:
     select:
       prompt: "請選擇"
 
-  activerecord:
-    errors:
-      template: # ~ 2.3.5 backward compatible
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-      full_messages:
-        format: "%{attribute} %{message}"
-      messages:
-        inclusion: "沒有包含在列表中"
-        exclusion: "是被保留的關鍵字"
-        invalid: "是無效的"
-        confirmation: "不符合確認值"
-        accepted: "必須是可被接受的"
-        empty: "不能留空"
-        blank: "不能是空白字元"
-        too_long: "過長（最長是 %{count} 個字）"
-        too_short: "過短（最短是 %{count} 個字）"
-        wrong_length: "字數錯誤（必須是 %{count} 個字）"
-        not_a_number: "不是數字"
-        not_an_integer: "必須是整數"
-        greater_than: "必須大於 %{count}"
-        greater_than_or_equal_to: "必須大於或等於 %{count}"
-        equal_to: "必須等於 %{count}"
-        less_than: "必須小於 %{count}"
-        less_than_or_equal_to: "必須小於或等於 %{count}"
-        odd: "必須是奇數"
-        even: "必須是偶數"
-        taken: "已經被使用"
-        record_invalid: "校驗失敗: %{errors}"
-
-  activemodel:
-    errors:
-      template:
-        header:
-          one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
-          other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
-        body: "以下欄位發生問題："
-
   errors:
     format: "%{attribute} %{message}"
-    messages:
+    messages: &errors_messages
       inclusion: "沒有包含在列表中"
       exclusion: "是被保留的關鍵字"
       invalid: "是無效的"
@@ -240,6 +188,22 @@ zh-TW:
       less_than_or_equal_to: "必須小於或等於 %{count}"
       odd: "必須是奇數"
       even: "必須是偶數"
+      taken: "已經被使用"
+      record_invalid: "校驗失敗: %{errors}"
+    template: &errors_template
+      header:
+        one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
+        other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
+      body: "以下欄位發生問題："
+  
+  activerecord:
+    errors:
+      messages:
+        <<: *errors_messages
+      template:
+        <<: *errors_template
+      full_messages:
+        format: "%{attribute} %{message}"
 
   helpers:
     select: