rails-i18n 6.0.0.beta1 → 6.0.0

data/rails/locale/uz.yml

@@ -14,7 +14,7 @@ uz:
     - Ju
     - Sh
     abbr_month_names:
-    -
+    - 
     - yan.
     - fev.
     - mart
@@ -40,7 +40,7 @@ uz:
       long: "%d %B %Y"
       short: "%d %b"
     month_names:
-    -
+    - 
     - yanvar
     - fevral
     - mart
@@ -60,19 +60,19 @@ uz:
   datetime:
     distance_in_words:
       about_x_hours:
+        one: chamasi %{count} soat
         few: chamasi %{count} soat
         many: chamasi %{count} soat
-        one: chamasi %{count} soat
         other: chamasi %{count} soat
       about_x_months:
+        one: chamasi %{count} oy
         few: chamasi %{count} oy
         many: chamasi %{count} oy
-        one: chamasi %{count} oy
         other: chamasi %{count} oy
       about_x_years:
+        one: chamasi %{count} yil
         few: chamasi %{count} yil
         many: chamasi %{count} yil
-        one: chamasi %{count} yil
         other: chamasi %{count} yil
       almost_x_years:
         one: deyarli 1 yil
@@ -80,47 +80,47 @@ uz:
         many: deyarli %{count} yil
         other: deyarli %{count} yil
       half_a_minute: bir daqiqadan kam
-      less_than_x_minutes:
-        few: "%{count} daqiqadan kam"
-        many: "%{count} daqiqadan kam"
-        one: "%{count} daqiqadan kam"
-        other: "%{count} daqiqadan kam"
       less_than_x_seconds:
+        one: "%{count} soniyadan kam"
         few: "%{count} soniyadan kam"
         many: "%{count} soniyadan kam"
-        one: "%{count} soniyadan kam"
         other: "%{count} soniyadan kam"
+      less_than_x_minutes:
+        one: "%{count} daqiqadan kam"
+        few: "%{count} daqiqadan kam"
+        many: "%{count} daqiqadan kam"
+        other: "%{count} daqiqadan kam"
       over_x_years:
+        one: "%{count} yildan ziyod"
         few: "%{count} yildan ziyod"
         many: "%{count} yildan ziyod"
-        one: "%{count} yildan ziyod"
         other: "%{count} yildan ziyod"
-      x_days:
-        few: "%{count} kun"
-        many: "%{count} kun"
-        one: "%{count} kun"
-        other: "%{count} kun"
+      x_seconds:
+        one: "%{count} soniya"
+        few: "%{count} soniya"
+        many: "%{count} soniya"
+        other: "%{count} soniya"
       x_minutes:
+        one: "%{count} daqiqa"
         few: "%{count} daqiqa"
         many: "%{count} daqiqa"
-        one: "%{count} daqiqa"
         other: "%{count} daqiqa"
+      x_days:
+        one: "%{count} kun"
+        few: "%{count} kun"
+        many: "%{count} kun"
+        other: "%{count} kun"
       x_months:
+        one: "%{count} oy"
         few: "%{count} oy"
         many: "%{count} oy"
-        one: "%{count} oy"
         other: "%{count} oy"
-      x_seconds:
-        few: "%{count} soniya"
-        many: "%{count} soniya"
-        one: "%{count} soniya"
-        other: "%{count} soniya"
     prompts:
-      day: kun
-      hour: soat
+      second: soniya
       minute: daqiqa
+      hour: soat
+      day: kun
       month: oy
-      second: soniya
       year: yil
   errors:
     format: "%{attribute} %{message}"
@@ -143,26 +143,26 @@ uz:
       odd: toq sonlar mumkin
       taken: band
       too_long:
+        one: uzunligi yetarligidan ortiq (%{count} ta simvoldan yuqori mumkin emas)
         few: uzunligi yetarligidan ortiq (%{count} ta simvoldan yuqori mumkin emas)
         many: uzunligi yetarligidan ortiq (%{count} ta simvoldan yuqori mumkin emas)
-        one: uzunligi yetarligidan ortiq (%{count} ta simvoldan yuqori mumkin emas)
         other: uzunligi yetarligidan ortiq (%{count} ta simvoldan yuqori mumkin emas)
       too_short:
+        one: uzunligi yetarli emas (%{count} ta simvoldan kam mumkin emas)
         few: uzunligi yetarli emas (%{count} ta simvoldan kam mumkin emas)
         many: uzunligi yetarli emas (%{count} ta simvoldan kam mumkin emas)
-        one: uzunligi yetarli emas (%{count} ta simvoldan kam mumkin emas)
         other: uzunligi yetarli emas (%{count} ta simvoldan kam mumkin emas)
       wrong_length:
+        one: uzunligi noto'gri (uzunligi %{count} simvolga teng bulishi kerak)
         few: uzunligi noto'gri (uzunligi %{count} simvolga teng bulishi kerak)
         many: uzunligi noto'gri (uzunligi %{count} simvolga teng bulishi kerak)
