Use more generic error string when loading images is impossible

There is little gain in repeating the type of images we were trying
to load just after the user chose this type.

10 files changed, 7 insertions, 19 deletions

diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 9b599fd..69727f8 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -225,8 +225,6 @@
   <string name="warn_search_help_user">Name eines Benutzers auf Geocaching.com eingeben.</string>
   <string name="warn_search_help_tb">Code des Trackables eingeben, z.B. \"TB29QMZ\".</string>
   <string name="warn_log_text_fill">Bitte Text einfügen.</string>
-  <string name="warn_load_log_image">c:geo konnte das Log-Bild nicht laden.</string>
-  <string name="warn_load_spoiler_image">c:geo konnte das Spoiler-Bild nicht laden.</string>
 
   <string name="info_altitude">Momentane Höhe</string>
   <string name="info_distance">Gereiste Strecke</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 19b8af4..3b1e6f5 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -224,8 +224,6 @@
   <string name="warn_search_help_user">Escribe el nombre de usuario de Geocaching.com.</string>
   <string name="warn_search_help_tb">Escribe el código del rastreable. Por ejemplo \"TB29QMZ\".</string>
   <string name="warn_log_text_fill">Escribe algún texto de registro.</string>
-  <string name="warn_load_log_image">Error al cargar la imagen del registro.</string>
-  <string name="warn_load_spoiler_image">Error al cargar la imagen reveladora.</string>
   
   <string name="info_altitude">Altitud actual</string>
   <string name="info_distance">Distancia recorrida</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index f33d0a7..56ebb07 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -150,6 +150,7 @@
   <string name="err_auth_process">Echec de la demande d\'autorisation.</string>
   <string name="err_cannot_log_visit">c:geo n\'a pas assez d\'information pour logger votre visite. Faites le depuis le détail de la cache, s\'il vous plait!</string>
   <string name="err_init_cleared">Désolé, c:geo ne peux pas effacer votre nom d\'utilisateur.</string>
+  <string name="warn_load_images">Désolé, c:geo n\'a pas pu charger les images.</string>
 
   <!-- location service -->
   <string name="loc_last">dernière pos. connue</string>
@@ -351,6 +352,8 @@
   <string name="cache_attributes">attributs</string>
   <string name="cache_inventory">inventaire</string>
   <string name="cache_log_offline">enregistrement hors ligne</string>
+  <string name="cache_log_images_loading">Chargement des images du carnet…</string>
+  <string name="cache_log_images_title">Images du carnet</string>
   <string name="cache_description">description</string>
   <string name="cache_description_long">description longue</string>
   <string name="cache_waypoints">étapes</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 5c5f4b9..1a39900 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -225,8 +225,6 @@
   <string name="warn_search_help_user">Voer een gebruikersnaam in van een Geocaching.com gebruiker.</string>
   <string name="warn_search_help_tb">Voer de trackable code in. Bijvoorbeeld \"TB29QMZ\".</string>
   <string name="warn_log_text_fill">Voer s.v.p. een logtekst in.</string>
-  <string name="warn_load_log_image">Sorry, c:geo kon de logafbeelding niet laden.</string>
-  <string name="warn_load_spoiler_image">Sorry, c:geo kon de spoilerafbeelding niet laden.</string>
 
   <string name="info_altitude">Huidige hoogte</string>
   <string name="info_distance">Afgelegde afstand</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index d646c8d..258781c 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -222,8 +222,6 @@
   <string name="warn_search_help_user">Wpisz nazwę użytkownika serwisu Geocaching.com.</string>
   <string name="warn_search_help_tb">Wpisz kod przedmiotu podróżnego. Na przykład \"TB29QMZ\".</string>
   <string name="warn_log_text_fill">Proszę wypełnić jakimś tekstem.</string>
-  <string name="warn_load_log_image">Przepraszam, c:geo nie mógł załadować zdjęcia.</string>
-  <string name="warn_load_spoiler_image">Przepraszam, c:geo nie mógł załadować zdjęcia z spoilerem.</string>
 
   <string name="info_altitude">Aktualna wysokość</string>
   <string name="info_distance">Przebyta odległość</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 37e1f05..8d65d90 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -222,8 +222,6 @@
   <string name="warn_search_help_user">Preencha o nome de utilizador em Geocaching.com.</string>
   <string name="warn_search_help_tb">Preencha o código do trackable. Por exemplo \"TB29QMZ\".</string>
   <string name="warn_log_text_fill">Por favor, preencha algum texto para o registo.</string>
