diff --git a/locale/fr_FR/admin.po b/locale/fr/admin.po
similarity index 100%
rename from locale/fr_FR/admin.po
rename to locale/fr/admin.po
diff --git a/locale/fr_FR/api.po b/locale/fr/api.po
similarity index 100%
rename from locale/fr_FR/api.po
rename to locale/fr/api.po
diff --git a/locale/fr_FR/author.po b/locale/fr/author.po
similarity index 100%
rename from locale/fr_FR/author.po
rename to locale/fr/author.po
diff --git a/locale/fr_FR/default.po b/locale/fr/default.po
similarity index 100%
rename from locale/fr_FR/default.po
rename to locale/fr/default.po
diff --git a/locale/fr_FR/editor.po b/locale/fr/editor.po
similarity index 100%
rename from locale/fr_FR/editor.po
rename to locale/fr/editor.po
diff --git a/locale/fr_FR/emails.po b/locale/fr/emails.po
similarity index 100%
rename from locale/fr_FR/emails.po
rename to locale/fr/emails.po
diff --git a/locale/fr_FR/locale.po b/locale/fr/locale.po
similarity index 100%
rename from locale/fr_FR/locale.po
rename to locale/fr/locale.po
diff --git a/locale/fr_FR/manager.po b/locale/fr/manager.po
similarity index 100%
rename from locale/fr_FR/manager.po
rename to locale/fr/manager.po
diff --git a/locale/fr_FR/submission.po b/locale/fr/submission.po
similarity index 100%
rename from locale/fr_FR/submission.po
rename to locale/fr/submission.po
diff --git a/locale/nb/admin.po b/locale/nb_NO/admin.po
similarity index 100%
rename from locale/nb/admin.po
rename to locale/nb_NO/admin.po
diff --git a/locale/nb/api.po b/locale/nb_NO/api.po
similarity index 100%
rename from locale/nb/api.po
rename to locale/nb_NO/api.po
diff --git a/locale/nb/author.po b/locale/nb_NO/author.po
similarity index 100%
rename from locale/nb/author.po
rename to locale/nb_NO/author.po
diff --git a/locale/nb/default.po b/locale/nb_NO/default.po
similarity index 100%
rename from locale/nb/default.po
rename to locale/nb_NO/default.po
diff --git a/locale/nb/editor.po b/locale/nb_NO/editor.po
similarity index 100%
rename from locale/nb/editor.po
rename to locale/nb_NO/editor.po
diff --git a/locale/nb/emails.po b/locale/nb_NO/emails.po
similarity index 100%
rename from locale/nb/emails.po
rename to locale/nb_NO/emails.po
diff --git a/locale/nb/locale.po b/locale/nb_NO/locale.po
similarity index 100%
rename from locale/nb/locale.po
rename to locale/nb_NO/locale.po
diff --git a/locale/nb/manager.po b/locale/nb_NO/manager.po
similarity index 100%
rename from locale/nb/manager.po
rename to locale/nb_NO/manager.po
diff --git a/locale/nb/submission.po b/locale/nb_NO/submission.po
similarity index 100%
rename from locale/nb/submission.po
rename to locale/nb_NO/submission.po
diff --git a/plugins/blocks/developedBy/locale/fr_FR/locale.po b/plugins/blocks/developedBy/locale/fr/locale.po
similarity index 100%
rename from plugins/blocks/developedBy/locale/fr_FR/locale.po
rename to plugins/blocks/developedBy/locale/fr/locale.po
diff --git a/plugins/blocks/developedBy/locale/nb/locale.po b/plugins/blocks/developedBy/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/blocks/developedBy/locale/nb/locale.po
rename to plugins/blocks/developedBy/locale/nb_NO/locale.po
diff --git a/plugins/blocks/developedBy/locale/sr@latin/locale.po b/plugins/blocks/developedBy/locale/sr_Latn/locale.po
similarity index 100%
rename from plugins/blocks/developedBy/locale/sr@latin/locale.po
rename to plugins/blocks/developedBy/locale/sr_Latn/locale.po
diff --git a/plugins/blocks/languageToggle/locale/fr_FR/locale.po b/plugins/blocks/languageToggle/locale/fr/locale.po
similarity index 100%
rename from plugins/blocks/languageToggle/locale/fr_FR/locale.po
rename to plugins/blocks/languageToggle/locale/fr/locale.po
diff --git a/plugins/blocks/languageToggle/locale/nb/locale.po b/plugins/blocks/languageToggle/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/blocks/languageToggle/locale/nb/locale.po
rename to plugins/blocks/languageToggle/locale/nb_NO/locale.po
diff --git a/plugins/blocks/languageToggle/locale/sr@latin/locale.po b/plugins/blocks/languageToggle/locale/sr_Latn/locale.po
similarity index 100%
rename from plugins/blocks/languageToggle/locale/sr@latin/locale.po
rename to plugins/blocks/languageToggle/locale/sr_Latn/locale.po
diff --git a/plugins/blocks/languageToggle/locale/zh_CN/locale.po b/plugins/blocks/languageToggle/locale/zh_Hans/locale.po
similarity index 100%
rename from plugins/blocks/languageToggle/locale/zh_CN/locale.po
rename to plugins/blocks/languageToggle/locale/zh_Hans/locale.po
diff --git a/plugins/generic/usageEvent/locale/fr_FR/locale.po b/plugins/generic/usageEvent/locale/fr/locale.po
similarity index 100%
rename from plugins/generic/usageEvent/locale/fr_FR/locale.po
rename to plugins/generic/usageEvent/locale/fr/locale.po
diff --git a/plugins/generic/usageEvent/locale/nb/locale.po b/plugins/generic/usageEvent/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/generic/usageEvent/locale/nb/locale.po
rename to plugins/generic/usageEvent/locale/nb_NO/locale.po
diff --git a/plugins/generic/usageEvent/locale/sr@latin/locale.po b/plugins/generic/usageEvent/locale/sr_Latn/locale.po
similarity index 100%
rename from plugins/generic/usageEvent/locale/sr@latin/locale.po
rename to plugins/generic/usageEvent/locale/sr_Latn/locale.po
diff --git a/plugins/importexport/native/locale/fr_FR/locale.po b/plugins/importexport/native/locale/fr/locale.po
similarity index 100%
rename from plugins/importexport/native/locale/fr_FR/locale.po
rename to plugins/importexport/native/locale/fr/locale.po
diff --git a/plugins/importexport/native/locale/nb/locale.po b/plugins/importexport/native/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/importexport/native/locale/nb/locale.po
rename to plugins/importexport/native/locale/nb_NO/locale.po
diff --git a/plugins/importexport/native/locale/sr@latin/locale.po b/plugins/importexport/native/locale/sr_Latn/locale.po
similarity index 100%
rename from plugins/importexport/native/locale/sr@latin/locale.po
rename to plugins/importexport/native/locale/sr_Latn/locale.po
diff --git a/plugins/importexport/native/locale/uz@cyrillic/locale.po b/plugins/importexport/native/locale/uz/locale.po
similarity index 100%
rename from plugins/importexport/native/locale/uz@cyrillic/locale.po
rename to plugins/importexport/native/locale/uz/locale.po
diff --git a/plugins/importexport/native/locale/uz@latin/locale.po b/plugins/importexport/native/locale/uz_Latn/locale.po
similarity index 100%
rename from plugins/importexport/native/locale/uz@latin/locale.po
rename to plugins/importexport/native/locale/uz_Latn/locale.po
diff --git a/plugins/themes/default/locale/fr_FR/locale.po b/plugins/themes/default/locale/fr/locale.po
similarity index 100%
rename from plugins/themes/default/locale/fr_FR/locale.po
rename to plugins/themes/default/locale/fr/locale.po
diff --git a/plugins/themes/default/locale/nb/locale.po b/plugins/themes/default/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/themes/default/locale/nb/locale.po
rename to plugins/themes/default/locale/nb_NO/locale.po
diff --git a/plugins/themes/default/locale/sr@latin/locale.po b/plugins/themes/default/locale/sr_Latn/locale.po
similarity index 100%
rename from plugins/themes/default/locale/sr@latin/locale.po
rename to plugins/themes/default/locale/sr_Latn/locale.po