diff --git a/config/locales/rails-i18n/da.yml b/config/locales/rails-i18n/da.yml
index f88daf667..3ee8dd130 100644
--- a/config/locales/rails-i18n/da.yml
+++ b/config/locales/rails-i18n/da.yml
@@ -135,7 +135,7 @@ da:
         inclusion: "er ikke i listen"
         exclusion: "er reserveret"
         invalid: "er ikke gyldig"
-        confirmation: stemmer ikke overens med bekræftelse"
+        confirmation: "stemmer ikke overens med bekræftelse"
         accepted: "skal accepteres"
         empty: "må ikke udelades"
         blank: "skal udfyldes"
diff --git a/config/locales/rails-i18n/en-US.yml b/config/locales/rails-i18n/en-US.yml
index c2ac985bc..d4af5cffc 100644
--- a/config/locales/rails-i18n/en-US.yml
+++ b/config/locales/rails-i18n/en-US.yml
@@ -15,9 +15,10 @@
     month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
     abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
     order:
+      - :year
       - :month
       - :day
-      - :year
+
   time:
     formats:
       default: "%a, %d %b %Y %H:%M:%S %z"
diff --git a/config/locales/rails-i18n/fr-CA.yml b/config/locales/rails-i18n/fr-CA.yml
index b6e5b0995..16bbbd566 100644
--- a/config/locales/rails-i18n/fr-CA.yml
+++ b/config/locales/rails-i18n/fr-CA.yml
@@ -120,7 +120,7 @@ fr-CA:
           million: "Million"
           billion: "Milliard"
           trillion: "Mille milliard"
-          quadrillion: "Million de milliard"
+          quadrillion: "Million de milliards"
 
   support:
     array:
diff --git a/config/locales/rails-i18n/fr-CH.yml b/config/locales/rails-i18n/fr-CH.yml
index 43d5c4fb8..d58123601 100644
--- a/config/locales/rails-i18n/fr-CH.yml
+++ b/config/locales/rails-i18n/fr-CH.yml
@@ -10,12 +10,12 @@ fr-CH:
       default: "%d.%m.%Y"
       short: "%e %b"
       long: "%e %B %Y"
-    day_names: [lundi, mardi, mercredi, jeudi, vendredi, samedi, dimanche]
-    abbr_day_names: [lun, mar, mer, jeu, ven, sam, dim]
+    day_names: [dimanche, lundi, mardi, mercredi, jeudi, vendredi, samedi]
+    abbr_day_names: [dim, lun, mar, mer, jeu, ven, sam]
     month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
     abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
     order: [ :day, :month, :year ]
-  
+
   time:
     formats:
       default: "%d. %B %Y %H:%M"
@@ -69,7 +69,7 @@ fr-CH:
       hour:   "Heure"
       minute: "Minute"
       second: "Seconde"
-  
+
   number:
     format:
       separator: "."
@@ -102,8 +102,8 @@ fr-CH:
         format: "%n %u"
         units:
           byte:
-            one:   "Octet"
-            other: "Octets"
+            one:   "octet"
+            other: "octets"
           kb: "ko"
           mb: "Mo"
           gb: "Go"
@@ -112,12 +112,12 @@ fr-CH:
         format: "%n %u"
         units:
           unit: ""
-          thousand: "Millier"
-          million: "Million"
-          billion: "Milliard"
-          trillion: "Mille milliard"
-          quadrillion: "Million de milliard"
-  
+          thousand: "millier"
+          million: "million"
+          billion: "milliard"
+          trillion: "billion"
+          quadrillion: "million de milliards"
+
   support:
     array:
       words_connector: ", "
diff --git a/config/locales/rails-i18n/fr.yml b/config/locales/rails-i18n/fr.yml
index 0824c2cef..2cab33f99 100644
--- a/config/locales/rails-i18n/fr.yml
+++ b/config/locales/rails-i18n/fr.yml
@@ -11,8 +11,8 @@ fr:
       default: "%d/%m/%Y"
       short: "%e %b"
       long: "%e %B %Y"
-    day_names: [lundi, mardi, mercredi, jeudi, vendredi, samedi, dimanche]
-    abbr_day_names: [lun, mar, mer, jeu, ven, sam, dim]
+    day_names: [dimanche, lundi, mardi, mercredi, jeudi, vendredi, samedi]
+    abbr_day_names: [dim, lun, mar, mer, jeu, ven, sam]
     month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
     abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
     order: [ :day, :month, :year ]
@@ -103,8 +103,8 @@ fr:
         format: "%n %u"
         units:
           byte:
-            one:   "Octet"
-            other: "Octets"
+            one:   "octet"
+            other: "octets"
           kb: "ko"
           mb: "Mo"
           gb: "Go"
