From d0fc9d144ad743911ec95ce70abefc95eefd45cc Mon Sep 17 00:00:00 2001 From: Rahul Kumar Patel Date: Sun, 15 Sep 2019 03:58:01 +0530 Subject: [PATCH] Translation : Resolve singular|plural ambiguity https://gitlab.com/AuroraOSS/AuroraStore/issues/129 --- .../store/fragment/UpdatesFragment.java | 4 +- .../store/iterator/CustomAppListIterator.java | 1 + app/src/main/res/drawable/downloads_anim.xml | 206 ++++++++++++++++++ app/src/main/res/drawable/vd_downloading.xml | 84 +++++++ app/src/main/res/values-ar-rSA/strings.xml | 1 - app/src/main/res/values-b+ast/strings.xml | 1 - app/src/main/res/values-be-rBY/strings.xml | 1 - app/src/main/res/values-bg-rBG/strings.xml | 1 - app/src/main/res/values-bh-rIN/strings.xml | 1 - app/src/main/res/values-ca-rES/strings.xml | 1 - app/src/main/res/values-de-rDE/strings.xml | 1 - app/src/main/res/values-el-rGR/strings.xml | 1 - app/src/main/res/values-es-rES/strings.xml | 1 - app/src/main/res/values-fr-rFR/strings.xml | 1 - app/src/main/res/values-gl-rES/strings.xml | 1 - app/src/main/res/values-hi-rIN/strings.xml | 1 - app/src/main/res/values-in-rID/strings.xml | 1 - app/src/main/res/values-it-rIT/strings.xml | 1 - app/src/main/res/values-ja-rJP/strings.xml | 1 - app/src/main/res/values-nb-rNO/strings.xml | 1 - app/src/main/res/values-nl-rNL/strings.xml | 1 - app/src/main/res/values-pa-rIN/strings.xml | 1 - app/src/main/res/values-pl-rPL/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-ru-rRU/strings.xml | 1 - app/src/main/res/values-sc-rIT/strings.xml | 1 - app/src/main/res/values-tr-rTR/strings.xml | 1 - app/src/main/res/values-uk-rUA/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 2 +- 32 files changed, 295 insertions(+), 29 deletions(-) create mode 100644 app/src/main/res/drawable/downloads_anim.xml create mode 100644 app/src/main/res/drawable/vd_downloading.xml diff --git a/app/src/main/java/com/aurora/store/fragment/UpdatesFragment.java b/app/src/main/java/com/aurora/store/fragment/UpdatesFragment.java index ebf44ae09..c20e0293a 100644 --- a/app/src/main/java/com/aurora/store/fragment/UpdatesFragment.java +++ b/app/src/main/java/com/aurora/store/fragment/UpdatesFragment.java @@ -248,10 +248,12 @@ public class UpdatesFragment extends BaseFragment { } private void updateCounter() { + int count = adapter.getItemCount(); txtUpdateAll.setText(new StringBuilder() .append(adapter.getItemCount()) .append(StringUtils.SPACE) - .append(context.getString(R.string.list_update_all_txt))); + .append(count == 1 ? context.getString(R.string.list_update_all_txt_one) : + context.getString(R.string.list_update_all_txt))); } private View.OnClickListener updateAllListener() { diff --git a/app/src/main/java/com/aurora/store/iterator/CustomAppListIterator.java b/app/src/main/java/com/aurora/store/iterator/CustomAppListIterator.java index 5a39a749e..db0f13287 100644 --- a/app/src/main/java/com/aurora/store/iterator/CustomAppListIterator.java +++ b/app/src/main/java/com/aurora/store/iterator/CustomAppListIterator.java @@ -92,6 +92,7 @@ public class CustomAppListIterator implements Iterator { } private boolean shouldSkip(App app) { + Log.e(app.getUpdated()); return (!filter.isPaidApps() && !app.isFree()) || (!filter.isAppsWithAds() && app.containsAds()) || (!filter.isGsfDependentApps() && !app.getDependencies().isEmpty()) diff --git a/app/src/main/res/drawable/downloads_anim.xml b/app/src/main/res/drawable/downloads_anim.xml new file mode 100644 index 000000000..663b9d676 --- /dev/null +++ b/app/src/main/res/drawable/downloads_anim.xml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/vd_downloading.xml b/app/src/main/res/drawable/vd_downloading.xml new file mode 100644 index 000000000..3f182a79f --- /dev/null +++ b/app/src/main/res/drawable/vd_downloading.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index 2bcf9f6d8..bf8a8f99c 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -251,7 +251,6 @@ "داكن" "أسود" "اغلاق" - "تحديثات قد الإنتظار" "نجح التثبيت" "فشل التثبيت" "جار التثبيت" diff --git a/app/src/main/res/values-b+ast/strings.xml b/app/src/main/res/values-b+ast/strings.xml index 071d1e857..c5bf7d040 100644 --- a/app/src/main/res/values-b+ast/strings.xml +++ b/app/src/main/res/values-b+ast/strings.xml @@ -215,7 +215,6 @@ Decátate que baxar versiones al debalu nun lo sofita la tienda Google Play. L' "Escuridá" "Prietu" "Zarrar" - "anovamientu(os) na cola" "Instalóse con ésitu" "Falló la instalación" "Instalando" diff --git a/app/src/main/res/values-be-rBY/strings.xml b/app/src/main/res/values-be-rBY/strings.xml index eb66f5740..49d82450f 100644 --- a/app/src/main/res/values-be-rBY/strings.xml +++ b/app/src/main/res/values-be-rBY/strings.xml @@ -254,7 +254,6 @@ "Цёмная" "Чорная" "Закрыць" - "абнаўленне(-і) ў чарзе" "Паспяхова ўсталявана" "Збой усталявання" "Усталяванне" diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index a44bb9fd8..2118ccafb 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -251,7 +251,6 @@ "Тъмна" "Черна" "Затвори" - "обновления на опашката" "Инсталиран усепшно" "Неуспешна инсталация" "Инсталиране" diff --git a/app/src/main/res/values-bh-rIN/strings.xml b/app/src/main/res/values-bh-rIN/strings.xml index 88ad167bc..7aef4f10c 100644 --- a/app/src/main/res/values-bh-rIN/strings.xml +++ b/app/src/main/res/values-bh-rIN/strings.xml @@ -254,7 +254,6 @@ Keep in mind that downloading arbitrary versions of stupid apps is not supported "Dark as fuck" "Black as fuck" "Close" - "update(s) motherfucking queued" "Successfully Asstalled" "Asstallation Failed" "Asstalling" diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index 67ee2c961..0a595a301 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -253,7 +253,6 @@ Tingueu en compte que Google Play Store no admet la baixada de versions arbitrà "Fosc" "Negre" "Tancar" - "actualitzacions en cua" "S'ha instal·lat amb èxit" "La instal·lació ha fallit" "S'està instal·lant" diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 736147ae4..6e16bdaef 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -253,7 +253,6 @@ Zudem zeigt Aurora die Anzahl der Tracker in der jeweiligen App an." "Dunkel" "Schwarz" "Schließen" - "Update(s) eingereiht" "Erfolgreich installiert" "Installation fehlgeschlagen" "Installieren" diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index f4ea26f91..68e14778c 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -253,7 +253,6 @@ "Σκοτεινό" "Μαύρο" "Κλείσιμο" - "ενημερώσεις στην ουρά" "Εγκαταστάθηκε Επιτυχώς" "Η εγκατάσταση απέτυχε" "Εγκαθιστάται" diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 568c219d3..923279846 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -253,7 +253,6 @@ También ofrece una lista de los trackers incluidos en una aplicación.""Oscuro" "Negro" "Cerrar" - "Actualización(es) pendiente(s)" "Instalado correctamente" "Instalación fallida" "Instalando" diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 3f742af24..18a07140d 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -259,7 +259,6 @@ Elle fournit également une liste de traqueurs intégrés dans une application." "Sombre" "Noir" "Fermer" - "Mise(s) à jour en attente" "Installation réussie" "Echec de l'installation" "Installation" diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml index 4cf066d4a..ffe2ca742 100644 --- a/app/src/main/res/values-gl-rES/strings.xml +++ b/app/src/main/res/values-gl-rES/strings.xml @@ -253,7 +253,6 @@ Tamén prové unha lista de trackers incluídos nunha aplicación." "Escuro" "Negro" "Pechar" - "Actualización(s) en cola" "Instalado Correctamente" "Erro ao Instalar" "Instalando" diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 45b7984d8..3a4c34078 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -251,7 +251,6 @@ "साँवला" "काला" "बंद करें" - "अद्यतन पंत्किबद्ध" "सफलतापूर्वक अद्यतित" "अद्यतन असफल" "अद्यतन हो रहा है" diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index 048cf1a63..1af2eaf60 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -253,7 +253,6 @@ Harap diperhatikan bahwa mengubah-ubah versi aplikasi yang akan diunduh tidak di "Gelap" "Hitam" "Tutup" - "antrian pembaruan" "Berhasil terpasang" "Gagal terpasang" "Memasang" diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index 0422924d0..5a1c1f9ea 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -313,7 +313,6 @@ Inoltre fornisce una lista di tracker incorporati in una applicazione." "Scuro" "Nero" "Chiudi" - "Aggiornamento/i in coda" "Installato con successo" "Installazione fallita" "Installazione" diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index bc473ac5b..13b68c0e8 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -249,7 +249,6 @@ "ダーク" "ブラック" "閉じる" - "アップデートがキューに追加されました" "インストールに成功しました" "インストール失敗" "インストール中" diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 5b2a48bce..6176f209d 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -253,7 +253,6 @@ Husk at nedlasting av vilkårlig versjoner av apper ikke støttes av Google Play "pref_ui_theme_dark" "Svart" "Lukk" - "list_update_all_queue_txt" "notification_installation_complete" "notification_installation_failed" "notification_installation_progress" diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index 3df081be2..9ce7f2352 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -249,7 +249,6 @@ "Donker" "Zwart" "Sluiten" - "Bijwerken in behandeling" "Succesvolle installatie" "Installatie mislukt" "Installatie" diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml index 7263dc8ff..44e53b0b6 100644 --- a/app/src/main/res/values-pa-rIN/strings.xml +++ b/app/src/main/res/values-pa-rIN/strings.xml @@ -254,7 +254,6 @@ "ਗੂੜਾ" "ਕਾਲਾ" "ਬੰਦ ਕਰੋ" - "ਅਪਡੇਟਾਂ ਕਤਾਰਬੱਧ ਹਨ" "ਇੰਸਟਾਲ ਹੋ ਗਿਆ ਹੈ" "ਇੰਸਟਾਲ ਫੇਲ" "ਇੰਸਟਾਲ ਹੋ ਰਿਹਾ ਹੈ" diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index f3041789f..cd440019d 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -254,7 +254,6 @@ Udostępnia również listę usług śledzących zaimplementowanych w aplikacjac "Ciemny" "Czarny" "Zamknij" - "aktualizacja(-i) w kolejce" "Zainstalowano poprawnie" "Instalacja nieudana" "Instalowanie" diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 512137562..9b4ab3215 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -253,7 +253,6 @@ Lembre-se que fazer o download de versões arbitrárias de aplicativos não é s "Escuro" "Preto" "Fechar" - "atualização(ções) na fila" "Instalação concluída" "Falha ao instalar" "Instalando" diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 5cf85ce6d..2717430df 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -262,7 +262,6 @@ Tenha em mente que a transferencia de versões arbitrárias de aplicações não "Escuro" "Preto" "Fechar" - "Atualizações em fila" "Instalado com sucesso" "Falha ao instalar" "A instalar" diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index 6e5596543..856fcf358 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -298,7 +298,6 @@ https://exodus-privacy.eu.org/en/. Это как "отчёт от аваста" "Тёмная тема" "Чёрная тема" "Закрыть" - "обновлений в очереди" "Успешно установлено" "Не удалось установить" "Устанавливается" diff --git a/app/src/main/res/values-sc-rIT/strings.xml b/app/src/main/res/values-sc-rIT/strings.xml index 3dae09351..5cf2a9e52 100644 --- a/app/src/main/res/values-sc-rIT/strings.xml +++ b/app/src/main/res/values-sc-rIT/strings.xml @@ -255,7 +255,6 @@ Ammenta·ti chi iscarrigare versiones arbitràrias de sas aplicatziones no est s "Iscuru" "Nieddu" "Serra" - "agiornamentu(os) postu(os) in sa lista de isetu" "Installatzione resèssida" "Installatzione fallida" "Installende" diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 36f4b4363..18a9ef5e1 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -250,7 +250,6 @@ "Koyu" "Karanlık" "Kapat" - "güncelleme(ler) kuyruğa alındı" "Başarıyla kuruldu" "Kurulum başarısız oldu" "Kuruluyor" diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml index f13f7fcac..a243323d0 100644 --- a/app/src/main/res/values-uk-rUA/strings.xml +++ b/app/src/main/res/values-uk-rUA/strings.xml @@ -251,7 +251,6 @@ Aurora дозволяє шукати, завантажувати, встанов "Темна" "Чорна" "Відміна" - "оновлень у черзі" "Успішно установлено" "Помилка при установці" "Установка" diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 086eed3fd..44b1e4eae 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -253,7 +253,6 @@ "暗淡" "暗黑" "关闭" - "更新队列" "安装成功" "安装失败" "正在安装" diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 710b0d5d5..1a7fce8cd 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -253,7 +253,6 @@ "暗" "黑" "關閉" - "更新已請求" "安裝成功" "安裝失敗" "安裝中" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 404f5c135..6927cc518 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -228,8 +228,8 @@ Not installed Apps selected Update all + update available" update(s) available" - update(s) queued Updating Disclaimer