aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/res/values-cs/strings.xml2
-rw-r--r--main/res/values-es/strings.xml2
-rw-r--r--main/res/values-fr/strings.xml5
-rw-r--r--main/res/values-hu/strings.xml2
-rw-r--r--main/res/values-ja/strings.xml4
-rw-r--r--main/res/values-nb/strings.xml2
-rw-r--r--main/res/values-nl/strings.xml7
-rw-r--r--main/res/values-pl/strings.xml2
-rw-r--r--main/res/values-pt/strings.xml1
-rw-r--r--main/res/values-sk/strings.xml1
-rw-r--r--main/res/values-sv/strings.xml1
-rw-r--r--main/res/values/strings.xml3
-rw-r--r--main/src/cgeo/geocaching/files/GPXImporter.java2
13 files changed, 14 insertions, 20 deletions
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index 9809f5d..7c2b1e9 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -340,7 +340,7 @@
<!-- gpx -->
<string name="gpx_import_caches_imported">keše importovány</string>
- <string name="gpx_import_loading">nahrávání keší z .gpx souboru</string>
+ <string name="gpx_import_loading_caches">nahrávání keší z .gpx souboru</string>
<string name="gpx_import_title">Import GPX</string>
<string name="gpx_import_title_reading_file">čtení souboru</string>
<string name="gpx_import_title_caches_imported">výsledek</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index e1cbd65..0aa5474 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -517,7 +517,7 @@
<!-- gpx -->
<string name="gpx_import_caches_imported">escondites importados</string>
- <string name="gpx_import_loading">Cargando escondites del archivo .gpx</string>
+ <string name="gpx_import_loading_caches">Cargando escondites del archivo .gpx</string>
<string name="gpx_import_title">Importar GPX</string>
<string name="gpx_import_title_reading_file">Leyendo archivo</string>
<string name="gpx_import_title_caches_imported">Resultados</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 9c078bb..d6a25c9 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -555,11 +555,10 @@
<string name="file_title_searching">Recherche en cours</string>
<!-- gpx -->
- <string name="gpx_import_loading_caches">Chargement des caches depuis le fichier .gpx\nLus:</string>
- <string name="gpx_import_loading_waypoints">Chargement des points intermédiaires depuis le fichier .gpx\nLus:</string>
+ <string name="gpx_import_loading_caches">Chargement des caches depuis le fichier .gpx</string>
+ <string name="gpx_import_loading_waypoints">Chargement des points intermédiaires depuis le fichier .gpx</string>
<string name="gpx_import_storing">Écriture des caches dans la base de données\nEnregistrés :</string>
<string name="gpx_import_caches_imported">caches importées</string>
- <string name="gpx_import_loading">Chargement des caches depuis le fichier .gpx</string>
<string name="gpx_import_title">Importation GPX</string>
<string name="gpx_import_title_reading_file">Lecture du fichier</string>
<string name="gpx_import_title_caches_imported">Résultat</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index 0e42907..29a0d58 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -536,7 +536,7 @@
<!-- gpx -->
<string name="gpx_import_caches_imported">ládák importálva</string>
- <string name="gpx_import_loading">Ládák betöltése .gpx fájlból</string>
+ <string name="gpx_import_loading_caches">Ládák betöltése .gpx fájlból</string>
<string name="gpx_import_title">GPX importálása</string>
<string name="gpx_import_title_reading_file">Fájl olvasása</string>
<string name="gpx_import_title_caches_imported">Eredmény</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index c99a452..c78aa16 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -414,7 +414,7 @@
<!-- gpx -->
<string name="gpx_import_caches_imported">個のキャッシュを読み込みました</string>
- <string name="gpx_import_loading">GPXファイルをロード中</string>
+ <string name="gpx_import_loading_caches">GPXファイルをロード中</string>
<string name="gpx_import_title">GPXファイルの読み込み</string>
<string name="gpx_import_title_reading_file">ファイルを読み込み中</string>
<string name="gpx_import_title_caches_imported">結果</string>
@@ -679,4 +679,4 @@
<string name="about_twitter">キャッシュのログを書いたら<b>c:geo</b>にTwitterでつぶやいてほしい?</string>
<string name="about_auth_1"><b>c:geo</b>がTwitterにアクセスする許可を得るには次のようにしてください。</string>
<string name="about_auth_2">「認証を開始する」ボタンを押すとブラウザでTwitterのページが開きます。そのページにログインすれば<b>c:geo</b>があなたのアカウントにアクセルする許可が得られます。ログインに成功したら数字のPINコードが表示されるので、この下の入力欄にコピー&amp;ペーストして「完了」ボタンを押してください。</string>
-</resources> \ No newline at end of file
+</resources>
diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml
index f3fe0ff..cb32e0b 100644
--- a/main/res/values-nb/strings.xml
+++ b/main/res/values-nb/strings.xml
@@ -325,7 +325,7 @@
<!-- gpx -->
<string name="gpx_import_caches_imported">Cacher importert</string>
- <string name="gpx_import_loading">Laster cacher fra .*.GPX-fil</string>
+ <string name="gpx_import_loading_caches">Laster cacher fra .*.GPX-fil</string>
<string name="gpx_import_title">Importer GPX</string>
<string name="gpx_import_title_reading_file">Leser fil</string>
<string name="gpx_import_title_caches_imported">Resultat</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 3720536..3d6abc9 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -550,11 +550,10 @@
<string name="file_title_searching">Bezig met zoeken</string>
<!-- gpx -->
- <string name="gpx_import_loading_caches">Caches laden van .gpx bestand\nGelezen:</string>
- <string name="gpx_import_loading_waypoints">Waypoints laden van .gpx bestand\nGelezen:</string>
- <string name="gpx_import_storing">Opslaan caches in de database\nOpgeslagen:</string>
+ <string name="gpx_import_loading_caches">Caches laden van .gpx bestand</string>
+ <string name="gpx_import_loading_waypoints">Waypoints laden van .gpx bestand</string>
+ <string name="gpx_import_storing">Opslaan caches in de database</string>
<string name="gpx_import_caches_imported">Caches geïmporteerd</string>
- <string name="gpx_import_loading">Caches laden van .gpx bestand</string>
<string name="gpx_import_title">Importeer GPX</string>
<string name="gpx_import_title_reading_file">Bestand aan het lezen</string>
<string name="gpx_import_title_caches_imported">Resultaat</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index ef0f838..8ee1c2e 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -514,7 +514,7 @@
<!-- gpx -->
<string name="gpx_import_caches_imported">skrzynek importowanych</string>
- <string name="gpx_import_loading">Ładuje skrzynki z pliku .gpx</string>
+ <string name="gpx_import_loading_caches">Ładuje skrzynki z pliku .gpx</string>
<string name="gpx_import_title">Import GPX</string>
<string name="gpx_import_title_reading_file">Czytanie pliku</string>
<string name="gpx_import_title_caches_imported">Wynik</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 3fcab7f..d645cba 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -510,7 +510,6 @@
<!-- gpx -->
<string name="gpx_import_caches_imported">Caches importadas</string>
- <string name="gpx_import_loading">A carregar caches do ficheiro .gpx</string>
<string name="gpx_import_title">Importar GPX</string>
<string name="gpx_import_title_reading_file">A ler o ficheiro</string>
<string name="gpx_import_title_caches_imported">Resultado</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index 6699ece..c9cf2dc 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -569,7 +569,6 @@
<string name="gpx_import_error_parser">Nie je v poriadku formát súboru</string>
<string name="gpx_import_error_unexpected">Neočakávaná chyba</string>
<string name="gpx_import_confirm">Chcete importovať GPX súbor do c:geo?</string>
- <string name="gpx_import_loading">Načitanie skrýš z .gpx súboru</string>
<!-- map file select -->
<string name="map_file_select_title">Výber mapového súboru</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 138aebf..a034f57 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -554,7 +554,6 @@
<string name="gpx_import_loading_waypoints">Läser in punkter från .gpx file\nLäst:</string>
<string name="gpx_import_storing">Skriver cacher till databasen\nSparat:</string>
<string name="gpx_import_caches_imported">cacher importerade</string>
- <string name="gpx_import_loading">Laddar cacher från .gpx fil</string>
<string name="gpx_import_title">Importera GPX</string>
<string name="gpx_import_title_reading_file">Läser fil</string>
<string name="gpx_import_title_caches_imported">Resultat</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 14aa1a6..da61f31 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -35,7 +35,7 @@
<string name="ape">Project ape cache</string>
<string name="gchq">Groundspeak hq</string>
<string name="gps">GPS cache exhibit</string>
- <string name="unknown">Unknown type</string>
+ <string name="unknown">Unknown cache</string>
<!-- cache sizes -->
<string name="cache_size_micro">micro</string>
@@ -577,7 +577,6 @@
<string name="gpx_import_error_parser">File format not ok</string>
<string name="gpx_import_error_unexpected">Unexpected error</string>
<string name="gpx_import_confirm">Do you want to import the GPX file into c:geo?</string>
- <string name="gpx_import_loading">Loading caches from GPX file</string>
<!-- map file select -->
<string name="map_file_select_title">Select map file</string>
diff --git a/main/src/cgeo/geocaching/files/GPXImporter.java b/main/src/cgeo/geocaching/files/GPXImporter.java
index 73cb5b2..68cfe4a 100644
--- a/main/src/cgeo/geocaching/files/GPXImporter.java
+++ b/main/src/cgeo/geocaching/files/GPXImporter.java
@@ -51,7 +51,7 @@ public class GPXImporter {
parseDialog = new ProgressDialog(realActivity);
parseDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
parseDialog.setTitle(res.getString(R.string.gpx_import_title_reading_file));
- parseDialog.setMessage(res.getString(R.string.gpx_import_loading));
+ parseDialog.setMessage(res.getString(R.string.gpx_import_loading_caches));
parseDialog.setCancelable(false);
parseDialog.setMax(-1);
parseDialog.show();
generated by cgit v1.1 at 2025-11-10 21:11:43 +0000