Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-08-25 15:02:15 +02:00
commit a7dd7689bc
2 changed files with 4 additions and 3 deletions

View file

@ -14,10 +14,11 @@
<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_to_gpx">Log track to GPX file during navigation</string>
<string name="save_track_to_gpx_descrp">Tracks will be saved to track directory during navigation</string>
<string name="save_track_interval_globally">Logging interval</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>

View file

@ -355,7 +355,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
//if(choice.value) {
// runnable.run();
//} else {
showIntervalChooseDialog(map, app.getString(R.string.save_track_interval) + " : %s",
showIntervalChooseDialog(map, app.getString(R.string.save_track_interval_globally) + " : %s",
app.getString(R.string.save_track_to_gpx_globally), SECONDS, MINUTES, choice, vs,
new OnClickListener() {
@Override