diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 68d1f608d4e..3582a1ced2d 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -141,6 +141,7 @@
 		<migration class="APP\migration\upgrade\v3_5_0\I5885_RenameReviewReminderSettingsName"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\COA75_AddUserRoleEndEmail"/>
 		<migration class="APP\migration\upgrade\v3_5_0\I10561_OnixFilter"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I9707_WeblateUILocales"/>
 	</upgrade>
 
 	<!-- Update plugin configuration - should be done as the final upgrade task -->
diff --git a/lib/pkp b/lib/pkp
index d1f45f70706..7610a269329 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit d1f45f70706207cf9ca9767a658d9c3c73a8e673
+Subproject commit 7610a269329999073132563caf5772d7feddeb2a
diff --git a/lib/ui-library b/lib/ui-library
index b67a68d568a..1f0ea590515 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit b67a68d568aa4d53c2dc518d46a0794fcdb04a67
+Subproject commit 1f0ea59051530964548616b300719e550b646cff
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/ONIX_BookProduct_Codelists.xml b/locale/nb_NO/ONIX_BookProduct_Codelists.xml
similarity index 100%
rename from locale/nb/ONIX_BookProduct_Codelists.xml
rename to locale/nb_NO/ONIX_BookProduct_Codelists.xml
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/browse/locale/fr_FR/locale.po b/plugins/blocks/browse/locale/fr/locale.po
similarity index 100%
rename from plugins/blocks/browse/locale/fr_FR/locale.po
rename to plugins/blocks/browse/locale/fr/locale.po
diff --git a/plugins/blocks/browse/locale/nb/locale.po b/plugins/blocks/browse/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/blocks/browse/locale/nb/locale.po
rename to plugins/blocks/browse/locale/nb_NO/locale.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/information/locale/fr_FR/locale.po b/plugins/blocks/information/locale/fr/locale.po
similarity index 100%
rename from plugins/blocks/information/locale/fr_FR/locale.po
rename to plugins/blocks/information/locale/fr/locale.po
diff --git a/plugins/blocks/information/locale/nb/locale.po b/plugins/blocks/information/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/blocks/information/locale/nb/locale.po
rename to plugins/blocks/information/locale/nb_NO/locale.po
diff --git a/plugins/blocks/information/locale/zh_CN/locale.po b/plugins/blocks/information/locale/zh_Hans/locale.po
similarity index 100%
rename from plugins/blocks/information/locale/zh_CN/locale.po
rename to plugins/blocks/information/locale/zh_Hans/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/makeSubmission b/plugins/blocks/makeSubmission
index b6c2e1117a8..d4ac6e6ce42 160000
--- a/plugins/blocks/makeSubmission
+++ b/plugins/blocks/makeSubmission
@@ -1 +1 @@
-Subproject commit b6c2e1117a8478ac8bbf6e49dd5813247145a856
+Subproject commit d4ac6e6ce426327c0349be280c4907aee40f1f26
diff --git a/plugins/generic/citationStyleLanguage b/plugins/generic/citationStyleLanguage
index 90ea703be70..ce7e34e0489 160000
--- a/plugins/generic/citationStyleLanguage
+++ b/plugins/generic/citationStyleLanguage
@@ -1 +1 @@
-Subproject commit 90ea703be706dd5ca6f86993bdb4e6d7be1de53b
+Subproject commit ce7e34e0489af7f882cd7327b21d8d0efc460ba9
diff --git a/plugins/generic/customBlockManager b/plugins/generic/customBlockManager
index dd8c68d3355..3db4b49b4dd 160000
--- a/plugins/generic/customBlockManager
+++ b/plugins/generic/customBlockManager
@@ -1 +1 @@
-Subproject commit dd8c68d33551b37429aa79210d1ec40517f30f63
+Subproject commit 3db4b49b4dd43960286dbe0a7eeb1d27a2690471
diff --git a/plugins/generic/dublinCoreMeta/DublinCoreMetaPlugin.php b/plugins/generic/dublinCoreMeta/DublinCoreMetaPlugin.php
index aff33d93594..2e44e602d95 100644
--- a/plugins/generic/dublinCoreMeta/DublinCoreMetaPlugin.php
+++ b/plugins/generic/dublinCoreMeta/DublinCoreMetaPlugin.php
@@ -16,6 +16,7 @@
 
 use APP\core\Application;
 use APP\template\TemplateManager;
