From 8be1e53fdad8a074eb385e0e514986b5533d28c8 Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Tue, 10 Dec 2024 15:07:32 +0000
Subject: [PATCH 1/2] GUI: Use the Simplified Chinese version of NotoSans in
 the themes

---
 gui/themes/residualvm/remastered_gfx.stx      | 21 ++++++++++++-------
 gui/themes/scummmodern/scummmodern_gfx.stx    | 21 ++++++++++++-------
 gui/themes/scummremastered/remastered_gfx.stx | 21 ++++++++++++-------
 3 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/gui/themes/residualvm/remastered_gfx.stx b/gui/themes/residualvm/remastered_gfx.stx
index 0277e1b9fe49..1bf939e7b2c0 100644
--- a/gui/themes/residualvm/remastered_gfx.stx
+++ b/gui/themes/residualvm/remastered_gfx.stx
@@ -144,7 +144,8 @@
 				<!-- Add these in order of priority. First match is used -->
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Bold.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Bold.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Bold.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Bold.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Bold.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Bold.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Bold.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSansBold.ttf'/>
@@ -154,7 +155,8 @@
 				point_size = '11'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
@@ -164,7 +166,8 @@
 				file = 'helvb12.bdf'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Bold.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Bold.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Bold.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Bold.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Bold.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Bold.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Bold.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSansBold.ttf'/>
@@ -174,7 +177,8 @@
 				point_size = '11'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
@@ -184,7 +188,8 @@
 				file = 'helvb12.bdf'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
@@ -194,7 +199,8 @@
 				point_size = '11'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
@@ -204,7 +210,8 @@
 				point_size = '11'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index 8b3619f99154..dc05da58c268 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -142,7 +142,8 @@
 				file = 'helvb12.bdf'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Bold.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Bold.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Bold.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Bold.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Bold.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Bold.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Bold.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSansBold.ttf'/>
@@ -152,7 +153,8 @@
 				point_size = '11'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansSC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
@@ -162,7 +164,8 @@
 				file = 'helvb12.bdf'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Bold.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Bold.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Bold.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Bold.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Bold.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Bold.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Bold.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSansBold.ttf'/>
@@ -172,7 +175,8 @@
 				point_size = '11'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
@@ -182,7 +186,8 @@
 				file = 'helvb12.bdf'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
@@ -192,7 +197,8 @@
 				point_size = '11'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
@@ -202,7 +208,8 @@
 				point_size = '8'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeMonoBold.ttf'/>
diff --git a/gui/themes/scummremastered/remastered_gfx.stx b/gui/themes/scummremastered/remastered_gfx.stx
index 4397fd721df9..db4726399642 100644
--- a/gui/themes/scummremastered/remastered_gfx.stx
+++ b/gui/themes/scummremastered/remastered_gfx.stx
@@ -144,7 +144,8 @@
 				<!-- Add these in order of priority. First match is used -->
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Bold.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Bold.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Bold.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Bold.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Bold.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Bold.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Bold.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSansBold.ttf'/>
@@ -154,7 +155,8 @@
 				point_size = '11'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
@@ -164,7 +166,8 @@
 				file = 'helvb12.bdf'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Bold.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Bold.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Bold.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Bold.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Bold.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Bold.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Bold.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
@@ -175,7 +178,8 @@
 				point_size = '11'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
@@ -185,7 +189,8 @@
 				file = 'helvb12.bdf'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
@@ -195,7 +200,8 @@
 				point_size = '11'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>
@@ -205,7 +211,8 @@
 				point_size = '11'>
 				<language id = 'ja'  scalable_file = 'NotoSansJP-Regular.otf'/>
 				<language id = 'ko'  scalable_file = 'NotoSansKR-Regular.otf'/>
-				<language id = 'zh*' scalable_file = 'NotoSansTC-Regular.otf'/>
+				<language id = 'zh_Hans' scalable_file = 'NotoSansSC-Regular.otf'/>
+				<language id = 'zh_Hant' scalable_file = 'NotoSansTC-Regular.otf'/>
 				<language id = 'hi'  scalable_file = 'NotoSans-Regular.ttf'/>
 				<language id = 'ar'  scalable_file = 'NotoNaskhArabic-Regular.ttf'/>
 				<language id = '*'   scalable_file = 'FreeSans.ttf'/>

From ae8a77ceb67fc8598b93481de9d7f767cfbbd4fd Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Tue, 10 Dec 2024 15:08:18 +0000
Subject: [PATCH 2/2] I18N: Add missing language names

---
 po/ka.po      | 1 +
 po/zh_Hans.po | 1 +
 po/zh_Hant.po | 1 +
 3 files changed, 3 insertions(+)

diff --git a/po/ka.po b/po/ka.po
index 5993e129fde0..e9c1a97337fa 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -18,6 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.7.2\n"
+"X-Language-name: Georgian\n"
 
 #: audio/mac_plugin.cpp:30
 msgid "Apple Macintosh Audio"
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index fd2bd337254c..1a7bac08d2ee 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.po
@@ -18,6 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.7.2\n"
+"X-Language-name: Chinese (Simplified)\n"
 
 #: audio/mac_plugin.cpp:30
 msgid "Apple Macintosh Audio"
diff --git a/po/zh_Hant.po b/po/zh_Hant.po
index 2c42a141a28c..ad7e0cd86f06 100644
--- a/po/zh_Hant.po
+++ b/po/zh_Hant.po
@@ -15,6 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Language-name: Chinese (Traditional)\n"
 
 #: audio/mac_plugin.cpp:30
 msgid "Apple Macintosh Audio"