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 2017-01-04 21:58:16 +01:00
commit c547f756ce
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/values-de/strings.xml
View file

@ -2118,7 +2118,7 @@ Lon %2$s</string>
<string name="shared_string_qr_code">QR-Code</string> <string name="shared_string_qr_code">QR-Code</string>
<string name="map_downloaded">Karte heruntergeladen</string> <string name="map_downloaded">Karte heruntergeladen</string>
<string name="map_downloaded_descr">Karte von %1$s wurde heruntergeladen. Gehen Sie zur Karte, um sie zu benutzen.</string> <string name="map_downloaded_descr">Karte von %1$s wurde heruntergeladen. Gehen Sie zur Karte, um sie zu benutzen.</string>
<string name="go_to_map">Zur Karte gehen</string> <string name="go_to_map">Karte anzeigen</string>
<string name="lang_nds">Plattdeutsch</string> <string name="lang_nds">Plattdeutsch</string>
<string name="lang_mk">Mazedonisch</string> <string name="lang_mk">Mazedonisch</string>
<string name="read_more">Weiter lesen</string> <string name="read_more">Weiter lesen</string>
@ -2498,7 +2498,7 @@ Wenn Sie OsmAnd und OSM lieben und unterstützen wollen, so ist dies die perfekt
<string name="clear_tile_data">Alle Kartenkacheln löschen</string> <string name="clear_tile_data">Alle Kartenkacheln löschen</string>
<string name="skip_map_downloading_desc">Es sind keine Offlinekarten installiert. Sie können jetzt eine Karte auswählen oder später Karten über “Menü - %1$s“ herunterladen.</string> <string name="skip_map_downloading_desc">Es sind keine Offlinekarten installiert. Sie können jetzt eine Karte auswählen oder später Karten über “Menü - %1$s“ herunterladen.</string>
<string name="search_another_country">Eine andere Region auswählen</string> <string name="search_another_country">Eine andere Region auswählen</string>
<string name="search_map">Karte wird gesucht…</string> <string name="search_map">Karten werden gesucht…</string>
<string name="first_usage_wizard_desc">Lassen Sie OsmAnd Ihren Standort bestimmen und Karten für diese Region zum Herunterladen vorschlagen.</string> <string name="first_usage_wizard_desc">Lassen Sie OsmAnd Ihren Standort bestimmen und Karten für diese Region zum Herunterladen vorschlagen.</string>
<string name="location_not_found">Position nicht gefunden</string> <string name="location_not_found">Position nicht gefunden</string>
<string name="no_inet_connection">Keine Internetverbindung</string> <string name="no_inet_connection">Keine Internetverbindung</string>

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

@ -95,7 +95,7 @@
<string name="skip_map_downloading">Skip downloading maps</string> <string name="skip_map_downloading">Skip downloading maps</string>
<string name="skip_map_downloading_desc">You have no offline map installed. You may choose a map from the list or download maps later via Menu - %1$s.</string> <string name="skip_map_downloading_desc">You have no offline map installed. You may choose a map from the list or download maps later via Menu - %1$s.</string>
<string name="search_another_country">Select another region</string> <string name="search_another_country">Select another region</string>
<string name="search_map">Searching map…</string> <string name="search_map">Searching maps…</string>
<string name="first_usage_wizard_desc">Let OsmAnd determine your location and suggest maps to download for that region.</string> <string name="first_usage_wizard_desc">Let OsmAnd determine your location and suggest maps to download for that region.</string>
<string name="location_not_found">Location not found</string> <string name="location_not_found">Location not found</string>
<string name="no_inet_connection">No Internet connection</string> <string name="no_inet_connection">No Internet connection</string>
@ -405,7 +405,7 @@
<string name="shared_string_qr_code">QR-code</string> <string name="shared_string_qr_code">QR-code</string>
<string name="map_downloaded">Map downloaded</string> <string name="map_downloaded">Map downloaded</string>
<string name="map_downloaded_descr">Map of %1$s has been downloaded. Go back to the map to start using it.</string> <string name="map_downloaded_descr">Map of %1$s has been downloaded. Go back to the map to start using it.</string>
<string name="go_to_map">Go to the map</string> <string name="go_to_map">Display the map</string>
<string name="simulate_initial_startup_descr">"Sets the flag indicating first app startup, keeps all other settings unchanged"</string> <string name="simulate_initial_startup_descr">"Sets the flag indicating first app startup, keeps all other settings unchanged"</string>
<string name="simulate_initial_startup">Simulate first app start</string> <string name="simulate_initial_startup">Simulate first app start</string>
<string name="share_geo">geo:</string> <string name="share_geo">geo:</string>

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

@ -59,6 +59,10 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
final CheckBoxPreference openGlRender = createCheckBoxPreference(settings.USE_OPENGL_RENDER, R.string.use_opengl_render,R.string.use_opengl_render_descr); final CheckBoxPreference openGlRender = createCheckBoxPreference(settings.USE_OPENGL_RENDER, R.string.use_opengl_render,R.string.use_opengl_render_descr);
cat.addPreference(openGlRender); cat.addPreference(openGlRender);
cat.addPreference(createCheckBoxPreference(settings.USE_OSM_LIVE_FOR_ROUTING,
R.string.use_osm_live_routing,
R.string.use_osm_live_routing_description));
final Preference firstRunPreference = new Preference(this); final Preference firstRunPreference = new Preference(this);
firstRunPreference.setTitle(R.string.simulate_initial_startup); firstRunPreference.setTitle(R.string.simulate_initial_startup);
firstRunPreference.setSummary(R.string.simulate_initial_startup_descr); firstRunPreference.setSummary(R.string.simulate_initial_startup_descr);
@ -74,11 +78,6 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
}); });
cat.addPreference(firstRunPreference); cat.addPreference(firstRunPreference);
cat.addPreference(createCheckBoxPreference(settings.USE_OSM_LIVE_FOR_ROUTING,
R.string.use_osm_live_routing,
R.string.use_osm_live_routing_description));
cat.addPreference(createCheckBoxPreference(settings.SHOULD_SHOW_FREE_VERSION_BANNER, cat.addPreference(createCheckBoxPreference(settings.SHOULD_SHOW_FREE_VERSION_BANNER,
R.string.show_free_version_banner, R.string.show_free_version_banner,
R.string.show_free_version_banner_description)); R.string.show_free_version_banner_description));