From 2312c3880911782dc02842ba91f960aaa95c8d85 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Tue, 16 Dec 2014 18:12:44 +0100
Subject: [PATCH] en + de string improvements

---
 OsmAnd/res/values-de/strings.xml | 22 +++++++++++-----------
 OsmAnd/res/values/phrases.xml    |  2 +-
 OsmAnd/res/values/strings.xml    | 30 +++++++++++++++---------------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index cf144d026c..d5a642e717 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 	<string name="traffic_warning_speed_limit">Geschwindigkeitsbegrenzung</string>
 	<string name="traffic_warning_border_control">Grenzkontrolle</string>
@@ -2003,7 +2003,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="select_impassable_road">Auswählen auf der Karte</string>
     <string name="impassable_road">Straße blockieren…</string>
     <string name="rendering_attr_tramTrainRoutes_name">Straßen- und Eisenbahnlinien</string>
-    <string name="rendering_attr_trainLightrailRoutes_name">Eisenbahn-Strecken</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">Stadtbahnlinien</string>
     <string name="rendering_attr_shareTaxiRoutes_name">Sammeltaxi-Linien</string>
     <string name="rendering_attr_trolleybusRoutes_name">Oberleitungsbuslinien</string>
     <string name="rendering_attr_busRoutes_name">Buslinien</string>
@@ -2018,12 +2018,12 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="show_map">KARTE ZEIGEN</string>
     <string name="show_all">ALLES ZEIGEN</string>
     <string name="coordinates">Koordinaten</string>
-    <string name="error_avoid_specific_road">Nächstgelegene Straße konnte nicht gefunden werden</string>
+    <string name="error_avoid_specific_road">Es konnte keine alternative Wegführung gefunden werden</string>
     <string name="dismiss">Ablehnen</string>
-    <string name="everything_up_to_date">Alles ist aktuell</string>
+    <string name="everything_up_to_date">Alle Dateien sind aktuell</string>
     <string name="use_opengl_render">OpenGL-Renderung verwenden</string>
-    <string name="use_opengl_render_descr">Hardware beschleunigte OpenGL-Renderung verwenden (Funktioniert nicht auf allen Geräten)</string>
-    <string name="no_internet_connection">Herunterladen nicht möglich. Zum Fortsetzen mit WLAN verbinden!</string>
+    <string name="use_opengl_render_descr">Hardware beschleunigtes OpenGL-Rendering verwenden (Funktioniert nicht auf allen Geräten)</string>
+    <string name="no_internet_connection">Herunterladen nicht möglich, zum Fortsetzen mit WLAN verbinden!</string>
     <string name="download_tab_downloads">Alle Downloads</string>
     <string name="download_tab_updates">Aktualisierungen</string>
     <string name="download_tab_local">Lokal</string>
@@ -2033,17 +2033,17 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="navigate_point_northing">Nordwert</string>
     <string name="navigate_point_easting">Ostwert</string>
     <string name="dash_download_msg_none">Möchten Sie Offline-Karten herunterladen?</string>
-    <string name="dash_download_msg">%1$s Karten bereits heruntergeladen</string>
+    <string name="dash_download_msg">%1$s heruntergeladenen Karten</string>
     <string name="dash_download_new_one">Neue Karte herunterladen</string>
     <string name="dash_download_manage">Karten verwalten</string>
-    <string name="rendering_attr_roadStyle_name">Straßen-Stil</string>
+    <string name="rendering_attr_roadStyle_name">Straßen-Darstellung</string>
     <string name="rendering_value_default_name">Standard</string>
     <string name="rendering_value_orange_name">Orange</string>
     <string name="rendering_value_germanRoadAtlas_name">Deutscher Straßenatlas</string>
-    <string name="traffic_warning_railways">Eisenbahnen</string>
+    <string name="traffic_warning_railways">Eisenbahn</string>
     <string name="traffic_waring_pedestrian">Fußgänger</string>
-    <string name="show_railway_warnings">Eisenbahn-Warnungen anzeigen</string>
-    <string name="show_pedestrian_warnings">Fußgänger-Warnungen anzeigen</string>
+    <string name="show_railway_warnings">Eisenbahn-Übergänge anzeigen</string>
+    <string name="show_pedestrian_warnings">Fußgänger-Übergänge anzeigen</string>
     <string name="rendering_value_americanRoadAtlas_name">Amerikanischer Straßenatlas</string>
     <string name="routing_attr_no_new_routing_name">Routing v1.9 nicht verwenden</string>
     <string name="routing_attr_no_new_routing_description">Neue Routenberechnung nicht verwenden</string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 815772a8c7..08f772a5a6 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -474,7 +474,7 @@
 	<string name="poi_dog_park">Dog park</string>
 	<string name="poi_fishing_place">Fishing place</string>
 	<string name="poi_hunting_stand">Hunting stand</string>