@@ -113,11 +113,11 @@ fr:
         format: "%n %u"
         units:
           unit: ""
-          thousand: "Millier"
-          million: "Million"
-          billion: "Milliard"
-          trillion: "Mille milliard"
-          quadrillion: "Million de milliard"
+          thousand: "millier"
+          million: "million"
+          billion: "milliard"
+          trillion: "billion"
+          quadrillion: "million de milliards"
 
   support:
     array:
diff --git a/config/locales/rails-i18n/th.rb b/config/locales/rails-i18n/th.rb
index 8c780eb2a..5e82451e5 100644
--- a/config/locales/rails-i18n/th.rb
+++ b/config/locales/rails-i18n/th.rb
@@ -37,8 +37,8 @@ end
 :date => {
   :formats => {
     :default => lambda { |date, opts| "%d-%m-#{date.year + 543}" },
-    :short => "%e %b",
-    :long => lambda { |date, opts| "%e %B #{date.year + 543}" },
+    :short => "%d %b",
+    :long => lambda { |date, opts| "%d %B #{date.year + 543}" },
   },
 
   :day_names => ["อาทิตย์", "จันทร์", "อังคาร", "พุธ", "พฤหัสบดี", "ศุกร์", "เสาร์"],
@@ -52,8 +52,8 @@ end
 :time => {
   :formats => {
     :default => lambda { |date, opts| "%a %d %b #{date.year + 543} %H:%M:%S %z" },
-    :short => "%e %b %H:%M น.",
-    :long => lambda { |date, opts| "%e %B #{date.year + 543} %H:%M น." },
+    :short => "%d %b %H:%M น.",
+    :long => lambda { |date, opts| "%d %B #{date.year + 543} %H:%M น." },
   },
   :am => "ก่อนเที่ยง",
   :pm => "หลังเที่ยง"
diff --git a/config/locales/rails-i18n/zh-CN.yml b/config/locales/rails-i18n/zh-CN.yml
index 627ed8c3c..7e253adff 100644
--- a/config/locales/rails-i18n/zh-CN.yml
+++ b/config/locales/rails-i18n/zh-CN.yml
@@ -1,7 +1,7 @@
-# Chinese (China) translations for Ruby on Rails 
+# Chinese (China) translations for Ruby on Rails
 # by tsechingho (http://github.com/tsechingho)
 
-"zh-CN":
+zh-CN:
   date:
     formats:
       default: "%Y-%m-%d"
@@ -12,7 +12,7 @@
     month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
     abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
     order: [ :year, :month, :day ]
-  
+
   time:
     formats:
       default: "%Y年%b%d日 %A %H:%M:%S %Z"
@@ -20,7 +20,7 @@
       long: "%Y年%b%d日 %H:%M"
     am: "上午"
     pm: "下午"
-  
+
   datetime:
     distance_in_words:
       half_a_minute: "半分钟"
@@ -64,12 +64,14 @@
       hour:   "时"
       minute: "分"
       second: "秒"
-  
+
   number:
     format:
       separator: "."
       delimiter: ","
       precision: 3
+      significant: false
+      strip_insignificant_zeros: false
     currency:
       format:
         format: "%u %n"
@@ -77,6 +79,8 @@
         separator: "."
         delimiter: ","
         precision: 2
+        significant: false
+        strip_insignificant_zeros: false
     percentage:
       format:
         delimiter: ""
@@ -87,6 +91,8 @@
       format:
         delimiter: ""
         precision: 1
+        significant: false
+        strip_insignificant_zeros: false
       storage_units:
         format: "%n %u"
         units:
@@ -97,7 +103,30 @@
           mb: "MB"
           gb: "GB"
           tb: "TB"
-  
+      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
+          trillion: "兆" # 10^12 tera
+          quadrillion: "千兆" # 10^15 peta
+          # 10^18 exa, 10^21 zetta, 10^24 yotta
+
   support:
     array:
       words_connector: ", "
@@ -105,7 +134,7 @@
       last_word_connector: ", 和 "
     select:
       prompt: "请选择"
-  
+
   activerecord:
     errors:
       template: # ~ 2.3.5 backward compatible
@@ -113,6 +142,8 @@
           one: "有 1 个错误发生导致「%{model}」无法被保存。"
           other: "有 %{count} 个错误发生导致「%{model}」无法被保存。"
         body: "如下字段出现错误："
+      full_messages:
+        format: "%{attribute} %{message}"
       messages:
         inclusion: "不包含于列表中"
         exclusion: "是保留关键字"
@@ -124,7 +155,6 @@
         too_long: "过长（最长为 %{count} 个字符）"
         too_short: "过短（最短为 %{count} 个字符）"
         wrong_length: "长度非法（必须为 %{count} 个字符）"
-        taken: "已经被使用"
         not_a_number: "不是数字"
         not_an_integer: "必须是整数"
         greater_than: "必须大于 %{count}"
@@ -134,8 +164,9 @@
         less_than_or_equal_to: "必须小于或等于 %{count}"
         odd: "必须为单数"
         even: "必须为双数"
+        taken: "已经被使用"
         record_invalid: "校验失败: %{errors}"
-  
+
   activemodel:
     errors:
       template:
@@ -143,5 +174,34 @@
           one: "有 1 个错误发生导致「%{model}」无法被保存。"
           other: "有 %{count} 个错误发生导致「%{model}」无法被保存。"
         body: "如下字段出现错误："
-  
 
+  errors:
+    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: "必须为双数"
+
+  helpers:
+    select:
+      prompt: "请选择"
+    submit:
+      create: "新增%{model}"
+      update: "更新%{model}"
+      submit: "储存%{model}"
diff --git a/config/locales/rails-i18n/zh-TW.yml b/config/locales/rails-i18n/zh-TW.yml
index 18888ea20..c0099425f 100644
--- a/config/locales/rails-i18n/zh-TW.yml
+++ b/config/locales/rails-i18n/zh-TW.yml
@@ -1,7 +1,7 @@
-# Chinese (Taiwan) translations for Ruby on Rails 
+# Chinese (Taiwan) translations for Ruby on Rails
 # by tsechingho (http://github.com/tsechingho)
 
-"zh-TW":
+zh-TW:
   date:
     formats:
       default: "%Y-%m-%d"
@@ -12,7 +12,7 @@
     month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
     abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
     order: [ :year, :month, :day ]
-  
+
   time:
     formats:
       default: "%Y年%b%d日 %A %H:%M:%S %Z"
@@ -20,7 +20,7 @@
       long: "%Y年%b%d日 %H:%M"
     am: "上午"
     pm: "下午"
-  
+
   datetime:
     distance_in_words:
       half_a_minute: "半分鐘"
@@ -64,12 +64,14 @@
       hour:   "時"
       minute: "分"
       second: "秒"
-  
+
   number:
     format:
       separator: "."
       delimiter: ","
       precision: 3
+      significant: false
+      strip_insignificant_zeros: false
     currency:
       format:
         format: "%u %n"
@@ -77,6 +79,8 @@
         separator: "."
         delimiter: ","
         precision: 2
+        significant: false
+        strip_insignificant_zeros: false
     percentage:
       format:
         delimiter: ""
@@ -87,6 +91,8 @@
       format:
         delimiter: ""
         precision: 1
+        significant: false
+        strip_insignificant_zeros: false
       storage_units:
         format: "%n %u"
         units:
@@ -97,7 +103,30 @@
           mb: "MB"
           gb: "GB"
           tb: "TB"
-  
+      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
+          trillion: "兆" # 10^12 tera
+          quadrillion: "千兆" # 10^15 peta
+          # 10^18 exa, 10^21 zetta, 10^24 yotta
+
   support:
     array:
       words_connector: ", "
@@ -105,7 +134,7 @@
       last_word_connector: ", 和 "
     select:
       prompt: "請選擇"
-  
+
   activerecord:
     errors:
       template: # ~ 2.3.5 backward compatible
@@ -113,6 +142,8 @@
           one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
           other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
         body: "以下欄位發生問題："
+      full_messages:
+        format: "%{attribute} %{message}"
       messages:
         inclusion: "沒有包含在列表中"
         exclusion: "是被保留的關鍵字"
@@ -124,7 +155,6 @@
         too_long: "過長（最長是 %{count} 個字）"
         too_short: "過短（最短是 %{count} 個字）"
         wrong_length: "字數錯誤（必須是 %{count} 個字）"
-        taken: "已經被使用"
         not_a_number: "不是數字"
         not_an_integer: "必須是整數"
         greater_than: "必須大於 %{count}"
@@ -134,8 +164,9 @@
         less_than_or_equal_to: "必須小於或等於 %{count}"
         odd: "必須是奇數"
         even: "必須是偶數"
+        taken: "已經被使用"
         record_invalid: "校驗失敗: %{errors}"
-  
+
   activemodel:
     errors:
       template:
@@ -143,5 +174,34 @@
           one: "有 1 個錯誤發生使得「%{model}」無法被儲存。"
           other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
         body: "以下欄位發生問題："
-  
 
+  errors:
+    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: "必須是偶數"
+
+  helpers:
+    select:
+      prompt: "請選擇"
+    submit:
+      create: "新增%{model}"
+      update: "更新%{model}"
+      submit: "儲存%{model}"