diff --git a/dist/languages/ca.ts b/dist/languages/ca.ts index 770b80a96f..12dcce3811 100644 --- a/dist/languages/ca.ts +++ b/dist/languages/ca.ts @@ -3953,11 +3953,6 @@ UUID: %2 Russian (Русский) Rus (Русский) - - - Taiwanese - Taiwanès - British English diff --git a/dist/languages/cs.ts b/dist/languages/cs.ts index a932dabed9..9f9c47b383 100644 --- a/dist/languages/cs.ts +++ b/dist/languages/cs.ts @@ -3945,11 +3945,6 @@ UUID: %2 Russian (Русский) Ruština (Русский) - - - Taiwanese - Tajwanština - British English diff --git a/dist/languages/da.ts b/dist/languages/da.ts index 7a16e813c2..b1e5356c19 100644 --- a/dist/languages/da.ts +++ b/dist/languages/da.ts @@ -3961,11 +3961,6 @@ UUID: %2 Russian (Русский) Russisk (Русский) - - - Taiwanese - Taiwanesisk - British English diff --git a/dist/languages/de.ts b/dist/languages/de.ts index 500dce5f25..28a2891923 100644 --- a/dist/languages/de.ts +++ b/dist/languages/de.ts @@ -3963,11 +3963,6 @@ UUID: %2 Russian (Русский) Russisch (Русский) - - - Taiwanese - Taiwanesisch - British English diff --git a/dist/languages/el.ts b/dist/languages/el.ts index 712f5241e6..e1d09c9ada 100644 --- a/dist/languages/el.ts +++ b/dist/languages/el.ts @@ -3953,11 +3953,6 @@ UUID: %2 Russian (Русский) Ρώσικα (Русский) - - - Taiwanese - Ταϊβανέζικα - British English diff --git a/dist/languages/es.ts b/dist/languages/es.ts index 7032c726e9..842c87e063 100644 --- a/dist/languages/es.ts +++ b/dist/languages/es.ts @@ -3969,11 +3969,6 @@ UUID: %2 Russian (Русский) Ruso (Русский) - - - Taiwanese - Taiwanés - British English diff --git a/dist/languages/fi.ts b/dist/languages/fi.ts index ad2fbe7f35..d3f0686b75 100644 --- a/dist/languages/fi.ts +++ b/dist/languages/fi.ts @@ -3095,11 +3095,6 @@ To invert the axes, first move your joystick vertically, and then horizontally.< Russian (Русский) - - - Taiwanese - - British English diff --git a/dist/languages/fr.ts b/dist/languages/fr.ts index 49d30137fb..5ea26a1265 100644 --- a/dist/languages/fr.ts +++ b/dist/languages/fr.ts @@ -3969,11 +3969,6 @@ UUID : %2 Russian (Русский) Russe (Русский) - - - Taiwanese - Taïwanais - British English diff --git a/dist/languages/id.ts b/dist/languages/id.ts index 374b18402f..27dea1e470 100644 --- a/dist/languages/id.ts +++ b/dist/languages/id.ts @@ -3920,11 +3920,6 @@ UUID: %2 Russian (Русский) Rusia (Русский) - - - Taiwanese - Taiwan - British English diff --git a/dist/languages/it.ts b/dist/languages/it.ts index fbd1247f6e..c6315e3658 100644 --- a/dist/languages/it.ts +++ b/dist/languages/it.ts @@ -3950,11 +3950,6 @@ UUID: %2 Russian (Русский) Russo (Русский) - - - Taiwanese - Taiwanese - British English diff --git a/dist/languages/ja_JP.ts b/dist/languages/ja_JP.ts index 74094f48b5..49f32ad748 100644 --- a/dist/languages/ja_JP.ts +++ b/dist/languages/ja_JP.ts @@ -3965,11 +3965,6 @@ UUID: %2 Russian (Русский) ロシア語 (Русский) - - - Taiwanese - 台湾語 - British English diff --git a/dist/languages/ko_KR.ts b/dist/languages/ko_KR.ts index 8ebdf1d048..6f48ad45e6 100644 --- a/dist/languages/ko_KR.ts +++ b/dist/languages/ko_KR.ts @@ -3970,11 +3970,6 @@ UUID: %2 Russian (Русский) 러시아어(Русский) - - - Taiwanese - 대만어 - British English diff --git a/dist/languages/nb.ts b/dist/languages/nb.ts index 6e86588f62..a11d1d0a33 100644 --- a/dist/languages/nb.ts +++ b/dist/languages/nb.ts @@ -3969,11 +3969,6 @@ UUID: %2 Russian (Русский) Russisk (Русский) - - - Taiwanese - Taiwansk - British English diff --git a/dist/languages/nl.ts b/dist/languages/nl.ts index 070e4dba7c..8114b5d0da 100644 --- a/dist/languages/nl.ts +++ b/dist/languages/nl.ts @@ -3951,11 +3951,6 @@ UUID: %2 Russian (Русский) Russisch (Русский) - - - Taiwanese - Taiwanese - British English diff --git a/dist/languages/pl.ts b/dist/languages/pl.ts index 2ee8cef474..146eeb0e95 100644 --- a/dist/languages/pl.ts +++ b/dist/languages/pl.ts @@ -3959,11 +3959,6 @@ UUID: %2 Russian (Русский) Rosyjski (Русский) - - - Taiwanese - Tajwański - British English diff --git a/dist/languages/pt_BR.ts b/dist/languages/pt_BR.ts index 05545c04de..864078fcd1 100644 --- a/dist/languages/pt_BR.ts +++ b/dist/languages/pt_BR.ts @@ -3965,11 +3965,6 @@ UUID: %2 Russian (Русский) Russo (Русский) - - - Taiwanese - Taiwanês - British English diff --git a/dist/languages/pt_PT.ts b/dist/languages/pt_PT.ts index 704ffa0c43..0c6cfb939a 100644 --- a/dist/languages/pt_PT.ts +++ b/dist/languages/pt_PT.ts @@ -3955,11 +3955,6 @@ UUID: %2 Russian (Русский) Russo (Русский) - - - Taiwanese - Taiwanês - British English diff --git a/dist/languages/ru_RU.ts b/dist/languages/ru_RU.ts index b623a5dbd4..38b3c21d73 100644 --- a/dist/languages/ru_RU.ts +++ b/dist/languages/ru_RU.ts @@ -3969,11 +3969,6 @@ UUID: %2 Russian (Русский) Русский - - - Taiwanese - Тайваньский - British English diff --git a/dist/languages/sv.ts b/dist/languages/sv.ts index 245a1f7640..83c3873178 100644 --- a/dist/languages/sv.ts +++ b/dist/languages/sv.ts @@ -3940,11 +3940,6 @@ UUID: %2 Russian (Русский) Ryska (Русский) - - - Taiwanese - Taiwanesiska - British English diff --git a/dist/languages/tr_TR.ts b/dist/languages/tr_TR.ts index c98e78ddb7..92b65eb8f0 100644 --- a/dist/languages/tr_TR.ts +++ b/dist/languages/tr_TR.ts @@ -3958,11 +3958,6 @@ UUID: %2 Russian (Русский) Rusça (Русский) - - - Taiwanese - Tayvanca - British English diff --git a/dist/languages/uk.ts b/dist/languages/uk.ts index 6c5762e8d1..428e81a3f4 100644 --- a/dist/languages/uk.ts +++ b/dist/languages/uk.ts @@ -3969,11 +3969,6 @@ UUID: %2 Russian (Русский) Російська (Русский) - - - Taiwanese - Тайванська - British English diff --git a/dist/languages/vi.ts b/dist/languages/vi.ts index a9674f6447..d88b755099 100644 --- a/dist/languages/vi.ts +++ b/dist/languages/vi.ts @@ -3935,11 +3935,6 @@ UUID: %2 Russian (Русский) Tiếng Nga (Русский) - - - Taiwanese - Tiếng Đài Loan - British English diff --git a/dist/languages/vi_VN.ts b/dist/languages/vi_VN.ts index 4c5961689f..cdd9765792 100644 --- a/dist/languages/vi_VN.ts +++ b/dist/languages/vi_VN.ts @@ -3935,11 +3935,6 @@ UUID: %2 Russian (Русский) Tiếng Nga (Russian) - - - Taiwanese - Tiếng Đài Loan - British English diff --git a/dist/languages/zh_CN.ts b/dist/languages/zh_CN.ts index 2c0885dfa6..37073ae2d9 100644 --- a/dist/languages/zh_CN.ts +++ b/dist/languages/zh_CN.ts @@ -3966,11 +3966,6 @@ UUID: %2 Russian (Русский) 俄语 (Русский) - - - Taiwanese - 台湾中文 - British English diff --git a/dist/languages/zh_TW.ts b/dist/languages/zh_TW.ts index 436f3bdb7f..dcf8c6a26f 100644 --- a/dist/languages/zh_TW.ts +++ b/dist/languages/zh_TW.ts @@ -3968,11 +3968,6 @@ UUID: %2 Russian (Русский) 俄文 (Русский) - - - Taiwanese - 台灣中文 - British English diff --git a/src/android/app/src/main/jni/default_ini.h b/src/android/app/src/main/jni/default_ini.h index d81422a748..9f4f8f98a3 100644 --- a/src/android/app/src/main/jni/default_ini.h +++ b/src/android/app/src/main/jni/default_ini.h @@ -431,8 +431,8 @@ custom_rtc = # Sets the systems language index # 0: Japanese, 1: English (default), 2: French, 3: German, 4: Italian, 5: Spanish, 6: Chinese, -# 7: Korean, 8: Dutch, 9: Portuguese, 10: Russian, 11: Taiwanese, 12: British English, 13: Canadian French, -# 14: Latin American Spanish, 15: Simplified Chinese, 16: Traditional Chinese, 17: Brazilian Portuguese +# 7: Korean, 8: Dutch, 9: Portuguese, 10: Russian, 11: British English, 12: Canadian French, +# 13: Latin American Spanish, 14: Simplified Chinese, 15: Traditional Chinese, 16: Brazilian Portuguese language_index = # The system region that yuzu will use during emulation diff --git a/src/android/app/src/main/res/values-de/strings.xml b/src/android/app/src/main/res/values-de/strings.xml index 969223ef8d..e3a94d9a12 100644 --- a/src/android/app/src/main/res/values-de/strings.xml +++ b/src/android/app/src/main/res/values-de/strings.xml @@ -247,7 +247,6 @@ Niederländisch (Nederlands) Portugiesisch (Português) Russisch (Русский) - Taiwanesisch (台湾) Britisches Englisch Kanadisches Französisch (Français canadien) Lateinamerikanisches Spanisch (Español latinoamericano) diff --git a/src/android/app/src/main/res/values-es/strings.xml b/src/android/app/src/main/res/values-es/strings.xml index 986e80e502..9340fb73f6 100644 --- a/src/android/app/src/main/res/values-es/strings.xml +++ b/src/android/app/src/main/res/values-es/strings.xml @@ -252,7 +252,6 @@ Holandés (nederlands) Portugués (Português) Ruso (Русский) - Taiwanés (台湾) Inglés británico Francés Canadiense (Français canadien) Español Latinoamericano (Español latinoamericano) diff --git a/src/android/app/src/main/res/values-fr/strings.xml b/src/android/app/src/main/res/values-fr/strings.xml index 14a9b2d5c2..1605c7a3e7 100644 --- a/src/android/app/src/main/res/values-fr/strings.xml +++ b/src/android/app/src/main/res/values-fr/strings.xml @@ -252,7 +252,6 @@ Néerlandais (Nederlands) Portugais (Português) Russe (Русский) - Taïwanais (台湾) Anglais Britannique Français canadien (Français canadien) Espagnol latino-américain (Español latinoamericano) diff --git a/src/android/app/src/main/res/values-it/strings.xml b/src/android/app/src/main/res/values-it/strings.xml index 47a4cfa317..cf00f3cae1 100644 --- a/src/android/app/src/main/res/values-it/strings.xml +++ b/src/android/app/src/main/res/values-it/strings.xml @@ -252,7 +252,6 @@ Olandese (Nederlands) Portoghese (Português) Russo (Русский) - Taiwanese (台湾) Inglese britannico Francese Canadese (Français canadien) Spagnolo Latino Americano (Español latinoamericano) diff --git a/src/android/app/src/main/res/values-ja/strings.xml b/src/android/app/src/main/res/values-ja/strings.xml index 46eda9ef7e..46747ed224 100644 --- a/src/android/app/src/main/res/values-ja/strings.xml +++ b/src/android/app/src/main/res/values-ja/strings.xml @@ -250,7 +250,6 @@ オランダ語 (Nederlands) ポルトガル語 (Português) ロシア語 (Русский) - 台湾語 (台湾) イギリス英語 フランス語(カナダ) (Français canadien) スペイン語(ラテンアメリカ) (Español latinoamericano) diff --git a/src/android/app/src/main/res/values-ko/strings.xml b/src/android/app/src/main/res/values-ko/strings.xml index 5da80ab4be..f562b099d2 100644 --- a/src/android/app/src/main/res/values-ko/strings.xml +++ b/src/android/app/src/main/res/values-ko/strings.xml @@ -252,7 +252,6 @@ 네덜란드어 (Nederlands) 포르투갈어 (Português) 러시아어 (Русский) - 대만어 (台湾) 영어 (British English) 캐나다 프랑스어 (Français canadien) 라틴 아메리카 스페인어 (Español latinoamericano) diff --git a/src/android/app/src/main/res/values-nb/strings.xml b/src/android/app/src/main/res/values-nb/strings.xml index 3e1f9bce53..b1500c67a6 100644 --- a/src/android/app/src/main/res/values-nb/strings.xml +++ b/src/android/app/src/main/res/values-nb/strings.xml @@ -252,7 +252,6 @@ Nederlandsk (Nederlands) Portugisisk (Português) Russisk (Русский) - Taiwansk (台湾) Britisk Engelsk Kanadisk fransk (Français canadien) Latinamerikansk spansk (Español latinoamericano) diff --git a/src/android/app/src/main/res/values-pl/strings.xml b/src/android/app/src/main/res/values-pl/strings.xml index 1cd1a8f879..73c753fb7d 100644 --- a/src/android/app/src/main/res/values-pl/strings.xml +++ b/src/android/app/src/main/res/values-pl/strings.xml @@ -252,7 +252,6 @@ Duński (Holandia) Portugalski (Portugalia) Rosyjski (Русский) - Tajwański (台湾) Angielski Brytyjski Francuski (Kanada) Hiszpański (Ameryka Latynoska) diff --git a/src/android/app/src/main/res/values-pt-rBR/strings.xml b/src/android/app/src/main/res/values-pt-rBR/strings.xml index 35197c2809..657327d10c 100644 --- a/src/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/src/android/app/src/main/res/values-pt-rBR/strings.xml @@ -252,7 +252,6 @@ Holandês (Nederlands) Português (Português) Russo (Русский) - Taiwanês (台湾) Inglês britânico (British English) Fracês Canadiano (Français canadien) Espanhol da América Latina (Español latino-americano) diff --git a/src/android/app/src/main/res/values-pt-rPT/strings.xml b/src/android/app/src/main/res/values-pt-rPT/strings.xml index 8761e23749..75c17817a6 100644 --- a/src/android/app/src/main/res/values-pt-rPT/strings.xml +++ b/src/android/app/src/main/res/values-pt-rPT/strings.xml @@ -252,7 +252,6 @@ Holandês (Nederlands) Português (Português) Russo (Русский) - Taiwanês (台湾) Inglês Britânico Fracês Canadiano (Français canadien) Espanhol da América Latina (Español latino-americano) diff --git a/src/android/app/src/main/res/values-ru/strings.xml b/src/android/app/src/main/res/values-ru/strings.xml index 0fb4908f7c..d715c1bc08 100644 --- a/src/android/app/src/main/res/values-ru/strings.xml +++ b/src/android/app/src/main/res/values-ru/strings.xml @@ -252,7 +252,6 @@ Голландский (Nederlands) Португальский (Português) Русский - Тайваньский (台湾) Британский английский Канадский французский (Français canadien) Латиноамериканский испанский (Español latinoamericano) diff --git a/src/android/app/src/main/res/values-uk/strings.xml b/src/android/app/src/main/res/values-uk/strings.xml index 0d11eb2d22..d990db2c87 100644 --- a/src/android/app/src/main/res/values-uk/strings.xml +++ b/src/android/app/src/main/res/values-uk/strings.xml @@ -252,7 +252,6 @@ Голландська (Nederlands) Португальська (Português) Російська (Русский) - Тайванська (台湾) Британська англійська Канадська французька (Français canadien) Латиноамериканська іспанська (Español latinoamericano) diff --git a/src/android/app/src/main/res/values-zh-rCN/strings.xml b/src/android/app/src/main/res/values-zh-rCN/strings.xml index e00bbaa2e7..e970380d06 100644 --- a/src/android/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/android/app/src/main/res/values-zh-rCN/strings.xml @@ -252,7 +252,6 @@ 荷兰语 (Nederlands) 葡萄牙语 (Português) 俄语 (Русский) - 台湾中文 (台灣) 英式英语 加拿大法语 (Français canadien) 拉丁美洲西班牙语 (Español latinoamericano) diff --git a/src/android/app/src/main/res/values-zh-rTW/strings.xml b/src/android/app/src/main/res/values-zh-rTW/strings.xml index a54d042480..48c83d6b96 100644 --- a/src/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/android/app/src/main/res/values-zh-rTW/strings.xml @@ -252,7 +252,6 @@ 荷蘭文 (Nederlands) 葡萄牙文 (Português) 俄文 (Русский) - 台文 (台灣) 英式英文 加拿大法文 (Français canadien) 拉丁美洲西班牙文 (Español latinoamericano) diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml index 200b99185f..49d11a26d4 100644 --- a/src/android/app/src/main/res/values/arrays.xml +++ b/src/android/app/src/main/res/values/arrays.xml @@ -40,7 +40,6 @@ @string/language_russian @string/language_simplified_chinese @string/language_spanish - @string/language_taiwanese @string/language_traditional_chinese diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index bfdebd35bc..244aec9416 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -298,7 +298,6 @@ Dutch (Nederlands) Portuguese (Português) Russian (Русский) - Taiwanese (台湾) British English Canadian French (Français canadien) Latin American Spanish (Español latinoamericano) diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h index d4fd163daf..bc1f1ff7fc 100644 --- a/src/core/hle/service/am/am.h +++ b/src/core/hle/service/am/am.h @@ -35,15 +35,14 @@ enum SystemLanguage { Dutch = 8, Portuguese = 9, Russian = 10, - Taiwanese = 11, - BritishEnglish = 12, // en-GB - CanadianFrench = 13, - LatinAmericanSpanish = 14, // es-419 + BritishEnglish = 11, // en-GB + CanadianFrench = 12, + LatinAmericanSpanish = 13, // es-419 // 4.0.0+ - SimplifiedChinese = 15, - TraditionalChinese = 16, + SimplifiedChinese (Chinese mainland) = 14, + TraditionalChinese (Taiwan region) = 15, // 10.1.0+ - BrazilianPortuguese = 17, + BrazilianPortuguese = 16, }; class AppletMessageQueue { diff --git a/src/yuzu/configuration/configure_system.ui b/src/yuzu/configuration/configure_system.ui index e0caecd5e3..7b3a8e9151 100644 --- a/src/yuzu/configuration/configure_system.ui +++ b/src/yuzu/configuration/configure_system.ui @@ -374,11 +374,6 @@ Russian (Русский) - - - Taiwanese - - British English diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 119e22183e..a66680632c 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -473,8 +473,8 @@ custom_rtc = # Sets the systems language index # 0: Japanese, 1: English (default), 2: French, 3: German, 4: Italian, 5: Spanish, 6: Chinese, -# 7: Korean, 8: Dutch, 9: Portuguese, 10: Russian, 11: Taiwanese, 12: British English, 13: Canadian French, -# 14: Latin American Spanish, 15: Simplified Chinese, 16: Traditional Chinese, 17: Brazilian Portuguese +# 7: Korean, 8: Dutch, 9: Portuguese, 10: Russian, 11: British English, 12: Canadian French, +# 13: Latin American Spanish, 14: Simplified Chinese, 15: Traditional Chinese, 16: Brazilian Portuguese language_index = # The system region that yuzu will use during emulation