Remove conflicts

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 - Add following locales:
   - Welsh (cy)
+## 7.0.9 (2023-11-16)
+
+- Fix empty `am` and `pm` keys to make dates/times in the 12-hour time format distinguishable in every locale #1105
+- Update following locales:
+  - Afrikaans (af): Fix translation of May #1110
+  - Traditional Chinese (zh-HK, zh-TW, zh-YUE): Use traditional "week" character in `date.abbr_day_names` #1112
+  - Italian (it): Fix translation for `second` prompt #1111
+  - Bosnian (bs): am/pm
+  - Danish (da): am/pm
+  - Galician (gl): am/pm
+  - Icelandic (is): am/pm
+  - Norwegian Bokmål (nb): am/pm
+  - Norwegian Nynorsk (nn): am/pm
+  - Portuguese (pt-BR): am/pm
+  - Romanian (ro): am/pm
+  - Swedish (sv sv-FI sv-SE): am/pm
 
 ## 7.0.8 (2023-08-15)
 

rails/locale/af.yml

@@ -48,7 +48,7 @@ af:
     - Februarie
     - Maart
     - April
-    - Mai
+    - Mei
     - Junie
     - Julie
     - Augustus

rails/locale/bs.yml

@@ -240,9 +240,9 @@ bs:
       two_words_connector: " i "
       words_connector: ", "
   time:
-    am: ''
+    am: am
     formats:
       default: "%d.%m.%Y. %H:%M:%S"
       long: "%d. %B %Y. - %H:%M:%S"
       short: "%d. %b %Y. %H:%M"
-    pm: ''
+    pm: pm

rails/locale/da.yml

@@ -213,9 +213,9 @@ da:
       two_words_connector: " og "
       words_connector: ", "
   time:
-    am: ''
+    am: am
     formats:
       default: "%e. %B %Y, %H.%M"
       long: "%A d. %e. %B %Y, %H.%M"
       short: "%e. %b %Y, %H.%M"
-    pm: ''
+    pm: pm

rails/locale/gl.yml

@@ -164,9 +164,9 @@ gl:
       two_words_connector: " e "
       words_connector: ", "
   time:
-    am: ''
+    am: am
     formats:
       default: "%A, %e de %B de %Y ás %H:%M"
       long: "%A %e de %B de %Y ás %H:%M"
       short: "%e/%m, %H:%M"
-    pm: ''
+    pm: pm

rails/locale/is.yml

@@ -208,9 +208,9 @@ is:
       two_words_connector: " og "
       words_connector: ", "
   time:
-    am: ''
+    am: am
     formats:
       default: "%A %e. %B %Y kl. %H:%M"
       long: "%A %e. %B %Y kl. %H:%M"
       short: "%e. %B kl. %H:%M"
-    pm: ''
+    pm: pm

rails/locale/it.yml

@@ -100,7 +100,7 @@ it:
         one: "%{count} anno"
         other: "%{count} anni"
     prompts:
-      second: Secondi
+      second: Secondo
       minute: Minuto
       hour: Ora
       day: Giorno

rails/locale/nb.yml

@@ -213,9 +213,9 @@ nb:
       two_words_connector: " og "
       words_connector: ", "
   time:
-    am: ''
+    am: am
     formats:
       default: "%A, %e. %B %Y, %H:%M"
       long: "%A, %e. %B %Y, %H:%M"
       short: "%e. %B, %H:%M"
-    pm: ''
+    pm: pm

rails/locale/nn.yml

@@ -200,9 +200,9 @@ nn:
       two_words_connector: " og "
       words_connector: ", "
   time:
-    am: ''
+    am: am
     formats:
       default: "%A, %e. %B %Y, %H:%M"
       long: "%A, %e. %B %Y, %H:%M"
       short: "%e. %B, %H:%M"
-    pm: ''
+    pm: pm

rails/locale/pt-BR.yml

@@ -217,9 +217,9 @@ pt-BR:
       two_words_connector: " e "
       words_connector: ", "
   time:
-    am: ''
+    am: am
     formats:
       default: "%a, %d de %B de %Y, %H:%M:%S %z"
       long: "%d de %B de %Y, %H:%M"
       short: "%d de %B, %H:%M"
-    pm: ''
+    pm: pm

rails/locale/ro.yml

@@ -201,9 +201,9 @@ ro:
       two_words_connector: " și "
       words_connector: ", "
   time:
-    am: ''
+    am: am
     formats:
       default: "%a %d %b %Y, %H:%M:%S %z"
       long: "%d %B %Y %H:%M"
       short: "%d %b %H:%M"
-    pm: ''
+    pm: pm

rails/locale/sv-FI.yml

@@ -199,9 +199,9 @@ sv-FI:
       two_words_connector: " och "
       words_connector: ", "
   time:
-    am: ""
+    am: am
     formats:
       default: "%a, %e %b %Y %H:%M:%S %z"
       long: "%e %B %Y %H:%M"
       short: "%e %b %H:%M"
-    pm: ""
+    pm: pm

rails/locale/sv-SE.yml

@@ -202,9 +202,9 @@ sv-SE:
       two_words_connector: " och "
       words_connector: ", "
   time:
-    am: ''
+    am: am
     formats:
       default: "%a, %e %b %Y %H:%M:%S %z"
       long: "%e %B %Y %H:%M"
       short: "%e %b %H:%M"
-    pm: ''
+    pm: pm

rails/locale/sv.yml

@@ -202,9 +202,9 @@ sv:
       two_words_connector: " och "
       words_connector: ", "
   time:
-    am: ''
+    am: am
     formats:
       default: "%a, %e %b %Y %H:%M:%S %z"
       long: "%e %B %Y %H:%M"
       short: "%e %b %H:%M"
-    pm: ''
+    pm: pm

rails/locale/zh-HK.yml

@@ -9,13 +9,13 @@ zh-HK:
           has_many: 由於%{record}依賴此記錄，無法移除
   date:
     abbr_day_names:
-    - 周日
-    - 周一
-    - 周二
-    - 周三
-    - 周四
-    - 周五
-    - 周六
+    - 週日
+    - 週一
+    - 週二
+    - 週三
+    - 週四
+    - 週五
+    - 週六
     abbr_month_names:
     - 
     - 1月

rails/locale/zh-TW.yml

@@ -9,13 +9,13 @@ zh-TW:
           has_many: 由於%{record}需要此記錄，所以無法移除記錄
   date:
     abbr_day_names:
-    - 周日
-    - 周一
-    - 周二
-    - 周三
-    - 周四
-    - 周五
-    - 周六
+    - 週日
+    - 週一
+    - 週二
+    - 週三
+    - 週四
+    - 週五
+    - 週六
     abbr_month_names:
     - 
     - 1月

rails/locale/zh-YUE.yml

@@ -9,13 +9,13 @@ zh-YUE:
           has_many: 唔可以刪除，因為%{record}要用佢
   date:
     abbr_day_names:
-    - 周日
-    - 周一
-    - 周二
-    - 周三
-    - 周四
-    - 周五
-    - 周六
+    - 週日
+    - 週一
+    - 週二
+    - 週三
+    - 週四
+    - 週五
+    - 週六
     abbr_month_names:
     - 
     - 1月