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-03-30 20:55:35 +02:00
commit d6fcff2ada
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,8 +23,8 @@
<string name="osmo_grop_name_length_alert">Group name should be at least 3 symbols long!</string>
<string name="local_osm_changes_upload_all_confirm">You are going to upload %1$d changes to OSM. Are you sure?</string>
<string name="confirmation_to_clear_history">Do you want to clear the whole history?</string>
<string name="delay_to_start_navigation_descr">Automatically start navigation after specified interval</string>
<string name="delay_to_start_navigation">Skip route planning</string>
<string name="delay_to_start_navigation_descr">Specify wait time to remain on the route planning screen</string>
<string name="delay_to_start_navigation">Start turn-by-turn navigation after</string>
<string name="shared_string_go">Go</string>
<string name="osmand_parking_overdue">overdue</string>
<string name="action_create">Action create</string>
@ -52,7 +52,7 @@
<string name="shared_string_cancel">Cancel</string>
<string name="shared_string_dismiss">Dismiss</string>
<string name="shared_string_yes">Yes</string>
<string name="shared_string_not_use">Not use</string>
<string name="shared_string_do_not_use">Do not use</string>
<string name="shared_string_no">No</string>
<string name="shared_string_on">On</string>
<string name="shared_string_off">Off</string>
@ -1543,8 +1543,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="init_native_library">Initializing native library…</string>
<string name="choose_auto_follow_route">Auto-center map view</string>
<string name="choose_auto_follow_route_descr">Time until map view synchronizes with current position</string>
<string name="auto_follow_route_never">Never (tap blue arrow to start guidance manually)</string>
<string name="keep_informing_never">Only manually (tap arrow)</string>
<string name="auto_follow_route_never">Never (tap \'Go\' to start guidance manually)</string>
<string name="keep_informing_descr">Re-announce navigation instructions at regular intervals</string>
<string name="keep_informing">Repeat navigation instructions</string>
<string name="auto_follow_route_navigation">Auto-center nav only</string>
@ -1659,7 +1658,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
\n\t- GPX navigation options
\n\t- UI update and large bug fixing
</string>
<string name="voice_not_use">Do not use</string>
<string name="installing_new_resources">Unpacking new data…</string>
<string name="internet_connection_required_for_online_route">An online navigation service is selected but no Internet connection is available.</string>
<string name="tts_language_not_supported_title">Language not supported</string>

2
OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
View file

@ -675,7 +675,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
int k = 0;
// entries[k++] = getString(R.string.shared_string_none);
entrieValues[k] = OsmandSettings.VOICE_PROVIDER_NOT_USE;
entries[k++] = getString(R.string.voice_not_use);
entries[k++] = getString(R.string.shared_string_do_not_use);
for (String s : voiceFiles) {
entries[k] = (s.contains("tts") ? getString(R.string.ttsvoice) +" ":"") +
FileNameTranslationHelper.getVoiceName(this, s);

2
OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
View file

@ -194,7 +194,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
String[] delayIntervalNames = new String[delayIntervals.length];
for (int i = 0; i < delayIntervals.length; i++) {
if (i == 0) {
delayIntervalNames[i] = getString(R.string.shared_string_not_use);
delayIntervalNames[i] = getString(R.string.auto_follow_route_never);
} else {
delayIntervalNames[i] = delayIntervals[i] + " " + getString(R.string.int_seconds);
}