diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index de8c2cdb66..af15e0da37 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1,5 +1,7 @@  + Warnungen anzeigen… + Warnungen für Tempolimits, stationäre Radarfallen, Rüttelschwellen, weiterführende Fahrspuren Verwende Kompass, wenn keine andere Richtungsbestimmung möglich Kompass verwenden Vermeide Autobahnen @@ -1107,8 +1109,6 @@ Vermeide Fähren Vermeide… Mautstraßen, Fähren und ungeteerte Straßen vermeiden - Warnungen anzeigen… - Warnungen für stationäre Radarfallen, Tempolimits und Rüttelschwellen Routen in Leuchtfarbe Maßstab Verschiedenes: diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index de34874c8e..02c70f3cf1 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -10,6 +10,8 @@ PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy --> + Show alarms… + Show speed limits, speed cameras, speed bumps, lane info Use the compass when no heading is detected otherwise Use compass Avoid motorways @@ -104,8 +106,6 @@ Avoid ferries Avoid… Avoid toll roads, unpaved, ferries - Show alarms… - Show speed limits, speed cameras, and traffic bumps Fluorescent routes Ruler Miscellaneous: diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 8bd5a5d007..012e12befa 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -592,8 +592,8 @@ public class OsmandSettings { // this value string is synchronized with settings_pref.xml preference name public final OsmandPreference FAST_ROUTE_MODE = new BooleanPreference("fast_route_mode", true).makeProfile(); - public final OsmandPreference SHOW_CAMERAS = new BooleanPreference("show_cameras", true).makeGlobal().cache(); public final OsmandPreference SHOW_SPEED_LIMITS = new BooleanPreference("show_speed_limits", true).makeGlobal().cache(); + public final OsmandPreference SHOW_CAMERAS = new BooleanPreference("show_cameras", true).makeGlobal().cache(); public final OsmandPreference SHOW_LANES = new BooleanPreference("show_lanes", true).makeGlobal().cache(); public final OsmandPreference AVOID_TOLL_ROADS = new BooleanPreference("avoid_toll_roads", false).makeGlobal().cache(); diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java index a74fd9cab5..6c5296e823 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java @@ -751,9 +751,9 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference osmandSettings.AVOID_FERRIES, osmandSettings.AVOID_UNPAVED_ROADS, osmandSettings.AVOID_MOTORWAY }); return true; } else if (preference == showAlarms) { - showBooleanSettings(new String[] { getString(R.string.show_cameras), getString(R.string.show_speed_limits), - getString(R.string.show_lanes) }, new OsmandPreference[] { osmandSettings.SHOW_CAMERAS, - osmandSettings.SHOW_SPEED_LIMITS, osmandSettings.SHOW_LANES }); + showBooleanSettings(new String[] { getString(R.string.show_speed_limits), getString(R.string.show_cameras), + getString(R.string.show_lanes) }, new OsmandPreference[] { osmandSettings.SHOW_SPEED_LIMITS, + osmandSettings.SHOW_CAMERAS, osmandSettings.SHOW_LANES }); return true; } return false;