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 2015-05-18 13:43:02 +02:00
commit 25496effa2
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -644,8 +644,12 @@
<string name="routing_attr_avoid_ferries_description">Avoid ferries</string>
<string name="routing_attr_avoid_motorway_name">Avoid motorways</string>
<string name="routing_attr_avoid_motorway_description">Avoid motorways</string>
<string name="routing_attr_avoid_borders_name">Avoid border crossing</string>
<string name="routing_attr_avoid_borders_description">Avoid crossing a border into another country</string>
<string name="routing_attr_weight_name">Weight limit</string>
<string name="routing_attr_weight_description">Specify vehicle weight to be permitted on routes</string>
<string name="routing_attr_height_name">Height limit</string>
<string name="routing_attr_height_description">Specify vehicle height to be permitted on routes</string>
<string name="android_19_location_disabled">Since Android version 4.4 (KitKat) you cannot download and update maps to the previous storage folder (%s). Do you want to change to the permitted storage location and copy all OsmAnd files there?
\n Note 1: Your old files will remain untouched (but can be deleted manually).
\n Note 2: In the new storage location it will not be possible to share files between OsmAnd and OsmAnd+.</string>
@ -2138,4 +2142,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="plugin_description_title">Description</string>
<string name="plugin_install_needs_network">You need an Internet connection to install this plugin.</string>
<string name="get_plugin">Get</string>
<string name="use_fast_recalculation">Smart route recalculation</string>
<string name="use_fast_recalculation_desc">Recalculate only initial part of the route for long trips</string>
</resources>

10
OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
View file

@ -39,12 +39,16 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
R.string.trace_rendering, R.string.trace_rendering_descr);
cat.addPreference(dbg);
cat.addPreference(createCheckBoxPreference(settings.DISABLE_COMPLEX_ROUTING, R.string.disable_complex_routing, R.string.disable_complex_routing_descr));
cat.addPreference(createCheckBoxPreference(settings.DISABLE_COMPLEX_ROUTING,
R.string.disable_complex_routing, R.string.disable_complex_routing_descr));
cat.addPreference(createCheckBoxPreference(settings.USE_FAST_RECALCULATION, "Smart route recalculation", "Recalculate only initial part of the route for long trips"));
cat.addPreference(createCheckBoxPreference(settings.USE_FAST_RECALCULATION,
R.string.use_fast_recalculation, R.string.use_fast_recalculation_desc));
cat.addPreference(createCheckBoxPreference(settings.USE_MAGNETIC_FIELD_SENSOR_COMPASS, R.string.use_magnetic_sensor, R.string.use_magnetic_sensor_descr));
cat.addPreference(createCheckBoxPreference(settings.USE_MAGNETIC_FIELD_SENSOR_COMPASS,
R.string.use_magnetic_sensor,
R.string.use_magnetic_sensor_descr));
Preference pref = new Preference(this);
pref.setTitle(R.string.test_voice_prompts);