From 6cba3b0a9ec95436bd10259975112a8b17755e11 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Wed, 11 Jun 2014 20:49:43 +0200
Subject: fix #3953: have number of caches in deletion confirmation

This also renames a number of involved string resources to enforce a new
translation which avoids the term "drop" and instead uses "remove".
---
 main/res/menu/cache_list_options.xml |  4 ++--
 main/res/values-ca/strings.xml       |  7 -------
 main/res/values-cs/strings.xml       |  7 -------
 main/res/values-de/strings.xml       |  7 -------
 main/res/values-es/strings.xml       |  7 -------
 main/res/values-fr/strings.xml       |  7 -------
 main/res/values-hu/strings.xml       |  7 -------
 main/res/values-it/strings.xml       |  7 -------
 main/res/values-ja/strings.xml       |  7 -------
 main/res/values-lt/strings.xml       |  7 -------
 main/res/values-nb/strings.xml       |  7 -------
 main/res/values-nl/strings.xml       |  7 -------
 main/res/values-pl/strings.xml       |  7 -------
 main/res/values-pt/strings.xml       |  7 -------
 main/res/values-ro/strings.xml       |  7 -------
 main/res/values-sk/strings.xml       |  7 -------
 main/res/values-sl/strings.xml       |  7 -------
 main/res/values-sv/strings.xml       |  7 -------
 main/res/values/strings.xml          | 13 ++++++-------
 19 files changed, 8 insertions(+), 128 deletions(-)

(limited to 'main/res')

diff --git a/main/res/menu/cache_list_options.xml b/main/res/menu/cache_list_options.xml
index 1ff0851..8cf6f64 100644
--- a/main/res/menu/cache_list_options.xml
+++ b/main/res/menu/cache_list_options.xml
@@ -45,11 +45,11 @@
             </item>
             <item
                 android:id="@+id/menu_drop_caches"
-                android:title="@string/caches_drop_all">
+                android:title="@string/caches_remove_all">
             </item>
             <item
                 android:id="@+id/menu_drop_caches_and_list"
-                android:title="@string/caches_drop_all_and_list">
+                android:title="@string/caches_remove_all_and_list">
             </item>
             <item
                 android:id="@+id/menu_delete_events"
diff --git a/main/res/values-ca/strings.xml b/main/res/values-ca/strings.xml
index 89f9011..c250d27 100644
--- a/main/res/values-ca/strings.xml
+++ b/main/res/values-ca/strings.xml
@@ -267,13 +267,6 @@
   <string name="caches_select_invert">Inverteix la selecció</string>
   <string name="caches_nearby">Propers</string>
   <string name="caches_manage">Administra</string>
-  <string name="caches_drop_selected">Elimina els seleccionats</string>
-  <string name="caches_drop_selected_ask">Voleu suprimir els catxés seleccionats del dispositiu?</string>
-  <string name="caches_drop_all">Esborra\'ls tots</string>
-  <string name="caches_drop_all_ask">Voleu suprimir tots els catxés de la llista actual?</string>
-  <string name="caches_drop_stored">Esborra els desats</string>
-  <string name="caches_drop_progress">S\'estan eliminant els catxés</string>
-  <string name="caches_drop_all_and_list">Esborra\'ls tots i suprimeix la llista</string>
   <string name="caches_delete_events">Elimina trobades passades</string>
   <string name="caches_refresh_selected">Actualitza els seleccionats</string>
   <string name="caches_refresh_all">Actualitza-ho tot</string>
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index caad0ff..67b92f1 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -266,13 +266,6 @@
   <string name="caches_select_invert">Invertovat výběr</string>
   <string name="caches_nearby">Blízké</string>
   <string name="caches_manage">Správa</string>
-  <string name="caches_drop_selected">Smazat vybrané</string>
-  <string name="caches_drop_selected_ask">Opravdu chceš smazat vybrané keše z přístroje?</string>
-  <string name="caches_drop_all">Smazat vše</string>
-  <string name="caches_drop_all_ask">Opravdu chceš smazat všechny keše z tohoto seznamu?</string>
-  <string name="caches_drop_stored">Smazat uložené</string>
-  <string name="caches_drop_progress">Odstraňování keší</string>
-  <string name="caches_drop_all_and_list">Vymazat všechny a zrušit seznam</string>
   <string name="caches_delete_events">Vymazat staré události</string>
   <string name="caches_refresh_selected">Aktualizovat vybrané</string>
   <string name="caches_refresh_all">Aktualizovat vše</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 4f402cc..f0a8e34 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -269,13 +269,6 @@
   <string name="caches_select_invert">Auswahl invertieren</string>
   <string name="caches_nearby">In der Nähe</string>
   <string name="caches_manage">Verwalten</string>
