diff --git a/locales/ar.yml b/locales/ar.yml
index c1e1f1f..4bff3df 100644
--- a/locales/ar.yml
+++ b/locales/ar.yml
@@ -1,9 +1,3 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 ar:
   search_banner:
     headline: "مرحبًا بك في مجتمعنا"
diff --git a/locales/be.yml b/locales/be.yml
index 2ea77a0..91ccc2d 100644
--- a/locales/be.yml
+++ b/locales/be.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 be:
diff --git a/locales/bg.yml b/locales/bg.yml
index 5233352..d0e375d 100644
--- a/locales/bg.yml
+++ b/locales/bg.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 bg:
diff --git a/locales/bs_BA.yml b/locales/bs_BA.yml
index 828a7e6..e9e1744 100644
--- a/locales/bs_BA.yml
+++ b/locales/bs_BA.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
-bs_BA:
+bs:
diff --git a/locales/ca.yml b/locales/ca.yml
index ec737bc..f0c4872 100644
--- a/locales/ca.yml
+++ b/locales/ca.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 ca:
diff --git a/locales/cs.yml b/locales/cs.yml
index cdae40b..b16a3b4 100644
--- a/locales/cs.yml
+++ b/locales/cs.yml
@@ -1,9 +1,3 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 cs:
   search_banner:
     headline: "Vítejte v naší komunitě"
diff --git a/locales/da.yml b/locales/da.yml
index f39c727..347c94d 100644
--- a/locales/da.yml
+++ b/locales/da.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 da:
diff --git a/locales/de.yml b/locales/de.yml
index bd7ae45..94f2ad6 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -1,9 +1,3 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 de:
   search_banner:
     headline: "Willkommen in unserer Community"
diff --git a/locales/el.yml b/locales/el.yml
index d872d0e..419ec70 100644
--- a/locales/el.yml
+++ b/locales/el.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 el:
diff --git a/locales/en_GB.yml b/locales/en_GB.yml
index 2d4fa18..ef03d18 100644
--- a/locales/en_GB.yml
+++ b/locales/en_GB.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
-en_GB:
+en-GB:
diff --git a/locales/es.yml b/locales/es.yml
index 8f211e9..5889f24 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -1,9 +1,3 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 es:
   search_banner:
     headline: "Te damos la bienvenida a nuestra comunidad"
diff --git a/locales/et.yml b/locales/et.yml
index 0ea0b6d..e020c4f 100644
--- a/locales/et.yml
+++ b/locales/et.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 et:
diff --git a/locales/fa_IR.yml b/locales/fa_IR.yml
index f16a5c1..41cc6a7 100644
--- a/locales/fa_IR.yml
+++ b/locales/fa_IR.yml
@@ -1,10 +1,4 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
-fa_IR:
+fa:
   search_banner:
     headline: "به انجمن ما خوش آمدید"
     subhead: "خوشحالیم که اینجا هستید. اگر نیاز به راهنمایی دارید، لطفا قبل از ارسال فرسته، از قابلیت جست و جو استفاده کنید."
diff --git a/locales/fi.yml b/locales/fi.yml
index 63c6322..9c60032 100644
--- a/locales/fi.yml
+++ b/locales/fi.yml
@@ -1,9 +1,3 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 fi:
   search_banner:
     headline: "Tervetuloa yhteisöömme"
diff --git a/locales/fr.yml b/locales/fr.yml
index 430002f..986d95f 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -1,9 +1,3 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 fr:
   search_banner:
     headline: "Bienvenue dans notre communauté "
diff --git a/locales/gl.yml b/locales/gl.yml
index fb911ce..8ec5fc8 100644
--- a/locales/gl.yml
+++ b/locales/gl.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 gl:
diff --git a/locales/he.yml b/locales/he.yml
index b9069f1..86354b1 100644
--- a/locales/he.yml
+++ b/locales/he.yml
@@ -1,9 +1,3 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 he:
   search_banner:
     headline: "ברוך בואך לקהילה שלנו"
diff --git a/locales/hr.yml b/locales/hr.yml
index 93343ce..f67f33c 100644
--- a/locales/hr.yml
+++ b/locales/hr.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 hr:
diff --git a/locales/hu.yml b/locales/hu.yml
index 88657b1..5bae296 100644
--- a/locales/hu.yml
+++ b/locales/hu.yml
@@ -1,9 +1,3 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 hu:
   search_banner:
     headline: "Üdvözöljük közösségünkben"
diff --git a/locales/hy.yml b/locales/hy.yml
index cb18f64..c406540 100644
--- a/locales/hy.yml
+++ b/locales/hy.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 hy:
diff --git a/locales/id.yml b/locales/id.yml
index 596e36b..8446cba 100644
--- a/locales/id.yml
+++ b/locales/id.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 id:
diff --git a/locales/it.yml b/locales/it.yml
index 96e08ae..3818eeb 100644
--- a/locales/it.yml
+++ b/locales/it.yml
@@ -1,9 +1,3 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 it:
   search_banner:
     headline: "Ti diamo il benvenuto nella nostra community"
diff --git a/locales/ja.yml b/locales/ja.yml
index aa792b5..4a3c413 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -1,9 +1,3 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 ja:
   search_banner:
     headline: "コミュニティーへようこそ"
