Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-08-25 14:37:19 +02:00
commit 21ee5938f2
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd/res/values/strings.xml
View file

@ -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>

4
OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
View file

@ -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) {

9
OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
View file

@ -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));
}