From cef4733bdc6a533bb21d529f1fd7a0798a0ee168 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Wed, 4 Jan 2012 12:17:25 +0100
Subject: [PATCH] Issue 794: Try yet another visualization

---
 OsmAnd/res/values-de/strings.xml | 12 +++++++-----
 OsmAnd/res/values/strings.xml    | 12 +++++++-----
 OsmAnd/res/xml/settings_pref.xml | 10 +++++++---
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 5724e6c926..3ef54733fc 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <!-- this block re-worked for new menu structure -->
-	<string name="index_settings">OFFLINE-DATEN</string>
-	<string name="index_settings_descr">Laden und Verwalten von Landkarten und Daten für Offlineverwendung</string>
-	<string name="settings_preset">ANWENDUNGSMODUS</string>
+	<string name="profile_settings">EINSTELLUNGEN PRO ANWENDUNGSMODUS</string>
+	<string name="settings_preset">Anwendungsmodus</string>
 	<string name="settings_preset_descr">Anwendungsprofil wählen. (Karten-, Logging- und Navigationseinstellungen werden für jedes Profil separat gespeichert.)</string>
 	<string name="rendering_settings">- Landkarten</string>
 	<string name="rendering_settings_descr">Konfiguration der Kartenquellen und -darstellung</string>
@@ -13,14 +12,17 @@
 	<string name="monitor_preferences_descr">Positions-Logging konfigurieren</string>
 	<string name="routing_settings">- Navigation</string>
 	<string name="routing_settings_descr">Navigationsoptionen</string>
-	<string name="general_settings">ALLGEMEIN</string>
+	<string name="global_settings">GLOBALE EINSTELLUNGEN</string>
+	<string name="index_settings">Offline-Daten</string>
+	<string name="index_settings_descr">Laden und Verwalten von Landkarten und Daten für Offlineverwendung</string>
+	<string name="general_settings">Allgemein</string>
 	<string name="general_settings_descr">Konfiguration der Anzeige und anderer allgemeiner Einstellungen</string>
 	<string name="global_app_settings">Globale Einstellungen</string>
 	<string name="user_name">OSM Benutzername</string>
 	<string name="user_name_descr">Nötig für openstreetmap.org Beiträge</string>
 	<string name="user_password">OSM Kennwort</string>
 	<string name="user_password_descr">Nötig für openstreetmap.org Beiträge</string>
-	<string name="osmand_service">HINTERGRUNDSERVICE</string>
+	<string name="osmand_service">Hintergrundservice</string>
 	<string name="osmand_service_descr">Für Verwendung von OsmAnd bei ausgeschalteter Anzeige</string>
 
 	<string name="tip_rotation_switching">Kartenrotation</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 0be523f5b7..d25c8a5237 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
 <!-- this block re-worked for new menu structure -->
-	<string name="index_settings">OFFLINE DATA</string>
-	<string name="index_settings_descr">Download and manage offline maps and other data like GPX tracks</string>
-	<string name="settings_preset">APPLICATION MODE</string>
+	<string name="profile_settings">PROFILE SPECIFIC SETTINGS</string>
+	<string name="settings_preset">Application Mode</string>
 	<string name="settings_preset_descr">Select a use profile. (Each profiles\'s Map, Tracking, and Navigation settings can be customized below.)</string>
 	<string name="rendering_settings">- Map configuration</string>
 	<string name="rendering_settings_descr">Configure maps and map sources</string>
@@ -13,14 +12,17 @@
 	<string name="monitor_preferences_descr">Specify tracking settings</string>
 	<string name="routing_settings">- Navigation</string>
 	<string name="routing_settings_descr">Specify routing options</string>
-	<string name="general_settings">GENERAL SETTINGS</string>
+	<string name="global_settings">GLOBAL SETTINGS</string>
+	<string name="index_settings">Offline Data</string>
+	<string name="index_settings_descr">Download and manage offline maps and other data like GPX tracks</string>
+	<string name="general_settings">General Settings</string>
 	<string name="general_settings_descr">Configure display and other global settings</string>
 	<string name="global_app_settings">Global app settings</string>
 	<string name="user_name">Your OSM user name</string>
 	<string name="user_name_descr">Needed for openstreetmap.org submissions</string>
 	<string name="user_password">Your OSM password</string>
 	<string name="user_password_descr">Needed for openstreetmap.org submissions</string>
-	<string name="osmand_service">BACKGROUND SERVICE</string>
+	<string name="osmand_service">Background Service</string>
 	<string name="osmand_service_descr">Use to run OsmAnd while screen is off</string>
 
 	<string name="tip_rotation_switching">Map Rotation</string>
diff --git a/OsmAnd/res/xml/settings_pref.xml b/OsmAnd/res/xml/settings_pref.xml
index 1c19a4a54e..755d0c4428 100644
--- a/OsmAnd/res/xml/settings_pref.xml
+++ b/OsmAnd/res/xml/settings_pref.xml
@@ -2,9 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
 
-	<Preference android:title="@string/index_settings" android:key="local_indexes" android:summary="@string/index_settings_descr"></Preference>
-
-
+<PreferenceCategory android:title="@string/profile_settings">
 	<ListPreference android:summary="@string/settings_preset_descr" android:title="@string/settings_preset" android:key="application_mode"></ListPreference>
 
 
@@ -71,6 +69,11 @@
 		<CheckBoxPreference android:summary="@string/use_osmand_routing_service_descr" android:title="@string/use_osmand_routing_service"
 			android:key="use_osmand_routing_service"></CheckBoxPreference>	
 	</PreferenceScreen>
+</PreferenceCategory>
+
+
+<PreferenceCategory android:title="@string/global_settings">
+	<Preference android:title="@string/index_settings" android:key="local_indexes" android:summary="@string/index_settings_descr"></Preference>
 
 
 	<PreferenceScreen android:key="general_settings" android:title="@string/general_settings" android:summary="@string/general_settings_descr">
@@ -111,6 +114,7 @@
 		<ListPreference android:key="service_off_wait_interval" android:title="@string/background_service_wait_int"
 			android:summary="@string/background_service_wait_int_descr"></ListPreference>
 	</PreferenceScreen>
+</PreferenceCategory>
 
 
 </PreferenceScreen>