From 05b804510ff24ed6031208d67ea14f8ea325d6e7 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Mon, 25 Aug 2014 14:37:03 +0200
Subject: [PATCH] clean up settings strings to  reflect navigation-only logging
 settings

---
 OsmAnd/res/values/strings.xml                     | 15 +++++++++------
 .../plus/monitoring/OsmandMonitoringPlugin.java   |  4 ++--
 .../monitoring/SettingsMonitoringActivity.java    |  9 +++++----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index afebad2a98..963db6b129 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,15 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+
+	<string name="save_track_to_gpx_globally">Log track to GPX file</string>
+	<string name="save_track_to_gpx_globally_descr">General position logging to a GPX file can be turned on or off using the GPX recording widget on the map screen</string>
+	<string name="save_current_track_descr">Save current track to SD now</string>
+	<string name="save_current_track">Save current GPX track</string>
+	<string name="save_track_interval">Logging interval during navigation</string>
+	<string name="save_track_interval_descr">Choose logging interval for track recording during navigation</string>
+	<string name="save_track_to_gpx_descrp">Tracks will be saved to track directory during navigation</string>
+	<string name="save_track_to_gpx">Log track to GPX file during navigation</string>
 	<string name="voice_provider_descr">Select voice guidance for navigation</string>
 	<string name="voice_provider">Voice guidance</string>
 	<string name="rendering_attr_publicTransportMode_name">Public transport mode</string>
@@ -1821,12 +1830,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="osm_settings">OSM editing</string>
 	<string name="additional_settings">Additional settings</string>
 	<string name="settings">Settings</string>
-	<string name="save_current_track_descr">Save current track to SD now</string>
-	<string name="save_current_track">Save current GPX track</string>
-	<string name="save_track_interval">Logging interval</string>
-	<string name="save_track_interval_descr">Choose positioning interval for tracks</string>
-	<string name="save_track_to_gpx_descrp">Tracks will be saved to track directory grouped by days</string>
-	<string name="save_track_to_gpx">Log track to GPX file</string>
 	<string name="update_tile">Update map</string>
 	<string name="reload_tile">Reload tile</string>
 	<string name="mark_point">Target</string>
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index ae9133d1e2..20327af460 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -308,7 +308,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 					final ValueHolder<Integer> vs = new ValueHolder<Integer>();
 					vs.value = settings.LIVE_MONITORING_INTERVAL.get();
 					showIntervalChooseDialog(map, app.getString(R.string.live_monitoring_interval) + " : %s", 
-							app.getString(R.string.save_track_to_gpx), SECONDS, MINUTES,
+							app.getString(R.string.save_track_to_gpx_globally), SECONDS, MINUTES,
 							null, vs, new OnClickListener() {
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
@@ -356,7 +356,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 		//	runnable.run();
 		//} else {
 			showIntervalChooseDialog(map, app.getString(R.string.save_track_interval) + " : %s",
-					app.getString(R.string.save_track_to_gpx), SECONDS, MINUTES, choice, vs,
+					app.getString(R.string.save_track_to_gpx_globally), SECONDS, MINUTES, choice, vs,
 					new OnClickListener() {
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java b/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
index 131e6551a0..3aaea9c103 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
@@ -59,10 +59,6 @@ public class SettingsMonitoringActivity extends SettingsBaseActivity {
 		cat.setTitle(R.string.save_track_to_gpx);
 		grp.addPreference(cat);
 		
-		cat.addPreference(createCheckBoxPreference(settings.SAVE_TRACK_TO_GPX, R.string.save_track_to_gpx,
-				R.string.save_track_to_gpx_descrp));
-		cat.addPreference(createTimeListPreference(settings.SAVE_TRACK_INTERVAL, SECONDS,
-				MINUTES, 1000, R.string.save_track_interval, R.string.save_track_interval_descr));
 		Preference pref = new Preference(this);
 		pref.setTitle(R.string.save_current_track);
 		pref.setSummary(R.string.save_current_track_descr);
@@ -79,6 +75,11 @@ public class SettingsMonitoringActivity extends SettingsBaseActivity {
 			}
 		});
 		cat.addPreference(pref);
+
+		cat.addPreference(createCheckBoxPreference(settings.SAVE_TRACK_TO_GPX, R.string.save_track_to_gpx,
+				R.string.save_track_to_gpx_descrp));
+		cat.addPreference(createTimeListPreference(settings.SAVE_TRACK_INTERVAL, SECONDS,
+				MINUTES, 1000, R.string.save_track_interval, R.string.save_track_interval_descr));
 	}