From df624de99866e82643563856473e15a8f52d33f8 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Fri, 7 Oct 2011 12:06:13 +0200
Subject: Translate individual map sources strings rather than the array

---
 main/res/values-de/strings.xml | 14 ++++++--------
 main/res/values-es/strings.xml | 14 ++++++--------
 main/res/values-fr/strings.xml | 14 ++++++--------
 main/res/values-hu/strings.xml | 14 ++++++--------
 main/res/values-nl/strings.xml | 14 ++++++--------
 main/res/values-pl/strings.xml | 14 ++++++--------
 main/res/values-pt/strings.xml | 14 ++++++--------
 main/res/values-sk/strings.xml | 14 ++++++--------
 main/res/values-sv/strings.xml | 14 ++++++--------
 main/res/values/strings.xml    | 18 ++++++++++++------
 10 files changed, 66 insertions(+), 78 deletions(-)

(limited to 'main/res')

diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 9bb27e5..4f1008e 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -447,14 +447,12 @@
   <string name="init_loaddirectionimg">Richtungs-Grafik laden wenn nötig</string>
 
   <!-- map sources -->
-  <string-array name="map_sources">
-    <item>Google: Map</item>
-    <item>Google: Satellit</item>
-    <item>OSM: Mapnik</item>
-    <item>OSM: Osmarender</item>
-    <item>OSM: Cyclemap</item>
-    <item>OSM: Offline</item>
-  </string-array>
+  <string name="map_source_google_map">Google: Map</string>
+  <string name="map_source_google_satellite">Google: Satellit</string>
+  <string name="map_source_osm_mapnik">OSM: Mapnik</string>
+  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
+  <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
+  <string name="map_source_osm_offline">OSM: Offline</string>
 
   <string name="init_sendToCgeo">Send to c:geo</string>
   <string name="init_sendToCgeo_name">Der Name deines Handys:</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index cb92c51..26d7550 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -441,14 +441,12 @@
   <string name="init_sigautoinsert">Insertar firma automáticamente</string>
 
   <!-- map sources -->
-  <string-array name="map_sources">
-    <item>Google: Mapa</item>
-    <item>Google: Satélite</item>
-    <item>OSM: Mapnik</item>
-    <item>OSM: Osmarender</item>
-    <item>OSM: Cyclemap</item>
-    <item>OSM: Offline</item>
-  </string-array>
+  <string name="map_source_google_map">Google: Mapa</string>
+  <string name="map_source_google_satellite">Google: Satélite</string>
+  <string name="map_source_osm_mapnik">OSM: Mapnik</string>
+  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
+  <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
+  <string name="map_source_osm_offline">OSM: Offline</string>
 
   <string name="init_sendToCgeo">Enviar a c:geo</string>
   <string name="init_sendToCgeo_name">Nombre de tu dispositivo:</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 276b2e5..b35917f 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -456,14 +456,12 @@
   <string name="init_loaddirectionimg">Charge la direction de l\'image si nécessaire</string>
 
   <!-- map sources -->
-  <string-array name="map_sources">
-    <item>Google: Map</item>
-    <item>Google: Satellite</item>
-    <item>OSM: Mapnik</item>
-    <item>OSM: Osmarender</item>
-    <item>OSM: Cyclemap</item>
-    <item>OSM: Hors-ligne</item>
-  </string-array>
+  <string name="map_source_google_map">Google: Map</string>
+  <string name="map_source_google_satellite">Google: Satellite</string>
+  <string name="map_source_osm_mapnik">OSM: Mapnik</string>
+  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
+  <string name="map_source_osm_cyclemap">OSM: Pistes cyclables</string>
+  <string name="map_source_osm_offline">OSM: Hors-ligne</string>
 
   <string name="init_sendToCgeo">Envoyers vers c:geo</string>
   <string name="init_sendToCgeo_name">Votre nom d\'appareil:</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index 4982f2e..ff42a3b 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -451,14 +451,12 @@
   <string name="init_loaddirectionimg">Irány-kép betöltése ha szükséges</string>
 
   <!-- map sources -->
-  <string-array name="map_sources">
-    <item>Google: Térkép</item>
-    <item>Google: Műholdkép</item>
-    <item>OSM: Mapnik</item>
-    <item>OSM: Osmarender</item>
-    <item>OSM: Biciklis térkép</item>
-    <item>OSM: Offline</item>
-  </string-array>
+  <string name="map_source_google_map">Google: Térkép</string>
+  <string name="map_source_google_satellite">Google: Műholdkép</string>
+  <string name="map_source_osm_mapnik">OSM: Mapnik</string>
+  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
+  <string name="map_source_osm_cyclemap">OSM: Biciklis térkép</string>
+  <string name="map_source_osm_offline">OSM: Offline</string>
 
   <string name="init_sendToCgeo">Küldés a c:geo-hoz</string>
   <string name="init_sendToCgeo_name">Az eszközöd neve:</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 94fa0a4..51f419e 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -445,14 +445,12 @@
   <string name="init_loaddirectionimg">Laad de richting-afbeelding in, indien nodig</string>
 
   <!-- map sources -->