-  <string name="caches_drop_selected">Ausgewählte löschen</string>
-  <string name="caches_drop_selected_ask">Sollen die ausgewählten Caches wirklich vom Gerät gelöscht werden?</string>
-  <string name="caches_drop_all">Alle löschen</string>
-  <string name="caches_drop_all_ask">Sollen wirklich alle Caches von dieser Liste gelöscht werden?</string>
-  <string name="caches_drop_stored">Gespeicherte löschen</string>
-  <string name="caches_drop_progress">Entferne Caches…</string>
-  <string name="caches_drop_all_and_list">Alle Caches und Liste löschen</string>
   <string name="caches_delete_events">Vergangene Events löschen</string>
   <string name="caches_refresh_selected">Ausgewählte aktualisieren</string>
   <string name="caches_refresh_all">Alle aktualisieren</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 99d27b2..7b63939 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -265,13 +265,6 @@
   <string name="caches_select_invert">Invertir selección</string>
   <string name="caches_nearby">Cercanos</string>
   <string name="caches_manage">Gestionar</string>
-  <string name="caches_drop_selected">Descartar los seleccionados</string>
-  <string name="caches_drop_selected_ask">¿Quieres borrar los escondites seleccionados del dispositivo?</string>
-  <string name="caches_drop_all">Descartar todos</string>
-  <string name="caches_drop_all_ask">¿Quieres borrar todos los escondites guardados en el dispositivo?</string>
-  <string name="caches_drop_stored">Descartar guardados</string>
-  <string name="caches_drop_progress">Borrando escondites</string>
-  <string name="caches_drop_all_and_list">Descartar todos y borrar lista</string>
   <string name="caches_delete_events">Borrar eventos pasados</string>
   <string name="caches_refresh_selected">Actualizar seleccionados</string>
   <string name="caches_refresh_all">Actualizar todos</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 3691602..83bb2fd 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -268,13 +268,6 @@
   <string name="caches_select_invert">Inverser la sélection</string>
   <string name="caches_nearby">Proches</string>
   <string name="caches_manage">Gérer</string>
-  <string name="caches_drop_selected">Effacer les caches sélectionnées</string>
-  <string name="caches_drop_selected_ask">Effacer les caches sélectionnées du téléphone ?</string>
-  <string name="caches_drop_all">Tout effacer</string>
-  <string name="caches_drop_all_ask">Effacer les caches de la liste courante ?</string>
-  <string name="caches_drop_stored">Effacer les caches stockées</string>
-  <string name="caches_drop_progress">Suppression des caches en cours</string>
-  <string name="caches_drop_all_and_list">Suppr. caches et liste</string>
   <string name="caches_delete_events">Effacer les événements précédents</string>
   <string name="caches_refresh_selected">Rafraîchir les caches sélectionnées</string>
   <string name="caches_refresh_all">Tout rafraîchir</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index 4e66d8e..e2c681f 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -221,13 +221,6 @@
   <string name="caches_select_invert">Kijelölés invertálása</string>
   <string name="caches_nearby">Közeli</string>
   <string name="caches_manage">Kezelés</string>
-  <string name="caches_drop_selected">Kiválasztott törlése</string>
-  <string name="caches_drop_selected_ask">El szeretnéd távolítani a kiválasztott ládákat az eszközről?</string>
-  <string name="caches_drop_all">Az összes törlése</string>
-  <string name="caches_drop_all_ask">Szeretnél eltávolítani minden ládát a jelenlegi listáról?</string>
-  <string name="caches_drop_stored">Tároltak elvetése</string>
-  <string name="caches_drop_progress">Ládák eltávolítása</string>
-  <string name="caches_drop_all_and_list">Az összes térlése és a lista eltávolítása.</string>
   <string name="caches_refresh_selected">Kijelöltek frissítése</string>
   <string name="caches_refresh_all">Mind frissítése</string>
   <string name="caches_move_selected">Kijelöltek mozgatása</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 3d0c33e..564e891 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -266,13 +266,6 @@
   <string name="caches_select_invert">Inverti selezione</string>
   <string name="caches_nearby">Qui vicino</string>
   <string name="caches_manage">Gestisci</string>