-        one: uzunligi noto'gri (uzunligi %{count} simvolga teng bulishi kerak)
         other: uzunligi noto'gri (uzunligi %{count} simvolga teng bulishi kerak)
     template:
       body: 'Quyidagilarda hatolar mavjud:'
       header:
+        one: "%{count} ta hato sababli %{model}:ni saqlab bulmadi"
         few: "%{count} ta hatolar sababli %{model}:ni saqlab bulmadi"
         many: "%{count} ta hatolar sababli %{model}:ni saqlab bulmadi"
-        one: "%{count} ta hato sababli %{model}:ni saqlab bulmadi"
         other: "%{count} ta hatolar sababli %{model}:ni saqlab bulmadi"
   helpers:
     select:
@@ -192,29 +192,29 @@ uz:
         format: "%n %u"
         units:
           billion:
+            one: milliard
             few: milliard
             many: milliard
-            one: milliard
             other: milliard
           million:
+            one: million
             few: million
             many: million
-            one: million
             other: million
           quadrillion:
+            one: kvadrillion
             few: kvadrillion
             many: kvadrillion
-            one: kvadrillion
             other: kvadrillion
           thousand:
+            one: ming
             few: ming
             many: ming
-            one: ming
             other: ming
           trillion:
+            one: trillion
             few: trillion
             many: trillion
-            one: trillion
             other: trillion
           unit: ''
       format:
@@ -226,9 +226,9 @@ uz:
         format: "%n %u"
         units:
           byte:
+            one: bayt
             few: bayt
             many: bayt
-            one: bayt
             other: bayt
           gb: GB
           kb: KB

data/rails/locale/vi.yml

@@ -17,7 +17,7 @@ vi:
     - Thứ 6
     - Thứ 7
     abbr_month_names:
-    -
+    - 
     - Thg 1
     - Thg 2
     - Thg 3
@@ -43,7 +43,7 @@ vi:
       long: "%d %B, %Y"
       short: "%d %b"
     month_names:
-    -
+    - 
     - Tháng một
     - Tháng hai
     - Tháng ba
@@ -75,40 +75,39 @@ vi:
         one: gần 1 năm
         other: gần %{count} năm
       half_a_minute: 30 giây
-      less_than_x_minutes:
-        one: chưa tới 1 phút
-        other: chưa tới %{count} phút
       less_than_x_seconds:
         one: chưa tới 1 giây
         other: chưa tới %{count} giây
+      less_than_x_minutes:
+        one: chưa tới 1 phút
+        other: chưa tới %{count} phút
       over_x_years:
         one: hơn 1 năm
         other: hơn %{count} năm
-      x_days:
-        one: 1 ngày
-        other: "%{count} ngày"
+      x_seconds:
+        one: 1 giây
+        other: "%{count} giây"
       x_minutes:
         one: 1 phút
         other: "%{count} phút"
+      x_days:
+        one: 1 ngày
+        other: "%{count} ngày"
       x_months:
         one: 1 tháng
         other: "%{count} tháng"
-      x_seconds:
-        one: 1 giây
-        other: "%{count} giây"
     prompts:
-      day: Ngày
-      hour: Giờ
+      second: Giây
       minute: Phút
+      hour: Giờ
+      day: Ngày
       month: Tháng
-      second: Giây
       year: Năm
   errors:
     format: "%{attribute} %{message}"
     messages:
       accepted: phải được đồng ý
       blank: không thể để trắng
-      present: cần phải để trắng
       confirmation: không khớp với xác nhận
       empty: không thể rỗng
       equal_to: phải bằng %{count}
@@ -123,11 +122,12 @@ vi:
       not_a_number: không phải là số
       not_an_integer: phải là một số nguyên
       odd: phải là số lẻ
+      other_than: cần phải khác %{count}
+      present: cần phải để trắng
       taken: đã có
       too_long: quá dài (tối đa %{count} ký tự)
       too_short: quá ngắn (tối thiểu %{count} ký tự)
       wrong_length: độ dài không đúng (phải là %{count} ký tự)
-      other_than: cần phải khác %{count}
     template:
       body: 'Có lỗi với các mục sau:'
       header:
@@ -160,12 +160,12 @@ vi:
       decimal_units:
         format: "%n %u"
         units:
-          unit: ''
           billion: Tỷ
           million: Triệu
           quadrillion: Triệu tỷ
           thousand: Nghìn
           trillion: Nghìn tỷ
+          unit: ''
       format:
         delimiter: ''
         precision: 1

data/rails/locale/wo.yml

@@ -3,10 +3,10 @@ wo:
   activerecord:
     errors:
       messages:
-        record_invalid: "Validation failed: %{errors}"
+        record_invalid: 'Validation failed: %{errors}'
         restrict_dependent_destroy:
-          has_one: "Cannot delete record because a dependent %{record} exists"
-          has_many: "Cannot delete record because dependent %{record} exist"
+          has_one: Cannot delete record because a dependent %{record} exists
+          has_many: Cannot delete record because dependent %{record} exist
   date:
     abbr_day_names:
     - Dib
