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..f2e1d52345f80913cd79dddda484a18f3279989f --- /dev/null +++ b/0001-Standardization-of-language-names-in-countries-and-r.patch @@ -0,0 +1,1141 @@ +From bea05c5a1abe749c509ac5d2cfa8a17946234ab1 Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas +Date: Thu, 25 May 2023 10:43:18 +0800 +Subject: [PATCH] Standardization of language names in countries and regions + +--- + geometry/sun | 4 ++-- + po/bg.po | 6 +++--- + po/ca.po | 6 +++--- + po/cs.po | 6 +++--- + po/da.po | 6 +++--- + po/de.po | 6 +++--- + po/el.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 | 12 ++++++------ + po/ja.po | 12 ++++++------ + po/ko.po | 6 +++--- + po/lt.po | 6 +++--- + po/nl.po | 6 +++--- + po/pl.po | 6 +++--- + po/pt_BR.po | 6 +++--- + po/ru.po | 6 +++--- + po/sk.po | 6 +++--- + po/sl.po | 6 +++--- + po/sv.po | 6 +++--- + po/tr.po | 6 +++--- + po/uk.po | 6 +++--- + po/vi.po | 6 +++--- + po/zh_CN.po | 16 ++++++++-------- + po/zh_TW.po | 14 +++++++------- + rules/base.xml.in | 39 ++------------------------------------- + rules/evdev.xml.in | 39 ++------------------------------------- + symbols/cn | 4 ++-- + symbols/sun_vndr/tw | 2 +- + symbols/tw | 6 +++--- + 37 files changed, 122 insertions(+), 192 deletions(-) + +diff --git a/geometry/sun b/geometry/sun +index fc6d5a6..7314966 100644 +--- a/geometry/sun ++++ b/geometry/sun +@@ -717,7 +717,7 @@ xkb_geometry "t6unix" { + + default xkb_geometry "type6" { + include "sun(t6)" +- description= "Sun Type6 keyboard (US, Korea, Taiwan)"; ++ description= "Sun Type6 keyboard (US, Korea, Chinese Taiwan)"; + }; + + xkb_geometry "type6jp" { +@@ -737,7 +737,7 @@ xkb_geometry "type6unix" { + + xkb_geometry "type7" { + include "sun(t6)" +- description= "Sun Type7 keyboard (US, Korea, Taiwan)"; ++ description= "Sun Type7 keyboard (US, Korea, Chinese Taiwan)"; + }; + + xkb_geometry "type7jp" { +diff --git a/po/bg.po b/po/bg.po +index 723a7ee..fb1e184 100644 +--- a/po/bg.po ++++ b/po/bg.po +@@ -1352,7 +1352,7 @@ msgstr "английска — канадска" + msgid "French (Democratic Republic of the Congo)" + msgstr "френска — конгоанска" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:341 + msgid "zh" + msgstr "Ктс" +@@ -2863,11 +2863,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "кримски татарски — турска, „Q“ горе-вляво, алтернативна" + + #: ../rules/base.xml.in.h:753 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "тайванска" + + #: ../rules/base.xml.in.h:754 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "тайванска — туземна" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/ca.po b/po/ca.po +index f052674..db11cdb 100644 +--- a/po/ca.po ++++ b/po/ca.po +@@ -1510,7 +1510,7 @@ msgstr "Anglès (Canadà)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Francès (República Democràtica del Congo)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:401 + msgid "zh" + msgstr "zh" +@@ -3042,11 +3042,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tàtar de Crimea (Turc Alt-Q)" + + #: ../rules/base.xml.in.h:818 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanès" + + #: ../rules/base.xml.in.h:819 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanès (indígena)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/cs.po b/po/cs.po +index 33cfd49..0d48994 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -1525,7 +1525,7 @@ msgstr "Anglické (Kanada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Francouzské (Konžská demokratická republika)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:401 + msgid "zh" + msgstr "zh" +@@ -3057,11 +3057,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krymskotatarské (turecké Alt-Q)" + + #: ../rules/base.xml.in.h:818 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tchajwanské" + + #: ../rules/base.xml.in.h:819 +-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 e6a63f0..292f0aa 100644 +--- a/po/da.po ++++ b/po/da.po +@@ -1537,7 +1537,7 @@ msgstr "Engelsk (Canada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Fransk (Congo, Den Demokratiske Republik)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:401 + msgid "zh" + msgstr "zh" +@@ -3082,11 +3082,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimtatarsk (tyrkisk Alt-Q)" + + #: ../rules/base.xml.in.h:818 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanesisk" + + #: ../rules/base.xml.in.h:819 +-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 437ad5a..9ce4a40 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -1501,7 +1501,7 @@ msgstr "Englisch (Kanada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Französisch (Demokratische Republik Kongo)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:399 + msgid "zh" + msgstr "zh" +@@ -3025,11 +3025,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimtatarisch (Türkisch Alt-Q)" + + #: ../rules/base.xml.in.h:814 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanesisch" + + #: ../rules/base.xml.in.h:815 +-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 b7f1ad0..514ee05 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -1437,7 +1437,7 @@ msgstr "Αγγλικό (Καναδάς)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Γαλλικά (Λαϊκή Δημοκρατία του Κονγκό)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:382 + msgid "zh" + msgstr "zh" +@@ -2873,11 +2873,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Ταταρικό Κριμαίας (τουρκικό Alt-Q)" + + #: ../rules/base.xml.in.h:775 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Ταϊβανέζικο" + + #: ../rules/base.xml.in.h:776 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Ταϊβανέζικο (ιθαγενές)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/eo.po b/po/eo.po +index 3d45d4e..b17c530 100644 +--- a/po/eo.po ++++ b/po/eo.po +@@ -1305,7 +1305,7 @@ msgstr "Angla (Kanado)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Franca (Demokratia Respubliko de Kongo)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:341 + msgid "zh" + msgstr "zh" +@@ -2814,11 +2814,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krime-tatara (Turka Alt-Q)" + + #: ../rules/base.xml.in.h:753 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tajvana" + + #: ../rules/base.xml.in.h:754 +-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 99791ff..b592025 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -1514,7 +1514,7 @@ msgstr "Inglés (Canadá)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Francés (República Democrática del Congo)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:401 + msgid "zh" + msgstr "zh" +@@ -3046,11 +3046,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tártaro de Crimea (Alt-Q turca)" + + #: ../rules/base.xml.in.h:818 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanés" + + #: ../rules/base.xml.in.h:819 +-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 dc17dad..279aa98 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -1513,7 +1513,7 @@ msgstr "Englantilainen (Kanada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Ranskalainen (Kongon demokraattinen tasavalta)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:401 + msgid "zh" + msgstr "zh" +@@ -3046,11 +3046,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimintataari (turkkilainen Alt-Q)" + + #: ../rules/base.xml.in.h:818 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanilainen" + + #: ../rules/base.xml.in.h:819 +-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 2afba9e..e9983a2 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -1542,7 +1542,7 @@ msgstr "Anglais (Canada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Français (République démocratique du Congo)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:401 + msgid "zh" + msgstr "zh" +@@ -3132,11 +3132,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tatar de Crimée (Alt-Q turc)" + + #: ../rules/base.xml.in.h:818 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taïwanais" + + #: ../rules/base.xml.in.h:819 +-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 4147c1f..eb4d9d3 100644 +--- a/po/fur.po ++++ b/po/fur.po +@@ -1306,7 +1306,7 @@ msgstr "Inglese (Canadà)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Francese (Republiche democratiche dal Congo)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:341 + msgid "zh" + msgstr "zh" +@@ -2815,12 +2815,12 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tatare de Crimee (Alt-Q Turche)" + + #: ../rules/base.xml.in.h:753 +-msgid "Taiwanese" +-msgstr "Taiwanese" ++msgid "Chinese Taiwan" ++msgstr "Chinese Taiwan" + + #: ../rules/base.xml.in.h:754 +-msgid "Taiwanese (indigenous)" +-msgstr "Taiwanese (indigjene)" ++msgid "Chinese Taiwan (indigenous)" ++msgstr "Chinese Taiwan (indigjene)" + + #. Keyboard indicator for Saisiyat layouts + #: ../rules/base.xml.in.h:756 +diff --git a/po/gl.po b/po/gl.po +index c04fbbc..888bc1c 100644 +--- a/po/gl.po ++++ b/po/gl.po +@@ -1505,7 +1505,7 @@ msgstr "Inglés (Canadá)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Francés (República Democrática do Congo)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:399 + msgid "zh" + msgstr "zh" +@@ -3029,11 +3029,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tártaro de Crimea (turco Alt-Q)" + + #: ../rules/base.xml.in.h:814 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanés" + + #: ../rules/base.xml.in.h:815 +-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 856122d..fc30973 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -1505,7 +1505,7 @@ msgstr "Engleski (Kanada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Francuski (Demokratska Republika Kongo)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:399 + msgid "zh" + msgstr "zh" +@@ -3029,11 +3029,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimski tatarski (Turski Alt-Q)" + + #: ../rules/base.xml.in.h:814 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tajvanski" + + #: ../rules/base.xml.in.h:815 +-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 259c3cf..e9d13b3 100644 +--- a/po/hu.po ++++ b/po/hu.po +@@ -1505,7 +1505,7 @@ msgstr "Angol (Kanada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Francia (Kongói Demokratikus Köztársaság)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:399 + msgid "zh" + msgstr "zh" +@@ -3029,11 +3029,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krími tatár (török Alt-Q)" + + #: ../rules/base.xml.in.h:814 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tajvani" + + #: ../rules/base.xml.in.h:815 +-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 504b280..d283050 100644 +--- a/po/id.po ++++ b/po/id.po +@@ -1504,7 +1504,7 @@ msgstr "Inggris (Kanada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Perancis (Republik Demokratik Kongo)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:399 + msgid "zh" + msgstr "zh" +@@ -3028,11 +3028,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Crimean Tatar (Turkish Alt-Q)" + + #: ../rules/base.xml.in.h:814 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwan" + + #: ../rules/base.xml.in.h:815 +-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 2b23fe1..0d1c31d 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -2922,8 +2922,8 @@ msgid "SVEN Slim 303" + msgstr "SVEN Slim 303" + + #: ../rules/base.xml.in.h:677 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiyat (Taiwan)" ++msgid "Saisiyat (Chinese Taiwan)" ++msgstr "Saisiyat (Chinese Taiwan)" + + #: ../rules/base.xml.in.h:678 + msgid "Samsung SDM 4500P" +@@ -3151,12 +3151,12 @@ msgid "Syriac (phonetic)" + msgstr "Siriana (fonetica)" + + #: ../rules/base.xml.in.h:732 +-msgid "Taiwanese" +-msgstr "Taiwanese" ++msgid "Chinese Taiwan" ++msgstr "Chinese Taiwan" + + #: ../rules/base.xml.in.h:733 +-msgid "Taiwanese (indigenous)" +-msgstr "Taiwanese (indigena)" ++msgid "Chinese Taiwan (indigenous)" ++msgstr "Chinese Taiwan (indigena)" + + # UE + #: ../rules/base.xml.in.h:734 +diff --git a/po/ja.po b/po/ja.po +index 8514e93..37413b5 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -1427,7 +1427,7 @@ msgstr "英語 (カナダ)" + msgid "French (Democratic Republic of the Congo)" + msgstr "フランス語 (コンゴ民主共和国)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:374 + msgid "zh" + msgstr "zh" +@@ -2886,12 +2886,12 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "クリミア・タタール語 (トルコ語 Alt-Q)" + + #: ../rules/base.xml.in.h:763 +-msgid "Taiwanese" +-msgstr "台湾語" ++msgid "Chinese Taiwan" ++msgstr "中国台湾語" + + #: ../rules/base.xml.in.h:764 +-msgid "Taiwanese (indigenous)" +-msgstr "台湾語 (現地語)" ++msgid "Chinese Taiwan (indigenous)" ++msgstr "中国台湾語 (現地語)" + + #. Keyboard indicator for Saisiyat layouts + #: ../rules/base.xml.in.h:766 +@@ -2900,7 +2900,7 @@ msgstr "xsy" + + # 台湾の地方語、サイシャット語? + #: ../rules/base.xml.in.h:767 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Chinese Taiwan)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/ko.po b/po/ko.po +index 6f850be..535e9f1 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -1551,7 +1551,7 @@ msgstr "영어 (캐나다)" + msgid "French (Democratic Republic of the Congo)" + msgstr "프랑스어 (콩고 민주 공화국)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:401 + msgid "zh" + msgstr "zh" +@@ -3096,11 +3096,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "크림타타르 (터키어 Alt-Q)" + + #: ../rules/base.xml.in.h:818 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "타이완" + + #: ../rules/base.xml.in.h:819 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "타이완 (원주민)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/lt.po b/po/lt.po +index 5b8a1ad..cbb0876 100644 +--- a/po/lt.po ++++ b/po/lt.po +@@ -1444,7 +1444,7 @@ msgstr "Anglų (Kanada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Prancūzų (Kongo Demokratinė Respublika)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:384 + msgid "zh" + msgstr "zh" +@@ -2912,11 +2912,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krymo totorių (turkiškas Alt-Q)" + + #: ../rules/base.xml.in.h:785 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taivaniečių" + + #: ../rules/base.xml.in.h:786 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taivano (čiabuvių)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/nl.po b/po/nl.po +index 6a75c65..95a1829 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -1543,7 +1543,7 @@ msgstr "Engels (Canada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Frans (Democratische Republiek Congo)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:399 + msgid "zh" + msgstr "zh" +@@ -3105,11 +3105,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krim-Tataars (Turks Alt-Q)" + + #: ../rules/base.xml.in.h:814 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanees" + + #: ../rules/base.xml.in.h:815 +-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 8237134..11e0d92 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -1507,7 +1507,7 @@ msgstr "Angielski (Kanada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Francuski (Demokratyczna Republika Konga)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:401 + msgid "zh" + msgstr "zh" +@@ -3039,11 +3039,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krymskotatarski (turecki Alt-Q)" + + #: ../rules/base.xml.in.h:818 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tajwański" + + #: ../rules/base.xml.in.h:819 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tajwański (autochtoniczny)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/pt_BR.po b/po/pt_BR.po +index 6321077..b89ffd9 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -1499,7 +1499,7 @@ msgstr "Inglês (Canadá)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Francês (República Democrática de Congo)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:398 + msgid "zh" + msgstr "zh" +@@ -3028,11 +3028,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tártaro da Crimeia (Alt-Q turco)" + + #: ../rules/base.xml.in.h:814 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanês" + + #: ../rules/base.xml.in.h:815 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanês (indígena)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/ru.po b/po/ru.po +index b0c103d..b114ee1 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -1508,7 +1508,7 @@ msgstr "Английская (Канада)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Французская (Демократическая республика Конго)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:399 + msgid "zh" + msgstr "zh" +@@ -3032,11 +3032,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Крымско-татарская (турецкая Alt-Q)" + + #: ../rules/base.xml.in.h:814 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Тайваньская" + + #: ../rules/base.xml.in.h:815 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Тайваньская (туземная)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/sk.po b/po/sk.po +index 30924d4..7dfbcc0 100644 +--- a/po/sk.po ++++ b/po/sk.po +@@ -1645,7 +1645,7 @@ msgstr "" + msgid "French (Democratic Republic of the Congo)" + msgstr "Konžská demokratická republika" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:398 + msgid "zh" + msgstr "" +@@ -3384,11 +3384,11 @@ msgstr "" + + #: ../rules/base.xml.in.h:814 + #, fuzzy +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Japonské" + + #: ../rules/base.xml.in.h:815 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/sl.po b/po/sl.po +index 4bb51ef..1e84453 100644 +--- a/po/sl.po ++++ b/po/sl.po +@@ -2954,11 +2954,11 @@ msgid "Syriac (phonetic)" + msgstr "sirska (fonetična)" + + #: ../rules/base.xml.in.h:736 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "tajvanska" + + #: ../rules/base.xml.in.h:737 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "tajvanska (domorodna)" + + #: ../rules/base.xml.in.h:738 +@@ -3767,7 +3767,7 @@ msgstr "xsy" + msgid "yo" + msgstr "yo" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:1014 + msgid "zh" + msgstr "zh" +diff --git a/po/sv.po b/po/sv.po +index b38c2db..257947f 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -1513,7 +1513,7 @@ msgstr "Engelsk (Kanada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Fransk (Demokratiska republiken Kongo)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:401 + msgid "zh" + msgstr "zh" +@@ -3045,11 +3045,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimtatarisk (Turkisk Alt-Q)" + + #: ../rules/base.xml.in.h:818 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanesisk" + + #: ../rules/base.xml.in.h:819 +-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 b8caa6e..b1df670 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -1513,7 +1513,7 @@ msgstr "İngilizce (Kanada)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Fransızca (Demokratik Kongo Cumhuriyeti)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:401 + msgid "zh" + msgstr "zh" +@@ -3045,11 +3045,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Kırım Tatarcası (Türkçe Alt-Q)" + + #: ../rules/base.xml.in.h:818 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tayvanca" + + #: ../rules/base.xml.in.h:819 +-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 90ff157..40ebb43 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -1515,7 +1515,7 @@ msgstr "Англійська (Канада)" + msgid "French (Democratic Republic of the Congo)" + msgstr "Французька (Демократична республіка Конго)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:401 + msgid "zh" + msgstr "zh" +@@ -3047,11 +3047,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Кримськотатарська (турецька Alt-Q)" + + #: ../rules/base.xml.in.h:818 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Тайванська" + + #: ../rules/base.xml.in.h:819 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Тайванська (місцева)" + + #. Keyboard indicator for Saisiyat layouts +diff --git a/po/vi.po b/po/vi.po +index 98f90e3..e03b723 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -1313,7 +1313,7 @@ msgstr "Tiếng Anh (Ca-na-đa)" + 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 Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:341 + msgid "zh" + msgstr "zh" +@@ -2822,11 +2822,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tiếng Ta-tă Cợ-ri-mia (Thổ Nhĩ Kỳ Alt-Q)" + + #: ../rules/base.xml.in.h:753 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tiếng Đài Loan" + + #: ../rules/base.xml.in.h:754 +-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 722c893..bcadf36 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -1738,14 +1738,14 @@ msgstr "英语(加拿大)" + msgid "French (Democratic Republic of the Congo)" + msgstr "法语(刚果民主共和国，刚果(金))" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:401 + msgid "zh" + msgstr "zh" + + #: ../rules/base.xml.in.h:402 + msgid "Chinese" +-msgstr "汉语" ++msgstr "简体中文" + + #: ../rules/base.xml.in.h:403 + msgid "Tibetan" +@@ -3509,12 +3509,12 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "乌兹别克语(克里米亚鞑靼土耳其 Alt-Q)" + + #: ../rules/base.xml.in.h:818 +-msgid "Taiwanese" +-msgstr "台湾" ++msgid "Chinese Taiwan" ++msgstr "繁体中文(中国台湾)" + + #: ../rules/base.xml.in.h:819 +-msgid "Taiwanese (indigenous)" +-msgstr "台湾原住民语言" ++msgid "Chinese Taiwan (indigenous)" ++msgstr "繁体中文(中国台湾原住民语言)" + + #. Keyboard indicator for Saisiyat layouts + #: ../rules/base.xml.in.h:821 +@@ -3522,8 +3522,8 @@ msgid "xsy" + msgstr "xsy" + + #: ../rules/base.xml.in.h:822 +-msgid "Saisiyat (Taiwan)" +-msgstr "" ++msgid "Saisiyat (Chinese Taiwan)" ++msgstr "赛亚族语(中国台湾)" + + #. Keyboard indicator for Ukranian layouts + #: ../rules/base.xml.in.h:824 ../rules/base.extras.xml.in.h:173 +diff --git a/po/zh_TW.po b/po/zh_TW.po +index 5d8714b..87619ea 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -1411,7 +1411,7 @@ msgstr "英語 (加拿大)" + msgid "French (Democratic Republic of the Congo)" + msgstr "法語 (剛果民主共和國)" + +-#. Keyboard indicator for Taiwanese layouts ++#. Keyboard indicator for Chinese Taiwan layouts + #: ../rules/base.xml.in.h:374 + msgid "zh" + msgstr "zh" +@@ -2839,12 +2839,12 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "克里米亞韃靼語 (土耳其語 Alt-Q)" + + #: ../rules/base.xml.in.h:765 +-msgid "Taiwanese" +-msgstr "臺灣語" ++msgid "Chinese Taiwan" ++msgstr "中國臺灣語" + + #: ../rules/base.xml.in.h:766 +-msgid "Taiwanese (indigenous)" +-msgstr "臺灣語 (原住民)" ++msgid "Chinese Taiwan (indigenous)" ++msgstr "中國臺灣語 (原住民)" + + #. Keyboard indicator for Saisiyat layouts + #: ../rules/base.xml.in.h:768 +@@ -2852,8 +2852,8 @@ msgid "xsy" + msgstr "xsy" + + #: ../rules/base.xml.in.h:769 +-msgid "Saisiyat (Taiwan)" +-msgstr "賽夏族語 (臺灣)" ++msgid "Saisiyat (Chinese Taiwan)" ++msgstr "賽夏族語 (中國臺灣)" + + #. Keyboard indicator for Ukranian layouts + #: ../rules/base.xml.in.h:771 ../rules/base.extras.xml.in.h:121 +diff --git a/rules/base.xml.in b/rules/base.xml.in +index 7765b50..45af987 100644 +--- a/rules/base.xml.in ++++ b/rules/base.xml.in +@@ -5291,49 +5291,14 @@ + + + tw +- ++ + <_shortDescription>zh +- <_description>Taiwanese ++ <_description>Chinese Taiwan + + fox + + + +- +- +- indigenous +- <_description>Taiwanese (indigenous) +- +- ami +- tay +- bnn +- ckv +- pwn +- pyu +- dru +- ais +- ssf +- tao +- tsu +- trv +- xnb +- sxr +- uun +- fos +- +- +- +- +- +- saisiyat +- +- <_shortDescription>xsy +- <_description>Saisiyat (Taiwan) +- +- xsy +- +- +- + + + +diff --git a/rules/evdev.xml.in b/rules/evdev.xml.in +index 3608b60..5458dfc 100644 +--- a/rules/evdev.xml.in ++++ b/rules/evdev.xml.in +@@ -5285,49 +5285,14 @@ + + + tw +- ++ + <_shortDescription>zh +- <_description>Taiwanese ++ <_description>Chinese Taiwan + + fox + + + +- +- +- indigenous +- <_description>Taiwanese (indigenous) +- +- ami +- tay +- bnn +- ckv +- pwn +- pyu +- dru +- ais +- ssf +- tao +- tsu +- trv +- xnb +- sxr +- uun +- fos +- +- +- +- +- +- saisiyat +- +- <_shortDescription>xsy +- <_description>Saisiyat (Taiwan) +- +- xsy +- +- +- + + + +diff --git a/symbols/cn b/symbols/cn +index 45a3fee..d702ca2 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 3a22872..3031fba 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 69437f5a994231509ead907a787ae1d74208c94c..6ae7266260e40b98a309ae4d9d4a3a0025491712 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,13 +1,14 @@ # INFO: Package contains data-only, no binaries, so no debuginfo is needed %define debug_package %{nil} +%define anolis_release .0.1 #global gitdate 20110415 #global gitversion 19a0026b5 Summary: X Keyboard Extension configuration data Name: xkeyboard-config Version: 2.24 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{anolis_release}%{?dist} License: MIT Group: User Interface/X URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig @@ -23,6 +24,8 @@ Patch01: 0001-Revert-rules-Move-Finnish-DAS-layout-to-extras.patch # Keycodes > 255 cannot be parsed by xkbcomp < 1.4.0 Patch02: 0001-Revert-Map-evdev-keycode-KEY_KEYBOARD-to-XF86Keyboar.patch Patch03: 0002-Revert-Map-evdev-keycode-KEY_FAVORITES-to-XF86Favori.patch +# Standardization of language names in countries and regions +Patch04: 0001-Standardization-of-language-names-in-countries-and-r.patch BuildArch: noarch @@ -114,6 +117,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled %{_datadir}/pkgconfig/xkeyboard-config.pc %changelog +* Thu May 25 2023 leeffo - 2.24-1.0.1 +- Standardization of language names in countries and regions + * Wed Jun 06 2018 Peter Hutterer 2.24-1 - xkeyboard-config 2.24 (#1564615) - Revert the high-keycode patches to avoid conflicts with xkbcomp < 1.4