aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/res/values-ca/strings.xml4
-rw-r--r--main/res/values-cs/strings.xml6
-rw-r--r--main/res/values-de/strings.xml4
-rw-r--r--main/res/values-es/strings.xml4
-rw-r--r--main/res/values-fr/strings.xml8
-rw-r--r--main/res/values-it/strings.xml4
-rw-r--r--main/res/values-ja/strings.xml2
-rw-r--r--main/res/values-lt/strings.xml10
-rw-r--r--main/res/values-nb/strings.xml4
-rw-r--r--main/res/values-nl/strings.xml4
-rw-r--r--main/res/values-pl/strings.xml6
-rw-r--r--main/res/values-pt/strings.xml4
-rw-r--r--main/res/values-sl/strings.xml8
-rw-r--r--main/res/values-sv/strings.xml4
-rw-r--r--main/res/values/strings.xml4
-rw-r--r--main/src/cgeo/geocaching/CacheListActivity.java4
-rw-r--r--main/src/cgeo/geocaching/maps/CGeoMap.java4
17 files changed, 42 insertions, 42 deletions
diff --git a/main/res/values-ca/strings.xml b/main/res/values-ca/strings.xml
index ca94b82..ddc2bcb 100644
--- a/main/res/values-ca/strings.xml
+++ b/main/res/values-ca/strings.xml
@@ -238,8 +238,8 @@
<string name="caches_downloading">S\'estan descarregant els catxés…\nETA:  </string>
<string name="caches_eta_ltm">Menys d\'un minut</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minut</item>
- <item quantity="other">minuts</item>
+ <item quantity="one">%d minut</item>
+ <item quantity="other">%d minuts</item>
</plurals>
<string name="caches_store_offline">Desa per usar fora de línia</string>
<string name="caches_store_selected">Desa els seleccionats</string>
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index 7536710..1d787f1 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -235,9 +235,9 @@
<string name="caches_downloading">Stahování keší…\nETA:</string>
<string name="caches_eta_ltm">Méně než minutu</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minuta</item>
- <item quantity="few">minuty</item>
- <item quantity="other">minuty</item>
+ <item quantity="one">%d minuta</item>
+ <item quantity="few">%d minuty</item>
+ <item quantity="other">%d minuty</item>
</plurals>
<string name="caches_store_offline">Uložit pro offline</string>
<string name="caches_store_selected">Uložit vybrané</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 708fc9c..66af8e6 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -238,8 +238,8 @@
<string name="caches_downloading">Lade Caches…\nGeschätzte Zeit: </string>
<string name="caches_eta_ltm">Weniger als eine Minute</string>
<plurals name="caches_eta_mins">
- <item quantity="one">Minute</item>
- <item quantity="other">Minuten</item>
+ <item quantity="one">%d Minute</item>
+ <item quantity="other">%d Minuten</item>
</plurals>
<string name="caches_store_offline">Für Offline speichern</string>
<string name="caches_store_selected">Ausgewählte speichern</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index f6db58f..8915376 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -234,8 +234,8 @@
<string name="caches_downloading">Descargando escondites…\nFaltan: </string>
<string name="caches_eta_ltm">Menos de un minuto</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minuto</item>
- <item quantity="other">minutos</item>
+ <item quantity="one">%d minuto</item>
+ <item quantity="other">%d minutos</item>
</plurals>
<string name="caches_store_offline">Usar sin conexión luego</string>
<string name="caches_store_selected">Almacenamiento seleccionado</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 328be8d..3c77839 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -237,8 +237,8 @@
<string name="caches_downloading">Téléchargement des caches…\nRestant: </string>
<string name="caches_eta_ltm">Moins d\'une minute</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minute</item>
- <item quantity="other">minutes</item>
+ <item quantity="one">%d minute</item>
+ <item quantity="other">%d minutes</item>
</plurals>
<string name="caches_store_offline">Stocker localement</string>
<string name="caches_store_selected">Stocker la sélection</string>
@@ -578,7 +578,7 @@
<string name="cache_images">Images</string>
<string name="cache_waypoints">Étapes</string>
<plurals name="waypoints">
- <item quantity="one">1 étape</item>
+ <item quantity="one">%d étape</item>
<item quantity="other">%d étapes</item>
</plurals>
<string name="cache_waypoints_add">Ajouter une étape</string>
@@ -1140,7 +1140,7 @@
<string name="tts_oclock">%s heures</string>
<string name="clipboard_copy_ok">Copié dans le presse-papiers</string>
<plurals name="days_ago">
- <item quantity="one">hier</item>
+ <item quantity="one" tools:ignore="ImpliedQuantity">hier</item>
<item quantity="other">il y a %d jours</item>
</plurals>
<plurals name="favorite_points">
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 5b24812..f2433f2 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -238,8 +238,8 @@
<string name="caches_downloading">Download cache in corso…\nETA: </string>
<string name="caches_eta_ltm">Meno di un minuto</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minuto</item>
- <item quantity="other">minuti</item>
+ <item quantity="one">%d minuto</item>
+ <item quantity="other">%d minuti</item>
</plurals>
<string name="caches_store_offline">Salva per Offline</string>
<string name="caches_store_selected">Salva selezionati</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 55c7a0a..c5caa60 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -229,7 +229,7 @@
<string name="caches_downloading">キャッシュ情報をダウンロード中…\n残り時間: </string>
<string name="caches_eta_ltm">1分以内</string>
<plurals name="caches_eta_mins">
- <item quantity="other">分</item>
+ <item quantity="other">%d 分</item>
</plurals>
<string name="caches_store_offline">オフライン用に保存</string>
<string name="caches_store_selected">選択したキャッシュを保存</string>
diff --git a/main/res/values-lt/strings.xml b/main/res/values-lt/strings.xml
index 778fef5..174f75b 100644
--- a/main/res/values-lt/strings.xml
+++ b/main/res/values-lt/strings.xml
@@ -238,9 +238,9 @@
<string name="caches_downloading">Atnaujinamos slėptuvės…\nUžtruks</string>
<string name="caches_eta_ltm">mažiau nei minutę</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minutę</item>
- <item quantity="few">minutes</item>
- <item quantity="other">minučių</item>
+ <item quantity="one">%d minutę</item>
+ <item quantity="few">%d minutes</item>
+ <item quantity="other">%d minučių</item>
</plurals>
<string name="caches_store_offline">Išsaugoti slėptuves</string>
<string name="caches_store_selected">Išsaugoti pasirinktas</string>
@@ -583,7 +583,7 @@
<string name="cache_images">Nuotraukos</string>
<string name="cache_waypoints">Papildomi taškai</string>
<plurals name="waypoints">
- <item quantity="one">1papildomas taškas</item>
+ <item quantity="one">%d papildomas taškas</item>
<item quantity="few">%d papildomi taškai</item>
<item quantity="other">%d papildomų taškų</item>
</plurals>
@@ -1149,7 +1149,7 @@
<string name="tts_oclock">%s o\'clock</string>
<string name="clipboard_copy_ok">Nukopijuota į mainų sritį</string>
<plurals name="days_ago">
- <item quantity="one">vakar</item>
+ <item quantity="one" tools:ignore="ImpliedQuantity">vakar</item>
<item quantity="few">%d dienas atgal</item>
<item quantity="other">%d dienų atgal</item>
</plurals>
diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml
index 0f46e12..1a84609 100644
--- a/main/res/values-nb/strings.xml
+++ b/main/res/values-nb/strings.xml
@@ -235,8 +235,8 @@
<string name="caches_downloading">Laster ned cacher…\nETA: </string>
<string name="caches_eta_ltm">Mindre enn ett minutt</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minutt</item>
- <item quantity="other">minutter</item>
+ <item quantity="one">%d minutt</item>
+ <item quantity="other">%d minutter</item>
</plurals>
<string name="caches_store_offline">Lagre for offline-bruk</string>
<string name="caches_store_selected">Lagre valgte</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index eb33260..a2fec76 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -238,8 +238,8 @@
<string name="caches_downloading">Caches aan het downloaden…\nGeschatte tijd: </string>
<string name="caches_eta_ltm">Minder dan een minuut</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minuut</item>
- <item quantity="other">minuten</item>
+ <item quantity="one">%d minuut</item>
+ <item quantity="other">%d minuten</item>
</plurals>
<string name="caches_store_offline">Opslaan voor Offline gebruik</string>
<string name="caches_store_selected">Geselecteerden opslaan</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index 058e233..c1751cf 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -236,9 +236,9 @@
<string name="caches_downloading">Pobieram skrzynki…\nSzacowany czas: </string>
<string name="caches_eta_ltm">Mniej niż minuta</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minuta</item>
- <item quantity="few">minuty</item>
- <item quantity="other">minut</item>
+ <item quantity="one">%d minuta</item>
+ <item quantity="few">%d minuty</item>
+ <item quantity="other">%d minut</item>
</plurals>
<string name="caches_store_offline">Zapisz offline</string>
<string name="caches_store_selected">Zapisz wybrane</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index f423050..fa31708 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -235,8 +235,8 @@
<string name="caches_downloading">Downloading caches…\nETE: </string>
<string name="caches_eta_ltm">Menos de um minuto</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minuto</item>
- <item quantity="other">minutos</item>
+ <item quantity="one">%d minuto</item>
+ <item quantity="other">%d minutos</item>
</plurals>
<string name="caches_store_offline">Arquivar para uso offline</string>
<string name="caches_store_selected">Arquivar selecionadas</string>
diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml
index d72f527..fe97481 100644
--- a/main/res/values-sl/strings.xml
+++ b/main/res/values-sl/strings.xml
@@ -235,10 +235,10 @@
<string name="caches_downloading">Nalagam zaklade…\nČas do konca: </string>
<string name="caches_eta_ltm">manj kot minuta</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minuta</item>
- <item quantity="two">minuti</item>
- <item quantity="few">minute</item>
- <item quantity="other">minut</item>
+ <item quantity="one">%d minuta</item>
+ <item quantity="two">%d minuti</item>
+ <item quantity="few">%d minute</item>
+ <item quantity="other">%d minut</item>
</plurals>
<string name="caches_store_offline">Shrani</string>
<string name="caches_store_selected">Shrani izbrane</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index cd6bbb5..1a01c1a 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -236,8 +236,8 @@
<string name="caches_downloading">Laddar ner cacher…\nTid kvar: </string>
<string name="caches_eta_ltm">mindre än en minut</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minut</item>
- <item quantity="other">minuter</item>
+ <item quantity="one">%d minut</item>
+ <item quantity="other">%d minuter</item>
</plurals>
<string name="caches_store_offline">Spara för Offline</string>
<string name="caches_store_selected">Spara valda</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 8088222..86067cc 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -265,8 +265,8 @@
<string name="caches_eta_ltm">Less than a minute</string>
<plurals name="caches_eta_mins">
- <item quantity="one">minute</item>
- <item quantity="other">minutes</item>
+ <item quantity="one">%d minute</item>
+ <item quantity="other">%d minutes</item>
</plurals>
<string name="caches_store_offline">Store Offline</string>
diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java
index 598171f..f2c8f8e 100644
--- a/main/src/cgeo/geocaching/CacheListActivity.java
+++ b/main/src/cgeo/geocaching/CacheListActivity.java
@@ -288,7 +288,7 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
if (minutesRemaining < 1) {
progress.setMessage(res.getString(R.string.caches_downloading) + " " + res.getString(R.string.caches_eta_ltm));
} else {
- progress.setMessage(res.getString(R.string.caches_downloading) + " " + minutesRemaining + " " + res.getQuantityString(R.plurals.caches_eta_mins, minutesRemaining));
+ progress.setMessage(res.getString(R.string.caches_downloading) + " " + res.getQuantityString(R.plurals.caches_eta_mins, minutesRemaining, minutesRemaining));
}
} else {
if (search != null) {
@@ -1086,7 +1086,7 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
if (etaTime < 1) {
message = res.getString(R.string.caches_downloading) + " " + res.getString(R.string.caches_eta_ltm);
} else {
- message = res.getString(R.string.caches_downloading) + " " + etaTime + " " + res.getQuantityString(R.plurals.caches_eta_mins, etaTime);
+ message = res.getString(R.string.caches_downloading) + " " + res.getQuantityString(R.plurals.caches_eta_mins, etaTime, etaTime);
}
progress.show(this, null, message, ProgressDialog.STYLE_HORIZONTAL, loadDetailsHandler.cancelMessage());
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 4524dec..736b3fd 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -352,7 +352,7 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + res.getString(R.string.caches_eta_ltm));
} else {
final int minsRemaining = secondsRemaining / 60;
- waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + minsRemaining + " " + res.getQuantityString(R.plurals.caches_eta_mins, minsRemaining));
+ waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + res.getQuantityString(R.plurals.caches_eta_mins, minsRemaining, minsRemaining));
}
}
} else if (msg.what == FINISHED_LOADING_DETAILS) {
@@ -1461,7 +1461,7 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
if (etaTime < 0.4) {
waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + res.getString(R.string.caches_eta_ltm));
} else {
- waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + roundedEta + " " + res.getQuantityString(R.plurals.caches_eta_mins, roundedEta));
+ waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + res.getQuantityString(R.plurals.caches_eta_mins, roundedEta, roundedEta));
}
waitDialog.show();
generated by cgit v1.1 at 2025-11-10 07:58:31 +0000