From 9de195d26a635e63a6c7a3216dfc842fd9b99781 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 25 May 2020 19:38:42 +0800 Subject: [PATCH 01/61] Remove language region --- .../twidere/preference/LanguageListPreference.kt | 9 ++++++++- .../{values-af-rZA => values-af}/arrays.xml | 0 .../{values-af-rZA => values-af}/plurals.xml | 0 .../{values-af-rZA => values-af}/strings.xml | 0 .../{values-af-rZA => values-af}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-an-rES => values-an}/arrays.xml | 0 .../{values-an-rES => values-an}/plurals.xml | 0 .../{values-an-rES => values-an}/strings.xml | 0 .../{values-an-rES => values-an}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-ar-rSA => values-ar}/arrays.xml | 0 .../{values-ar-rSA => values-ar}/plurals.xml | 0 .../{values-ar-rSA => values-ar}/strings.xml | 0 .../{values-ar-rSA => values-ar}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-ast-rES => values-ast}/arrays.xml | 0 .../{values-ast-rES => values-ast}/plurals.xml | 0 .../{values-ast-rES => values-ast}/strings.xml | 0 .../strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-ca-rES => values-ca}/arrays.xml | 0 .../{values-ca-rES => values-ca}/plurals.xml | 0 .../{values-ca-rES => values-ca}/strings.xml | 0 .../{values-ca-rES => values-ca}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-cs-rCZ => values-cs}/arrays.xml | 0 .../{values-cs-rCZ => values-cs}/plurals.xml | 0 .../{values-cs-rCZ => values-cs}/strings.xml | 0 .../{values-cs-rCZ => values-cs}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-da-rDK => values-da}/arrays.xml | 0 .../{values-da-rDK => values-da}/plurals.xml | 0 .../{values-da-rDK => values-da}/strings.xml | 0 .../{values-da-rDK => values-da}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-de-rDE => values-de}/arrays.xml | 0 .../{values-de-rDE => values-de}/plurals.xml | 0 .../{values-de-rDE => values-de}/strings.xml | 0 .../{values-de-rDE => values-de}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-el-rGR => values-el}/arrays.xml | 0 .../{values-el-rGR => values-el}/plurals.xml | 0 .../{values-el-rGR => values-el}/strings.xml | 0 .../{values-el-rGR => values-el}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-es-rES => values-es}/arrays.xml | 0 .../{values-es-rES => values-es}/plurals.xml | 0 .../{values-es-rES => values-es}/strings.xml | 0 .../{values-es-rES => values-es}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-fa-rIR => values-fa}/arrays.xml | 0 .../{values-fa-rIR => values-fa}/plurals.xml | 0 .../{values-fa-rIR => values-fa}/strings.xml | 0 .../{values-fa-rIR => values-fa}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-fi-rFI => values-fi}/arrays.xml | 0 .../{values-fi-rFI => values-fi}/plurals.xml | 0 .../{values-fi-rFI => values-fi}/strings.xml | 0 .../{values-fi-rFI => values-fi}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-fil-rPH => values-fil}/arrays.xml | 0 .../{values-fil-rPH => values-fil}/plurals.xml | 0 .../{values-fil-rPH => values-fil}/strings.xml | 0 .../strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-fj-rFJ => values-fj}/arrays.xml | 0 .../{values-fj-rFJ => values-fj}/plurals.xml | 0 .../{values-fj-rFJ => values-fj}/strings.xml | 0 .../{values-fj-rFJ => values-fj}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-fr-rFR => values-fr}/arrays.xml | 0 .../{values-fr-rFR => values-fr}/plurals.xml | 0 .../{values-fr-rFR => values-fr}/strings.xml | 0 .../{values-fr-rFR => values-fr}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-gl-rES => values-gl}/arrays.xml | 0 .../{values-gl-rES => values-gl}/plurals.xml | 0 .../{values-gl-rES => values-gl}/strings.xml | 0 .../{values-gl-rES => values-gl}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-hi-rIN => values-hi}/arrays.xml | 0 .../{values-hi-rIN => values-hi}/plurals.xml | 0 .../{values-hi-rIN => values-hi}/strings.xml | 0 .../{values-hi-rIN => values-hi}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-hr-rHR => values-hr}/arrays.xml | 0 .../{values-hr-rHR => values-hr}/plurals.xml | 0 .../{values-hr-rHR => values-hr}/strings.xml | 0 .../{values-hr-rHR => values-hr}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-hu-rHU => values-hu}/arrays.xml | 0 .../{values-hu-rHU => values-hu}/plurals.xml | 0 .../{values-hu-rHU => values-hu}/strings.xml | 0 .../{values-hu-rHU => values-hu}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-in-rID => values-in}/arrays.xml | 0 .../{values-in-rID => values-in}/plurals.xml | 0 .../{values-in-rID => values-in}/strings.xml | 0 .../{values-in-rID => values-in}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-it-rIT => values-it}/arrays.xml | 0 .../{values-it-rIT => values-it}/plurals.xml | 0 .../{values-it-rIT => values-it}/strings.xml | 0 .../{values-it-rIT => values-it}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-iw-rIL => values-iw}/arrays.xml | 0 .../{values-iw-rIL => values-iw}/plurals.xml | 0 .../{values-iw-rIL => values-iw}/strings.xml | 0 .../{values-iw-rIL => values-iw}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-ja-rJP => values-ja}/arrays.xml | 0 .../{values-ja-rJP => values-ja}/plurals.xml | 0 .../{values-ja-rJP => values-ja}/strings.xml | 0 .../{values-ja-rJP => values-ja}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-kab-rDZ => values-kab}/arrays.xml | 0 .../{values-kab-rDZ => values-kab}/plurals.xml | 0 .../{values-kab-rDZ => values-kab}/strings.xml | 0 .../strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-ko-rKR => values-ko}/arrays.xml | 0 .../{values-ko-rKR => values-ko}/plurals.xml | 0 .../{values-ko-rKR => values-ko}/strings.xml | 0 .../{values-ko-rKR => values-ko}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-lo-rLA => values-lo}/arrays.xml | 0 .../{values-lo-rLA => values-lo}/plurals.xml | 0 .../{values-lo-rLA => values-lo}/strings.xml | 0 .../{values-lo-rLA => values-lo}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-ms-rMY => values-ms}/arrays.xml | 0 .../{values-ms-rMY => values-ms}/plurals.xml | 0 .../{values-ms-rMY => values-ms}/strings.xml | 0 .../{values-ms-rMY => values-ms}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-nl-rNL => values-nl}/arrays.xml | 0 .../{values-nl-rNL => values-nl}/plurals.xml | 0 .../{values-nl-rNL => values-nl}/strings.xml | 0 .../{values-nl-rNL => values-nl}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-no-rNO => values-no}/arrays.xml | 0 .../{values-no-rNO => values-no}/plurals.xml | 0 .../{values-no-rNO => values-no}/strings.xml | 0 .../{values-no-rNO => values-no}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-pl-rPL => values-pl}/arrays.xml | 0 .../{values-pl-rPL => values-pl}/plurals.xml | 0 .../{values-pl-rPL => values-pl}/strings.xml | 0 .../{values-pl-rPL => values-pl}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-pt-rBR => values-pt}/arrays.xml | 0 .../{values-pt-rBR => values-pt}/plurals.xml | 0 .../{values-pt-rBR => values-pt}/strings.xml | 0 .../{values-pt-rBR => values-pt}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-ro-rRO => values-ro}/arrays.xml | 0 .../{values-ro-rRO => values-ro}/plurals.xml | 0 .../{values-ro-rRO => values-ro}/strings.xml | 0 .../{values-ro-rRO => values-ro}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-ru-rRU => values-ru}/arrays.xml | 0 .../{values-ru-rRU => values-ru}/plurals.xml | 0 .../{values-ru-rRU => values-ru}/strings.xml | 0 .../{values-ru-rRU => values-ru}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-sk-rSK => values-sk}/arrays.xml | 0 .../{values-sk-rSK => values-sk}/plurals.xml | 0 .../{values-sk-rSK => values-sk}/strings.xml | 0 .../{values-sk-rSK => values-sk}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-sl-rSI => values-sl}/arrays.xml | 0 .../{values-sl-rSI => values-sl}/plurals.xml | 0 .../{values-sl-rSI => values-sl}/strings.xml | 0 .../{values-sl-rSI => values-sl}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-sr-rSP => values-sr}/arrays.xml | 0 .../{values-sr-rSP => values-sr}/plurals.xml | 0 .../{values-sr-rSP => values-sr}/strings.xml | 0 .../{values-sr-rSP => values-sr}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-sv-rSE => values-sv}/arrays.xml | 0 .../{values-sv-rSE => values-sv}/plurals.xml | 0 .../{values-sv-rSE => values-sv}/strings.xml | 0 .../{values-sv-rSE => values-sv}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-ta-rIN => values-ta}/arrays.xml | 0 .../{values-ta-rIN => values-ta}/plurals.xml | 0 .../{values-ta-rIN => values-ta}/strings.xml | 0 .../{values-ta-rIN => values-ta}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-te-rIN => values-te}/arrays.xml | 0 .../{values-te-rIN => values-te}/plurals.xml | 0 .../{values-te-rIN => values-te}/strings.xml | 0 .../{values-te-rIN => values-te}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-th-rTH => values-th}/arrays.xml | 0 .../{values-th-rTH => values-th}/plurals.xml | 0 .../{values-th-rTH => values-th}/strings.xml | 0 .../{values-th-rTH => values-th}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-tl-rPH => values-tl}/arrays.xml | 0 .../{values-tl-rPH => values-tl}/plurals.xml | 0 .../{values-tl-rPH => values-tl}/strings.xml | 0 .../{values-tl-rPH => values-tl}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-tr-rTR => values-tr}/arrays.xml | 0 .../{values-tr-rTR => values-tr}/plurals.xml | 0 .../{values-tr-rTR => values-tr}/strings.xml | 0 .../{values-tr-rTR => values-tr}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-uk-rUA => values-uk}/arrays.xml | 0 .../{values-uk-rUA => values-uk}/plurals.xml | 0 .../{values-uk-rUA => values-uk}/strings.xml | 0 .../{values-uk-rUA => values-uk}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-vi-rVN => values-vi}/arrays.xml | 0 .../{values-vi-rVN => values-vi}/plurals.xml | 0 .../{values-vi-rVN => values-vi}/strings.xml | 0 .../{values-vi-rVN => values-vi}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-yue-rHK => values-yue}/arrays.xml | 0 .../{values-yue-rHK => values-yue}/plurals.xml | 0 .../{values-yue-rHK => values-yue}/strings.xml | 0 .../strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 .../{values-zu-rZA => values-zu}/arrays.xml | 0 .../{values-zu-rZA => values-zu}/plurals.xml | 0 .../{values-zu-rZA => values-zu}/strings.xml | 0 .../{values-zu-rZA => values-zu}/strings_http_errors.xml | 0 .../strings_twitter_errors.xml | 0 231 files changed, 8 insertions(+), 1 deletion(-) rename twidere/src/main/res-localized/{values-af-rZA => values-af}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-af-rZA => values-af}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-af-rZA => values-af}/strings.xml (100%) rename twidere/src/main/res-localized/{values-af-rZA => values-af}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-af-rZA => values-af}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-an-rES => values-an}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-an-rES => values-an}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-an-rES => values-an}/strings.xml (100%) rename twidere/src/main/res-localized/{values-an-rES => values-an}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-an-rES => values-an}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-ar-rSA => values-ar}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-ar-rSA => values-ar}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-ar-rSA => values-ar}/strings.xml (100%) rename twidere/src/main/res-localized/{values-ar-rSA => values-ar}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-ar-rSA => values-ar}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-ast-rES => values-ast}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-ast-rES => values-ast}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-ast-rES => values-ast}/strings.xml (100%) rename twidere/src/main/res-localized/{values-ast-rES => values-ast}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-ast-rES => values-ast}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-ca-rES => values-ca}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-ca-rES => values-ca}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-ca-rES => values-ca}/strings.xml (100%) rename twidere/src/main/res-localized/{values-ca-rES => values-ca}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-ca-rES => values-ca}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-cs-rCZ => values-cs}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-cs-rCZ => values-cs}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-cs-rCZ => values-cs}/strings.xml (100%) rename twidere/src/main/res-localized/{values-cs-rCZ => values-cs}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-cs-rCZ => values-cs}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-da-rDK => values-da}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-da-rDK => values-da}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-da-rDK => values-da}/strings.xml (100%) rename twidere/src/main/res-localized/{values-da-rDK => values-da}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-da-rDK => values-da}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-de-rDE => values-de}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-de-rDE => values-de}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-de-rDE => values-de}/strings.xml (100%) rename twidere/src/main/res-localized/{values-de-rDE => values-de}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-de-rDE => values-de}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-el-rGR => values-el}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-el-rGR => values-el}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-el-rGR => values-el}/strings.xml (100%) rename twidere/src/main/res-localized/{values-el-rGR => values-el}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-el-rGR => values-el}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-es-rES => values-es}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-es-rES => values-es}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-es-rES => values-es}/strings.xml (100%) rename twidere/src/main/res-localized/{values-es-rES => values-es}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-es-rES => values-es}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-fa-rIR => values-fa}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-fa-rIR => values-fa}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-fa-rIR => values-fa}/strings.xml (100%) rename twidere/src/main/res-localized/{values-fa-rIR => values-fa}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-fa-rIR => values-fa}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-fi-rFI => values-fi}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-fi-rFI => values-fi}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-fi-rFI => values-fi}/strings.xml (100%) rename twidere/src/main/res-localized/{values-fi-rFI => values-fi}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-fi-rFI => values-fi}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-fil-rPH => values-fil}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-fil-rPH => values-fil}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-fil-rPH => values-fil}/strings.xml (100%) rename twidere/src/main/res-localized/{values-fil-rPH => values-fil}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-fil-rPH => values-fil}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-fj-rFJ => values-fj}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-fj-rFJ => values-fj}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-fj-rFJ => values-fj}/strings.xml (100%) rename twidere/src/main/res-localized/{values-fj-rFJ => values-fj}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-fj-rFJ => values-fj}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-fr-rFR => values-fr}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-fr-rFR => values-fr}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-fr-rFR => values-fr}/strings.xml (100%) rename twidere/src/main/res-localized/{values-fr-rFR => values-fr}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-fr-rFR => values-fr}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-gl-rES => values-gl}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-gl-rES => values-gl}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-gl-rES => values-gl}/strings.xml (100%) rename twidere/src/main/res-localized/{values-gl-rES => values-gl}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-gl-rES => values-gl}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-hi-rIN => values-hi}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-hi-rIN => values-hi}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-hi-rIN => values-hi}/strings.xml (100%) rename twidere/src/main/res-localized/{values-hi-rIN => values-hi}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-hi-rIN => values-hi}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-hr-rHR => values-hr}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-hr-rHR => values-hr}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-hr-rHR => values-hr}/strings.xml (100%) rename twidere/src/main/res-localized/{values-hr-rHR => values-hr}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-hr-rHR => values-hr}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-hu-rHU => values-hu}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-hu-rHU => values-hu}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-hu-rHU => values-hu}/strings.xml (100%) rename twidere/src/main/res-localized/{values-hu-rHU => values-hu}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-hu-rHU => values-hu}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-in-rID => values-in}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-in-rID => values-in}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-in-rID => values-in}/strings.xml (100%) rename twidere/src/main/res-localized/{values-in-rID => values-in}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-in-rID => values-in}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-it-rIT => values-it}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-it-rIT => values-it}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-it-rIT => values-it}/strings.xml (100%) rename twidere/src/main/res-localized/{values-it-rIT => values-it}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-it-rIT => values-it}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-iw-rIL => values-iw}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-iw-rIL => values-iw}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-iw-rIL => values-iw}/strings.xml (100%) rename twidere/src/main/res-localized/{values-iw-rIL => values-iw}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-iw-rIL => values-iw}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-ja-rJP => values-ja}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-ja-rJP => values-ja}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-ja-rJP => values-ja}/strings.xml (100%) rename twidere/src/main/res-localized/{values-ja-rJP => values-ja}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-ja-rJP => values-ja}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-kab-rDZ => values-kab}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-kab-rDZ => values-kab}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-kab-rDZ => values-kab}/strings.xml (100%) rename twidere/src/main/res-localized/{values-kab-rDZ => values-kab}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-kab-rDZ => values-kab}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-ko-rKR => values-ko}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-ko-rKR => values-ko}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-ko-rKR => values-ko}/strings.xml (100%) rename twidere/src/main/res-localized/{values-ko-rKR => values-ko}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-ko-rKR => values-ko}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-lo-rLA => values-lo}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-lo-rLA => values-lo}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-lo-rLA => values-lo}/strings.xml (100%) rename twidere/src/main/res-localized/{values-lo-rLA => values-lo}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-lo-rLA => values-lo}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-ms-rMY => values-ms}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-ms-rMY => values-ms}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-ms-rMY => values-ms}/strings.xml (100%) rename twidere/src/main/res-localized/{values-ms-rMY => values-ms}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-ms-rMY => values-ms}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-nl-rNL => values-nl}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-nl-rNL => values-nl}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-nl-rNL => values-nl}/strings.xml (100%) rename twidere/src/main/res-localized/{values-nl-rNL => values-nl}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-nl-rNL => values-nl}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-no-rNO => values-no}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-no-rNO => values-no}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-no-rNO => values-no}/strings.xml (100%) rename twidere/src/main/res-localized/{values-no-rNO => values-no}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-no-rNO => values-no}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-pl-rPL => values-pl}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-pl-rPL => values-pl}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-pl-rPL => values-pl}/strings.xml (100%) rename twidere/src/main/res-localized/{values-pl-rPL => values-pl}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-pl-rPL => values-pl}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-pt-rBR => values-pt}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-pt-rBR => values-pt}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-pt-rBR => values-pt}/strings.xml (100%) rename twidere/src/main/res-localized/{values-pt-rBR => values-pt}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-pt-rBR => values-pt}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-ro-rRO => values-ro}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-ro-rRO => values-ro}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-ro-rRO => values-ro}/strings.xml (100%) rename twidere/src/main/res-localized/{values-ro-rRO => values-ro}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-ro-rRO => values-ro}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-ru-rRU => values-ru}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-ru-rRU => values-ru}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-ru-rRU => values-ru}/strings.xml (100%) rename twidere/src/main/res-localized/{values-ru-rRU => values-ru}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-ru-rRU => values-ru}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-sk-rSK => values-sk}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-sk-rSK => values-sk}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-sk-rSK => values-sk}/strings.xml (100%) rename twidere/src/main/res-localized/{values-sk-rSK => values-sk}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-sk-rSK => values-sk}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-sl-rSI => values-sl}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-sl-rSI => values-sl}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-sl-rSI => values-sl}/strings.xml (100%) rename twidere/src/main/res-localized/{values-sl-rSI => values-sl}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-sl-rSI => values-sl}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-sr-rSP => values-sr}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-sr-rSP => values-sr}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-sr-rSP => values-sr}/strings.xml (100%) rename twidere/src/main/res-localized/{values-sr-rSP => values-sr}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-sr-rSP => values-sr}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-sv-rSE => values-sv}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-sv-rSE => values-sv}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-sv-rSE => values-sv}/strings.xml (100%) rename twidere/src/main/res-localized/{values-sv-rSE => values-sv}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-sv-rSE => values-sv}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-ta-rIN => values-ta}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-ta-rIN => values-ta}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-ta-rIN => values-ta}/strings.xml (100%) rename twidere/src/main/res-localized/{values-ta-rIN => values-ta}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-ta-rIN => values-ta}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-te-rIN => values-te}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-te-rIN => values-te}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-te-rIN => values-te}/strings.xml (100%) rename twidere/src/main/res-localized/{values-te-rIN => values-te}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-te-rIN => values-te}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-th-rTH => values-th}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-th-rTH => values-th}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-th-rTH => values-th}/strings.xml (100%) rename twidere/src/main/res-localized/{values-th-rTH => values-th}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-th-rTH => values-th}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-tl-rPH => values-tl}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-tl-rPH => values-tl}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-tl-rPH => values-tl}/strings.xml (100%) rename twidere/src/main/res-localized/{values-tl-rPH => values-tl}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-tl-rPH => values-tl}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-tr-rTR => values-tr}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-tr-rTR => values-tr}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-tr-rTR => values-tr}/strings.xml (100%) rename twidere/src/main/res-localized/{values-tr-rTR => values-tr}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-tr-rTR => values-tr}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-uk-rUA => values-uk}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-uk-rUA => values-uk}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-uk-rUA => values-uk}/strings.xml (100%) rename twidere/src/main/res-localized/{values-uk-rUA => values-uk}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-uk-rUA => values-uk}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-vi-rVN => values-vi}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-vi-rVN => values-vi}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-vi-rVN => values-vi}/strings.xml (100%) rename twidere/src/main/res-localized/{values-vi-rVN => values-vi}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-vi-rVN => values-vi}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-yue-rHK => values-yue}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-yue-rHK => values-yue}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-yue-rHK => values-yue}/strings.xml (100%) rename twidere/src/main/res-localized/{values-yue-rHK => values-yue}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-yue-rHK => values-yue}/strings_twitter_errors.xml (100%) rename twidere/src/main/res-localized/{values-zu-rZA => values-zu}/arrays.xml (100%) rename twidere/src/main/res-localized/{values-zu-rZA => values-zu}/plurals.xml (100%) rename twidere/src/main/res-localized/{values-zu-rZA => values-zu}/strings.xml (100%) rename twidere/src/main/res-localized/{values-zu-rZA => values-zu}/strings_http_errors.xml (100%) rename twidere/src/main/res-localized/{values-zu-rZA => values-zu}/strings_twitter_errors.xml (100%) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/LanguageListPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/LanguageListPreference.kt index d8d70ecf5..795c73077 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/LanguageListPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/LanguageListPreference.kt @@ -8,7 +8,14 @@ import java.util.* class LanguageListPreference(context: Context, attrs: AttributeSet? = null) : EntrySummaryListPreference(context, attrs) { init { - val locales = BuildConfig.TRANSLATION_ARRAY.map { Locale(it.split('-')[0], it.split('-')[1]) }.let { + val locales = BuildConfig.TRANSLATION_ARRAY.map { + val splits = it.split('-') + if (splits.count() > 1) { + Locale(splits[0], splits[1]) + } else { + Locale(it) + } + }.let { it + Locale.US }.sortedBy { it.getDisplayName(it) diff --git a/twidere/src/main/res-localized/values-af-rZA/arrays.xml b/twidere/src/main/res-localized/values-af/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-af-rZA/arrays.xml rename to twidere/src/main/res-localized/values-af/arrays.xml diff --git a/twidere/src/main/res-localized/values-af-rZA/plurals.xml b/twidere/src/main/res-localized/values-af/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-af-rZA/plurals.xml rename to twidere/src/main/res-localized/values-af/plurals.xml diff --git a/twidere/src/main/res-localized/values-af-rZA/strings.xml b/twidere/src/main/res-localized/values-af/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-af-rZA/strings.xml rename to twidere/src/main/res-localized/values-af/strings.xml diff --git a/twidere/src/main/res-localized/values-af-rZA/strings_http_errors.xml b/twidere/src/main/res-localized/values-af/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-af-rZA/strings_http_errors.xml rename to twidere/src/main/res-localized/values-af/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-af-rZA/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-af/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-af-rZA/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-af/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-an-rES/arrays.xml b/twidere/src/main/res-localized/values-an/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-an-rES/arrays.xml rename to twidere/src/main/res-localized/values-an/arrays.xml diff --git a/twidere/src/main/res-localized/values-an-rES/plurals.xml b/twidere/src/main/res-localized/values-an/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-an-rES/plurals.xml rename to twidere/src/main/res-localized/values-an/plurals.xml diff --git a/twidere/src/main/res-localized/values-an-rES/strings.xml b/twidere/src/main/res-localized/values-an/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-an-rES/strings.xml rename to twidere/src/main/res-localized/values-an/strings.xml diff --git a/twidere/src/main/res-localized/values-an-rES/strings_http_errors.xml b/twidere/src/main/res-localized/values-an/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-an-rES/strings_http_errors.xml rename to twidere/src/main/res-localized/values-an/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-an-rES/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-an/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-an-rES/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-an/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-ar-rSA/arrays.xml b/twidere/src/main/res-localized/values-ar/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-ar-rSA/arrays.xml rename to twidere/src/main/res-localized/values-ar/arrays.xml diff --git a/twidere/src/main/res-localized/values-ar-rSA/plurals.xml b/twidere/src/main/res-localized/values-ar/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-ar-rSA/plurals.xml rename to twidere/src/main/res-localized/values-ar/plurals.xml diff --git a/twidere/src/main/res-localized/values-ar-rSA/strings.xml b/twidere/src/main/res-localized/values-ar/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-ar-rSA/strings.xml rename to twidere/src/main/res-localized/values-ar/strings.xml diff --git a/twidere/src/main/res-localized/values-ar-rSA/strings_http_errors.xml b/twidere/src/main/res-localized/values-ar/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ar-rSA/strings_http_errors.xml rename to twidere/src/main/res-localized/values-ar/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-ar-rSA/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-ar/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ar-rSA/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-ar/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-ast-rES/arrays.xml b/twidere/src/main/res-localized/values-ast/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-ast-rES/arrays.xml rename to twidere/src/main/res-localized/values-ast/arrays.xml diff --git a/twidere/src/main/res-localized/values-ast-rES/plurals.xml b/twidere/src/main/res-localized/values-ast/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-ast-rES/plurals.xml rename to twidere/src/main/res-localized/values-ast/plurals.xml diff --git a/twidere/src/main/res-localized/values-ast-rES/strings.xml b/twidere/src/main/res-localized/values-ast/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-ast-rES/strings.xml rename to twidere/src/main/res-localized/values-ast/strings.xml diff --git a/twidere/src/main/res-localized/values-ast-rES/strings_http_errors.xml b/twidere/src/main/res-localized/values-ast/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ast-rES/strings_http_errors.xml rename to twidere/src/main/res-localized/values-ast/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-ast-rES/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-ast/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ast-rES/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-ast/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-ca-rES/arrays.xml b/twidere/src/main/res-localized/values-ca/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-ca-rES/arrays.xml rename to twidere/src/main/res-localized/values-ca/arrays.xml diff --git a/twidere/src/main/res-localized/values-ca-rES/plurals.xml b/twidere/src/main/res-localized/values-ca/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-ca-rES/plurals.xml rename to twidere/src/main/res-localized/values-ca/plurals.xml diff --git a/twidere/src/main/res-localized/values-ca-rES/strings.xml b/twidere/src/main/res-localized/values-ca/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-ca-rES/strings.xml rename to twidere/src/main/res-localized/values-ca/strings.xml diff --git a/twidere/src/main/res-localized/values-ca-rES/strings_http_errors.xml b/twidere/src/main/res-localized/values-ca/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ca-rES/strings_http_errors.xml rename to twidere/src/main/res-localized/values-ca/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-ca-rES/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-ca/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ca-rES/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-ca/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-cs-rCZ/arrays.xml b/twidere/src/main/res-localized/values-cs/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-cs-rCZ/arrays.xml rename to twidere/src/main/res-localized/values-cs/arrays.xml diff --git a/twidere/src/main/res-localized/values-cs-rCZ/plurals.xml b/twidere/src/main/res-localized/values-cs/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-cs-rCZ/plurals.xml rename to twidere/src/main/res-localized/values-cs/plurals.xml diff --git a/twidere/src/main/res-localized/values-cs-rCZ/strings.xml b/twidere/src/main/res-localized/values-cs/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-cs-rCZ/strings.xml rename to twidere/src/main/res-localized/values-cs/strings.xml diff --git a/twidere/src/main/res-localized/values-cs-rCZ/strings_http_errors.xml b/twidere/src/main/res-localized/values-cs/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-cs-rCZ/strings_http_errors.xml rename to twidere/src/main/res-localized/values-cs/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-cs-rCZ/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-cs/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-cs-rCZ/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-cs/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-da-rDK/arrays.xml b/twidere/src/main/res-localized/values-da/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-da-rDK/arrays.xml rename to twidere/src/main/res-localized/values-da/arrays.xml diff --git a/twidere/src/main/res-localized/values-da-rDK/plurals.xml b/twidere/src/main/res-localized/values-da/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-da-rDK/plurals.xml rename to twidere/src/main/res-localized/values-da/plurals.xml diff --git a/twidere/src/main/res-localized/values-da-rDK/strings.xml b/twidere/src/main/res-localized/values-da/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-da-rDK/strings.xml rename to twidere/src/main/res-localized/values-da/strings.xml diff --git a/twidere/src/main/res-localized/values-da-rDK/strings_http_errors.xml b/twidere/src/main/res-localized/values-da/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-da-rDK/strings_http_errors.xml rename to twidere/src/main/res-localized/values-da/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-da-rDK/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-da/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-da-rDK/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-da/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-de-rDE/arrays.xml b/twidere/src/main/res-localized/values-de/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-de-rDE/arrays.xml rename to twidere/src/main/res-localized/values-de/arrays.xml diff --git a/twidere/src/main/res-localized/values-de-rDE/plurals.xml b/twidere/src/main/res-localized/values-de/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-de-rDE/plurals.xml rename to twidere/src/main/res-localized/values-de/plurals.xml diff --git a/twidere/src/main/res-localized/values-de-rDE/strings.xml b/twidere/src/main/res-localized/values-de/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-de-rDE/strings.xml rename to twidere/src/main/res-localized/values-de/strings.xml diff --git a/twidere/src/main/res-localized/values-de-rDE/strings_http_errors.xml b/twidere/src/main/res-localized/values-de/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-de-rDE/strings_http_errors.xml rename to twidere/src/main/res-localized/values-de/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-de-rDE/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-de/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-de-rDE/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-de/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-el-rGR/arrays.xml b/twidere/src/main/res-localized/values-el/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-el-rGR/arrays.xml rename to twidere/src/main/res-localized/values-el/arrays.xml diff --git a/twidere/src/main/res-localized/values-el-rGR/plurals.xml b/twidere/src/main/res-localized/values-el/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-el-rGR/plurals.xml rename to twidere/src/main/res-localized/values-el/plurals.xml diff --git a/twidere/src/main/res-localized/values-el-rGR/strings.xml b/twidere/src/main/res-localized/values-el/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-el-rGR/strings.xml rename to twidere/src/main/res-localized/values-el/strings.xml diff --git a/twidere/src/main/res-localized/values-el-rGR/strings_http_errors.xml b/twidere/src/main/res-localized/values-el/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-el-rGR/strings_http_errors.xml rename to twidere/src/main/res-localized/values-el/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-el-rGR/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-el/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-el-rGR/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-el/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-es-rES/arrays.xml b/twidere/src/main/res-localized/values-es/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-es-rES/arrays.xml rename to twidere/src/main/res-localized/values-es/arrays.xml diff --git a/twidere/src/main/res-localized/values-es-rES/plurals.xml b/twidere/src/main/res-localized/values-es/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-es-rES/plurals.xml rename to twidere/src/main/res-localized/values-es/plurals.xml diff --git a/twidere/src/main/res-localized/values-es-rES/strings.xml b/twidere/src/main/res-localized/values-es/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-es-rES/strings.xml rename to twidere/src/main/res-localized/values-es/strings.xml diff --git a/twidere/src/main/res-localized/values-es-rES/strings_http_errors.xml b/twidere/src/main/res-localized/values-es/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-es-rES/strings_http_errors.xml rename to twidere/src/main/res-localized/values-es/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-es-rES/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-es/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-es-rES/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-es/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-fa-rIR/arrays.xml b/twidere/src/main/res-localized/values-fa/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-fa-rIR/arrays.xml rename to twidere/src/main/res-localized/values-fa/arrays.xml diff --git a/twidere/src/main/res-localized/values-fa-rIR/plurals.xml b/twidere/src/main/res-localized/values-fa/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-fa-rIR/plurals.xml rename to twidere/src/main/res-localized/values-fa/plurals.xml diff --git a/twidere/src/main/res-localized/values-fa-rIR/strings.xml b/twidere/src/main/res-localized/values-fa/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-fa-rIR/strings.xml rename to twidere/src/main/res-localized/values-fa/strings.xml diff --git a/twidere/src/main/res-localized/values-fa-rIR/strings_http_errors.xml b/twidere/src/main/res-localized/values-fa/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-fa-rIR/strings_http_errors.xml rename to twidere/src/main/res-localized/values-fa/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-fa-rIR/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-fa/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-fa-rIR/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-fa/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-fi-rFI/arrays.xml b/twidere/src/main/res-localized/values-fi/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-fi-rFI/arrays.xml rename to twidere/src/main/res-localized/values-fi/arrays.xml diff --git a/twidere/src/main/res-localized/values-fi-rFI/plurals.xml b/twidere/src/main/res-localized/values-fi/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-fi-rFI/plurals.xml rename to twidere/src/main/res-localized/values-fi/plurals.xml diff --git a/twidere/src/main/res-localized/values-fi-rFI/strings.xml b/twidere/src/main/res-localized/values-fi/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-fi-rFI/strings.xml rename to twidere/src/main/res-localized/values-fi/strings.xml diff --git a/twidere/src/main/res-localized/values-fi-rFI/strings_http_errors.xml b/twidere/src/main/res-localized/values-fi/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-fi-rFI/strings_http_errors.xml rename to twidere/src/main/res-localized/values-fi/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-fi-rFI/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-fi/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-fi-rFI/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-fi/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-fil-rPH/arrays.xml b/twidere/src/main/res-localized/values-fil/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-fil-rPH/arrays.xml rename to twidere/src/main/res-localized/values-fil/arrays.xml diff --git a/twidere/src/main/res-localized/values-fil-rPH/plurals.xml b/twidere/src/main/res-localized/values-fil/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-fil-rPH/plurals.xml rename to twidere/src/main/res-localized/values-fil/plurals.xml diff --git a/twidere/src/main/res-localized/values-fil-rPH/strings.xml b/twidere/src/main/res-localized/values-fil/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-fil-rPH/strings.xml rename to twidere/src/main/res-localized/values-fil/strings.xml diff --git a/twidere/src/main/res-localized/values-fil-rPH/strings_http_errors.xml b/twidere/src/main/res-localized/values-fil/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-fil-rPH/strings_http_errors.xml rename to twidere/src/main/res-localized/values-fil/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-fil-rPH/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-fil/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-fil-rPH/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-fil/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-fj-rFJ/arrays.xml b/twidere/src/main/res-localized/values-fj/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-fj-rFJ/arrays.xml rename to twidere/src/main/res-localized/values-fj/arrays.xml diff --git a/twidere/src/main/res-localized/values-fj-rFJ/plurals.xml b/twidere/src/main/res-localized/values-fj/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-fj-rFJ/plurals.xml rename to twidere/src/main/res-localized/values-fj/plurals.xml diff --git a/twidere/src/main/res-localized/values-fj-rFJ/strings.xml b/twidere/src/main/res-localized/values-fj/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-fj-rFJ/strings.xml rename to twidere/src/main/res-localized/values-fj/strings.xml diff --git a/twidere/src/main/res-localized/values-fj-rFJ/strings_http_errors.xml b/twidere/src/main/res-localized/values-fj/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-fj-rFJ/strings_http_errors.xml rename to twidere/src/main/res-localized/values-fj/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-fj-rFJ/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-fj/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-fj-rFJ/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-fj/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-fr-rFR/arrays.xml b/twidere/src/main/res-localized/values-fr/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-fr-rFR/arrays.xml rename to twidere/src/main/res-localized/values-fr/arrays.xml diff --git a/twidere/src/main/res-localized/values-fr-rFR/plurals.xml b/twidere/src/main/res-localized/values-fr/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-fr-rFR/plurals.xml rename to twidere/src/main/res-localized/values-fr/plurals.xml diff --git a/twidere/src/main/res-localized/values-fr-rFR/strings.xml b/twidere/src/main/res-localized/values-fr/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-fr-rFR/strings.xml rename to twidere/src/main/res-localized/values-fr/strings.xml diff --git a/twidere/src/main/res-localized/values-fr-rFR/strings_http_errors.xml b/twidere/src/main/res-localized/values-fr/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-fr-rFR/strings_http_errors.xml rename to twidere/src/main/res-localized/values-fr/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-fr-rFR/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-fr/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-fr-rFR/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-fr/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-gl-rES/arrays.xml b/twidere/src/main/res-localized/values-gl/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-gl-rES/arrays.xml rename to twidere/src/main/res-localized/values-gl/arrays.xml diff --git a/twidere/src/main/res-localized/values-gl-rES/plurals.xml b/twidere/src/main/res-localized/values-gl/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-gl-rES/plurals.xml rename to twidere/src/main/res-localized/values-gl/plurals.xml diff --git a/twidere/src/main/res-localized/values-gl-rES/strings.xml b/twidere/src/main/res-localized/values-gl/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-gl-rES/strings.xml rename to twidere/src/main/res-localized/values-gl/strings.xml diff --git a/twidere/src/main/res-localized/values-gl-rES/strings_http_errors.xml b/twidere/src/main/res-localized/values-gl/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-gl-rES/strings_http_errors.xml rename to twidere/src/main/res-localized/values-gl/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-gl-rES/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-gl/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-gl-rES/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-gl/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-hi-rIN/arrays.xml b/twidere/src/main/res-localized/values-hi/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-hi-rIN/arrays.xml rename to twidere/src/main/res-localized/values-hi/arrays.xml diff --git a/twidere/src/main/res-localized/values-hi-rIN/plurals.xml b/twidere/src/main/res-localized/values-hi/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-hi-rIN/plurals.xml rename to twidere/src/main/res-localized/values-hi/plurals.xml diff --git a/twidere/src/main/res-localized/values-hi-rIN/strings.xml b/twidere/src/main/res-localized/values-hi/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-hi-rIN/strings.xml rename to twidere/src/main/res-localized/values-hi/strings.xml diff --git a/twidere/src/main/res-localized/values-hi-rIN/strings_http_errors.xml b/twidere/src/main/res-localized/values-hi/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-hi-rIN/strings_http_errors.xml rename to twidere/src/main/res-localized/values-hi/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-hi-rIN/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-hi/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-hi-rIN/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-hi/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-hr-rHR/arrays.xml b/twidere/src/main/res-localized/values-hr/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-hr-rHR/arrays.xml rename to twidere/src/main/res-localized/values-hr/arrays.xml diff --git a/twidere/src/main/res-localized/values-hr-rHR/plurals.xml b/twidere/src/main/res-localized/values-hr/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-hr-rHR/plurals.xml rename to twidere/src/main/res-localized/values-hr/plurals.xml diff --git a/twidere/src/main/res-localized/values-hr-rHR/strings.xml b/twidere/src/main/res-localized/values-hr/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-hr-rHR/strings.xml rename to twidere/src/main/res-localized/values-hr/strings.xml diff --git a/twidere/src/main/res-localized/values-hr-rHR/strings_http_errors.xml b/twidere/src/main/res-localized/values-hr/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-hr-rHR/strings_http_errors.xml rename to twidere/src/main/res-localized/values-hr/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-hr-rHR/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-hr/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-hr-rHR/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-hr/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-hu-rHU/arrays.xml b/twidere/src/main/res-localized/values-hu/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-hu-rHU/arrays.xml rename to twidere/src/main/res-localized/values-hu/arrays.xml diff --git a/twidere/src/main/res-localized/values-hu-rHU/plurals.xml b/twidere/src/main/res-localized/values-hu/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-hu-rHU/plurals.xml rename to twidere/src/main/res-localized/values-hu/plurals.xml diff --git a/twidere/src/main/res-localized/values-hu-rHU/strings.xml b/twidere/src/main/res-localized/values-hu/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-hu-rHU/strings.xml rename to twidere/src/main/res-localized/values-hu/strings.xml diff --git a/twidere/src/main/res-localized/values-hu-rHU/strings_http_errors.xml b/twidere/src/main/res-localized/values-hu/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-hu-rHU/strings_http_errors.xml rename to twidere/src/main/res-localized/values-hu/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-hu-rHU/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-hu/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-hu-rHU/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-hu/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-in-rID/arrays.xml b/twidere/src/main/res-localized/values-in/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-in-rID/arrays.xml rename to twidere/src/main/res-localized/values-in/arrays.xml diff --git a/twidere/src/main/res-localized/values-in-rID/plurals.xml b/twidere/src/main/res-localized/values-in/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-in-rID/plurals.xml rename to twidere/src/main/res-localized/values-in/plurals.xml diff --git a/twidere/src/main/res-localized/values-in-rID/strings.xml b/twidere/src/main/res-localized/values-in/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-in-rID/strings.xml rename to twidere/src/main/res-localized/values-in/strings.xml diff --git a/twidere/src/main/res-localized/values-in-rID/strings_http_errors.xml b/twidere/src/main/res-localized/values-in/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-in-rID/strings_http_errors.xml rename to twidere/src/main/res-localized/values-in/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-in-rID/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-in/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-in-rID/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-in/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-it-rIT/arrays.xml b/twidere/src/main/res-localized/values-it/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-it-rIT/arrays.xml rename to twidere/src/main/res-localized/values-it/arrays.xml diff --git a/twidere/src/main/res-localized/values-it-rIT/plurals.xml b/twidere/src/main/res-localized/values-it/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-it-rIT/plurals.xml rename to twidere/src/main/res-localized/values-it/plurals.xml diff --git a/twidere/src/main/res-localized/values-it-rIT/strings.xml b/twidere/src/main/res-localized/values-it/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-it-rIT/strings.xml rename to twidere/src/main/res-localized/values-it/strings.xml diff --git a/twidere/src/main/res-localized/values-it-rIT/strings_http_errors.xml b/twidere/src/main/res-localized/values-it/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-it-rIT/strings_http_errors.xml rename to twidere/src/main/res-localized/values-it/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-it-rIT/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-it/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-it-rIT/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-it/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-iw-rIL/arrays.xml b/twidere/src/main/res-localized/values-iw/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-iw-rIL/arrays.xml rename to twidere/src/main/res-localized/values-iw/arrays.xml diff --git a/twidere/src/main/res-localized/values-iw-rIL/plurals.xml b/twidere/src/main/res-localized/values-iw/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-iw-rIL/plurals.xml rename to twidere/src/main/res-localized/values-iw/plurals.xml diff --git a/twidere/src/main/res-localized/values-iw-rIL/strings.xml b/twidere/src/main/res-localized/values-iw/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-iw-rIL/strings.xml rename to twidere/src/main/res-localized/values-iw/strings.xml diff --git a/twidere/src/main/res-localized/values-iw-rIL/strings_http_errors.xml b/twidere/src/main/res-localized/values-iw/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-iw-rIL/strings_http_errors.xml rename to twidere/src/main/res-localized/values-iw/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-iw-rIL/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-iw/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-iw-rIL/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-iw/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-ja-rJP/arrays.xml b/twidere/src/main/res-localized/values-ja/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-ja-rJP/arrays.xml rename to twidere/src/main/res-localized/values-ja/arrays.xml diff --git a/twidere/src/main/res-localized/values-ja-rJP/plurals.xml b/twidere/src/main/res-localized/values-ja/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-ja-rJP/plurals.xml rename to twidere/src/main/res-localized/values-ja/plurals.xml diff --git a/twidere/src/main/res-localized/values-ja-rJP/strings.xml b/twidere/src/main/res-localized/values-ja/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-ja-rJP/strings.xml rename to twidere/src/main/res-localized/values-ja/strings.xml diff --git a/twidere/src/main/res-localized/values-ja-rJP/strings_http_errors.xml b/twidere/src/main/res-localized/values-ja/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ja-rJP/strings_http_errors.xml rename to twidere/src/main/res-localized/values-ja/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-ja-rJP/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-ja/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ja-rJP/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-ja/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-kab-rDZ/arrays.xml b/twidere/src/main/res-localized/values-kab/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-kab-rDZ/arrays.xml rename to twidere/src/main/res-localized/values-kab/arrays.xml diff --git a/twidere/src/main/res-localized/values-kab-rDZ/plurals.xml b/twidere/src/main/res-localized/values-kab/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-kab-rDZ/plurals.xml rename to twidere/src/main/res-localized/values-kab/plurals.xml diff --git a/twidere/src/main/res-localized/values-kab-rDZ/strings.xml b/twidere/src/main/res-localized/values-kab/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-kab-rDZ/strings.xml rename to twidere/src/main/res-localized/values-kab/strings.xml diff --git a/twidere/src/main/res-localized/values-kab-rDZ/strings_http_errors.xml b/twidere/src/main/res-localized/values-kab/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-kab-rDZ/strings_http_errors.xml rename to twidere/src/main/res-localized/values-kab/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-kab-rDZ/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-kab/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-kab-rDZ/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-kab/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-ko-rKR/arrays.xml b/twidere/src/main/res-localized/values-ko/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-ko-rKR/arrays.xml rename to twidere/src/main/res-localized/values-ko/arrays.xml diff --git a/twidere/src/main/res-localized/values-ko-rKR/plurals.xml b/twidere/src/main/res-localized/values-ko/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-ko-rKR/plurals.xml rename to twidere/src/main/res-localized/values-ko/plurals.xml diff --git a/twidere/src/main/res-localized/values-ko-rKR/strings.xml b/twidere/src/main/res-localized/values-ko/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-ko-rKR/strings.xml rename to twidere/src/main/res-localized/values-ko/strings.xml diff --git a/twidere/src/main/res-localized/values-ko-rKR/strings_http_errors.xml b/twidere/src/main/res-localized/values-ko/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ko-rKR/strings_http_errors.xml rename to twidere/src/main/res-localized/values-ko/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-ko-rKR/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-ko/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ko-rKR/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-ko/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-lo-rLA/arrays.xml b/twidere/src/main/res-localized/values-lo/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-lo-rLA/arrays.xml rename to twidere/src/main/res-localized/values-lo/arrays.xml diff --git a/twidere/src/main/res-localized/values-lo-rLA/plurals.xml b/twidere/src/main/res-localized/values-lo/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-lo-rLA/plurals.xml rename to twidere/src/main/res-localized/values-lo/plurals.xml diff --git a/twidere/src/main/res-localized/values-lo-rLA/strings.xml b/twidere/src/main/res-localized/values-lo/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-lo-rLA/strings.xml rename to twidere/src/main/res-localized/values-lo/strings.xml diff --git a/twidere/src/main/res-localized/values-lo-rLA/strings_http_errors.xml b/twidere/src/main/res-localized/values-lo/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-lo-rLA/strings_http_errors.xml rename to twidere/src/main/res-localized/values-lo/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-lo-rLA/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-lo/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-lo-rLA/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-lo/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-ms-rMY/arrays.xml b/twidere/src/main/res-localized/values-ms/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-ms-rMY/arrays.xml rename to twidere/src/main/res-localized/values-ms/arrays.xml diff --git a/twidere/src/main/res-localized/values-ms-rMY/plurals.xml b/twidere/src/main/res-localized/values-ms/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-ms-rMY/plurals.xml rename to twidere/src/main/res-localized/values-ms/plurals.xml diff --git a/twidere/src/main/res-localized/values-ms-rMY/strings.xml b/twidere/src/main/res-localized/values-ms/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-ms-rMY/strings.xml rename to twidere/src/main/res-localized/values-ms/strings.xml diff --git a/twidere/src/main/res-localized/values-ms-rMY/strings_http_errors.xml b/twidere/src/main/res-localized/values-ms/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ms-rMY/strings_http_errors.xml rename to twidere/src/main/res-localized/values-ms/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-ms-rMY/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-ms/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ms-rMY/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-ms/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-nl-rNL/arrays.xml b/twidere/src/main/res-localized/values-nl/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-nl-rNL/arrays.xml rename to twidere/src/main/res-localized/values-nl/arrays.xml diff --git a/twidere/src/main/res-localized/values-nl-rNL/plurals.xml b/twidere/src/main/res-localized/values-nl/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-nl-rNL/plurals.xml rename to twidere/src/main/res-localized/values-nl/plurals.xml diff --git a/twidere/src/main/res-localized/values-nl-rNL/strings.xml b/twidere/src/main/res-localized/values-nl/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-nl-rNL/strings.xml rename to twidere/src/main/res-localized/values-nl/strings.xml diff --git a/twidere/src/main/res-localized/values-nl-rNL/strings_http_errors.xml b/twidere/src/main/res-localized/values-nl/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-nl-rNL/strings_http_errors.xml rename to twidere/src/main/res-localized/values-nl/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-nl-rNL/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-nl/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-nl-rNL/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-nl/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-no-rNO/arrays.xml b/twidere/src/main/res-localized/values-no/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-no-rNO/arrays.xml rename to twidere/src/main/res-localized/values-no/arrays.xml diff --git a/twidere/src/main/res-localized/values-no-rNO/plurals.xml b/twidere/src/main/res-localized/values-no/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-no-rNO/plurals.xml rename to twidere/src/main/res-localized/values-no/plurals.xml diff --git a/twidere/src/main/res-localized/values-no-rNO/strings.xml b/twidere/src/main/res-localized/values-no/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-no-rNO/strings.xml rename to twidere/src/main/res-localized/values-no/strings.xml diff --git a/twidere/src/main/res-localized/values-no-rNO/strings_http_errors.xml b/twidere/src/main/res-localized/values-no/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-no-rNO/strings_http_errors.xml rename to twidere/src/main/res-localized/values-no/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-no-rNO/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-no/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-no-rNO/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-no/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-pl-rPL/arrays.xml b/twidere/src/main/res-localized/values-pl/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-pl-rPL/arrays.xml rename to twidere/src/main/res-localized/values-pl/arrays.xml diff --git a/twidere/src/main/res-localized/values-pl-rPL/plurals.xml b/twidere/src/main/res-localized/values-pl/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-pl-rPL/plurals.xml rename to twidere/src/main/res-localized/values-pl/plurals.xml diff --git a/twidere/src/main/res-localized/values-pl-rPL/strings.xml b/twidere/src/main/res-localized/values-pl/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-pl-rPL/strings.xml rename to twidere/src/main/res-localized/values-pl/strings.xml diff --git a/twidere/src/main/res-localized/values-pl-rPL/strings_http_errors.xml b/twidere/src/main/res-localized/values-pl/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-pl-rPL/strings_http_errors.xml rename to twidere/src/main/res-localized/values-pl/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-pl-rPL/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-pl/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-pl-rPL/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-pl/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-pt-rBR/arrays.xml b/twidere/src/main/res-localized/values-pt/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-pt-rBR/arrays.xml rename to twidere/src/main/res-localized/values-pt/arrays.xml diff --git a/twidere/src/main/res-localized/values-pt-rBR/plurals.xml b/twidere/src/main/res-localized/values-pt/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-pt-rBR/plurals.xml rename to twidere/src/main/res-localized/values-pt/plurals.xml diff --git a/twidere/src/main/res-localized/values-pt-rBR/strings.xml b/twidere/src/main/res-localized/values-pt/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-pt-rBR/strings.xml rename to twidere/src/main/res-localized/values-pt/strings.xml diff --git a/twidere/src/main/res-localized/values-pt-rBR/strings_http_errors.xml b/twidere/src/main/res-localized/values-pt/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-pt-rBR/strings_http_errors.xml rename to twidere/src/main/res-localized/values-pt/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-pt-rBR/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-pt/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-pt-rBR/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-pt/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-ro-rRO/arrays.xml b/twidere/src/main/res-localized/values-ro/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-ro-rRO/arrays.xml rename to twidere/src/main/res-localized/values-ro/arrays.xml diff --git a/twidere/src/main/res-localized/values-ro-rRO/plurals.xml b/twidere/src/main/res-localized/values-ro/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-ro-rRO/plurals.xml rename to twidere/src/main/res-localized/values-ro/plurals.xml diff --git a/twidere/src/main/res-localized/values-ro-rRO/strings.xml b/twidere/src/main/res-localized/values-ro/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-ro-rRO/strings.xml rename to twidere/src/main/res-localized/values-ro/strings.xml diff --git a/twidere/src/main/res-localized/values-ro-rRO/strings_http_errors.xml b/twidere/src/main/res-localized/values-ro/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ro-rRO/strings_http_errors.xml rename to twidere/src/main/res-localized/values-ro/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-ro-rRO/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-ro/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ro-rRO/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-ro/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-ru-rRU/arrays.xml b/twidere/src/main/res-localized/values-ru/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-ru-rRU/arrays.xml rename to twidere/src/main/res-localized/values-ru/arrays.xml diff --git a/twidere/src/main/res-localized/values-ru-rRU/plurals.xml b/twidere/src/main/res-localized/values-ru/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-ru-rRU/plurals.xml rename to twidere/src/main/res-localized/values-ru/plurals.xml diff --git a/twidere/src/main/res-localized/values-ru-rRU/strings.xml b/twidere/src/main/res-localized/values-ru/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-ru-rRU/strings.xml rename to twidere/src/main/res-localized/values-ru/strings.xml diff --git a/twidere/src/main/res-localized/values-ru-rRU/strings_http_errors.xml b/twidere/src/main/res-localized/values-ru/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ru-rRU/strings_http_errors.xml rename to twidere/src/main/res-localized/values-ru/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-ru-rRU/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-ru/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ru-rRU/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-ru/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-sk-rSK/arrays.xml b/twidere/src/main/res-localized/values-sk/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-sk-rSK/arrays.xml rename to twidere/src/main/res-localized/values-sk/arrays.xml diff --git a/twidere/src/main/res-localized/values-sk-rSK/plurals.xml b/twidere/src/main/res-localized/values-sk/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-sk-rSK/plurals.xml rename to twidere/src/main/res-localized/values-sk/plurals.xml diff --git a/twidere/src/main/res-localized/values-sk-rSK/strings.xml b/twidere/src/main/res-localized/values-sk/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-sk-rSK/strings.xml rename to twidere/src/main/res-localized/values-sk/strings.xml diff --git a/twidere/src/main/res-localized/values-sk-rSK/strings_http_errors.xml b/twidere/src/main/res-localized/values-sk/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-sk-rSK/strings_http_errors.xml rename to twidere/src/main/res-localized/values-sk/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-sk-rSK/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-sk/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-sk-rSK/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-sk/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-sl-rSI/arrays.xml b/twidere/src/main/res-localized/values-sl/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-sl-rSI/arrays.xml rename to twidere/src/main/res-localized/values-sl/arrays.xml diff --git a/twidere/src/main/res-localized/values-sl-rSI/plurals.xml b/twidere/src/main/res-localized/values-sl/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-sl-rSI/plurals.xml rename to twidere/src/main/res-localized/values-sl/plurals.xml diff --git a/twidere/src/main/res-localized/values-sl-rSI/strings.xml b/twidere/src/main/res-localized/values-sl/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-sl-rSI/strings.xml rename to twidere/src/main/res-localized/values-sl/strings.xml diff --git a/twidere/src/main/res-localized/values-sl-rSI/strings_http_errors.xml b/twidere/src/main/res-localized/values-sl/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-sl-rSI/strings_http_errors.xml rename to twidere/src/main/res-localized/values-sl/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-sl-rSI/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-sl/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-sl-rSI/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-sl/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-sr-rSP/arrays.xml b/twidere/src/main/res-localized/values-sr/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-sr-rSP/arrays.xml rename to twidere/src/main/res-localized/values-sr/arrays.xml diff --git a/twidere/src/main/res-localized/values-sr-rSP/plurals.xml b/twidere/src/main/res-localized/values-sr/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-sr-rSP/plurals.xml rename to twidere/src/main/res-localized/values-sr/plurals.xml diff --git a/twidere/src/main/res-localized/values-sr-rSP/strings.xml b/twidere/src/main/res-localized/values-sr/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-sr-rSP/strings.xml rename to twidere/src/main/res-localized/values-sr/strings.xml diff --git a/twidere/src/main/res-localized/values-sr-rSP/strings_http_errors.xml b/twidere/src/main/res-localized/values-sr/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-sr-rSP/strings_http_errors.xml rename to twidere/src/main/res-localized/values-sr/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-sr-rSP/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-sr/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-sr-rSP/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-sr/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-sv-rSE/arrays.xml b/twidere/src/main/res-localized/values-sv/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-sv-rSE/arrays.xml rename to twidere/src/main/res-localized/values-sv/arrays.xml diff --git a/twidere/src/main/res-localized/values-sv-rSE/plurals.xml b/twidere/src/main/res-localized/values-sv/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-sv-rSE/plurals.xml rename to twidere/src/main/res-localized/values-sv/plurals.xml diff --git a/twidere/src/main/res-localized/values-sv-rSE/strings.xml b/twidere/src/main/res-localized/values-sv/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-sv-rSE/strings.xml rename to twidere/src/main/res-localized/values-sv/strings.xml diff --git a/twidere/src/main/res-localized/values-sv-rSE/strings_http_errors.xml b/twidere/src/main/res-localized/values-sv/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-sv-rSE/strings_http_errors.xml rename to twidere/src/main/res-localized/values-sv/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-sv-rSE/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-sv/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-sv-rSE/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-sv/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-ta-rIN/arrays.xml b/twidere/src/main/res-localized/values-ta/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-ta-rIN/arrays.xml rename to twidere/src/main/res-localized/values-ta/arrays.xml diff --git a/twidere/src/main/res-localized/values-ta-rIN/plurals.xml b/twidere/src/main/res-localized/values-ta/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-ta-rIN/plurals.xml rename to twidere/src/main/res-localized/values-ta/plurals.xml diff --git a/twidere/src/main/res-localized/values-ta-rIN/strings.xml b/twidere/src/main/res-localized/values-ta/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-ta-rIN/strings.xml rename to twidere/src/main/res-localized/values-ta/strings.xml diff --git a/twidere/src/main/res-localized/values-ta-rIN/strings_http_errors.xml b/twidere/src/main/res-localized/values-ta/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ta-rIN/strings_http_errors.xml rename to twidere/src/main/res-localized/values-ta/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-ta-rIN/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-ta/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-ta-rIN/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-ta/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-te-rIN/arrays.xml b/twidere/src/main/res-localized/values-te/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-te-rIN/arrays.xml rename to twidere/src/main/res-localized/values-te/arrays.xml diff --git a/twidere/src/main/res-localized/values-te-rIN/plurals.xml b/twidere/src/main/res-localized/values-te/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-te-rIN/plurals.xml rename to twidere/src/main/res-localized/values-te/plurals.xml diff --git a/twidere/src/main/res-localized/values-te-rIN/strings.xml b/twidere/src/main/res-localized/values-te/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-te-rIN/strings.xml rename to twidere/src/main/res-localized/values-te/strings.xml diff --git a/twidere/src/main/res-localized/values-te-rIN/strings_http_errors.xml b/twidere/src/main/res-localized/values-te/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-te-rIN/strings_http_errors.xml rename to twidere/src/main/res-localized/values-te/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-te-rIN/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-te/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-te-rIN/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-te/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-th-rTH/arrays.xml b/twidere/src/main/res-localized/values-th/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-th-rTH/arrays.xml rename to twidere/src/main/res-localized/values-th/arrays.xml diff --git a/twidere/src/main/res-localized/values-th-rTH/plurals.xml b/twidere/src/main/res-localized/values-th/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-th-rTH/plurals.xml rename to twidere/src/main/res-localized/values-th/plurals.xml diff --git a/twidere/src/main/res-localized/values-th-rTH/strings.xml b/twidere/src/main/res-localized/values-th/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-th-rTH/strings.xml rename to twidere/src/main/res-localized/values-th/strings.xml diff --git a/twidere/src/main/res-localized/values-th-rTH/strings_http_errors.xml b/twidere/src/main/res-localized/values-th/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-th-rTH/strings_http_errors.xml rename to twidere/src/main/res-localized/values-th/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-th-rTH/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-th/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-th-rTH/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-th/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-tl-rPH/arrays.xml b/twidere/src/main/res-localized/values-tl/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-tl-rPH/arrays.xml rename to twidere/src/main/res-localized/values-tl/arrays.xml diff --git a/twidere/src/main/res-localized/values-tl-rPH/plurals.xml b/twidere/src/main/res-localized/values-tl/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-tl-rPH/plurals.xml rename to twidere/src/main/res-localized/values-tl/plurals.xml diff --git a/twidere/src/main/res-localized/values-tl-rPH/strings.xml b/twidere/src/main/res-localized/values-tl/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-tl-rPH/strings.xml rename to twidere/src/main/res-localized/values-tl/strings.xml diff --git a/twidere/src/main/res-localized/values-tl-rPH/strings_http_errors.xml b/twidere/src/main/res-localized/values-tl/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-tl-rPH/strings_http_errors.xml rename to twidere/src/main/res-localized/values-tl/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-tl-rPH/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-tl/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-tl-rPH/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-tl/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-tr-rTR/arrays.xml b/twidere/src/main/res-localized/values-tr/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-tr-rTR/arrays.xml rename to twidere/src/main/res-localized/values-tr/arrays.xml diff --git a/twidere/src/main/res-localized/values-tr-rTR/plurals.xml b/twidere/src/main/res-localized/values-tr/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-tr-rTR/plurals.xml rename to twidere/src/main/res-localized/values-tr/plurals.xml diff --git a/twidere/src/main/res-localized/values-tr-rTR/strings.xml b/twidere/src/main/res-localized/values-tr/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-tr-rTR/strings.xml rename to twidere/src/main/res-localized/values-tr/strings.xml diff --git a/twidere/src/main/res-localized/values-tr-rTR/strings_http_errors.xml b/twidere/src/main/res-localized/values-tr/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-tr-rTR/strings_http_errors.xml rename to twidere/src/main/res-localized/values-tr/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-tr-rTR/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-tr/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-tr-rTR/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-tr/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-uk-rUA/arrays.xml b/twidere/src/main/res-localized/values-uk/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-uk-rUA/arrays.xml rename to twidere/src/main/res-localized/values-uk/arrays.xml diff --git a/twidere/src/main/res-localized/values-uk-rUA/plurals.xml b/twidere/src/main/res-localized/values-uk/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-uk-rUA/plurals.xml rename to twidere/src/main/res-localized/values-uk/plurals.xml diff --git a/twidere/src/main/res-localized/values-uk-rUA/strings.xml b/twidere/src/main/res-localized/values-uk/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-uk-rUA/strings.xml rename to twidere/src/main/res-localized/values-uk/strings.xml diff --git a/twidere/src/main/res-localized/values-uk-rUA/strings_http_errors.xml b/twidere/src/main/res-localized/values-uk/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-uk-rUA/strings_http_errors.xml rename to twidere/src/main/res-localized/values-uk/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-uk-rUA/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-uk/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-uk-rUA/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-uk/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-vi-rVN/arrays.xml b/twidere/src/main/res-localized/values-vi/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-vi-rVN/arrays.xml rename to twidere/src/main/res-localized/values-vi/arrays.xml diff --git a/twidere/src/main/res-localized/values-vi-rVN/plurals.xml b/twidere/src/main/res-localized/values-vi/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-vi-rVN/plurals.xml rename to twidere/src/main/res-localized/values-vi/plurals.xml diff --git a/twidere/src/main/res-localized/values-vi-rVN/strings.xml b/twidere/src/main/res-localized/values-vi/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-vi-rVN/strings.xml rename to twidere/src/main/res-localized/values-vi/strings.xml diff --git a/twidere/src/main/res-localized/values-vi-rVN/strings_http_errors.xml b/twidere/src/main/res-localized/values-vi/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-vi-rVN/strings_http_errors.xml rename to twidere/src/main/res-localized/values-vi/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-vi-rVN/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-vi/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-vi-rVN/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-vi/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-yue-rHK/arrays.xml b/twidere/src/main/res-localized/values-yue/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-yue-rHK/arrays.xml rename to twidere/src/main/res-localized/values-yue/arrays.xml diff --git a/twidere/src/main/res-localized/values-yue-rHK/plurals.xml b/twidere/src/main/res-localized/values-yue/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-yue-rHK/plurals.xml rename to twidere/src/main/res-localized/values-yue/plurals.xml diff --git a/twidere/src/main/res-localized/values-yue-rHK/strings.xml b/twidere/src/main/res-localized/values-yue/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-yue-rHK/strings.xml rename to twidere/src/main/res-localized/values-yue/strings.xml diff --git a/twidere/src/main/res-localized/values-yue-rHK/strings_http_errors.xml b/twidere/src/main/res-localized/values-yue/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-yue-rHK/strings_http_errors.xml rename to twidere/src/main/res-localized/values-yue/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-yue-rHK/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-yue/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-yue-rHK/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-yue/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-zu-rZA/arrays.xml b/twidere/src/main/res-localized/values-zu/arrays.xml similarity index 100% rename from twidere/src/main/res-localized/values-zu-rZA/arrays.xml rename to twidere/src/main/res-localized/values-zu/arrays.xml diff --git a/twidere/src/main/res-localized/values-zu-rZA/plurals.xml b/twidere/src/main/res-localized/values-zu/plurals.xml similarity index 100% rename from twidere/src/main/res-localized/values-zu-rZA/plurals.xml rename to twidere/src/main/res-localized/values-zu/plurals.xml diff --git a/twidere/src/main/res-localized/values-zu-rZA/strings.xml b/twidere/src/main/res-localized/values-zu/strings.xml similarity index 100% rename from twidere/src/main/res-localized/values-zu-rZA/strings.xml rename to twidere/src/main/res-localized/values-zu/strings.xml diff --git a/twidere/src/main/res-localized/values-zu-rZA/strings_http_errors.xml b/twidere/src/main/res-localized/values-zu/strings_http_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-zu-rZA/strings_http_errors.xml rename to twidere/src/main/res-localized/values-zu/strings_http_errors.xml diff --git a/twidere/src/main/res-localized/values-zu-rZA/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-zu/strings_twitter_errors.xml similarity index 100% rename from twidere/src/main/res-localized/values-zu-rZA/strings_twitter_errors.xml rename to twidere/src/main/res-localized/values-zu/strings_twitter_errors.xml From 0c2c0eea836b2ef228ed6903a1e4cffeb8c3ebdb Mon Sep 17 00:00:00 2001 From: Tlaster Date: Tue, 26 May 2020 12:01:32 +0800 Subject: [PATCH 02/61] Add zh localized resource --- .../main/res-localized/values-zh/arrays.xml | 97 ++ .../main/res-localized/values-zh/plurals.xml | 64 + .../main/res-localized/values-zh/strings.xml | 1103 +++++++++++++++++ .../values-zh/strings_http_errors.xml | 5 + .../values-zh/strings_twitter_errors.xml | 38 + 5 files changed, 1307 insertions(+) create mode 100644 twidere/src/main/res-localized/values-zh/arrays.xml create mode 100644 twidere/src/main/res-localized/values-zh/plurals.xml create mode 100644 twidere/src/main/res-localized/values-zh/strings.xml create mode 100644 twidere/src/main/res-localized/values-zh/strings_http_errors.xml create mode 100644 twidere/src/main/res-localized/values-zh/strings_twitter_errors.xml diff --git a/twidere/src/main/res-localized/values-zh/arrays.xml b/twidere/src/main/res-localized/values-zh/arrays.xml new file mode 100644 index 000000000..643d53472 --- /dev/null +++ b/twidere/src/main/res-localized/values-zh/arrays.xml @@ -0,0 +1,97 @@ + + + + 主页 + 互动 + 私信 + 话题 + + + 撰写 + 拍照 + 添加媒体 + + + 互动 + 私信 + 话题 + 已保存的搜索 + + + 相机 + 相册 + 剪贴板 + + + Wi-Fi + + + 裁剪 + 缩放 + 实际大小 + + + 默认 + 透明 + 带颜色 + + + 顶部 + 底部 + + + 主页 + 互动 + 私信 + + + 圆形 + 方形 + + + HTTP + 反向代理 + + + + 用户 + 时间线 + 用户收藏 + 列表 + 列表时间线 + + + 3分钟 + 5分钟 + 10分钟 + 15分钟 + 30分钟 + 1小时 + 2小时 + 4小时 + + + 较窄 + 普通 + 较宽 + + + 图标 + 标签 + 图标和标签 + + + 浅色 + 深色 + 自动 + + + 默认 + 纯白/纯黑 + 透明 + + + 回复 + 转推 + + diff --git a/twidere/src/main/res-localized/values-zh/plurals.xml b/twidere/src/main/res-localized/values-zh/plurals.xml new file mode 100644 index 000000000..3f41ce4d7 --- /dev/null +++ b/twidere/src/main/res-localized/values-zh/plurals.xml @@ -0,0 +1,64 @@ + + + + + 已选择 %d 项 + + + %1$d 个用户被添加到了列表 “%2$s” + + + %1$d 个用户被从列表 “%2$s” 中移除 + + + 把 %1$d 个用户从列表 “%2$s” 中移除吗？ + + + %d 条新推文 + + + %d 条新提及 + + + %d 条新互动 + + + %d 条新信息 + + + %d 媒体 + + + %1$s （每天 %2$d 推） + + + 其他 %d 人 + + + %d 推文 + + + %d 收藏 + + + %d 喜欢 + + + %d 投票 + + + %d 个用户 + + + %d 个成员 + + + %s 个收藏 + + + %s 个喜欢 + + + %s 条转推 + + diff --git a/twidere/src/main/res-localized/values-zh/strings.xml b/twidere/src/main/res-localized/values-zh/strings.xml new file mode 100644 index 000000000..7ad6fe7f6 --- /dev/null +++ b/twidere/src/main/res-localized/values-zh/strings.xml @@ -0,0 +1,1103 @@ + + + 帐号选项 + 饭否 + Mastodon + StatusNet + Twitter + + 同意 + + 同意 + + 添加 + 添加内容警告 + + 添加成员 + + 添加规则 + 添加订阅 + 添加 GIF + 添加媒体 + 添加成员 + 将 %1$s 添加到主屏幕 + 添加标签页 + 将标签添加到主屏幕 + 添加到过滤器 + 添加到主屏幕 + 添加到主屏幕... + 添加到列表 + + 阻止 + 从 Buffer 断开连接 + 设置 + 立即发布 + + 取消转推 + 居中 + 更改语言 + 清除 + 清除信息 + 清空并删除对话 + 评论 + 撰写 + 转换为推文 + 连接 + 对话信息 + 创建对话 + + 删除 + 删除信息 + 禁用推广 + 不重启 + 不退出 + + 编辑 + 编辑图标 + 编辑名称 + 编辑规则 + 启用 + 启用通知 + 启用推广 + 启用转推 + 导出到已隐藏的用户 + 收藏 + 从被阻止的用户导入 + 从被隐藏的用户导入 + 管理订阅 + 完成 + 关注 + 发推 %1$s + + 导入 + 导入自… + 反选 + + 稍后 + 离开对话 + + 喜欢 + 列表创建者 + 位置 + 在 Buffer 中管理 + 标为已读 + 隐藏 + 隐藏通知 + %1$s，保存于 %2$s + 下一步 + 不用了，谢谢 + 在浏览器中打开 + 选取颜色 + 购买 + 购买功能包 + 二维码 + 引用 + 录像 + 刷新 + 刷新启动屏幕 + 注册 + 删除图标 + 回复 + 报告垃圾信息 + + 恢复 + 重试 + + 转推 + + 保存 + 保存到… + 搜索 + 全选 + 全不选 + 选择用户 + + 发送 + 设置颜色 + 设置昵称 + 设置可见性 + 设置 + 分享 + 登录 + + 跳过 + 开始 + 推文附件 + 阻止用户… + 隐藏用户… + 置顶推文 + 推文排期 + 取消置顶推文 + 订阅 + + 连接 + + 断开连接 + 设置 + 现在同步 + 拍照 + 切换 + 翻译 + 隐藏用户 + 已隐藏的用户 + + 取消阻止 + 取消喜欢 + 取消收藏 + 取消关注 + 取消隐藏 + 退订 + 地图 + 已启用的帐号 + 关于我的活动 + %s 收藏了 + %1$s 和 %2$s 收藏了 + %s 收藏了一条标出您的推文 + %1$s 和 %2$s 收藏了一条标出您的推文 + %s 收藏了一条提及您的推文 + %1$s 和 %2$s 收藏了一条提及您的推文 + %s 收藏了您的转推 + %1$s 和 %2$s 收藏了您的转推 + %s 正在关注您 + %1$s 和 %2$s 正在关注您 + %s 喜欢了 + %1$s 和 %2$s 喜欢了 + %s 喜欢了一条标出您的推文 + %1$s 和 %2$s 喜欢了一条标出您的推文 + %s 喜欢了一条提及您的推文 + %1$s 和 %2$s 喜欢了一条提及您的推文 + %s 喜欢了您的转推 + %1$s 和 %2$s 喜欢了您的转推 + %s 把您添加到了列表 + %1$s 和 %2$s 把您添加到了列表 + %1$s 把您添加到了列表 %2$s + %s 标出了您 + %1$s 和 %2$s 标出了您 + %s 转推了 + %1$s 和 %2$s 转推了 + %s 转推了一条标出您的推文 + %1$s 和 %2$s 转推了一条标出您的推文 + %s 转推了一条提及您的推文 + %1$s 和 %2$s 转推了一条提及您的推文 + %s 转推了您的转推 + %1$s 和 %2$s 转推了您的转推 + %s 加入了 Twitter + %1$s 和 %2$s 加入了 Twitter + 添加帐号 + 添加主机名映射 + 添加图片 + 和其他 %d 个 + API URL 格式 + 属于您的 Twitter 应用 + + Twidere + Twidere 将重启以应用设置。 + Twidere 将退出以应用设置。 + 外观 + Basic + OAuth + OAuth 2 + twip O 模式 + xAuth + 自动刷新 + 背景 + 节省流量 + 使用收费网络时，禁用媒体预览 + 属于 + 阻止 %s 吗？这位用户将不能关注您、提及您、查看您的个人资料，或者给您发送私信。 + 错误报告 + 由 Fabric 提供技术支持 + 内置 DNS 解析 + 缓存空间限制 + 由于 Twitter 对第三方应用的限制，Twidere 没法查看一条推文的回复。Twidere 不能保证可以看到一条推的所有回复。 + 不能加载所有的回复。<a href=\"#dialog\";>为什么？</a> + 卡片 + 清除缓存 + 清空储存的媒体缓存 + 清除数据库 + 清除数据库中的推文、私信等。不必担心，您的帐号信息不会丢失 + 清除搜索历史 + 点击一项以配置 + 关闭帐号面板 + 颜色 + 合并通知 + 通知将会分开显示 + 通知将会被分组 + 评论… + 紧凑卡片视图 + 在屏幕中显示更多卡片 + 即时撰写 + “即时撰写”的默认操作 + 用 Twidere 的撰写界面替代 Google Now 的上滑操作 + 与 %s 冲突 + 连接超时 + Consumer key + Consumer secret + 内容 + 内容与存储 + 贴纸 + 通知的内容 + 刷新的内容 + 如果您没有看到您的名字，请联系我们的项目帐号 + 复制链接 + + 转推 + 由 %s 创建 + 创建了列表 “%s” + 当前推文 + 自定义主机映射 + 如同 /etc/hosts 的主机映射，但不需要任何额外的权限 + 暗色主题 + 默认帐号 + 默认API设置 + 这些设置只会应用到新登录的帐号 + 默认铃声 + 删除对话 + 删除此对话的所有信息？ + 删除选择的草稿？ + 删除这条信息吗？ + 删除用户 %s + 删除 %s 吗？这个操作不能撤销。 + 将 %1$s 从列表 “%2$s” 中移除吗？ + 删除列表 %s + 删除列表 %s 吗？这个操作不能撤销。 + 删除用户 + 删除了列表 “%s” + %1$s 被从列表 “%2$s” 中移除 + 拒绝了 %s 的关注请求 + 拒绝 + 删除保存的搜索 “%s” + 要删除保存的搜索 “%s” 吗？您可以稍后再保存这个搜索。 + 删除推文 + 删除这条推文吗？ + 开发者 + 舍弃 + 显示敏感内容 + 显示色情等敏感内容而不发出提示 + DNS 服务器 + 设置网络请求所用的 DNS 服务器 + 草稿已保存 + 您未发送的推文会被保存在这里 + 抽屉按钮 + 编辑 API + 编辑描述 + 编辑草稿 + 编辑媒体 + 编辑标签页 + 编辑标签页 + … + Emoji支持 + 空内容 + 请检查您的系统日期和时间设置 + 发生问题：%s + 这个设备与 Twidere 不兼容，建议升级到最新的系统版本。\n您可以把下面的信息发送给我，帮助我把这个问题报告给设备制造商。 + 不支持向私信添加媒体 + 媒体太多 + 媒体上传失败 + 没有找到媒体上传扩展，它可能已经被卸载了 + 信息太长 + 参与者太多 + 没有内容 + 超过了 Twitter 的调用次数限制，请在 %s 重试 + 推文排期不可用 + 推文太长 + 推文缩短失败 + 未找到推文缩短扩展，它可能已经被删除 + 不支持视频上传 + 您的应用不能访问这个接口 + 没有私信权限。请检查您注册的 Twitter 应用的权限设置。 + 不兼容的设备 + 饭否只能上传一张照片 + 错误：未知错误，这很可能是个 bug + 排除这个主机 + 排除 + 导出设置 + 导出设置… + 扩展 + %s 的外部群组 + %s 的外部用户 + 额外设置 + 过滤器订阅、高级规则等 + 推文排期（稍后发送） + 在推文中分享 GIF + 与 Dropbox、Google 云端硬盘等同步数据 + 高级过滤器 + + 支持 Twidere 并获得增强功能 + 或购买功能包，以获取所有功能 （包括将来的版本中的功能） + + 如果您已经购买增强功能，可以使用“恢复”来恢复购买。 + 浮动操作按钮 + 显示浮动操作按钮 + 快速图像载入 + 启用可以使图片载入更快，如果一些图片不能显示的话则可以把它禁用 + 全面过滤 + 这些会在 Twidere 中被过滤\n ·用户的推文\n ·提及用户的推文\n ·用户的转推或引用 + 关键词 + 链接 + 来源 + 用户 + 添加 %s 到过滤器？ + 已发送关注请求 + 关注了 %s + 仅您关注的 + 只显示来自您关注的用户的通知 + 正在关注您 + 关注 + 字体 + 字体族 + 来自相机 + 来自相册 + 来自 %1$s + 来自 %1$s 和其他 %2$d 人 + 来自 %1$s 和 %2$s + 功能 + 通用 + 获取位置 + + 群组 + + 群组 + 话题标签 + 隐藏设置 + *永远*不要在您不明白这些设置的意义的情况下更改它们，否则它们会：\n * 干掉您家的猫\n * 发射金三胖家的核弹\n * 把所有魔法少女都变成魔女\n * 毁灭宇宙 + 警告：这些设置受结界保护！ + 隐藏卡片动作按钮 + 隐藏卡片数字 + 隐藏引用 + 隐藏回复 + 隐藏转推 + 高亮 + 高亮和下划线 + 从屏幕边缘滑动来打开帐号面板 + 帐号面板 + 对话名称 + 没有订阅 + 必填 + 没有内容 + 搜索用户 + 没有帐号 + 搜索 GIF + 这条回复将会以引用的形式发送，因为推文作者的提及被移除了。<a href=\"#dialog\";>为什么？</a> + 提示 + 在主页时间线刷新 + 地址（可以是另一个主机名） + 主机名 + 把我的星星还给我！ + 使用收藏 (★) 代替喜欢 (♥︎) + 图标 + 图标已恢复！ + 导入/导出设置 + 导入设置 + 导入设置… + 回复%s + 收件箱 + 待定的关注请求 + 输入文本 + 互动 + 无效的 Consumer key + 无效的 Consumer secret + 只能包含字母、数字、“-”和“_”且必须以字母开始 + 无效标签页 + 跳到顶部 + 刚刚 + 返回 + 按下按键 + 快捷键 + 关键词：%s + 帐号 + 帐号类型 + 高级 + 验证方式 + 后台操作服务 + Buffer 帐号 + 没有定时 + + 全年龄级 + + PG 级 + + PG-13 级 + + 限制级 + 内容警告 + Twidere 数据库存储 + 内容 + 标题 + 应用在… + 针对… + 主页 + 互动 + 私信 + 其他 + 搜索结果 + 介绍 + 名字 + 文本 + 订阅 + 已发送关注请求 + %1$s 通过 %2$s + 粗略（城市） + 无 + 精确（坐标） + 您的大致位置 + Mastodon 站点 + 媒体 + 原推文 + 密码 + 密码登录 + 照片 + 照片 + 投票 + 由 GIPHY 强力驱动 + 引用 %s + 引用 %1$s：%2$s + 刷新和同步服务 + 刷新服务 + 回复 %s + 回复 %1$s：%2$s + Buffer 默认 + 发送于 + 敏感内容 + 有什么新鲜事？ + 推文不可用 + 显示更多 + 回复 + + 仅向提及的用户显示 + + 仅向关注者显示 + + 公开 + + 不在公共时间线显示 + 推文 + 推文和回复 + 推文和转推 + 推文、转推和回复 + 从 %s 翻译 + 翻译到 %s + 翻译 + 用户名 + 视频 + 您的头像 + 大尺寸 + 左侧撰写按钮 + 将撰写按钮放置在左边 + 链接高亮选项 + 链接到引用的推文 + 列表成员 + 订阅列表的用户 + 列表时间线 + 列表中 + 列表 + 关注这位用户的列表 + 关注 %s 的列表 + 加载默认设置 + 载入条目上限 + 设置一次载入条目的数量上限 + 载入媒体 + 加载更多 + 从顶部载入更多 + 如果您偏好从底部向上阅读的话会很有用 + 全国 + 重新输入您关联到 Twitter 的邮箱地址 + 重新输入您关联到 Twitter 的手机号码 + 默认 + 用户设置 + 登录验证 + 输入您手机收到的验证码以登录 + 从 Twitter 应用程序同意登录请求。在您同意了请求后，点击确定。 + 长按打开菜单 + 标记为敏感 + 媒体 + 媒体预加载 + 媒体预览 + 媒体预览样式 + 媒体上传服务 + 默认（Twitter） + 成员 + 提及这位用户 + 提及 %s + 提及 %1$s + 仅提及 + 这个帐号将被从 Twidere 中删除。 + API 数据损坏 + [DOMAIN]：Twitter API 域名\n举例： https://[DOMAIN].twitter.com/ 会被替换成 https://api.twitter.com/ 。 + Twidere 崩溃了。发送错误报告来帮我解决这个问题。 + 启用自动刷新以自动获取新推文？ + 阻止了 %s + 删除这个排期吗？ + 从 Buffer 断开连接吗？ + 清除所有信息吗？ + 对话已创建 + 离开这个对话吗？ + 私信已删除 + 私信已发送 + 无法连接到 Buffer + 暂时不支持在 Buffer 中排期媒体 + 一些帐号数据已损坏，Twidere 将删除这些帐户以避免崩溃。 + 这条推文将作为发送给 %1$s 的私信，继续吗？转换成普通推文需要多使用一个字符。 + 对话头像已更改 + %1$s 更改了对话图标 + 对话名称被改为 %1$s + %1$s 把对话名称改为 %2$s + %1$s 加入了对话 + %1$s 添加了 %2$s + %1$s 离开了对话 + %1$s · %2$s + 搜索并分享 GIF 动画，由 GIPHY 提供支持 + Buffer 列表为空 + 加入了对话 + Twidere 需要权限来向推文添加位置 + Twidere 需要存储权限来保存媒体 + Twidere 需要存储权限来向一些应用分享媒体 + 要置顶这条推文吗？原先置顶的推文会被替代。 + 请稍等 + 启用推广就可以免费使用所有增强功能。我们承诺不会打扰您的使用体验！ + Twitter 使推文作者总在回复中被提及，如果推文作者的提及被移除，Twidere 将会把这条回复以引用的形式发送，以保留上下文信息。 + 连接到 Buffer ，即使您没有在线也可以定时发送推文 + Twidere 已经连接到 Buffer + [贴纸] + 将 Twidere 连接到网络存储来同步数据 + Twidere 现在已经和 %s 同步 + 从 %s 断开连接？ + 上次同步： %s + 字段 “%s” 必填 + 启用推广就可以免费使用所有增强功能！ + + 同意了 %s 的关注请求 + 已添加到过滤器 + %1$s 被添加到了列表 “%2$s” + 您已经登录 + 不能获得您的位置 + 需要权限来删除拍摄的照片或视频 + 规则重复 + 发生错误，请重试 + + 尚未购买增强功能 + 按 “+” 来导入 + 不支持在 SD 卡中安装 Twidere，帐号信息可能在重启后丢失。 + 无效的 Mastodon 主机 + 链接已复制到剪贴板 + 我有一份小礼物给您，去系统设置看看吧 :) + 登录验证失败 + 媒体已保存 + + 网络错误 + 网络错误：%s + 没有帐号 + 需要帐号权限 + 没有选择帐号 + 没有选择用户 + 再次按下以关闭 + 个人资料背景已更新 + 个人资料横幅图片已更新 + 个人资料图片已更新 + 不支持这个链接 + 不支持这个二维码扫描器 + 转推已取消 + 需要存储访问权限来保存媒体 + 已保存到相册 + 需要选择将来的日期和时间 + 搜索已删除 + 搜索 “%s” 已删除 + 搜索 “%s” 已保存 + 搜索已保存 + 需要存储访问权限来选择文件 + 一些应用程序需要存储权限分享媒体 + TLS 错误，请检查您的时钟或代理服务器设置 + 推文已删除 + 推文已收藏 + 已取消喜欢了推文 + 已喜欢了推文 + 推文已置顶 + 已转推 + 推文已经保存到草稿箱 + 推文已排期 + 推文已取消收藏 + 推文已取消置顶 + 推文已发送 + 无法加载更早的推文 + 从过滤器列表中删除了这位用户 + 你过滤了这些用户，你将不会在主页/提及中看到这些用户的推文 + API 设置不正确 + 用户名/密码错误 + 取消置顶这条推文吗？ + 视频太长 + 视频太短 + 多选 + 这个帐号将被从 Twidere 中删除。 + 隐藏 %s 吗？您将在保持关注这位用户的情况下，在首页看不到这位用户的推文。 + 已隐藏 %s + %1$s 和另一人转推了 + %1$s 和其他 %2$d 人转推了 + 优先显示名字 + 优先显示 \@screenname + 优先显示名字 + %s 没有设置 + %s 转推了 + %1$s（%2$s） + 导航 + 网络 + 网络诊断 + 新私信 + “新文档” API + 以新任务打开个人资料和媒体 + 新建列表 + + 下一条 + 下一步 + 后一个标签页 + 发送推文之后仍然保持 “撰写” 开启 + 话痨专属 + 没有安装扩展程序 + 没有位置 + 没有规则 + 没有内容 + 没有标签页 + 没有标签页 + 没有找到用户 + 没有版本后缀 + 无 + 互动，例如提及和转推 + 重要的消息，例如私信 + 来自用户的推文通知 + 状态更新，例如主页的新推文 + 应用提醒 + 后台操作 + 互动 + 私信 + 订阅 + 更新 + %s 给您发送了一条私信 + %1$s 给您发了 %2$d 条私信 + %1$s 和其他 %2$d 人给您发了 %3$d 条私信 + 灯光颜色 + %s 提到了您 + %1$s 和其他 %2$d 人提到了您 + + 指示灯 + + 铃声 + + 振动 + %s 发送了新推文 + %1$s 和其他 %2$d 人发送了新推文 + %1$s 转推了 + %1$s 发送了新推文 + 主页 + 互动 + 私信 + 通知 + 通知类型 + 打开帐号面板 + 打开 Twitter 链接 + 用帐号打开 + 其他设置 + 覆盖 + 下翻页 + 上翻页 + 密码登录（仅 Twitter） + 暂停 + Pebble通知 + 发送通知到您的Pebble + 读取帐号授权信息 + 读写/发送私信 + 没有需要的权限 + 读取设置 + 读取推文和一些缓存的内容 + 刷新时间线（包括私信） + 应用程序可以为 Twidere 缩短推文，所以它可以访问您正在发送的推文。 + 应用程序可以为 Twidere 同步阅读位置，所以它可以访问您的阅读位置。 + 应用程序可以为 Twidere 上传媒体，所以它可以访问您正在发送的推文中的媒体。 + 将推文和其他一些内容写入到数据库，发送推文 + 缩短推文 + 同步时间线 + 上传媒体 + 授权请求 + 应用正在请求以下权限 + 钓鱼链接警告 + 您正在打开私信中一个可能是钓鱼站点的链接。\n\n请在输入任何个人信息前，认真检查站点的地址。 + 确定继续吗？ + 在您试图打开私信中可能的钓鱼链接时发出警告 + 照片 + 选取文件 + 置顶推文 + 播放 + %1$s · %2$s + 过滤敏感推文 + 过滤显示为“不可用”的引用 + 多任务 + 以新任务打开个人资料和媒体 + 随机帐号名称 + 不允许其他应用读取您的帐号名称，提高了隐私性 + 重命名已有的帐号吗？ + 启用以获得更快的刷新间隔，在 Android 5.0 以上会增加电量消耗。 + 电量低时停止自动刷新 + 在内置浏览器中打开链接（由 Chrome 提供技术支持） + 每个帐号在数据库中保存的推文/信息条目上限，降低数值可以节省更多存储空间以及加快载入的速度 + 在收藏一条推文前确认 + 在喜欢一条推文前确认 + 只在使用免费网络（比如Wi-Fi）时预加载媒体 + 当“记住位置”启用时 + 现在您可以在标签页设置中分别设置位置了。 + 当只有一个标签时隐藏标签 + 帐号 + 高级 + 兼容模式 + 节能模式 + 内置浏览器 + 数据库条目上限 + “收藏”前确认 + 管理 + 过滤器订阅 + 浮动详细视图 + 横向模式 + 细字体 + “喜欢”前确认 + 在免费网络下预加载 + 多栏标签页宽度 + 多栏标签页 + 导航栏样式 + 标签位置 + 自动隐藏标签 + 频道 + 铃声 + 应用程序语言 + 纵向模式 + 存储 + 平板模式 + 文字尺寸 + 时间线位置 + 翻译 + 本地话题的位置 + 仅使用Wi-Fi预加载 + 预览 + 推文预览图片 + + 裁剪 + + 实际大小 + + 缩放 + + 上一条 + 前一个标签页 + 资料 + 背景 + 背景色 + 横幅 + 个人资料图片 + 个人资料图片样式 + 个人资料图片 + 链接颜色（主色调） + 文字颜色 + 个人资料已更新 + 进度 + 项目帐号 + 我们参与的项目 + + 应用默认 + + 饭否 + Mastodon + 代理服务器 + 代理服务器主机名 + 代理服务器密码 + 代理服务器端口 + 为所有网络请求使用代理 + 代理服务器类型 + 代理服务器用户名 + 查询 + 按“回车”发送 + 按“回车”发送推文 + 引用格式 + \"[TEXT]\"：推文原文\n\"[NAME]\"：用户名 + 引用原推文 + 这条推文受保护。\n\n受保护的用户通常不希望他们的推文被公开分享。 + 引用 %s + 调用限制 + 从底部阅读 + 刷新后跳到最近的推文 + 刷新后保留阅读位置 + 最近的媒体 + 发送推文后刷新 + 在发送推文后刷新时间线 + 刷新间隔 + 启动时刷新 + 启动时刷新时间线和提及 + 主页 + 互动 + 私信 + 话题 + 记住位置 + 打开 Twidere 时，恢复到退出前列表/页面的位置 + 移除 + 从过滤器中删除 + 删除敏感标记 + 回复 + 报告垃圾信息 + 立即汇报使用情况 + 报告 %s + 报告 %s 发送垃圾信息吗？您将同时阻止这位用户。 + 您已报告这位用户发送垃圾信息 + 您已报告这些用户发送垃圾信息 + 已请求 + 重置快捷键到默认？ + 重置 + 遇到网络错误时重试 + 尝试自动从网络错误中恢复 + 由 %d 人转推 + 由 %s 转推 + %1$s 和其他 %2$d 人已转推 + 转推我的内容 + 撤销授权 + 圆形 + 安全 + OAuth 签名时使用相同 URL + 保存到相册 + 已保存的搜索 + 您可能已经保存过这个搜索了 + 被排期推文 + 垃圾场 + 搜索推文或用户 + 搜索用户 + 搜索推文 + 联合 + 本地 + 媒体 + 推文 + 用户 + 密钥 + 选择帐号 + 选择帐号 + 选择用来撰写的帐号 + 选择用户 + 选择列表 + 仍然发送 + 发送于 + 发送 Twidere 的崩溃报告 + 发送私信 + 发送关注请求 + 发送私信 + 这条推文可能有敏感内容，继续？ + 向%s 发送了关注请求 + 服务器地址 + Twidere 的令牌将要用完了。您需要在 https://apps.twitter.com/ 创建一个应用并把 consumer key and secret 粘贴在下面。\n如果您继续使用默认的 key ，可能会没法登录。 + 界面 + 通知 + 刷新 + 分享格式 + \"[TITLE]\" = 分享内容的标题\n\"[TEXT]\" = 分享内容的正文 + 分享链接 + 分享推文 + 不兼容的推文缩短服务 + 显示绝对时间 + 在推文等列表里显示绝对时间 + 在时间线中显示 + 电子邮件 + Google ID + Twitter + 登录方式… + 注册 + 登录时发生问题，您可能需要使用“浏览器登录”。（这将在登录时暂时忽略自定义 API 设置） + 尺寸 + 小尺寸 + 声音 + %s + 相机 + 剪贴板 + 来源：%s + 相册 + 特别感谢 + 赞助 + 方形 + 正在阻止 + %s + %1$s · %2$s + 您发送了重复的推文 + %1$s: %2$s + 推文未发送 + 推文未发送，并被保存到草稿箱 + 来自 %1$s（@%2$s）的推文，写于 %3$s + %1$s\n\n%2$s + 推文缩短服务 + 无（不发送过长推文） + + 转推 + 风格 + 订阅了列表 “%s” + 不支持这个帐号 + 下拉以刷新 + Dropbox + Google 云端硬盘 + 系统默认 + 标签页显示选项 + 图标 + 图标和标签 + 标签 + 名称 + 标签页 + TCP DNS 查询方式 + 使用 TCP 协议进行 DNS 查询，以避免 DNS 欺骗 + 文本已复制到剪贴板 + 文字尺寸 + 推文的字号 + 主题 + 自动 + 默认 + 纯白/纯黑 + 透明 + 主题颜色 + + 暗色 + 暗色 ActionBar + 主题字体族 + + 亮色 + Thumbor 集成 + %1$s · %2$s + 时间线同步服务 + 关于 + 删除帐号 + 帐号 + 从列表中添加或删除 + 阻止 %s + 已阻止的用户 + 浏览器登录 + Buffer 队列 + Buffer 排期 + 使用 Buffer 排期推文 + Buffer 设置 + 撰写 + 对话 + 裁剪图片 + 连接到… + 私信 + 对话信息 + 新建对话 + 草稿 + 编辑详情 + 编辑个人资料 + 帐号无效 + + 增强功能 + 收藏这条推文吗？ + + 收藏 + 过滤 + 无效的订阅 + URL + 关注者 + 正在关注 + GIF 分享 + 主页 + 喜欢这条推文吗？ + + 喜欢 + 过滤器订阅 + 媒体时间线 + 提及 + 对话信息 + 联合时间线 + 昵称 + 开源许可 + 置顶推文 + Twidere ∞ + 推广奖励 + 公共时间线 + 快捷操作 + 转推给您的关注者吗？ + 排期的推文 + 搜索 + 搜索 GIF + 选择用户 + 设置昵称 + 登录到 Buffer + 推文 + 推文 + 推文与回复 + 推文排期 + 名称 + URL + %1$s: %2$s + 数据同步 + 同步设置 + 翻译到… + 取消置顶推文 + 用户 + 用户颜色标签 + 反馈 + 列表 + 属于 + 创建 + 订阅 + 时间线过滤 + 订阅者 + 收藏这条推文的用户 + 喜欢这条推文的用户 + 转推了这条推文的用户 + 翻译结果语言 + 翻译者 + 话题 + 本地趋势的位置 + 设置位置，以显示本地趋势 + + 用 %1$s 发推 + 发推 #%1$s + Twidere 测试 + 输入姓名搜索 + 键入信息 + 取消阻止了 %s + 下划线 + 取消关注 %s + 取消关注 %s 吗？您将不会在时间线中看到这位用户的推文。 + 取消关注了 %s + 卸载 + 未知语言 + 未知位置 + 取消隐藏 %s + 已取消隐藏 %s + 未读条目 + 从列表 %s 退订 + 取消订阅列表 %s 吗？您稍后可以重新订阅这个列表。 + 取消订阅了列表 “%s” + 请报告上面的内容 + 不支持的登录验证类型 %1$s，请反馈到支持帐号 + 发送推文 + 更新了列表 “%s” 的详细信息 + 正在发送推文… + 不兼容的媒体上传服务 + 使用信息统计 + Twidere 参与了一些研究项目，加入这些项目帮助 Twidere 和更多应用做得更好。 + 帮助我们改进 Twidere！ + 您阻止了这位用户 + 用户：%s + 列表详情 + + 简介 + + 公开 + + 名称 + 列表 + %s 提到了您 + 提及用户的推文 + 简介 + 位置 + 名字 + 网址 + 您需要向这个受保护的用户发送关注请求来查看推文 + 受保护用户 + 验证用户 + 您解除了对这位用户的阻止 + 您阻止了这些用户 + %s 的列表 + 全部 + 推文 + 其他 + diff --git a/twidere/src/main/res-localized/values-zh/strings_http_errors.xml b/twidere/src/main/res-localized/values-zh/strings_http_errors.xml new file mode 100644 index 000000000..6c6c61e6d --- /dev/null +++ b/twidere/src/main/res-localized/values-zh/strings_http_errors.xml @@ -0,0 +1,5 @@ + + + + HTTP 407 - 代理需要认证 + diff --git a/twidere/src/main/res-localized/values-zh/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-zh/strings_twitter_errors.xml new file mode 100644 index 000000000..7195fd747 --- /dev/null +++ b/twidere/src/main/res-localized/values-zh/strings_twitter_errors.xml @@ -0,0 +1,38 @@ + + + + 无法验证到Twitter，您可能需要重新登录 + + 推文，用户或页面不存在 + + Twitter的调用次数超限，请稍后再试 + + 您的登录信息错误或过期，请重新登录 + + 您的帐号已被Twitter冻结，因此无法使用这个功能 + + Twitter暂时处于超载状态，请稍后再试 + + Twitter的服务器可能宕机了，请稍后再试 + + 请检查您的系统时间设置 + + 您被这个用户阻止了 + 您已经收藏了这条推文 + + 没有找到推文，它可能已经被删除了 + 您已经向这个用户发送过关注请求了 + + 您被这个用户阻止了 + + 您已经保存这个搜索了 + + 您不能查看这个受保护用户的推文 + + 您已经发送过这条推了 + 您上传的图片太大 + + 您可能需要重新登录 + 您的帐号被冻结，请访问 https://twitter.com/ 查看详情 + 您已经转推过这条推文 + From 96cfc4b4c1926aa4bc9bc7cb1245c3514b9685ee Mon Sep 17 00:00:00 2001 From: Tlaster Date: Tue, 26 May 2020 14:19:00 +0800 Subject: [PATCH 03/61] Fix #1318 --- .../mariotaku/twidere/activity/HomeActivity.kt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt index 1feb6a6c2..eca60ca7f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt @@ -422,8 +422,13 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp if (!ViewCompat.getFitsSystemWindows(homeMenu)) { homeContent.setPadding(0, insets.systemWindowInsetTop, 0, 0) } + (toolbar.layoutParams as? MarginLayoutParams)?.bottomMargin = insets.systemWindowInsetBottom (actionsButton.layoutParams as? MarginLayoutParams)?.bottomMargin = - actionsButtonBottomMargin + insets.systemWindowInsetBottom + actionsButtonBottomMargin + if (preferences[tabPositionKey] == SharedPreferenceConstants.VALUE_TAB_POSITION_TOP) { + insets.systemWindowInsetBottom + } else { + 0 + } return insets } @@ -623,16 +628,22 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp } notifyControlBarOffsetChanged() } else { + val layoutparams = toolbar.layoutParams + val toolbarMarginBottom = if (layoutparams is MarginLayoutParams) { + layoutparams.bottomMargin + } else { + 0 + } val translationY = if (mainTabs.columns > 1 || !toolbar.isVisible) { 0 } else { - (toolbar.height * (offset - 1)).toInt() + ((toolbar.height + toolbarMarginBottom) * (offset - 1)).toInt() } toolbar.translationY = -translationY.toFloat() windowOverlay.translationY = -translationY.toFloat() val lp = actionsButton.layoutParams if (lp is MarginLayoutParams) { - actionsButton.translationY = (lp.bottomMargin + toolbar.height + actionsButton.height) * (1 - offset) + actionsButton.translationY = (lp.bottomMargin + toolbar.height + actionsButton.height + toolbarMarginBottom) * (1 - offset) } else { actionsButton.translationY = actionsButton.height * (1 - offset) } From d7dad439287812f0bdd7635bc947a99e4948c973 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Tue, 26 May 2020 16:58:31 +0800 Subject: [PATCH 04/61] Fix webview crashing in api 21 --- .../twidere/view/LollipopFixedWebView.kt | 28 +++++++++++++++++++ .../res/layout/activity_browser_sign_in.xml | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 twidere/src/main/kotlin/org/mariotaku/twidere/view/LollipopFixedWebView.kt diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/LollipopFixedWebView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/LollipopFixedWebView.kt new file mode 100644 index 000000000..a4eb62c19 --- /dev/null +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/LollipopFixedWebView.kt @@ -0,0 +1,28 @@ +package org.mariotaku.twidere.view + +import android.annotation.TargetApi +import android.content.Context +import android.os.Build +import android.util.AttributeSet +import android.webkit.WebView + +private fun Context.fixForLollipop(): Context { + return if (Build.VERSION.SDK_INT in 21..22) { + applicationContext + } else this +} + +class LollipopFixWebView: WebView { + + constructor(context: Context?) : super(context?.fixForLollipop()) + constructor(context: Context?, attrs: AttributeSet?) : super(context?.fixForLollipop(), attrs) + constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context?.fixForLollipop(), attrs, defStyleAttr) + @TargetApi(Build.VERSION_CODES.LOLLIPOP) + constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context?.fixForLollipop(), attrs, defStyleAttr, defStyleRes) + constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, privateBrowsing: Boolean) : super(context?.fixForLollipop(), attrs, defStyleAttr, privateBrowsing) + + init { + isFocusable = true + isFocusableInTouchMode = true + } +} diff --git a/twidere/src/main/res/layout/activity_browser_sign_in.xml b/twidere/src/main/res/layout/activity_browser_sign_in.xml index 6e5cab499..11e3c0d29 100644 --- a/twidere/src/main/res/layout/activity_browser_sign_in.xml +++ b/twidere/src/main/res/layout/activity_browser_sign_in.xml @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - From a38b3c39823a1cbc8193a1a2787731f61c483467 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Tue, 26 May 2020 17:14:52 +0800 Subject: [PATCH 05/61] Down level the min api --- build.gradle | 2 +- .../twidere/util/DataImportExportUtils.java | 31 +++++++++++++++++-- .../core/view/WindowInsetsCompatAccessor.kt | 8 +++-- .../twidere/util/view/ViewProperties.kt | 5 ++- twidere/src/main/res/values/themes.xml | 4 +-- 5 files changed, 41 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 67600ae86..82370fff7 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ allprojects { globalCompileSdkVersion = 29 globalBuildToolsVersion = "29.0.3" - globalMinSdkVersion = 19 + globalMinSdkVersion = 16 globalTargetSdkVersion = 29 } diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/DataImportExportUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/DataImportExportUtils.java index 65d4dbe69..21edb8925 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/DataImportExportUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/DataImportExportUtils.java @@ -26,6 +26,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.database.Cursor; import android.net.Uri; +import android.os.Build; import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; @@ -292,7 +293,15 @@ public class DataImportExportUtils implements Constants { @NonNull final String preferencesName, @NonNull final String entryName, @NonNull final SharedPreferencesProcessStrategy strategy, @NonNull final String data) throws IOException { - if (!Objects.equals(entry.getName(), entryName)) return; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (!Objects.equals(entry.getName(), entryName)) { + return; + } + } else { + if (entry.getName().equals(entryName)) { + return; + } + } final JsonParser jsonParser = LoganSquare.JSON_FACTORY.createParser(data); if (jsonParser.getCurrentToken() == null) { jsonParser.nextToken(); @@ -327,7 +336,15 @@ public class DataImportExportUtils implements Constants { @NonNull final String data, @NonNull final ContentResolverProcessStrategy> strategy) throws IOException { - if (!Objects.equals(entry.getName(), entryName)) return; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (!Objects.equals(entry.getName(), entryName)) { + return; + } + } else { + if (entry.getName().equals(entryName)) { + return; + } + } List itemsList = JsonSerializer.parseList(data, itemCls); strategy.importItem(context.getContentResolver(), itemsList); } @@ -352,7 +369,15 @@ public class DataImportExportUtils implements Constants { @NonNull final String data, @NonNull final ContentResolverProcessStrategy strategy) throws IOException { - if (!Objects.equals(entry.getName(), entryName)) return; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (!Objects.equals(entry.getName(), entryName)) { + return; + } + } else { + if (entry.getName().equals(entryName)) { + return; + } + } T item = JsonSerializer.parse(data, itemCls); strategy.importItem(context.getContentResolver(), item); } diff --git a/twidere/src/main/kotlin/androidx/core/view/WindowInsetsCompatAccessor.kt b/twidere/src/main/kotlin/androidx/core/view/WindowInsetsCompatAccessor.kt index b085d3b2e..843e423d3 100644 --- a/twidere/src/main/kotlin/androidx/core/view/WindowInsetsCompatAccessor.kt +++ b/twidere/src/main/kotlin/androidx/core/view/WindowInsetsCompatAccessor.kt @@ -19,8 +19,12 @@ package androidx.core.view -fun createWindowInsetsCompat(obj: Any) = WindowInsetsCompat(obj) +import android.annotation.TargetApi +import android.os.Build +import android.view.WindowInsets + +@TargetApi(Build.VERSION_CODES.KITKAT_WATCH) +fun createWindowInsetsCompat(obj: Any) = WindowInsetsCompat.toWindowInsetsCompat(obj as WindowInsets) val WindowInsetsCompat.unwrapped: Any? - @Suppress("RestrictedApi") get() = this.toWindowInsets() \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/ViewProperties.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/ViewProperties.kt index 56513893b..3eae9ff5d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/ViewProperties.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/ViewProperties.kt @@ -19,12 +19,15 @@ package org.mariotaku.twidere.util.view +import android.annotation.TargetApi +import android.os.Build import android.util.FloatProperty import android.util.Property import android.view.View object ViewProperties { - val TRANSLATION_X_RELATIVE: Property = object : FloatProperty("xRelative") { + val TRANSLATION_X_RELATIVE: Property = @TargetApi(Build.VERSION_CODES.N) + object : FloatProperty("xRelative") { override fun setValue(obj: View, value: Float) { obj.translationX = value * obj.width } diff --git a/twidere/src/main/res/values/themes.xml b/twidere/src/main/res/values/themes.xml index f6e76b4f8..b8279d411 100644 --- a/twidere/src/main/res/values/themes.xml +++ b/twidere/src/main/res/values/themes.xml @@ -1,5 +1,5 @@ - +