+use PKP\i18n\LocaleConversion;
 use PKP\plugins\GenericPlugin;
 use PKP\plugins\Hook;
 
@@ -83,7 +84,7 @@ public function monographView($hookName, $args)
         if ($supportingAgencies = $publication->getData('supportingAgencies')) {
             foreach ($supportingAgencies as $locale => $localeSupportingAgencies) {
                 foreach ($localeSupportingAgencies as $i => $supportingAgency) {
-                    $templateMgr->addHeader('dublinCoreSponsor' . $locale . $i++, '<meta name="DC.Contributor.Sponsor" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($supportingAgency) . '"/>');
+                    $templateMgr->addHeader('dublinCoreSponsor' . $locale . $i++, '<meta name="DC.Contributor.Sponsor" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($supportingAgency) . '"/>');
                 }
             }
         }
@@ -91,7 +92,7 @@ public function monographView($hookName, $args)
         if ($coverages = $publication->getData('coverage')) {
             foreach ($coverages as $locale => $coverage) {
                 if ($coverage != '') {
-                    $templateMgr->addHeader('dublinCoreCoverage' . $locale, '<meta name="DC.Coverage" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars(strip_tags($coverage)) . '"/>');
+                    $templateMgr->addHeader('dublinCoreCoverage' . $locale, '<meta name="DC.Coverage" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars(strip_tags($coverage)) . '"/>');
                 }
             }
         }
@@ -117,7 +118,7 @@ public function monographView($hookName, $args)
         $abstracts = $isChapterRequest ? $chapter->getData('abstract') : $publication->getData('abstract');
         foreach ($abstracts ?: [] as $locale => $abstract) {
             if ($abstract != '') {
-                $templateMgr->addHeader('dublinCoreAbstract' . $locale, '<meta name="DC.Description" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars(strip_tags($abstract)) . '"/>');
+                $templateMgr->addHeader('dublinCoreAbstract' . $locale, '<meta name="DC.Description" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars(strip_tags($abstract)) . '"/>');
             }
         }
 
@@ -150,14 +151,14 @@ public function monographView($hookName, $args)
         if ($subjects = $publication->getData('subjects')) {
             foreach ($subjects as $locale => $localeSubjects) {
                 foreach ($localeSubjects as $i => $subject) {
-                    $templateMgr->addHeader('dublinCoreSubject' . $locale . $i++, '<meta name="DC.Subject" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($subject) . '"/>');
+                    $templateMgr->addHeader('dublinCoreSubject' . $locale . $i++, '<meta name="DC.Subject" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($subject) . '"/>');
                 }
             }
         }
         if ($keywords = $publication->getData('keywords')) {
             foreach ($keywords as $locale => $localeKeywords) {
                 foreach ($localeKeywords as $i => $keyword) {
-                    $templateMgr->addHeader('dublinCoreKeyword' . $locale . $i++, '<meta name="DC.Subject" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($keyword) . '"/>');
+                    $templateMgr->addHeader('dublinCoreKeyword' . $locale . $i++, '<meta name="DC.Subject" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($keyword) . '"/>');
                 }
             }
         }
@@ -167,7 +168,7 @@ public function monographView($hookName, $args)
         $titles = $isChapterRequest ? $chapter->getFullTitles() : $publication->getFullTitles();
         foreach ($titles as $locale => $altTitle) {
             if ($title != '' && $locale != $publicationLocale) {
-                $templateMgr->addHeader('dublinCoreAltTitle' . $locale, '<meta name="DC.Title.Alternative" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($altTitle) . '"/>');
+                $templateMgr->addHeader('dublinCoreAltTitle' . $locale, '<meta name="DC.Title.Alternative" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($altTitle) . '"/>');
             }
         }
 
@@ -175,7 +176,7 @@ public function monographView($hookName, $args)
         if ($types = $publication->getData('type')) {
             foreach ($types as $locale => $type) {
                 if ($type != '') {
-                    $templateMgr->addHeader('dublinCoreType' . $locale, '<meta name="DC.Type" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars(strip_tags($type)) . '"/>');
+                    $templateMgr->addHeader('dublinCoreType' . $locale, '<meta name="DC.Type" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars(strip_tags($type)) . '"/>');
                 }
             }
         }
@@ -220,7 +221,7 @@ public function monographFileView($hookName, $args)
         if ($supportingAgencies = $publication->getData('supportingAgencies')) {
             foreach ($supportingAgencies as $locale => $localeSupportingAgencies) {
                 foreach ($localeSupportingAgencies as $i => $supportingAgency) {
-                    $templateMgr->addHeader('dublinCoreSponsor' . $locale . $i++, '<meta name="DC.Contributor.Sponsor" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($supportingAgency) . '"/>');
+                    $templateMgr->addHeader('dublinCoreSponsor' . $locale . $i++, '<meta name="DC.Contributor.Sponsor" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($supportingAgency) . '"/>');
                 }
             }
         }
@@ -228,7 +229,7 @@ public function monographFileView($hookName, $args)
         if ($coverages = $publication->getData('coverage')) {
             foreach ($coverages as $locale => $coverage) {
                 if ($coverage != '') {
-                    $templateMgr->addHeader('dublinCoreCoverage' . $locale, '<meta name="DC.Coverage" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars(strip_tags($coverage)) . '"/>');
+                    $templateMgr->addHeader('dublinCoreCoverage' . $locale, '<meta name="DC.Coverage" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars(strip_tags($coverage)) . '"/>');
                 }
             }
         }
@@ -254,7 +255,7 @@ public function monographFileView($hookName, $args)
         $abstracts = $chapter ? $chapter->getData('abstract') : $publication->getData('abstract');
         foreach ($abstracts ?: [] as $locale => $abstract) {
             if ($abstract != '') {
-                $templateMgr->addHeader('dublinCoreAbstract' . $locale, '<meta name="DC.Description" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars(strip_tags($abstract)) . '"/>');
+                $templateMgr->addHeader('dublinCoreAbstract' . $locale, '<meta name="DC.Description" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars(strip_tags($abstract)) . '"/>');
             }
         }
 
@@ -297,14 +298,14 @@ public function monographFileView($hookName, $args)
         if ($subjects = $publication->getData('subjects')) {
             foreach ($subjects as $locale => $localeSubjects) {
                 foreach ($localeSubjects as $i => $subject) {
-                    $templateMgr->addHeader('dublinCoreSubject' . $locale . $i++, '<meta name="DC.Subject" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($subject) . '"/>');
+                    $templateMgr->addHeader('dublinCoreSubject' . $locale . $i++, '<meta name="DC.Subject" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($subject) . '"/>');
                 }
             }
         }
         if ($keywords = $publication->getData('keywords')) {
             foreach ($keywords as $locale => $localeKeywords) {
                 foreach ($localeKeywords as $i => $keyword) {
-                    $templateMgr->addHeader('dublinCoreKeyword' . $locale . $i++, '<meta name="DC.Subject" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($keyword) . '"/>');
+                    $templateMgr->addHeader('dublinCoreKeyword' . $locale . $i++, '<meta name="DC.Subject" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($keyword) . '"/>');
                 }
             }
         }
@@ -315,7 +316,7 @@ public function monographFileView($hookName, $args)
         $titles = $chapter ? $chapter->getFullTitles() : $publication->getFullTitles();
         foreach ($titles as $locale => $altTitle) {
             if ($title != '' && $locale != $publicationLocale) {
-                $templateMgr->addHeader('dublinCoreAltTitle' . $locale, '<meta name="DC.Title.Alternative" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($altTitle) . '"/>');
+                $templateMgr->addHeader('dublinCoreAltTitle' . $locale, '<meta name="DC.Title.Alternative" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($altTitle) . '"/>');
             }
         }
 
@@ -323,7 +324,7 @@ public function monographFileView($hookName, $args)
         if ($types = $publication->getData('type')) {
             foreach ($types as $locale => $type) {
                 if ($type != '') {
-                    $templateMgr->addHeader('dublinCoreType' . $locale, '<meta name="DC.Type" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars(strip_tags($type)) . '"/>');
+                    $templateMgr->addHeader('dublinCoreType' . $locale, '<meta name="DC.Type" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars(strip_tags($type)) . '"/>');
                 }
             }
         }
diff --git a/plugins/generic/dublinCoreMeta/locale/fr_FR/locale.po b/plugins/generic/dublinCoreMeta/locale/fr/locale.po
similarity index 100%
rename from plugins/generic/dublinCoreMeta/locale/fr_FR/locale.po
rename to plugins/generic/dublinCoreMeta/locale/fr/locale.po
diff --git a/plugins/generic/dublinCoreMeta/locale/nb/locale.po b/plugins/generic/dublinCoreMeta/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/generic/dublinCoreMeta/locale/nb/locale.po
rename to plugins/generic/dublinCoreMeta/locale/nb_NO/locale.po
diff --git a/plugins/generic/googleAnalytics b/plugins/generic/googleAnalytics
index c1dab4c182e..223b223a49c 160000
--- a/plugins/generic/googleAnalytics
+++ b/plugins/generic/googleAnalytics
@@ -1 +1 @@
-Subproject commit c1dab4c182eecfd1c2ba1ae594d2f96df503aa2c
+Subproject commit 223b223a49c3fba1be479dbded6ff221425b3c05
diff --git a/plugins/generic/googleScholar/GoogleScholarPlugin.php b/plugins/generic/googleScholar/GoogleScholarPlugin.php
index 483efaf7172..a45b5d6e2e2 100644
--- a/plugins/generic/googleScholar/GoogleScholarPlugin.php
+++ b/plugins/generic/googleScholar/GoogleScholarPlugin.php
@@ -18,6 +18,7 @@
 use APP\template\TemplateManager;
 use PKP\citation\CitationDAO;
 use PKP\db\DAORegistry;
+use PKP\i18n\LocaleConversion;
 use PKP\plugins\GenericPlugin;
 use PKP\plugins\Hook;
 
@@ -126,7 +127,7 @@ public function monographView($hookName, $args)
         if ($subjects = $publication->getData('subjects')) {
             foreach ($subjects as $locale => $localeSubjects) {
                 foreach ($localeSubjects as $i => $subject) {
-                    $templateMgr->addHeader('googleScholarSubject' . $i++, '<meta name="citation_keywords" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($subject) . '"/>');
+                    $templateMgr->addHeader('googleScholarSubject' . $i++, '<meta name="citation_keywords" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($subject) . '"/>');
                 }
             }
         }
@@ -135,7 +136,7 @@ public function monographView($hookName, $args)
         if ($keywords = $publication->getData('keywords')) {
             foreach ($keywords as $locale => $localeKeywords) {
                 foreach ($localeKeywords as $i => $keyword) {
-                    $templateMgr->addHeader('googleScholarKeyword' . $i++, '<meta name="citation_keywords" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($keyword) . '"/>');
+                    $templateMgr->addHeader('googleScholarKeyword' . $i++, '<meta name="citation_keywords" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($keyword) . '"/>');
                 }
             }
         }
diff --git a/plugins/generic/googleScholar/locale/fr_FR/locale.po b/plugins/generic/googleScholar/locale/fr/locale.po
similarity index 100%
rename from plugins/generic/googleScholar/locale/fr_FR/locale.po
rename to plugins/generic/googleScholar/locale/fr/locale.po
diff --git a/plugins/generic/googleScholar/locale/nb/locale.po b/plugins/generic/googleScholar/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/generic/googleScholar/locale/nb/locale.po
rename to plugins/generic/googleScholar/locale/nb_NO/locale.po
diff --git a/plugins/generic/htmlMonographFile/locale/fr_FR/locale.po b/plugins/generic/htmlMonographFile/locale/fr/locale.po
similarity index 100%
rename from plugins/generic/htmlMonographFile/locale/fr_FR/locale.po
rename to plugins/generic/htmlMonographFile/locale/fr/locale.po
diff --git a/plugins/generic/htmlMonographFile/locale/nb/locale.po b/plugins/generic/htmlMonographFile/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/generic/htmlMonographFile/locale/nb/locale.po
rename to plugins/generic/htmlMonographFile/locale/nb_NO/locale.po
diff --git a/plugins/generic/pdfJsViewer/locale/fr_FR/locale.po b/plugins/generic/pdfJsViewer/locale/fr/locale.po
similarity index 100%
rename from plugins/generic/pdfJsViewer/locale/fr_FR/locale.po
rename to plugins/generic/pdfJsViewer/locale/fr/locale.po
diff --git a/plugins/generic/pdfJsViewer/locale/nb/locale.po b/plugins/generic/pdfJsViewer/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/generic/pdfJsViewer/locale/nb/locale.po
rename to plugins/generic/pdfJsViewer/locale/nb_NO/locale.po
diff --git a/plugins/generic/staticPages b/plugins/generic/staticPages
index a66ed2b5193..fca23cd5bec 160000
--- a/plugins/generic/staticPages
+++ b/plugins/generic/staticPages
@@ -1 +1 @@
-Subproject commit a66ed2b519328179f39306b79fcd5423776d5aba
+Subproject commit fca23cd5becec021466a91bfe86fab99beefb385
diff --git a/plugins/generic/tinymce b/plugins/generic/tinymce
index bcd3e5d8f74..704bafacebb 160000
--- a/plugins/generic/tinymce
+++ b/plugins/generic/tinymce
@@ -1 +1 @@
-Subproject commit bcd3e5d8f746e03fa58c0eaac6b688a609da469d
+Subproject commit 704bafacebb3f18dc661fde1961f028f87b3e298
diff --git a/plugins/generic/webFeed b/plugins/generic/webFeed
index 12c9e93d53e..f60094d13f5 160000
--- a/plugins/generic/webFeed
+++ b/plugins/generic/webFeed
@@ -1 +1 @@
-Subproject commit 12c9e93d53ead5f22c3ad6979667f3affe1fb80f
+Subproject commit f60094d13f5164a4c643f3b19384718cec30421b
diff --git a/plugins/importexport/csv/locale/fr_FR/locale.po b/plugins/importexport/csv/locale/fr/locale.po
similarity index 100%
rename from plugins/importexport/csv/locale/fr_FR/locale.po
rename to plugins/importexport/csv/locale/fr/locale.po
diff --git a/plugins/importexport/csv/locale/nb/locale.po b/plugins/importexport/csv/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/importexport/csv/locale/nb/locale.po
rename to plugins/importexport/csv/locale/nb_NO/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/onix30/locale/fr_FR/locale.po b/plugins/importexport/onix30/locale/fr/locale.po
similarity index 100%
rename from plugins/importexport/onix30/locale/fr_FR/locale.po
rename to plugins/importexport/onix30/locale/fr/locale.po
diff --git a/plugins/importexport/onix30/locale/nb/locale.po b/plugins/importexport/onix30/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/importexport/onix30/locale/nb/locale.po
rename to plugins/importexport/onix30/locale/nb_NO/locale.po
diff --git a/plugins/importexport/users/locale/fr_FR/locale.po b/plugins/importexport/users/locale/fr/locale.po
similarity index 100%
rename from plugins/importexport/users/locale/fr_FR/locale.po
rename to plugins/importexport/users/locale/fr/locale.po
diff --git a/plugins/importexport/users/locale/nb/locale.po b/plugins/importexport/users/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/importexport/users/locale/nb/locale.po
rename to plugins/importexport/users/locale/nb_NO/locale.po
diff --git a/plugins/paymethod/manual/locale/fr_FR/emails.po b/plugins/paymethod/manual/locale/fr/emails.po
similarity index 100%
rename from plugins/paymethod/manual/locale/fr_FR/emails.po
rename to plugins/paymethod/manual/locale/fr/emails.po
diff --git a/plugins/paymethod/manual/locale/fr_FR/locale.po b/plugins/paymethod/manual/locale/fr/locale.po
similarity index 100%
rename from plugins/paymethod/manual/locale/fr_FR/locale.po
rename to plugins/paymethod/manual/locale/fr/locale.po
diff --git a/plugins/paymethod/manual/locale/nb/emails.po b/plugins/paymethod/manual/locale/nb_NO/emails.po
similarity index 100%
rename from plugins/paymethod/manual/locale/nb/emails.po
rename to plugins/paymethod/manual/locale/nb_NO/emails.po
diff --git a/plugins/paymethod/manual/locale/nb/locale.po b/plugins/paymethod/manual/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/paymethod/manual/locale/nb/locale.po
rename to plugins/paymethod/manual/locale/nb_NO/locale.po
diff --git a/plugins/paymethod/paypal/locale/fr_FR/locale.po b/plugins/paymethod/paypal/locale/fr/locale.po
similarity index 100%
rename from plugins/paymethod/paypal/locale/fr_FR/locale.po
rename to plugins/paymethod/paypal/locale/fr/locale.po
diff --git a/plugins/paymethod/paypal/locale/nb/locale.po b/plugins/paymethod/paypal/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/paymethod/paypal/locale/nb/locale.po
rename to plugins/paymethod/paypal/locale/nb_NO/locale.po
diff --git a/plugins/pubIds/urn/locale/fr_FR/locale.po b/plugins/pubIds/urn/locale/fr/locale.po
similarity index 100%
rename from plugins/pubIds/urn/locale/fr_FR/locale.po
rename to plugins/pubIds/urn/locale/fr/locale.po
diff --git a/plugins/pubIds/urn/locale/nb/locale.po b/plugins/pubIds/urn/locale/nb_NO/locale.po
similarity index 100%
rename from plugins/pubIds/urn/locale/nb/locale.po
rename to plugins/pubIds/urn/locale/nb_NO/locale.po
diff --git a/plugins/reports/reviewReport b/plugins/reports/reviewReport
index 19a412086aa..6b287c98b6f 160000
--- a/plugins/reports/reviewReport
+++ b/plugins/reports/reviewReport
@@ -1 +1 @@
-Subproject commit 19a412086aaf3a5a34aaba58032c5a78376415e8
+Subproject commit 6b287c98b6ff5c40c96f8472a94d54f3f9fdc61b
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/tools/xmllint-exclusions.txt b/tools/xmllint-exclusions.txt
index 5f8bcfd6ad7..5ac89ecc373 100644
--- a/tools/xmllint-exclusions.txt
+++ b/tools/xmllint-exclusions.txt
@@ -15,4 +15,4 @@
 ./locale/es/ONIX_BookProduct_Codelists.xml
 ./locale/fi/ONIX_BookProduct_Codelists.xml
 ./locale/it/ONIX_BookProduct_Codelists.xml
-./locale/nb/ONIX_BookProduct_Codelists.xml
+./locale/nb_NO/ONIX_BookProduct_Codelists.xml