-	<string name="poi_harbour">Harbour</string>
+	<string name="poi_harbour">Harbor</string>
 	<string name="poi_marina">Marina</string>
 	<string name="poi_miniature_golf">Miniature golf</string>
 	<string name="poi_playground">Playground</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 1dad1254d2..de0878d126 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -12,20 +12,20 @@
     <string name="rendering_attr_roadStyle_name">Road style</string>
     <string name="rendering_value_default_name">Default</string>
     <string name="rendering_value_orange_name">Orange</string>
-    <string name="rendering_value_germanRoadAtlas_name">German Road Atlas</string>
-	<string name="traffic_warning_railways">Railways</string>
-	<string name="traffic_waring_pedestrian">Pedestrian</string>
-	<string name="show_railway_warnings">Show railway warnings</string>
-	<string name="show_pedestrian_warnings">Show pedestrian warnings</string>
-    <string name="rendering_value_americanRoadAtlas_name">American Road Atlas</string>
+    <string name="rendering_value_germanRoadAtlas_name">German road atlas</string>
+	<string name="traffic_warning_railways">Railroad</string>
+	<string name="traffic_waring_pedestrian">Pedestrians</string>
+	<string name="show_railway_warnings">Show railroad crossings</string>
+	<string name="show_pedestrian_warnings">Show pedestrian crosswalks</string>
+    <string name="rendering_value_americanRoadAtlas_name">American road atlas</string>
     <string name="routing_attr_no_new_routing_name">Do not use v1.9 routing</string>
     <string name="routing_attr_no_new_routing_description">Do not use v1.9 routing</string>
-    <string name="dash_download_msg_none">Do you want to download any offline map?</string>
-    <string name="dash_download_msg">You have %1$s maps downloaded</string>
-    <string name="dash_download_new_one">Download New Map</string>
+    <string name="dash_download_msg_none">Do you want to download offline maps?</string>
+    <string name="dash_download_msg">You have downloaded %1$s maps</string>
+    <string name="dash_download_new_one">Download new map</string>
     <string name="dash_download_manage">Manage</string>
     <string name="map_locale">Map language</string>
-    <string name="rendering_attr_transportStops_name">Transport Stops</string>
+    <string name="rendering_attr_transportStops_name">Transport stops</string>
     <string name="application_dir_change_warning2">Do you want OsmAnd to also copy its data files to the new destination?  Select \'No\' for OsmAnd to just create and use the new folder.</string>
     <string name="navigate_point_zone">Zone</string>
     <string name="navigate_point_northing">Northing</string>
@@ -33,17 +33,17 @@
     <string name="download_tab_downloads">All&#160;Downloads</string>
     <string name="download_tab_updates">Updates</string>
     <string name="download_tab_local">Local</string>
-	<string name="no_internet_connection">Not possible to download. Please connect to Wi-Fi to proceed.</string>
+	<string name="no_internet_connection">Download not possible, please connect to WiFi to proceed.</string>
     <string name="dismiss">Dismiss</string>
-    <string name="everything_up_to_date">Everything up to date</string>
+    <string name="everything_up_to_date">All files up to date</string>
     <string name="use_opengl_render">Use OpenGL rendering</string>
     <string name="use_opengl_render_descr">Use hardware accelerated OpenGL rendering (may not work on some devices)</string>
-    <string name="error_avoid_specific_road">Nearest road was not found</string>
+    <string name="error_avoid_specific_road">No bypass found</string>
     <string name="home_button">Home</string>
-    <string name="osmo_use_https_descr">Use secure connection with server</string>
+    <string name="osmo_use_https_descr">Use secure connection to server</string>
     <string name="osmo_use_https">Use HTTPS</string>
 	<string name="advanced_settings">Advanced</string>
-	<string name="map_update">You have %1$s maps to update</string>
+	<string name="map_update">Updates available for %1$s maps</string>
 	<string name="search_for">Search for</string>
 	<string name="show_map">SHOW MAP</string>
 	<string name="show_all">SHOW ALL</string>