diff --git a/locales/ko.yml b/locales/ko.yml
index 18dd77f..8a7b3b8 100644
--- a/locales/ko.yml
+++ b/locales/ko.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 ko:
diff --git a/locales/lt.yml b/locales/lt.yml
index 16bb197..6c5cb83 100644
--- a/locales/lt.yml
+++ b/locales/lt.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 lt:
diff --git a/locales/lv.yml b/locales/lv.yml
index 59e0ef6..1be0eab 100644
--- a/locales/lv.yml
+++ b/locales/lv.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 lv:
diff --git a/locales/nb_NO.yml b/locales/nb_NO.yml
index 2e2224d..39d4a23 100644
--- a/locales/nb_NO.yml
+++ b/locales/nb_NO.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
-nb_NO:
+nb:
diff --git a/locales/nl.yml b/locales/nl.yml
index f52d0f6..5c1ad20 100644
--- a/locales/nl.yml
+++ b/locales/nl.yml
@@ -1,9 +1,3 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 nl:
   search_banner:
     headline: "Welkom bij onze community"
diff --git a/locales/pl_PL.yml b/locales/pl_PL.yml
index a260c31..a8e4dde 100644
--- a/locales/pl_PL.yml
+++ b/locales/pl_PL.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
-pl_PL:
+pl:
diff --git a/locales/pt.yml b/locales/pt.yml
index 298ba52..9cbe1f0 100644
--- a/locales/pt.yml
+++ b/locales/pt.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 pt:
diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index 6116218..e9598d2 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -1,10 +1,4 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
-pt_BR:
+pt:
   search_banner:
     headline: "Boas-vindas à nossa comunidade"
     subhead: "Estamos contentes que você está aqui. Se precisar de ajuda, pesquise antes de postar."
diff --git a/locales/ro.yml b/locales/ro.yml
index 08a77f8..79dbaa8 100644
--- a/locales/ro.yml
+++ b/locales/ro.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 ro:
diff --git a/locales/ru.yml b/locales/ru.yml
index d8d6448..6893be7 100644
--- a/locales/ru.yml
+++ b/locales/ru.yml
@@ -1,9 +1,3 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 ru:
   search_banner:
     headline: "Добро пожаловать в наше сообщество"
diff --git a/locales/sk.yml b/locales/sk.yml
index 6f81562..f634a02 100644
--- a/locales/sk.yml
+++ b/locales/sk.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 sk:
diff --git a/locales/sl.yml b/locales/sl.yml
index 23489a4..26c7ce2 100644
--- a/locales/sl.yml
+++ b/locales/sl.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 sl:
diff --git a/locales/sq.yml b/locales/sq.yml
index 7f051b7..44ddadc 100644
--- a/locales/sq.yml
+++ b/locales/sq.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 sq:
diff --git a/locales/sr.yml b/locales/sr.yml
index 88d63d6..9e26af8 100644
--- a/locales/sr.yml
+++ b/locales/sr.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 sr:
diff --git a/locales/sv.yml b/locales/sv.yml
index b165aa2..7e73a97 100644
--- a/locales/sv.yml
+++ b/locales/sv.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 sv:
diff --git a/locales/sw.yml b/locales/sw.yml
index 0d7cdd0..7bf7346 100644
--- a/locales/sw.yml
+++ b/locales/sw.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 sw:
diff --git a/locales/te.yml b/locales/te.yml
index 03967bd..34c54f1 100644
--- a/locales/te.yml
+++ b/locales/te.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 te:
diff --git a/locales/th.yml b/locales/th.yml
index 7de85ff..a443191 100644
--- a/locales/th.yml
+++ b/locales/th.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 th:
diff --git a/locales/tr_TR.yml b/locales/tr_TR.yml
index 236eeaa..609d634 100644
--- a/locales/tr_TR.yml
+++ b/locales/tr_TR.yml
@@ -1,10 +1,4 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
-tr_TR:
+tr:
   search_banner:
     headline: "Topluluğumuza hoş geldiniz"
     subhead: "Burada olmanızdan mutluluk duyuyoruz. Yardıma ihtiyacınız varsa lütfen gönderi paylaşmadan önce arama yapın."
diff --git a/locales/ug.yml b/locales/ug.yml
index a6bf018..289acf2 100644
--- a/locales/ug.yml
+++ b/locales/ug.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 ug:
diff --git a/locales/uk.yml b/locales/uk.yml
index f139054..c256c32 100644
--- a/locales/uk.yml
+++ b/locales/uk.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 uk:
diff --git a/locales/ur.yml b/locales/ur.yml
index b4a9c21..2cace58 100644
--- a/locales/ur.yml
+++ b/locales/ur.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 ur:
diff --git a/locales/vi.yml b/locales/vi.yml
index f629dcf..326506f 100644
--- a/locales/vi.yml
+++ b/locales/vi.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
 vi:
diff --git a/locales/zh_CN.yml b/locales/zh_CN.yml
index 7f061bf..57457ff 100644
--- a/locales/zh_CN.yml
+++ b/locales/zh_CN.yml
@@ -1,10 +1,4 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
-zh_CN:
+zh-CN:
   search_banner:
     headline: "欢迎访问我们的社区"
     subhead: "很高兴在这里见到您。如果您需要帮助，请先搜索，然后再发帖。"
diff --git a/locales/zh_TW.yml b/locales/zh_TW.yml
index 7e15fab..cb82c05 100644
--- a/locales/zh_TW.yml
+++ b/locales/zh_TW.yml
@@ -1,7 +1 @@
-# WARNING: Never edit this file.
-# It will be overwritten when translations are pulled from Crowdin.
-#
-# To work with us on translations, join this project:
-# https://translate.discourse.org/
-
-zh_TW:
+zh-TW: