Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2015-01-18 21:43:35 +01:00
commit 2468cc4c2b
6 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-be/strings.xml
View file

@ -1987,4 +1987,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="speak_pedestrian">Папярэджваць пра пешаходныя пераходы</string> <string name="speak_pedestrian">Папярэджваць пра пешаходныя пераходы</string>
<string name="rendering_value__name">Па змоўчаньні</string> <string name="rendering_value__name">Па змоўчаньні</string>
<string name="save_track_to_gpx_globally_headline">Запіс сьледу па запатрабаваньні</string> <string name="save_track_to_gpx_globally_headline">Запіс сьледу па запатрабаваньні</string>
<string name="avoid_roads_msg">Вы можаце зьмяніць маршрут пазначыўшы якія дарогі варта пазьбягаць</string>
<string name="navigation_over_track">Пачаць навігацыю ўздоўж сьледу?</string>
</resources> </resources>

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

@ -1333,7 +1333,7 @@
<string name="recording_delete_confirm">Wollen Sie diese Aufnahme löschen?</string> <string name="recording_delete_confirm">Wollen Sie diese Aufnahme löschen?</string>
<string name="recording_unavailable">nicht verfügbar</string> <string name="recording_unavailable">nicht verfügbar</string>
<string name="recording_context_menu_play">Wiedergabe</string> <string name="recording_context_menu_play">Wiedergabe</string>
<string name="recording_default_name">Aufnehmen</string> <string name="recording_default_name">Aufnahme</string>
<string name="recording_error">Fehler bei der Aufnahme</string> <string name="recording_error">Fehler bei der Aufnahme</string>
<string name="recording_is_recorded">Audio/Video wird aufgenommen. Zum Stoppen drücken Sie das A/V-Widget.</string> <string name="recording_is_recorded">Audio/Video wird aufgenommen. Zum Stoppen drücken Sie das A/V-Widget.</string>
<string name="recording_playing">Aus der angegebenen Aufnahme wird abgespielt.\n%1$s</string> <string name="recording_playing">Aus der angegebenen Aufnahme wird abgespielt.\n%1$s</string>
@ -1908,7 +1908,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="gpx_selection_segment_title">Abschnitt</string> <string name="gpx_selection_segment_title">Abschnitt</string>
<string name="gpx_selection_number_of_points"> %1$s Punkte</string> <string name="gpx_selection_number_of_points"> %1$s Punkte</string>
<string name="gpx_selection_point">Punkt %1$s</string> <string name="gpx_selection_point">Punkt %1$s</string>
<string name="gpx_selection_current_track">Aufnahme</string> <!-- string name="gpx_selection_current_track">Aufnahme</string -->
<string name="gpx_selection_route_points">%1$s \nRoutenpunkte %2$s</string> <string name="gpx_selection_route_points">%1$s \nRoutenpunkte %2$s</string>
<string name="gpx_selection_points">%1$s \nPunkte</string> <string name="gpx_selection_points">%1$s \nPunkte</string>
<string name="gpx_selection_track">%1$s \nTrack %2$s</string> <string name="gpx_selection_track">%1$s \nTrack %2$s</string>

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

File diff suppressed because one or more lines are too long

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