@@ -17,7 +17,7 @@ wo:
     - Ajj
     - Gaw
     abbr_month_names:
-    -
+    - 
     - Jan
     - Feb
     - Mar
@@ -43,7 +43,7 @@ wo:
       long: "%B %d, %Y"
       short: "%b %d"
     month_names:
-    -
+    - 
     - Tamkharit
     - Digui Gamou
     - Gamou
@@ -75,36 +75,36 @@ wo:
         one: almost 1 year
         other: almost %{count} years
       half_a_minute: half a minute
-      less_than_x_minutes:
-        one: less than a minute
-        other: less than %{count} minutes
       less_than_x_seconds:
         one: less than 1 second
         other: less than %{count} seconds
+      less_than_x_minutes:
+        one: less than a minute
+        other: less than %{count} minutes
       over_x_years:
         one: over 1 year
         other: over %{count} years
-      x_days:
-        one: 1 day
-        other: "%{count} days"
+      x_seconds:
+        one: 1 second
+        other: "%{count} seconds"
       x_minutes:
         one: 1 minute
         other: "%{count} minutes"
+      x_days:
+        one: 1 day
+        other: "%{count} days"
       x_months:
         one: 1 month
         other: "%{count} months"
       x_years:
         one: 1 year
-        other: "%{count} years"  
-      x_seconds:
-        one: 1 second
-        other: "%{count} seconds"
+        other: "%{count} years"
     prompts:
-      day: Day
-      hour: Hour
+      second: Second
       minute: Minute
+      hour: Hour
+      day: Day
       month: Month
-      second: Seconds
       year: Year
   errors:
     format: "%{attribute} %{message}"

data/rails/locale/zh-CN.yml

@@ -3,7 +3,7 @@ zh-CN:
   activerecord:
     errors:
       messages:
-        record_invalid: "验证失败: %{errors}"
+        record_invalid: '验证失败: %{errors}'
         restrict_dependent_destroy:
           has_one: 由于 %{record} 需要此记录，所以无法移除记录
           has_many: 由于 %{record} 需要此记录，所以无法移除记录
@@ -17,7 +17,7 @@ zh-CN:
     - 周五
     - 周六
     abbr_month_names:
-    -
+    - 
     - 1月
     - 2月
     - 3月
@@ -43,7 +43,7 @@ zh-CN:
       long: "%Y年%m月%d日"
       short: "%m月%d日"
     month_names:
-    -
+    - 
     - 一月
     - 二月
     - 三月
@@ -67,28 +67,27 @@ zh-CN:
       about_x_years: 大约 %{count} 年
       almost_x_years: 接近 %{count} 年
       half_a_minute: 半分钟
-      less_than_x_minutes: 不到 %{count} 分钟
       less_than_x_seconds: 不到 %{count} 秒
+      less_than_x_minutes: 不到 %{count} 分钟
       over_x_years: "%{count} 年多"
-      x_days: "%{count} 天"
+      x_seconds: "%{count} 秒"
       x_minutes: "%{count} 分钟"
+      x_days: "%{count} 天"
       x_months: "%{count} 个月"
       x_years: "%{count} 年"
-      x_seconds: "%{count} 秒"
     prompts:
-      day: 日
-      hour: 时
+      second: 秒
       minute: 分
+      hour: 时
+      day: 日
       month: 月
-      second: 秒
       year: 年
   errors:
     format: "%{attribute}%{message}"
     messages:
       accepted: 必须是可被接受的
       blank: 不能为空字符
-      present: 必须是空白
-      confirmation: 与确认值不匹配
+      confirmation: 与 %{attribute} 不匹配
       empty: 不能留空
       equal_to: 必须等于 %{count}
       even: 必须为双数
@@ -99,16 +98,17 @@ zh-CN:
       invalid: 是无效的
       less_than: 必须小于 %{count}
       less_than_or_equal_to: 必须小于或等于 %{count}
-      model_invalid: "验证失败: %{errors}"
+      model_invalid: '验证失败: %{errors}'
       not_a_number: 不是数字
       not_an_integer: 必须是整数
       odd: 必须为单数
+      other_than: 长度非法（不可为 %{count} 个字符
+      present: 必须是空白
       required: 必须存在
       taken: 已经被使用
       too_long: 过长（最长为 %{count} 个字符）
       too_short: 过短（最短为 %{count} 个字符）
       wrong_length: 长度非法（必须为 %{count} 个字符）
-      other_than: 长度非法（不可为 %{count} 个字符
     template:
       body: 如下字段出现错误：
       header: 有 %{count} 个错误发生导致“%{model}”无法被保存。
@@ -154,12 +154,12 @@ zh-CN:
         format: "%n %u"
         units:
           byte: 字节
+          eb: EB
           gb: GB
           kb: KB
           mb: MB
-          tb: TB
           pb: PB
-          eb: EB
+          tb: TB
     percentage:
       format:
         delimiter: ''