diff --git a/0001-Standardization-of-language-names-in-countries-and-r.patch b/0001-Standardization-of-language-names-in-countries-and-r.patch new file mode 100644 index 0000000000000000000000000000000000000000..73640dcf8b7fdd31080daf24bc33ce12a8ec565e --- /dev/null +++ b/0001-Standardization-of-language-names-in-countries-and-r.patch @@ -0,0 +1,1454 @@ +From 66e412aee4e37c1befd17f1436a92b411c7322dd Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Wed, 24 May 2023 15:56:20 +0800 +Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E4=BA=8E=E5=8F=B0?= + =?UTF-8?q?=E6=B9=BE=E3=80=81=E9=A6=99=E6=B8=AF=E7=9A=84=E6=8F=8F=E8=BF=B0?= + =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E7=AC=A6=E5=90=88=E5=9B=BD=E5=AE=B6?= + =?UTF-8?q?=E8=A6=81=E6=B1=82=E7=9A=84=E6=8F=8F=E8=BF=B0?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + po/af.po | 6 +++--- + po/az.po | 6 +++--- + po/bg.po | 6 +++--- + po/ca.po | 6 +++--- + po/crh.po | 6 +++--- + po/cs.po | 6 +++--- + po/da.po | 6 +++--- + po/de.po | 6 +++--- + po/el.po | 6 +++--- + po/en_GB.po | 6 +++--- + po/eo.po | 6 +++--- + po/es.po | 6 +++--- + po/fi.po | 6 +++--- + po/fr.po | 6 +++--- + po/fur.po | 10 +++++----- + po/gl.po | 6 +++--- + po/hr.po | 6 +++--- + po/hu.po | 6 +++--- + po/id.po | 6 +++--- + po/it.po | 10 +++++----- + po/ja.po | 12 ++++++------ + po/ka.po | 6 +++--- + po/ko.po | 6 +++--- + po/ky.po | 6 +++--- + po/lt.po | 6 +++--- + po/nb.po | 6 +++--- + po/nl.po | 6 +++--- + po/pl.po | 6 +++--- + po/pt.po | 6 +++--- + po/pt_BR.po | 6 +++--- + po/ro.po | 6 +++--- + po/ru.po | 6 +++--- + po/rw.po | 6 +++--- + po/sk.po | 6 +++--- + po/sl.po | 6 +++--- + po/sq.po | 6 +++--- + po/sr.po | 6 +++--- + po/sv.po | 6 +++--- + po/tr.po | 6 +++--- + po/uk.po | 6 +++--- + po/vi.po | 6 +++--- + po/zh_CN.po | 14 +++++++------- + po/zh_TW.po | 12 ++++++------ + rules/base.xml | 39 ++------------------------------------- + rules/evdev.xml | 39 ++------------------------------------- + symbols/cn | 4 ++-- + symbols/sun_vndr/tw | 2 +- + symbols/tw | 6 +++--- + 48 files changed, 153 insertions(+), 223 deletions(-) + +diff --git a/po/af.po b/po/af.po +index 6d1b0be..7065c33 100644 +--- a/po/af.po ++++ b/po/af.po +@@ -1664,7 +1664,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "" +@@ -3398,11 +3398,11 @@ msgstr "" + + #: rules/base.xml:5466 + #, fuzzy +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Japanees" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/az.po b/po/az.po +index 4aa8fab..5884ed1 100644 +--- a/po/az.po ++++ b/po/az.po +@@ -1665,7 +1665,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "" +@@ -3399,11 +3399,11 @@ msgstr "" + + #: rules/base.xml:5466 + #, fuzzy +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Yaponca" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/bg.po b/po/bg.po +index 72d25eb..904806e 100644 +--- a/po/bg.po ++++ b/po/bg.po +@@ -1611,7 +1611,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "френска — конгоанска" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chineses Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "Ктс" +@@ -3225,11 +3225,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "кримско татарска — турска, „Q“ горе-вляво, алтернативна" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "тайванска" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "тайванска — туземна" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/ca.po b/po/ca.po +index 7d435b5..bd6c19c 100644 +--- a/po/ca.po ++++ b/po/ca.po +@@ -1559,7 +1559,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Francès (República Democràtica del Congo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3171,11 +3171,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tàtar de Crimea (Turc Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanès" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanès (indígena)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/crh.po b/po/crh.po +index 21361c7..e863db4 100644 +--- a/po/crh.po ++++ b/po/crh.po +@@ -1720,7 +1720,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Kongo Demokratik Cumhuriyeti" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "" +@@ -3576,11 +3576,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Qırımtatarca (Türkçe Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/cs.po b/po/cs.po +index 3e15548..b18b852 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -1574,7 +1574,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Francouzské (Konžská demokratická republika)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3186,11 +3186,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krymskotatarské (turecké Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tchajwanské" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tchajwanské (domorodé)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/da.po b/po/da.po +index faf4413..8a1d6b1 100644 +--- a/po/da.po ++++ b/po/da.po +@@ -1588,7 +1588,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Fransk (Congo, Den Demokratiske Republik)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3222,11 +3222,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimtatarsk (tyrkisk Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanesisk" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanesisk (indfødte)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/de.po b/po/de.po +index 5fd424e..c20f7aa 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -1561,7 +1561,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Französisch (Demokratische Republik Kongo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3174,11 +3174,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimtatarisch (Türkisch Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanesisch" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanesisch (indigen)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/el.po b/po/el.po +index 043479f..7c857b4 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -1687,7 +1687,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Γαλλικά (Λαϊκή Δημοκρατία του Κονγκό)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3437,11 +3437,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Ταταρικό Κριμαίας (τουρκικό Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Ταϊβανέζικο" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Ταϊβανέζικο (ιθαγενές)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/en_GB.po b/po/en_GB.po +index aed2ed1..d48ac65 100644 +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -1686,7 +1686,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "" +@@ -3478,11 +3478,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/eo.po b/po/eo.po +index bf34fd7..1aff52a 100644 +--- a/po/eo.po ++++ b/po/eo.po +@@ -1558,7 +1558,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Franca (Demokratia Respubliko de Kongo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3179,11 +3179,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krime-tatara (Turka Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tajvana" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tajvana (indiĝena)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/es.po b/po/es.po +index 63ccd53..fa0b0f1 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -1563,7 +1563,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Francés (República Democrática del Congo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3184,11 +3184,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tártaro de Crimea (Alt-Q turca)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanés" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanés (autóctono)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/fi.po b/po/fi.po +index b8dff3e..9a200ee 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -1562,7 +1562,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Ranskalainen (Kongon demokraattinen tasavalta)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3185,11 +3185,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimintataari (turkkilainen Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanilainen" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanilainen (kotoperäinen)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/fr.po b/po/fr.po +index 19365e5..694c88b 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -1593,7 +1593,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Français (République démocratique du Congo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3271,11 +3271,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tatar de Crimée (Alt-Q turc)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taïwanais" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taïwanais (indigène)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/fur.po b/po/fur.po +index 4790676..0b14749 100644 +--- a/po/fur.po ++++ b/po/fur.po +@@ -1559,7 +1559,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Francese (Republiche democratiche dal Congo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3185,12 +3185,12 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tatare de Crimee (Alt-Q Turche)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" +-msgstr "Taiwanese" ++msgid "Chinese Taiwan" ++msgstr "Chinese Taiwan" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" +-msgstr "Taiwanese (indigjene)" ++msgid "Chinese Taiwan (indigenous)" ++msgstr "Chinese Taiwan (indigjene)" + + #. Keyboard indicator for Saisiyat layouts + #: rules/base.xml:5500 +diff --git a/po/gl.po b/po/gl.po +index 99d2937..c8da5e0 100644 +--- a/po/gl.po ++++ b/po/gl.po +@@ -1563,7 +1563,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Francés (República Democrática do Congo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3185,11 +3185,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tártaro de Crimea (turco Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanés" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanés (autóctono)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/hr.po b/po/hr.po +index 0134d04..9688eea 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -1563,7 +1563,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Francuski (Demokratska Republika Kongo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3175,11 +3175,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimski tatarski (Turski Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tajvanski" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tajvanski (autohtoni)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/hu.po b/po/hu.po +index 7e849e6..f5fb94b 100644 +--- a/po/hu.po ++++ b/po/hu.po +@@ -1564,7 +1564,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Francia (Kongói Demokratikus Köztársaság)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3193,11 +3193,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krími tatár (török Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tajvani" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tajvani (őslakos)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/id.po b/po/id.po +index 3e93e4e..4e71ee8 100644 +--- a/po/id.po ++++ b/po/id.po +@@ -1563,7 +1563,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Perancis (Republik Demokratik Kongo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3192,11 +3192,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Crimean Tatar (Turkish Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwan" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwan (asli)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/it.po b/po/it.po +index ea1ac12..563e18f 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -1781,7 +1781,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Francese (Repubblica Democratica del Congo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3640,12 +3640,12 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tatar crimea (turca Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" +-msgstr "Taiwanese" ++msgid "Chinese Taiwan" ++msgstr "Chinese Taiwan" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" +-msgstr "Taiwanese (indigena)" ++msgid "Chinese Taiwan (indigenous)" ++msgstr "Chinese Taiwan (indigena)" + + #. Keyboard indicator for Saisiyat layouts + #: rules/base.xml:5500 +diff --git a/po/ja.po b/po/ja.po +index 07c453b..ef11949 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -1708,7 +1708,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "フランス語 (コンゴ民主共和国)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3505,12 +3505,12 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "クリミア・タタール語 (トルコ語 Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" +-msgstr "台湾語" ++msgid "Chinese Taiwan" ++msgstr "中国台湾語" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" +-msgstr "台湾語 (現地語)" ++msgid "Chinese Taiwan (indigenous)" ++msgstr "中国台湾語 (現地語)" + + #. Keyboard indicator for Saisiyat layouts + #: rules/base.xml:5500 +@@ -3519,7 +3519,7 @@ msgstr "xsy" + + # 台湾の地方語、サイシャット語? + #: rules/base.xml:5501 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Chinese Taiwan)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/ka.po b/po/ka.po +index a7c57dd..2d941a4 100644 +--- a/po/ka.po ++++ b/po/ka.po +@@ -1697,7 +1697,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "კონგოს დემოკრატიული რესპუბლიკა" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "" +@@ -3520,11 +3520,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/ko.po b/po/ko.po +index 27c7c2a..5bc4894 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -1600,7 +1600,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "프랑스어 (콩고 민주 공화국)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3225,11 +3225,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "크림타타르 (터키어 Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "타이완" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "타이완 (원주민)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/ky.po b/po/ky.po +index df3221b..20911d1 100644 +--- a/po/ky.po ++++ b/po/ky.po +@@ -1711,7 +1711,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Конго, Демократикалык республикасы" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "" +@@ -3538,11 +3538,11 @@ msgstr "Крым татардык (түрк Alt-Q)" + + #: rules/base.xml:5466 + #, fuzzy +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Япондук" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/lt.po b/po/lt.po +index a17c0a7..b3c33de 100644 +--- a/po/lt.po ++++ b/po/lt.po +@@ -1687,7 +1687,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Prancūzų (Kongo Demokratinė Respublika)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3435,11 +3435,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krymo totorių (turkiškas Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taivaniečių" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taivano (čiabuvių)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/nb.po b/po/nb.po +index e57ae54..3cf37a1 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -1598,7 +1598,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "" +@@ -3315,11 +3315,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/nl.po b/po/nl.po +index 0f979e7..a9b706f 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -1600,7 +1600,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Frans (Democratische Republiek Congo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3249,11 +3249,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krim-Tataars (Turks Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanees" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanees (oorspronkelijk)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/pl.po b/po/pl.po +index 7e261bb..6e714ab 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -1556,7 +1556,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Francuski (Demokratyczna Republika Konga)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3168,11 +3168,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krymskotatarski (turecki Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tajwański" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tajwański (autochtoniczny)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/pt.po b/po/pt.po +index c0107f6..10067e8 100644 +--- a/po/pt.po ++++ b/po/pt.po +@@ -1560,7 +1560,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Francês (República Democrática do Congo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3172,11 +3172,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tatar da Crimeia (Turco Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanês" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanês (indígena)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/pt_BR.po b/po/pt_BR.po +index 2efe951..ccb7424 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -1561,7 +1561,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Francês (República Democrática de Congo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3189,11 +3189,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tártaro da Crimeia (Alt-Q turco)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanês" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanês (indígena)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/ro.po b/po/ro.po +index fb9bf73..7cfcb9b 100644 +--- a/po/ro.po ++++ b/po/ro.po +@@ -1645,7 +1645,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Franceză (Republica Democrată Congo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3403,11 +3403,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tătară din Crimea (Alt-Q turcesc)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwaneză" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwaneză (indigeneză)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/ru.po b/po/ru.po +index 901bf8d..6f9fed9 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -1568,7 +1568,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Французская (Демократическая республика Конго)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3180,11 +3180,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Крымско-татарская (турецкая Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Тайваньская" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Тайваньская (туземная)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/rw.po b/po/rw.po +index 6d1e6e7..4f505a2 100644 +--- a/po/rw.po ++++ b/po/rw.po +@@ -1629,7 +1629,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "" +@@ -3367,11 +3367,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/sk.po b/po/sk.po +index 7ea7726..3b5d8ff 100644 +--- a/po/sk.po ++++ b/po/sk.po +@@ -1706,7 +1706,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Konžská demokratická republika" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "" +@@ -3545,11 +3545,11 @@ msgstr "" + + #: rules/base.xml:5466 + #, fuzzy +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Japonské" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/sl.po b/po/sl.po +index 96ed497..b935ac8 100644 +--- a/po/sl.po ++++ b/po/sl.po +@@ -1701,7 +1701,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "francoska (Demokratična republika Kongo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3457,11 +3457,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "krimsko tatarska (turški Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "tajvanska" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "tajvanska (domorodna)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/sq.po b/po/sq.po +index bbd2f24..372b69d 100644 +--- a/po/sq.po ++++ b/po/sq.po +@@ -1664,7 +1664,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "" +@@ -3398,11 +3398,11 @@ msgstr "" + + #: rules/base.xml:5466 + #, fuzzy +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Japonisht" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/sr.po b/po/sr.po +index 0b89d64..bb613b9 100644 +--- a/po/sr.po ++++ b/po/sr.po +@@ -1704,7 +1704,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "" +@@ -3520,11 +3520,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/sv.po b/po/sv.po +index 6ecb6b6..9b2d052 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -1562,7 +1562,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Fransk (Demokratiska republiken Kongo)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3183,11 +3183,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimtatarisk (Turkisk Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanesisk" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanesisk (inhemsk)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/tr.po b/po/tr.po +index 0906956..942cf8f 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -1564,7 +1564,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Fransızca (Demokratik Kongo Cumhuriyeti)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3176,11 +3176,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Kırım Türkçesi (Türkçe Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tayvanca" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tayvanca (yöreye özgü)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/uk.po b/po/uk.po +index 18a87d6..b36c6e4 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -1565,7 +1565,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Французька (Демократична республіка Конго)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3177,11 +3177,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Кримськотатарська (турецька Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Тайванська" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Тайванська (місцева)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/vi.po b/po/vi.po +index 7cb7429..7342648 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -1689,7 +1689,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "Tiếng Pháp (Cộng Hòa Dân Chủ Công-gô)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3424,11 +3424,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tiếng Ta-tă Cợ-ri-mia (Thổ Nhĩ Kỳ Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tiếng Đài Loan" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tiếng Đài Loan (bản địa)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 93a6cdf..f0311d7 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -1654,14 +1654,14 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "法语(刚果民主共和国，刚果(金))" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" + + #: rules/base.xml:2711 + msgid "Chinese" +-msgstr "汉语" ++msgstr "简体中文" + + #: rules/base.xml:2721 + #, fuzzy +@@ -3393,12 +3393,12 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "乌兹别克语(克里米亚鞑靼土耳其 Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" +-msgstr "台湾" ++msgid "Chinese Taiwan" ++msgstr "繁体中文(中国台湾)" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" +-msgstr "台湾原住民语言" ++msgid "Chinese Taiwan (indigenous)" ++msgstr "繁体中文(中国台湾原住民语言)" + + #. Keyboard indicator for Saisiyat layouts + #: rules/base.xml:5500 +@@ -3407,7 +3407,7 @@ msgstr "xsy" + + #: rules/base.xml:5501 + msgid "Saisiyat (Taiwan)" +-msgstr "" ++msgstr "赛亚族语(中国台湾)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5513 rules/base.extras.xml:1126 +diff --git a/po/zh_TW.po b/po/zh_TW.po +index fe81076..52bb8d2 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -1701,7 +1701,7 @@ msgid "French (Democratic Republic of the Congo)" + msgstr "法語 (剛果民主共和國)" + + #. Keyboard indicator for Chinese layouts +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: rules/base.xml:2710 rules/base.xml:5465 + msgid "zh" + msgstr "zh" +@@ -3452,12 +3452,12 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "克里米亞韃靼語 (土耳其語 Alt-Q)" + + #: rules/base.xml:5466 +-msgid "Taiwanese" +-msgstr "臺灣語" ++msgid "Chinese Taiwan" ++msgstr "中國臺灣語" + + #: rules/base.xml:5475 +-msgid "Taiwanese (indigenous)" +-msgstr "臺灣語 (原住民)" ++msgid "Chinese Taiwan (indigenous)" ++msgstr "中國臺灣語 (原住民)" + + #. Keyboard indicator for Saisiyat layouts + #: rules/base.xml:5500 +@@ -3466,7 +3466,7 @@ msgstr "xsy" + + #: rules/base.xml:5501 + msgid "Saisiyat (Taiwan)" +-msgstr "賽夏族語 (臺灣)" ++msgstr "賽夏族語 (中國臺灣)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5513 rules/base.extras.xml:1126 +diff --git a/rules/base.xml b/rules/base.xml +index 39f4cb1..1632591 100644 +--- a/rules/base.xml ++++ b/rules/base.xml +@@ -5461,49 +5461,14 @@ + + + tw +- ++ + zh +- Taiwanese ++ Chinese Taiwan + + fox + + + +- +- +- indigenous +- Taiwanese (indigenous) +- +- ami +- tay +- bnn +- ckv +- pwn +- pyu +- dru +- ais +- ssf +- tao +- tsu +- trv +- xnb +- sxr +- uun +- fos +- +- +- +- +- +- saisiyat +- +- xsy +- Saisiyat (Taiwan) +- +- xsy +- +- +- + + + +diff --git a/rules/evdev.xml b/rules/evdev.xml +index 39f4cb1..1632591 100644 +--- a/rules/evdev.xml ++++ b/rules/evdev.xml +@@ -5461,49 +5461,14 @@ + + + tw +- ++ + zh +- Taiwanese ++ Chinese Taiwan + + fox + + + +- +- +- indigenous +- Taiwanese (indigenous) +- +- ami +- tay +- bnn +- ckv +- pwn +- pyu +- dru +- ais +- ssf +- tao +- tsu +- trv +- xnb +- sxr +- uun +- fos +- +- +- +- +- +- saisiyat +- +- xsy +- Saisiyat (Taiwan) +- +- xsy +- +- +- + + + +diff --git a/symbols/cn b/symbols/cn +index 888b9ed..8fbbe41 100644 +--- a/symbols/cn ++++ b/symbols/cn +@@ -206,7 +206,7 @@ xkb_symbols "ug" { + // Chinese speakers and learners often find it hard to type Hanyu Pinyin + // with all its tones and ü. This rule defines an altgr-intl-like behavior, + // with dead keys activated by "AltGr + ". It also works with many +-// "pinyin" extensions, such as Tongyong Pinyin (Taiwan Mandarin) and ++// "pinyin" extensions, such as Tongyong Pinyin (Chinese Taiwan Mandarin) and + // various SASM/GNC romanizations. + // + // Number row keys 1 2 3 4 are defined as dead-keys for the tones. +@@ -216,7 +216,7 @@ xkb_symbols "ug" { + // To generate a raw ü, use AltGr + v. + // V is used instead of ü for tones. + // +-// AltGr+Shift+` triggers dead_abovering (˚), used by the Taiwanese ++// AltGr+Shift+` triggers dead_abovering (˚), used by the Chinese Taiwan + // Tongyong Pinyin variant for the "neutral" tone. + // + // AltGr+6 triggers dead_circumflex (^) for ê ẑ ĉ ŝ, etc. +diff --git a/symbols/sun_vndr/tw b/symbols/sun_vndr/tw +index 2296ad1..f00e594 100644 +--- a/symbols/sun_vndr/tw ++++ b/symbols/sun_vndr/tw +@@ -30,7 +30,7 @@ + default partial alphanumeric_keys + xkb_symbols "sun_type6" { + +- name[Group1]= "Taiwanese (Sun Type 6/7)"; ++ name[Group1]= "Chinese Taiwan (Sun Type 6/7)"; + + include "sun_vndr/us(sunbasic)" + +diff --git a/symbols/tw b/symbols/tw +index beafb4f..ce02cbf 100644 +--- a/symbols/tw ++++ b/symbols/tw +@@ -3,7 +3,7 @@ xkb_symbols "tw" { + + include "us(basic)" + +- name[Group1]= "Taiwanese"; ++ name[Group1]= "Chinese Taiwan"; + + key { [ grave, asciitilde, dead_grave, dead_tilde ] }; + key { [ 1, exclam, U030D, exclamdown ] }; +@@ -51,7 +51,7 @@ xkb_symbols "indigenous" { + + include "tw(tw)" + +- name[Group1]= "Taiwanese (indigenous)"; ++ name[Group1]= "Chinese Taiwan (indigenous)"; + + key { [ U02BC, quotedbl, apostrophe, dead_doubleacute ] }; + +@@ -63,7 +63,7 @@ xkb_symbols "saisiyat" { + + include "tw(indigenous)" + +- name[Group1]= "Saisiyat (Taiwan)"; ++ name[Group1]= "Saisiyat (Chinese Taiwan)"; + + key { [ U02D0, colon, semicolon, dead_diaeresis ] }; + +-- +2.20.1 + diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 6236dd0f889a06b89440b845e4ea69b351c21b53..ef4e83b110254d468dd5008d5223b76ac560151f 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 # INFO: Package contains data-only, no binaries, so no debuginfo is needed %global debug_package %{nil} @@ -19,6 +19,8 @@ Source2: commitid %else Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2 %endif +# uos +Patch0001: 0001-Standardization-of-language-names-in-countries-and-r.patch BuildArch: noarch @@ -58,7 +60,7 @@ Requires: %{name} = %{version}-%{release} Doc pages for %{name}. %prep -%autosetup -S git +%autosetup -S git -p1 %build autoreconf -v --force --install || exit 1 @@ -98,6 +100,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled %doc AUTHORS README NEWS TODO COPYING docs/README.* docs/HOWTO.* %changelog +* Wed May 24 2023 leeffo - 2.28-1.0.2 +- Standardization of language names in countries and regions + * Sat Jul 16 2022 Hangbo Fan - 2.28-1.0.1 - Add doc sub package