-  <string name="warn_load_log_image">Desculpe, o c:geo falhou o carregamento da imagem do log.</string>
-  <string name="warn_load_spoiler_image">Desculpe, o c:geo falhou o carregamento da imagem spoiler.</string>
 
   <string name="info_altitude">Altitude corrente</string>
   <string name="info_distance">Distância percorrida</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index ba66879..a28abed 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -228,8 +228,6 @@
   <string name="warn_search_help_user">Zadajte meno používateľa z Geocaching.com.</string>
   <string name="warn_search_help_tb">Zadajte kód trasovateľného objektu. Napríklad „TB29QMZ“.</string>
   <string name="warn_log_text_fill">Prosím, vyplňte nejaký text do logu.</string>
-  <string name="warn_load_log_image">Prepáčte, c:geo sa nepodarilo načítať obrázok záznamu.</string>
-  <string name="warn_load_spoiler_image">Prepáčte, c:geo sa nepodarilo načítať spoilerový obrázok.</string>
 
   <string name="info_altitude">Súčasná nadmorská výška</string>
   <string name="info_distance">Precestovaná vzdialenosť</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 7f3ced6..5c5052f 100755
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -225,8 +225,6 @@
   <string name="warn_search_help_user">Ange en användare på Geocaching.com.</string>
   <string name="warn_search_help_tb">Ange koden för en trackable. Tex \"TB29QMZ\".</string>
   <string name="warn_log_text_fill">Vänligen skriv någon text i loggen.</string>
-  <string name="warn_load_log_image">Tyvärr misslyckades c:geo att ladda loggbilder.</string>
-  <string name="warn_load_spoiler_image">Tyvärr misslyckades c:geo att ladda spoilerbilder.</string>
 
   <string name="info_altitude">Nuvarande höjd</string>
   <string name="info_distance">Rest sträcka</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 83540f1..b9146f1 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -228,8 +228,7 @@
   <string name="warn_search_help_user">Fill name of user at Geocaching.com.</string>
   <string name="warn_search_help_tb">Fill code of trackable. For example \"TB29QMZ\".</string>
   <string name="warn_log_text_fill">Please, fill some log text.</string>
-  <string name="warn_load_log_image">Sorry, c:geo failed to load log image.</string>
-  <string name="warn_load_spoiler_image">Sorry, c:geo failed to load spoiler image.</string>
+  <string name="warn_load_images">Sorry, c:geo failed to load images.</string>
 
   <string name="info_altitude">Current altitude</string>
   <string name="info_distance">Distance traveled</string>
@@ -505,8 +504,8 @@
   <string name="cache_inventory">Inventory</string>
   <string name="cache_inventory_loading">loading cache inventory…</string>
   <string name="cache_log_offline">Offline log</string>
-  <string name="cache_log_images_loading">Loading log Image …</string>
-  <string name="cache_log_images_title">Log image</string>
+  <string name="cache_log_images_loading">Loading log images …</string>
+  <string name="cache_log_images_title">Log images</string>
   <string name="cache_log_image_default_title">Photo</string>
   <string name="cache_personal_note">Personal note</string>
   <string name="cache_description">Description</string>
diff --git a/main/src/cgeo/geocaching/cgeoimages.java b/main/src/cgeo/geocaching/cgeoimages.java
index 40adc00..c177bf2 100644
--- a/main/src/cgeo/geocaching/cgeoimages.java
+++ b/main/src/cgeo/geocaching/cgeoimages.java
@@ -180,7 +180,7 @@ public class cgeoimages extends AbstractActivity {
 
         final ArrayList<cgImage> images = extras.getParcelableArrayList("images");
         if (images == null || images.isEmpty()) {
-            showToast(res.getString(R.string.warn_load_spoiler_image));
+            showToast(res.getString(R.string.warn_load_images));
             finish();
             return;
         }