-  <string-array name="map_sources">
-    <item>Google: Map</item>
-    <item>Google: Satellite</item>
-    <item>OSM: Mapnik</item>
-    <item>OSM: Osmarender</item>
-    <item>OSM: Cyclemap</item>
-    <item>OSM: Offline</item>
-  </string-array>
+  <string name="map_source_google_map">Google: Map</string>
+  <string name="map_source_google_satellite">Google: Satellite</string>
+  <string name="map_source_osm_mapnik">OSM: Mapnik</string>
+  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
+  <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
+  <string name="map_source_osm_offline">OSM: Offline</string>
 
   <string name="init_sendToCgeo">Verstuur naar c:geo</string>
   <string name="init_sendToCgeo_name">Jouw apparaatnaam:</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index d50065a..79cf2e5 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -437,14 +437,12 @@
   <string name="init_loaddirectionimg">Załaduj obrazek kierunku w razie potrzeby</string>
   
   <!-- map sources -->
-  <string-array name="map_sources">
-    <item>Google: Mapa</item>
-    <item>Google: Satelita</item>
-    <item>OSM: Mapnik</item>
-    <item>OSM: Osmarender</item>
-    <item>OSM: Cyclemap</item>
-    <item>OSM: Offline</item>
-  </string-array>
+  <string name="map_source_google_map">Google: Mapa</string>
+  <string name="map_source_google_satellite">Google: Satelita</string>
+  <string name="map_source_osm_mapnik">OSM: Mapnik</string>
+  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
+  <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
+  <string name="map_source_osm_offline">OSM: Offline</string>
   
   <string name="init_sendToCgeo">Send to c:geo</string>
   <string name="init_sendToCgeo_name">Nazwa urządzenia:</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 8d65d90..9effef3 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -435,14 +435,12 @@
   <string name="init_sigautoinsert">Inserir assinatura automaticamente</string>
 
   <!-- map sources -->
-  <string-array name="map_sources">
-    <item>Google: Mapa</item>
-    <item>Google: Satélite</item>
-    <item>OSM: Mapnik</item>
-    <item>OSM: Osmarender</item>
-    <item>OSM: Cyclemap</item>
-    <item>OSM: Offline</item>
-  </string-array>
+  <string name="map_source_google_map">Google: Mapa</string>
+  <string name="map_source_google_satellite">Google: Satélite</string>
+  <string name="map_source_osm_mapnik">OSM: Mapnik</string>
+  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
+  <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
+  <string name="map_source_osm_offline">OSM: Offline</string>
 
   <string name="init_sendToCgeo">Enviar para o c:geo</string>
   <string name="init_sendToCgeo_name">Nome do seu dispositivo:</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index b7fc94d..222f3b9 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -456,14 +456,12 @@
   <string name="init_loaddirectionimg">Ak je to potrebné načítať obrázok zo smerom</string>
 
   <!-- map sources -->
-  <string-array name="map_sources">
-    <item>Google: Mapa</item>
-    <item>Google: Satelit</item>
-    <item>OSM: Mapnik</item>
-    <item>OSM: Osmarender</item>
-    <item>OSM: Cyklomapa</item>
-    <item>OSM: Offline</item>
-  </string-array>
+  <string name="map_source_google_map">Google: Mapa</string>
+  <string name="map_source_google_satellite">Google: Satelit</string>
+  <string name="map_source_osm_mapnik">OSM: Mapnik</string>
+  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
+  <string name="map_source_osm_cyclemap">OSM: Cyklomapa</string>
+  <string name="map_source_osm_offline">OSM: Offline</string>
 
   <string name="init_sendToCgeo">Poslať do c:geo</string>
   <string name="init_sendToCgeo_name">Názov vášho zariadenia:</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 7292f43..c7033dc 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -445,14 +445,12 @@
   <string name="init_loaddirectionimg">Ladda rikningsbild om det behövs</string>
 
   <!-- map sources -->
-  <string-array name="map_sources">
-    <item>Google: Map</item>
-    <item>Google: Satellit</item>
-    <item>OSM: Mapnik</item>
-    <item>OSM: Osmarender</item>
-    <item>OSM: Cyclemap</item>
-    <item>OSM: Offline</item>
-  </string-array>
+  <string name="map_source_google_map">Google: Map</string>
+  <string name="map_source_google_satellite">Google: Satellit</string>
+  <string name="map_source_osm_mapnik">OSM: Mapnik</string>
+  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
+  <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
+  <string name="map_source_osm_offline">OSM: Offline</string>
 
   <string name="init_sendToCgeo">Skicka till c:geo (Send2cgeo)</string>
   <string name="init_sendToCgeo_name">Namnet på din enhet:</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 9496637..083ccf7 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -457,13 +457,19 @@
 
   <!-- map sources -->
   <string-array name="map_sources">
-    <item>Google: Map</item>
-    <item>Google: Satellite</item>
-    <item>OSM: Mapnik</item>
-    <item>OSM: Osmarender</item>
-    <item>OSM: Cyclemap</item>
-    <item>OSM: Offline</item>
+    <item>@string/map_source_google_map</item>
+    <item>@string/map_source_google_satellite</item>
+    <item>@string/map_source_osm_mapnik</item>
+    <item>@string/map_source_osm_osmarender</item>
+    <item>@string/map_source_osm_cyclemap</item>
+    <item>@string/map_source_osm_offline</item>
   </string-array>
+  <string name="map_source_google_map">Google: Map</string>
+  <string name="map_source_google_satellite">Google: Satellite</string>
+  <string name="map_source_osm_mapnik">OSM: Mapnik</string>
+  <string name="map_source_osm_osmarender">OSM: Osmarender</string>
+  <string name="map_source_osm_cyclemap">OSM: Cyclemap</string>
+  <string name="map_source_osm_offline">OSM: Offline</string>
 
   <string name="init_sendToCgeo">Send to c:geo</string>
   <string name="init_sendToCgeo_name">Your device name:</string>
-- 
cgit v1.1