-  <string name="caches_drop_selected">Elimina selezionati</string>
-  <string name="caches_drop_selected_ask">Vuoi rimuovere i cache selezionati dal dispositivo?</string>
-  <string name="caches_drop_all">Elimina tutti</string>
-  <string name="caches_drop_all_ask">Vuoi rimuovere tutti i cache dalla lista corrente?</string>
-  <string name="caches_drop_stored">Elimina i cache salvati</string>
-  <string name="caches_drop_progress">Eliminazione dei cache</string>
-  <string name="caches_drop_all_and_list">Elimina tutti ed elimina la lista</string>
   <string name="caches_delete_events">Cancella eventi passati</string>
   <string name="caches_refresh_selected">Aggiorna i cache selezionati</string>
   <string name="caches_refresh_all">Aggiorna tutti</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index b1d5d4e..cebb919 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -259,13 +259,6 @@
   <string name="caches_select_invert">選択を反転</string>
   <string name="caches_nearby">現在地の近く</string>
   <string name="caches_manage">管理</string>
-  <string name="caches_drop_selected">選択したキャッシュを削除</string>
-  <string name="caches_drop_selected_ask">選択したキャッシュをデバイスから削除しますか?</string>
-  <string name="caches_drop_all">全て削除</string>
-  <string name="caches_drop_all_ask">全てのキャッシュをデバイスから削除しますか?</string>
-  <string name="caches_drop_stored">削除</string>
-  <string name="caches_drop_progress">キャッシュを削除中</string>
-  <string name="caches_drop_all_and_list">全て削除し、リストも消去</string>
   <string name="caches_delete_events">過去のイベントを削除</string>
   <string name="caches_refresh_selected">選択したキャッシュを更新</string>
   <string name="caches_refresh_all">全てのキャッシュを更新</string>
diff --git a/main/res/values-lt/strings.xml b/main/res/values-lt/strings.xml
index 9624d25..2329d9e 100644
--- a/main/res/values-lt/strings.xml
+++ b/main/res/values-lt/strings.xml
@@ -270,13 +270,6 @@
   <string name="caches_select_invert">Žymėti priešingai</string>
   <string name="caches_nearby">Netoliese</string>
   <string name="caches_manage">Valdyti</string>
-  <string name="caches_drop_selected">Išmesti pasirinktas</string>
-  <string name="caches_drop_selected_ask">Ar norite pašalinti pasirinktas slėptuves iš prietaiso?</string>
-  <string name="caches_drop_all">Išmesti visas</string>
-  <string name="caches_drop_all_ask">Ar norite pašalinti visas slėptuves iš dabartinio sąrašo?</string>
-  <string name="caches_drop_stored">Išmesti išsaugotas</string>
-  <string name="caches_drop_progress">Pašalinamos slėptuvės</string>
-  <string name="caches_drop_all_and_list">Išmesti visas ir panaikinti sąrašą</string>
   <string name="caches_delete_events">Ištrinti praeities įvykius</string>
   <string name="caches_refresh_selected">Atnaujinti pasirinktas</string>
   <string name="caches_refresh_all">Atnaujinti visas</string>
diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml
index 4c6fde4..97ee17e 100644
--- a/main/res/values-nb/strings.xml
+++ b/main/res/values-nb/strings.xml
@@ -266,13 +266,6 @@
   <string name="caches_select_invert">Inverter merking</string>
   <string name="caches_nearby">I nærheten</string>
   <string name="caches_manage">Administrer</string>
-  <string name="caches_drop_selected">Fjern valgte</string>
-  <string name="caches_drop_selected_ask">Vil du slette de valgte cachene fra enheten?</string>
-  <string name="caches_drop_all">Fjern alle</string>
-  <string name="caches_drop_all_ask">Vil du slette alle cacher fra enheten?</string>
-  <string name="caches_drop_stored">Fjern lagrede</string>
-  <string name="caches_drop_progress">Fjerner cacher</string>
-  <string name="caches_drop_all_and_list">Fjern alle cacher og fjern liste</string>
   <string name="caches_delete_events">Slett gamle eventer</string>
   <string name="caches_refresh_selected">Oppdater valgte</string>
   <string name="caches_refresh_all">Oppdater alle</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 57f8801..507c8cd 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -269,13 +269,6 @@
   <string name="caches_select_invert">Selectie omkeren</string>
   <string name="caches_nearby">Nabij</string>
   <string name="caches_manage">Beheer</string>