@ -276,7 +276,7 @@
<string name="init_native_library">Inicializácia natívnej knižnice…</string> <string name="init_native_library">Inicializácia natívnej knižnice…</string>
<string name="choose_auto_follow_route">Automatické centrovanie</string> <string name="choose_auto_follow_route">Automatické centrovanie</string>
<string name="choose_auto_follow_route_descr">Čas pokiaľ sa mapové zobrazenie zosynchronizuje s pozíciou</string> <string name="choose_auto_follow_route_descr">Čas pokiaľ sa mapové zobrazenie zosynchronizuje s pozíciou</string>
<string name="auto_follow_route_never">Nikdy</string> <string name="auto_follow_route_never">Nikdy (použite modrú šípku pre spustenie pokynov)</string>
<string name="auto_follow_route_navigation">Autom. nasledovanie iba pri navigácii</string> <string name="auto_follow_route_navigation">Autom. nasledovanie iba pri navigácii</string>
<string name="auto_follow_route_navigation_descr">Povoliť autom. nasledovanie pozície iba v režime navigácie.</string> <string name="auto_follow_route_navigation_descr">Povoliť autom. nasledovanie pozície iba v režime navigácie.</string>
<string name="auto_follow_location_enabled">Automatické nasledovanie je povolené.</string> <string name="auto_follow_location_enabled">Automatické nasledovanie je povolené.</string>
@ -950,7 +950,7 @@
<string name="poi_dialog_comment_default">Zmena POI</string> <string name="poi_dialog_comment_default">Zmena POI</string>
<string name="poi_dialog_other_tags_message">Všetky ostatné tagy ponechané</string> <string name="poi_dialog_other_tags_message">Všetky ostatné tagy ponechané</string>
<string name="default_buttons_commit">Uložiť</string> <string name="default_buttons_commit">Uložiť</string>
<string name="default_buttons_reset">Reset</string> <string name="default_buttons_reset">Vymazať</string>
<string name="filter_current_poiButton">Filter</string> <string name="filter_current_poiButton">Filter</string>
<string name="edit_filter_delete_menu_item">Vymazať</string> <string name="edit_filter_delete_menu_item">Vymazať</string>
<string name="edit_filter_save_as_menu_item">Uložiť ako</string> <string name="edit_filter_save_as_menu_item">Uložiť ako</string>
@ -1700,7 +1700,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="osmo_plugin_description">"OpenStreetMap pokročilé sledovanie naživo, pozrite http://osmo.mobi. Ponúka možnosti sledovania iných zariadení a byť sledovaný. Vytvorte anonymné skupiny, zdieľajte vzájomne polohu a komunikujte. Rôzne možnosti nastavenia krátkodobého a dlhodobého sledovania. Anonymné skupiny sú obmedzené na počet dní a pre niektoré funkcie nie je diaľkové ovládanie ani administrátor skupiny. Plne funkčné skupiny sa vytvárajú na webstránke a sú prístupné len registrovaným používateľom. "</string> <string name="osmo_plugin_description">"OpenStreetMap pokročilé sledovanie naživo, pozrite http://osmo.mobi. Ponúka možnosti sledovania iných zariadení a byť sledovaný. Vytvorte anonymné skupiny, zdieľajte vzájomne polohu a komunikujte. Rôzne možnosti nastavenia krátkodobého a dlhodobého sledovania. Anonymné skupiny sú obmedzené na počet dní a pre niektoré funkcie nie je diaľkové ovládanie ani administrátor skupiny. Plne funkčné skupiny sa vytvárajú na webstránke a sú prístupné len registrovaným používateľom. "</string>
<string name="osmo_plugin_name">OsMo</string> <string name="osmo_plugin_name">OsMo</string>
<string name="osmo_settings">OpenStreetMap sledovanie</string> <string name="osmo_settings">OpenStreetMap sledovanie</string>
<string name="keep_informing_never">Nikdy</string> <string name="keep_informing_never">Len ručne (použiť šípku)</string>
<string name="keep_informing_descr">Opakuj navigačné pokyny v pravidelných intervaloch</string> <string name="keep_informing_descr">Opakuj navigačné pokyny v pravidelných intervaloch</string>
<string name="keep_informing">Opakuj navigačné pokyny</string> <string name="keep_informing">Opakuj navigačné pokyny</string>
<string name="arrival_distance">Oznámenie príjazdu</string> <string name="arrival_distance">Oznámenie príjazdu</string>

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

@ -266,7 +266,7 @@
<string name="gpx_selection_segment_title">Segment</string> <string name="gpx_selection_segment_title">Segment</string>
<string name="gpx_selection_number_of_points"> %1$s points</string> <string name="gpx_selection_number_of_points"> %1$s points</string>
<string name="gpx_selection_point">Point %1$s</string> <string name="gpx_selection_point">Point %1$s</string>
<string name="gpx_selection_current_track">recording</string> <!-- string name="gpx_selection_current_track">recording</string -->
<string name="gpx_selection_route_points">%1$s \nRoute points %2$s</string> <string name="gpx_selection_route_points">%1$s \nRoute points %2$s</string>
<string name="gpx_selection_points">%1$s \nPoints</string> <string name="gpx_selection_points">%1$s \nPoints</string>
<string name="gpx_selection_track">%1$s \nTrack %2$s</string> <string name="gpx_selection_track">%1$s \nTrack %2$s</string>
@ -748,7 +748,7 @@
<string name="recording_context_menu_delete">Delete recording</string> <string name="recording_context_menu_delete">Delete recording</string>
<string name="recording_context_menu_play">Play</string> <string name="recording_context_menu_play">Play</string>
<string name="recording_description">Recording %1$s %3$s %2$s</string> <string name="recording_description">Recording %1$s %3$s %2$s</string>
<string name="recording_default_name">recording</string> <string name="recording_default_name">Recording</string>
<string name="av_control_stop">Stop</string> <string name="av_control_stop">Stop</string>
<string name="av_control_start">Start</string> <string name="av_control_start">Start</string>
<string name="map_widget_av_notes">Audio/video notes</string> <string name="map_widget_av_notes">Audio/video notes</string>

2
OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
View file

@ -74,7 +74,7 @@ public class GpxSelectionHelper {
private void collectDisplayGroups(List<GpxDisplayGroup> dg, GPXFile g) { private void collectDisplayGroups(List<GpxDisplayGroup> dg, GPXFile g) {
String name = g.path; String name = g.path;
if(g.showCurrentTrack){ if(g.showCurrentTrack){
name = getString(R.string.gpx_selection_current_track); name = getString(R.string.gpx_available_current_track);
} else { } else {
int i = name.lastIndexOf('/'); int i = name.lastIndexOf('/');
if(i >= 0) { if(i >= 0) {