From 148f413d18323c40382ee4b6d968b72296e194ee Mon Sep 17 00:00:00 2001 From: liweiganga Date: Thu, 11 May 2023 10:41:06 +0800 Subject: [PATCH] compliance modification of regional and textual titles --- ...ication-of-regional-and-textual-titl.patch | 1808 +++++++++++++++++ xkeyboard-config.spec | 6 +- 2 files changed, 1813 insertions(+), 1 deletion(-) create mode 100644 0001-compliance-modification-of-regional-and-textual-titl.patch diff --git a/0001-compliance-modification-of-regional-and-textual-titl.patch b/0001-compliance-modification-of-regional-and-textual-titl.patch new file mode 100644 index 0000000..d734737 --- /dev/null +++ b/0001-compliance-modification-of-regional-and-textual-titl.patch @@ -0,0 +1,1808 @@ +From 4037d27c69ecede2aa1845142a43823800068fde Mon Sep 17 00:00:00 2001 +From: leeffo +Date: Mon, 15 May 2023 11:05:26 +0800 +Subject: [PATCH] compliance modification of regional and textual titles + +--- + geometry/sun | 4 ++-- + po/af.po | 8 ++++---- + po/az.po | 8 ++++---- + po/bg.po | 8 ++++---- + po/ca.po | 10 +++++----- + po/crh.po | 8 ++++---- + po/cs.po | 8 ++++---- + po/da.po | 10 +++++----- + po/de.po | 10 +++++----- + po/el.po | 8 ++++---- + po/en_GB.po | 8 ++++---- + po/eo.po | 8 ++++---- + po/es.po | 8 ++++---- + po/fi.po | 10 +++++----- + po/fr.po | 8 ++++---- + po/fur.po | 14 +++++++------- + po/gl.po | 8 ++++---- + po/hr.po | 8 ++++---- + po/hu.po | 8 ++++---- + po/id.po | 10 +++++----- + po/it.po | 14 +++++++------- + po/ja.po | 8 ++++---- + po/ka.po | 8 ++++---- + po/ko.po | 8 ++++---- + po/ky.po | 8 ++++---- + po/lt.po | 8 ++++---- + po/nb.po | 8 ++++---- + po/nl.po | 10 +++++----- + po/pl.po | 8 ++++---- + po/pt.po | 10 +++++----- + po/pt_BR.po | 10 +++++----- + po/ro.po | 10 +++++----- + po/ru.po | 8 ++++---- + po/rw.po | 8 ++++---- + po/sk.po | 8 ++++---- + po/sl.po | 8 ++++---- + po/sq.po | 8 ++++---- + po/sr.po | 8 ++++---- + po/sv.po | 10 +++++----- + po/tr.po | 8 ++++---- + po/uk.po | 8 ++++---- + po/vi.po | 8 ++++---- + po/xkeyboard-config.pot | 2 +- + po/zh_CN.po | 8 ++++---- + po/zh_TW.po | 8 ++++---- + rules/base.xml | 8 ++++---- + rules/evdev.xml | 8 ++++---- + symbols/cn | 4 ++-- + symbols/sun_vndr/tw | 2 +- + symbols/tw | 6 +++--- + 50 files changed, 205 insertions(+), 205 deletions(-) + +diff --git a/geometry/sun b/geometry/sun +index fc6d5a6..ebeaad9 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, Taiwan China)"; + }; + + 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, Taiwan China)"; + }; + + xkb_geometry "type7jp" { +diff --git a/po/af.po b/po/af.po +index 3f2b8e4..e5edf84 100644 +--- a/po/af.po ++++ b/po/af.po +@@ -1722,7 +1722,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "" +@@ -3465,11 +3465,11 @@ msgstr "" + + #: rules/base.xml:5561 + #, fuzzy +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Japanees" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +@@ -3478,7 +3478,7 @@ msgid "xsy" + msgstr "" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/az.po b/po/az.po +index 6c7ad8d..556421f 100644 +--- a/po/az.po ++++ b/po/az.po +@@ -1723,7 +1723,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "" +@@ -3466,11 +3466,11 @@ msgstr "" + + #: rules/base.xml:5561 + #, fuzzy +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Yaponca" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +@@ -3479,7 +3479,7 @@ msgid "xsy" + msgstr "" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/bg.po b/po/bg.po +index c99eb02..e4e0257 100644 +--- a/po/bg.po ++++ b/po/bg.po +@@ -1678,7 +1678,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "Ктс" +@@ -3296,11 +3296,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "кримско татарска — турска, „Q“ горе-вляво, алтернативна" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "тайванска" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "тайванска — туземна" + + #. Keyboard indicator for Saisiyat layouts +@@ -3309,7 +3309,7 @@ msgid "xsy" + msgstr "Сст" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "сайсиятска — тайванска" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/ca.po b/po/ca.po +index eda3887..588d98c 100644 +--- a/po/ca.po ++++ b/po/ca.po +@@ -1619,7 +1619,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3235,11 +3235,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tàtar de Crimea (Turc Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanès" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanès (indígena)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3248,8 +3248,8 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" ++msgstr "Saisiyat (Taiwan China)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5608 rules/base.extras.xml:1181 +diff --git a/po/crh.po b/po/crh.po +index d299d53..e683a07 100644 +--- a/po/crh.po ++++ b/po/crh.po +@@ -1771,7 +1771,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "" +@@ -3624,11 +3624,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Qırımtatarca (Türkçe Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +@@ -3637,7 +3637,7 @@ msgid "xsy" + msgstr "" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/cs.po b/po/cs.po +index 8d79d15..7dc92e1 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -1634,7 +1634,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3250,11 +3250,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krymskotatarské (turecké Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tchajwanské" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tchajwanské (domorodé)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3263,7 +3263,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Saisiyatské (Tchaj-wan)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/da.po b/po/da.po +index aadea6b..34df3ee 100644 +--- a/po/da.po ++++ b/po/da.po +@@ -1676,7 +1676,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3370,11 +3370,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimtatarsk (tyrkisk Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanesisk" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanesisk (indfødte)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3383,8 +3383,8 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" ++msgstr "Saisiyat (Taiwan China)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5608 rules/base.extras.xml:1181 +diff --git a/po/de.po b/po/de.po +index ef5b92f..95aedeb 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -1619,7 +1619,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3236,11 +3236,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimtatarisch (Türkisch Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanesisch" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanesisch (indigen)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3249,8 +3249,8 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" ++msgstr "Saisiyat (Taiwan China)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5608 rules/base.extras.xml:1181 +diff --git a/po/el.po b/po/el.po +index 4459a20..795d75d 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -1754,7 +1754,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3504,11 +3504,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Ταταρικό Κριμαίας (τουρκικό Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Ταϊβανέζικο" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Ταϊβανέζικο (ιθαγενές)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3517,7 +3517,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Σαϊσιγιάτ (Ταϊβάν)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/en_GB.po b/po/en_GB.po +index 06a2bf5..8817e2c 100644 +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -1737,7 +1737,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "" +@@ -3537,11 +3537,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +@@ -3550,7 +3550,7 @@ msgid "xsy" + msgstr "" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/eo.po b/po/eo.po +index 58f7356..d5e5001 100644 +--- a/po/eo.po ++++ b/po/eo.po +@@ -1645,7 +1645,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3326,11 +3326,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krime-tatara (Turka Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tajvana" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tajvana (indiĝena)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3339,7 +3339,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Saisiyat (Tajvano)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/es.po b/po/es.po +index 6b2dcc9..45bfe89 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -1652,7 +1652,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3333,11 +3333,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tártaro de Crimea (Alt-Q turca)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanés" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanés (autóctono)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3346,7 +3346,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Saisiyat (Taiwán)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/fi.po b/po/fi.po +index 86cd61e..9c324f0 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -1647,7 +1647,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3320,11 +3320,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimintataari (turkkilainen Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanilainen" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanilainen (kotoperäinen)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3333,8 +3333,8 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" ++msgstr "Saisiat (Taiwan China)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5608 rules/base.extras.xml:1181 +diff --git a/po/fr.po b/po/fr.po +index 3c54993..bc8724e 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -1653,7 +1653,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3335,11 +3335,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tatar de Crimée (Alt-Q turc)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taïwanais" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taïwanais (indigène)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3348,7 +3348,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Saisiyat (Taïwan)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/fur.po b/po/fur.po +index 3422b9c..04e6405 100644 +--- a/po/fur.po ++++ b/po/fur.po +@@ -1619,7 +1619,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3235,12 +3235,12 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tatare de Crimee (Alt-Q Turche)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" +-msgstr "Taiwanese" ++msgid "Chinese Taiwan" ++msgstr "Chinese Taiwan" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" +-msgstr "Taiwanese (indigjene)" ++msgid "Chinese Taiwan (indigenous)" ++msgstr "Chinese Taiwan (indigjene)" + + #. Keyboard indicator for Saisiyat layouts + #: rules/base.xml:5595 +@@ -3248,8 +3248,8 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" ++msgstr "Saisiyat (Taiwan China)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5608 rules/base.extras.xml:1181 +diff --git a/po/gl.po b/po/gl.po +index 93f04e2..c483e79 100644 +--- a/po/gl.po ++++ b/po/gl.po +@@ -1652,7 +1652,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3333,11 +3333,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tártaro de Crimea (turco Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanés" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanés (autóctono)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3346,7 +3346,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Saisiyat (Taiwán)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/hr.po b/po/hr.po +index 7516e83..e6963c9 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -1623,7 +1623,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3239,11 +3239,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimski tatarski (Turski Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tajvanski" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tajvanski (autohtoni)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3252,7 +3252,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Saisiatanski (Tajvan)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/hu.po b/po/hu.po +index 98c289f..467ff8d 100644 +--- a/po/hu.po ++++ b/po/hu.po +@@ -1652,7 +1652,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3338,11 +3338,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krími tatár (török Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tajvani" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tajvani (őslakos)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3351,7 +3351,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Saisiyat (Tajvan)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/id.po b/po/id.po +index be3c9c8..73c0b06 100644 +--- a/po/id.po ++++ b/po/id.po +@@ -1621,7 +1621,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3237,11 +3237,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Crimean Tatar (Turkish Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwan" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwan (asli)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3250,8 +3250,8 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" ++msgstr "Saisiyat (Taiwan China)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5608 rules/base.extras.xml:1181 +diff --git a/po/it.po b/po/it.po +index f855971..ee7b6b2 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -1697,7 +1697,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3410,12 +3410,12 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tatar crimea (turca Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" +-msgstr "Taiwanese" ++msgid "Chinese Taiwan" ++msgstr "Chinese Taiwan" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" +-msgstr "Taiwanese (indigena)" ++msgid "Chinese Taiwan (indigenous)" ++msgstr "Chinese Taiwan (indigena)" + + #. Keyboard indicator for Saisiyat layouts + #: rules/base.xml:5595 +@@ -3423,8 +3423,8 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" ++msgstr "Saisiyat (Taiwan China)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5608 rules/base.extras.xml:1181 +diff --git a/po/ja.po b/po/ja.po +index c96138b..d599b41 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -1768,7 +1768,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3562,11 +3562,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "クリミア・タタール語 (トルコ語 Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "台湾語" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "台湾語 (現地語)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3576,7 +3576,7 @@ msgstr "xsy" + + # 台湾の地方語、サイシャット語? + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/ka.po b/po/ka.po +index be44170..1bdf388 100644 +--- a/po/ka.po ++++ b/po/ka.po +@@ -1750,7 +1750,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "" +@@ -3576,11 +3576,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +@@ -3589,7 +3589,7 @@ msgid "xsy" + msgstr "" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/ko.po b/po/ko.po +index beea16b..efd3adb 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -1674,7 +1674,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3304,11 +3304,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "크림타타르 (터키어 Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "타이완" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "타이완 (원주민)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3318,7 +3318,7 @@ msgstr "xsy" + + # 사이시얏트(賽夏族) - 타이완 원주민 + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "사이시얏트 (타이완)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/ky.po b/po/ky.po +index 22935f4..d0c8926 100644 +--- a/po/ky.po ++++ b/po/ky.po +@@ -1762,7 +1762,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "" +@@ -3588,11 +3588,11 @@ msgstr "Крым татардык (түрк Alt-Q)" + + #: rules/base.xml:5561 + #, fuzzy +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Япондук" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +@@ -3601,7 +3601,7 @@ msgid "xsy" + msgstr "" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/lt.po b/po/lt.po +index 5d3e04a..d622333 100644 +--- a/po/lt.po ++++ b/po/lt.po +@@ -1754,7 +1754,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3504,11 +3504,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krymo totorių (turkiškas Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taivaniečių" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taivano (čiabuvių)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3517,7 +3517,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Siaisijatų (Taivanas)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/nb.po b/po/nb.po +index 889dcfa..b15b53a 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -1653,7 +1653,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "" +@@ -3382,11 +3382,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +@@ -3395,7 +3395,7 @@ msgid "xsy" + msgstr "" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/nl.po b/po/nl.po +index 0358944..e6b729d 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -1659,7 +1659,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3315,11 +3315,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krim-Tataars (Turks Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanees" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanees (oorspronkelijk)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3330,8 +3330,8 @@ msgstr "xsy" + # Saisiyat, ook Saiset, Seisirat, Saisett, Saisiat, Saisiett, Saisirat, + # Saisyet, Saisyett, Amutoura of Bouiok. + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" ++msgstr "Saisiyat (Taiwan China)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5608 rules/base.extras.xml:1181 +diff --git a/po/pl.po b/po/pl.po +index 79e2932..cacc3d0 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -1616,7 +1616,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3232,11 +3232,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krymskotatarski (turecki Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tajwański" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tajwański (autochtoniczny)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3245,7 +3245,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Saisiyat (Tajwan)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/pt.po b/po/pt.po +index 5c7148f..6db4d33 100644 +--- a/po/pt.po ++++ b/po/pt.po +@@ -1620,7 +1620,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3236,11 +3236,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tatar da Crimeia (Turco Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanês" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanês (indígena)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3249,8 +3249,8 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" ++msgstr "Saisiyat (Taiwan China)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5608 rules/base.extras.xml:1181 +diff --git a/po/pt_BR.po b/po/pt_BR.po +index abedf38..e9de67d 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -1650,7 +1650,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3335,11 +3335,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tártaro da Crimeia (Alt-Q turco)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanês" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanês (indígena)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3348,8 +3348,8 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" ++msgstr "Saisiat (Taiwan China)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5608 rules/base.extras.xml:1181 +diff --git a/po/ro.po b/po/ro.po +index c2c214d..6a21d55 100644 +--- a/po/ro.po ++++ b/po/ro.po +@@ -1712,7 +1712,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3481,11 +3481,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tătară din Crimea (Alt-Q turcesc)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwaneză" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwaneză (indigeneză)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3494,8 +3494,8 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" ++msgstr "Saisiyat (Taiwan China)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5608 rules/base.extras.xml:1181 +diff --git a/po/ru.po b/po/ru.po +index 6f2b946..1494156 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -1628,7 +1628,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3244,11 +3244,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Крымско-татарская (турецкая Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Тайваньская" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Тайваньская (туземная)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3257,7 +3257,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Сайсьят (Тайвань)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/rw.po b/po/rw.po +index 4128ffd..33333c0 100644 +--- a/po/rw.po ++++ b/po/rw.po +@@ -1683,7 +1683,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "" +@@ -3430,11 +3430,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +@@ -3443,7 +3443,7 @@ msgid "xsy" + msgstr "" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/sk.po b/po/sk.po +index 588aff8..bc52840 100644 +--- a/po/sk.po ++++ b/po/sk.po +@@ -1779,7 +1779,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "" +@@ -3647,11 +3647,11 @@ msgstr "" + + #: rules/base.xml:5561 + #, fuzzy +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Japonské" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +@@ -3660,7 +3660,7 @@ msgid "xsy" + msgstr "" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/sl.po b/po/sl.po +index 5339246..0abfabb 100644 +--- a/po/sl.po ++++ b/po/sl.po +@@ -1761,7 +1761,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3516,11 +3516,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "krimsko tatarska (turški Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "tajvanska" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "tajvanska (domorodna)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3529,7 +3529,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "sajsijatska (Tajvan)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/sq.po b/po/sq.po +index 02a7565..1974b4a 100644 +--- a/po/sq.po ++++ b/po/sq.po +@@ -1722,7 +1722,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "" +@@ -3465,11 +3465,11 @@ msgstr "" + + #: rules/base.xml:5561 + #, fuzzy +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Japonisht" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +@@ -3478,7 +3478,7 @@ msgid "xsy" + msgstr "" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/sr.po b/po/sr.po +index 132e6a1..a9380fe 100644 +--- a/po/sr.po ++++ b/po/sr.po +@@ -1755,7 +1755,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "" +@@ -3579,11 +3579,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "" + + #. Keyboard indicator for Saisiyat layouts +@@ -3592,7 +3592,7 @@ msgid "xsy" + msgstr "" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/sv.po b/po/sv.po +index 5627c5d..5a6d873 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -1649,7 +1649,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3330,11 +3330,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Krimtatarisk (Turkisk Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Taiwanesisk" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Taiwanesisk (inhemsk)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3343,8 +3343,8 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" +-msgstr "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" ++msgstr "Saisiyat (Taiwan China)" + + #. Keyboard indicator for Ukranian layouts + #: rules/base.xml:5608 rules/base.extras.xml:1181 +diff --git a/po/tr.po b/po/tr.po +index 31835c2..d305c12 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -1624,7 +1624,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3240,11 +3240,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Kırım Türkçesi (Türkçe Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tayvanca" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tayvanca (yöreye özgü)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3253,7 +3253,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Saisiyat Dili (Tayvan)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/uk.po b/po/uk.po +index 2f8cc1a..031577a 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -1625,7 +1625,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3241,11 +3241,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Кримськотатарська (турецька Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Тайванська" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Тайванська (місцева)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3254,7 +3254,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Сайсіят (Тайвань)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/vi.po b/po/vi.po +index ca9bd81..d828ad2 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -1758,7 +1758,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3495,11 +3495,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "Tiếng Ta-tă Cợ-ri-mia (Thổ Nhĩ Kỳ Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "Tiếng Đài Loan" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "Tiếng Đài Loan (bản địa)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3508,7 +3508,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "Tiếng Saisiyat (Đài-loan)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/xkeyboard-config.pot b/po/xkeyboard-config.pot +index 9744728..37dba00 100644 +--- a/po/xkeyboard-config.pot ++++ b/po/xkeyboard-config.pot +@@ -3236,7 +3236,7 @@ msgid "xsy" + msgstr "" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 74b6de3..b685c3c 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3439,11 +3439,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "乌兹别克语(克里米亚鞑靼土耳其 Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "台湾" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "台湾原住民语言" + + #. Keyboard indicator for Saisiyat layouts +@@ -3452,7 +3452,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "" + + #. Keyboard indicator for Ukranian layouts +diff --git a/po/zh_TW.po b/po/zh_TW.po +index f514275..f9dca71 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -1761,7 +1761,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:2796 rules/base.xml:5560 + msgid "zh" + msgstr "zh" +@@ -3511,11 +3511,11 @@ msgid "Crimean Tatar (Turkish Alt-Q)" + msgstr "克里米亞韃靼語 (土耳其語 Alt-Q)" + + #: rules/base.xml:5561 +-msgid "Taiwanese" ++msgid "Chinese Taiwan" + msgstr "臺灣語" + + #: rules/base.xml:5570 +-msgid "Taiwanese (indigenous)" ++msgid "Chinese Taiwan (indigenous)" + msgstr "臺灣語 (原住民)" + + #. Keyboard indicator for Saisiyat layouts +@@ -3524,7 +3524,7 @@ msgid "xsy" + msgstr "xsy" + + #: rules/base.xml:5596 +-msgid "Saisiyat (Taiwan)" ++msgid "Saisiyat (Taiwan China)" + msgstr "賽夏族語 (臺灣)" + + #. Keyboard indicator for Ukranian layouts +diff --git a/rules/base.xml b/rules/base.xml +index a13af8f..29e46a5 100644 +--- a/rules/base.xml ++++ b/rules/base.xml +@@ -5556,9 +5556,9 @@ + + + tw +- ++ + zh +- Taiwanese ++ Chinese Taiwan + + fox + +@@ -5567,7 +5567,7 @@ + + + indigenous +- Taiwanese (indigenous) ++ Chinese Taiwan (indigenous) + + ami + tay +@@ -5593,7 +5593,7 @@ + saisiyat + + xsy +- Saisiyat (Taiwan) ++ Saisiyat (Taiwan China) + + xsy + +diff --git a/rules/evdev.xml b/rules/evdev.xml +index 71579f5..2d38925 100644 +--- a/rules/evdev.xml ++++ b/rules/evdev.xml +@@ -5545,9 +5545,9 @@ + + + tw +- ++ + zh +- Taiwanese ++ Chinese Taiwan + + fox + +@@ -5556,7 +5556,7 @@ + + + indigenous +- Taiwanese (indigenous) ++ Chinese Taiwan (indigenous) + + ami + tay +@@ -5582,7 +5582,7 @@ + saisiyat + + xsy +- Saisiyat (Taiwan) ++ Saisiyat (Taiwan China) + + xsy + +diff --git a/symbols/cn b/symbols/cn +index b1af96e..c824114 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 (Taiwan China 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 12ec3c7..f055991 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 (Taiwan China)"; + + key { [ U02D0, colon, semicolon, dead_diaeresis ] }; + +-- +2.20.1 + diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 18119f4..52aa904 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,6 +1,6 @@ Name: xkeyboard-config Version: 2.30 -Release: 2 +Release: 3 Summary: The X Keyboard Extension License: MIT URL: https://www.freedesktop.org/wiki/Software/XKeyboardConfig @@ -8,6 +8,7 @@ Source0: https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{ Patch01: 0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch Patch02: 0001-remove-duplicate-cm-tel-kagapa.patch +Patch03: 0001-compliance-modification-of-regional-and-textual-titl.patch BuildArch: noarch BuildRequires: gettext gettext-devel libtool libxslt perl(XML::Parser) pkgconfig(glib-2.0) xkbcomp @@ -64,6 +65,9 @@ autoreconf -v --force --install || exit 1 %{_mandir}/man7/xkeyboard-config.* %changelog +* Thu May 11 2023 leeffo - 2.30-3 +- compliance modification of regional and textual titles + * Fri Dec 3 2021 zhangshaoning - 2.30-2 - remove duplicate cm and tel-kagapa