-  <string name="caches_drop_selected">Drop geselecteerde</string>
-  <string name="caches_drop_selected_ask">Wil je de geselecteerde caches verwijderen van het apparaat?</string>
-  <string name="caches_drop_all">Alles verwijderen</string>
-  <string name="caches_drop_all_ask">Wil je alle caches van het apparaat verwijderen?</string>
-  <string name="caches_drop_stored">Verwijder opgeslagen</string>
-  <string name="caches_drop_progress">Caches worden verwijderd</string>
-  <string name="caches_drop_all_and_list">Alle verwijderen en lijst verwijderen</string>
   <string name="caches_delete_events">Verwijder afgelopen evenementen</string>
   <string name="caches_refresh_selected">Ververs geselecteerden</string>
   <string name="caches_refresh_all">Ververs alle</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index b777318..2bf5353 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -268,13 +268,6 @@
   <string name="caches_select_invert">Odwróć zaznaczenie</string>
   <string name="caches_nearby">Najbliższe</string>
   <string name="caches_manage">Zarządzaj</string>
-  <string name="caches_drop_selected">Usuń wybrane</string>
-  <string name="caches_drop_selected_ask">Czy na pewno chcesz usunąć wybrane skrzynki z pamięci?</string>
-  <string name="caches_drop_all">Usuń wszystkie</string>
-  <string name="caches_drop_all_ask">Czy na pewno chcesz usunąć wszystkie skrzynki z pamięci?</string>
-  <string name="caches_drop_stored">Usuń zapisane</string>
-  <string name="caches_drop_progress">Usuwanie skrzynek</string>
-  <string name="caches_drop_all_and_list">Usuń wszystkie skrzynki i listę</string>
   <string name="caches_delete_events">Usuń minione wydarzenia</string>
   <string name="caches_refresh_selected">Odśwież wybrane</string>
   <string name="caches_refresh_all">Odśwież wszystkie</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index a0a7b13..bdc6dcf 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -266,13 +266,6 @@
   <string name="caches_select_invert">Inverter selecção</string>
   <string name="caches_nearby">Por perto</string>
   <string name="caches_manage">Gerir</string>
-  <string name="caches_drop_selected">Apagar seleccionada</string>
-  <string name="caches_drop_selected_ask">Quer apagar as caches seleccionadas do dispositivo?</string>
-  <string name="caches_drop_all">Apagar todas</string>
-  <string name="caches_drop_all_ask">Quer remover todas as caches do dispositivo?</string>
-  <string name="caches_drop_stored">Apagar do arquivo</string>
-  <string name="caches_drop_progress">A remover caches</string>
-  <string name="caches_drop_all_and_list">Apagar todas e remover lista</string>
   <string name="caches_delete_events">Eliminar eventos passados</string>
   <string name="caches_refresh_selected">Actualizar seleccionada</string>
   <string name="caches_refresh_all">Actualizar todas</string>
diff --git a/main/res/values-ro/strings.xml b/main/res/values-ro/strings.xml
index 57649d4..ec690dc 100644
--- a/main/res/values-ro/strings.xml
+++ b/main/res/values-ro/strings.xml
@@ -264,13 +264,6 @@
   <string name="caches_select_invert">Inversează selecţia</string>
   <string name="caches_nearby">În apropiere</string>
   <string name="caches_manage">Gestionează</string>
-  <string name="caches_drop_selected">Şterge cutiile selectate</string>
-  <string name="caches_drop_selected_ask">Vrei să ştergi cutiile selectate din dispozitiv?</string>
-  <string name="caches_drop_all">Şterge tot</string>
-  <string name="caches_drop_all_ask">Vrei să ştergi toate cutiile din lista curenă?</string>
-  <string name="caches_drop_stored">Şterge cutiile stocate</string>
-  <string name="caches_drop_progress">Ştergere cutii…</string>
-  <string name="caches_drop_all_and_list">Şterge lista şi toate cutiile</string>
   <string name="caches_delete_events">Şterge evenimentele trecute</string>
   <string name="caches_refresh_selected">Reîncarcă cutiile selectate</string>
   <string name="caches_refresh_all">Reîncarcă toate cutiile</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index d9ffd48..7038538 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -262,13 +262,6 @@
   <string name="caches_select_invert">Inverzný výber</string>
   <string name="caches_nearby">V okolí</string>
   <string name="caches_manage">Správa</string>
