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-20 00:05:16 +01:00
commit 3ae6c9a4d9
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -990,10 +990,10 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="error_doing_search">Памылка пры аўтаномным пошуку</string> <string name="error_doing_search">Памылка пры аўтаномным пошуку</string>
<string name="search_offline_geo_error">Немагчыма апрацаваць запыт \'%s\'</string> <string name="search_offline_geo_error">Немагчыма апрацаваць запыт \'%s\'</string>
<string name="search_osm_offline">Пошук ў лакальных картах</string> <string name="search_osm_offline">Пошук ў лакальных картах</string>
<string name="system_locale">Сістэма</string> <string name="system_locale">Сістэмная</string>
<string name="preferred_locale_descr">Выбар мовы інтэрфэйсу (перазапусьціце OsmAnd пасьля зьмены)</string> <string name="preferred_locale_descr">Выбар мовы інтэрфэйсу (перазапусьціце OsmAnd пасьля зьмены)</string>
<string name="preferred_locale">Мова інтэрфэйсу</string> <string name="preferred_locale">Мова інтэрфэйсу</string>
<string name="incomplete_locale">няскончана</string> <string name="incomplete_locale">няскончаны</string>
<string name="tip_map_switch">Абраць крыніцу мапы</string> <string name="tip_map_switch">Абраць крыніцу мапы</string>
<string name="tip_app_mode">Профіль</string> <string name="tip_app_mode">Профіль</string>
<string name="tip_app_mode_t_v2">OsmAnd падтрымлівае розныя профілі для розных рэжымаў. ↵ <string name="tip_app_mode_t_v2">OsmAnd падтрымлівае розныя профілі для розных рэжымаў. ↵

3
OsmAnd/res/values-sc/strings.xml
View file

@ -1819,4 +1819,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="show_pedestrian_warnings">Ammustra sas istrìscias pedonales</string> <string name="show_pedestrian_warnings">Ammustra sas istrìscias pedonales</string>
<string name="speak_pedestrian">Annùntzia sos atraessamentos pedonales</string> <string name="speak_pedestrian">Annùntzia sos atraessamentos pedonales</string>
<string name="rendering_value__name">Predefinidu</string> <string name="rendering_value__name">Predefinidu</string>
<string name="navigation_over_track">Incumentzare su nàvigu in sa rasta?</string>
<string name="avoid_roads_msg">Podes cambiare s\'àndala ischertande sas istradas de istransire</string>
<string name="save_track_to_gpx_globally_headline">Registratzione de sa rasta a segus de rechesta</string>
</resources> </resources>

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

@ -229,7 +229,7 @@
<string name="live_monitoring_interval">Interval stopovania naživo</string> <string name="live_monitoring_interval">Interval stopovania naživo</string>
<string name="live_monitoring_url_descr">Zadajte webovú adresu stopovania naživo so syntaxom parametrov: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string> <string name="live_monitoring_url_descr">Zadajte webovú adresu stopovania naživo so syntaxom parametrov: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
<string name="live_monitoring_url">Webová adresa stopovania naživo</string> <string name="live_monitoring_url">Webová adresa stopovania naživo</string>
<string name="gpx_monitoring_disabled_warn">Prosím, zapnite "Logovať stopu do GPX súboru" v stopovacích nastaveniach.</string> <string name="gpx_monitoring_disabled_warn">Zaznamenajte stopu pomocou GPX nástroja alebo cez nastavenia \"Záznamenávanie výletu\".</string>
<string name="show_current_gpx_title">Zobraziť aktuálnu stopu</string> <string name="show_current_gpx_title">Zobraziť aktuálnu stopu</string>
<string name="tip_recent_changes_0_7_0_t">"Zmeny vo verzii 0.7.0 : <string name="tip_recent_changes_0_7_0_t">"Zmeny vo verzii 0.7.0 :
\n\t- Údaje článkov offline wikipedie \n\t- Údaje článkov offline wikipedie
@ -1158,7 +1158,7 @@
<string name="recording_context_menu_delete">Odstrániť záznam</string> <string name="recording_context_menu_delete">Odstrániť záznam</string>
<string name="recording_context_menu_play">Prehrať</string> <string name="recording_context_menu_play">Prehrať</string>
<string name="recording_description">Záznam %1$s %2$s %3$s</string> <string name="recording_description">Záznam %1$s %2$s %3$s</string>
<string name="recording_default_name">nahrávka</string> <string name="recording_default_name">Nahrávka</string>
<string name="av_control_stop">Zastaviť</string> <string name="av_control_stop">Zastaviť</string>
<string name="av_control_start">Nahrať</string> <string name="av_control_start">Nahrať</string>
<string name="map_widget_av_notes">Zvukové poznámky</string> <string name="map_widget_av_notes">Zvukové poznámky</string>

1
OsmAnd/src/net/osmand/plus/GPXUtilities.java
View file

@ -503,6 +503,7 @@ public class GPXUtilities {
public GPXTrackAnalysis getAnalysis(long fileTimestamp) { public GPXTrackAnalysis getAnalysis(long fileTimestamp) {
GPXTrackAnalysis g = new GPXTrackAnalysis(); GPXTrackAnalysis g = new GPXTrackAnalysis();
g.wptPoints = points.size(); g.wptPoints = points.size();
g.totalTracks = 0;
List<SplitSegment> splitSegments = new ArrayList<GPXUtilities.SplitSegment>(); List<SplitSegment> splitSegments = new ArrayList<GPXUtilities.SplitSegment>();
for(int i = 0; i< tracks.size() ; i++){ for(int i = 0; i< tracks.size() ; i++){
Track subtrack = tracks.get(i); Track subtrack = tracks.get(i);