-  <string name="caches_drop_selected">Zmazať vybrané</string>
-  <string name="caches_drop_selected_ask">Naozaj chcete zmazať vybraté skrýše zo zariadenia?</string>
-  <string name="caches_drop_all">Zmazať všetky</string>
-  <string name="caches_drop_all_ask">Naozaj chcete zmazať všetky skrýše zo zariadenia?</string>
-  <string name="caches_drop_stored">Zmazať uložené</string>
-  <string name="caches_drop_progress">Odstraňovanie skrýš</string>
-  <string name="caches_drop_all_and_list">Zmazať všetky a odstrániť zoznam</string>
   <string name="caches_delete_events">Odstrániť minulé záznamy</string>
   <string name="caches_refresh_selected">Obnoviť vybraté</string>
   <string name="caches_refresh_all">Obnoviť všetky</string>
diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml
index a7703e7..a1b80de 100644
--- a/main/res/values-sl/strings.xml
+++ b/main/res/values-sl/strings.xml
@@ -268,13 +268,6 @@
   <string name="caches_select_invert">Obrni izbor</string>
   <string name="caches_nearby">Blizu</string>
   <string name="caches_manage">Upravljaj</string>
-  <string name="caches_drop_selected">Izbriši izbrane</string>
-  <string name="caches_drop_selected_ask">Ali želite izbrisati izbrane zaklade?</string>
-  <string name="caches_drop_all">Izbriši vse</string>
-  <string name="caches_drop_all_ask">Ali želite izbrisati vse zaklade iz tega seznama?</string>
-  <string name="caches_drop_stored">Izbriši shranjene</string>
-  <string name="caches_drop_progress">Izbris zakladov</string>
-  <string name="caches_drop_all_and_list">Izbriši vse in odstrani seznam</string>
   <string name="caches_delete_events">Izbriši pretekla srečanja</string>
   <string name="caches_refresh_selected">Osveži izbrane</string>
   <string name="caches_refresh_all">Osveži vse</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index e955551..23e41d0 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -267,13 +267,6 @@
   <string name="caches_select_invert">Invertera valda</string>
   <string name="caches_nearby">Nära</string>
   <string name="caches_manage">Hantera</string>
-  <string name="caches_drop_selected">Ta bort valda</string>
-  <string name="caches_drop_selected_ask">Vill du ta bort valda cacher från enheten?</string>
-  <string name="caches_drop_all">Ta bort alla</string>
-  <string name="caches_drop_all_ask">Vill du ta bort alla cacher från enheten?</string>
-  <string name="caches_drop_stored">Ta bort sparade</string>
-  <string name="caches_drop_progress">Tar bort cacher</string>
-  <string name="caches_drop_all_and_list">Ta bort listan och dess cacher</string>
   <string name="caches_delete_events">Ta bort gamla event</string>
   <string name="caches_refresh_selected">Uppdatera valda</string>
   <string name="caches_refresh_all">Uppdatera alla</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 9732e39..deba809 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -297,13 +297,12 @@
     <string name="caches_select_invert">Invert selection</string>
     <string name="caches_nearby">Nearby</string>
     <string name="caches_manage">Manage</string>
-    <string name="caches_drop_selected">Drop selected</string>
-    <string name="caches_drop_selected_ask">Do you want to remove the selected caches from your device?</string>
-    <string name="caches_drop_all">Drop all</string>
-    <string name="caches_drop_all_ask">Do you want to remove all caches from current list?</string>
-    <string name="caches_drop_stored">Drop stored</string>
-    <string name="caches_drop_progress">Removing caches</string>
-    <string name="caches_drop_all_and_list">Drop all and remove list</string>
+    <string name="caches_remove_all">Remove all</string>
+    <string name="caches_remove_all_confirm">Do you want to remove all %s caches from current list?</string>
+    <string name="caches_remove_selected">Remove selected</string>
+    <string name="caches_remove_selected_confirm">Do you want to remove the selected %s caches from your device?</string>
+    <string name="caches_remove_progress">Removing caches</string>
+    <string name="caches_remove_all_and_list">Remove all and remove list</string>
     <string name="caches_delete_events">Delete past events</string>
     <string name="caches_refresh_selected">Refresh selected</string>
     <string name="caches_refresh_all">Refresh all</string>
-- 
cgit v1.1