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 into alex_fixes

Browse source 
# Conflicts:
#	OsmAnd/res/values-da/strings.xml
#	OsmAnd/res/values-es-rAR/strings.xml
#	OsmAnd/res/values-es-rUS/strings.xml
#	OsmAnd/res/values-zh-rTW/strings.xml
This commit is contained in:
Alexander Sytnyk 2017-07-17 13:12:00 +03:00
commit cd5b3875a3
12 changed files with 315 additions and 311 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/values-b+hsb/strings.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="app_mode_bus">Bus</string>
<string name="app_mode_train">Ćah</string>
<string name="map_widget_battery">Staw baterije</string>

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

@ -2804,5 +2804,5 @@ Tidligere destination bliver sidste mellemliggende punkt.</string>
\n • Andre forbedringer og fejlrettelser
\n
\n</string>
<string name="rendering_value_translucent_pink_name">Gennemsigtig pink</string>
<string name="rendering_value_translucent_pink_name">Gennemsigtig lyserød</string>
</resources>

4
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -2093,7 +2093,7 @@
<string name="poi_clothes_denim">De mezclilla (vaqueros/jeans)</string>
<string name="poi_historic_milestone">Hito histórico</string>
<string name="poi_shoes_children">De niños</string>
<string name="poi_shoes_children">Infantil</string>
<string name="poi_shoes_women">Femenino</string>
<string name="poi_shoes_sport">Deportivo</string>
<string name="poi_shoes_men">Masculino</string>
@ -3079,7 +3079,7 @@
<string name="poi_shoes_type">Tipo de calzado</string>
<string name="poi_fire_hydrant_type">Tipo de hidrante</string>
<string name="poi_fire_hydrant_position">Ubicación del hidrante</string>
<string name="poi_fire_hydrant_water_source">Fuente del agua</string>
<string name="poi_fire_hydrant_water_source">Origen del agua</string>
<string name="poi_payment_toll_type">Forma de pago (peaje)</string>
<string name="poi_traffic_signals_sound">Sonoro</string>
<string name="poi_highway_crossing_type">Tipo de cruce</string>

2
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -2678,7 +2678,7 @@ Proporciona un código completo</string>
<string name="range_min_max">Rango = Min/Máx</string>
<string name="min_max">Min/Máx</string>
<string name="release_2_7">\\u2022 Complemento de Mapillary con imágenes a nivel de calle
<string name="release_2_7">• Complemento de Mapillary con imágenes a nivel de calle
\n
\n • Control de regla para medir distancias
\n

4
OsmAnd/res/values-es-rUS/phrases.xml
View file

@ -1927,7 +1927,7 @@
<string name="poi_clothes_military">Militar</string>
<string name="poi_clothes_denim">De mezclilla (vaqueros/jeans)</string>
<string name="poi_historic_milestone">Hito histórico</string>
<string name="poi_shoes_children">De niños</string>
<string name="poi_shoes_children">Infantil</string>
<string name="poi_shoes_women">Femenino</string>
<string name="poi_shoes_sport">Deportivo</string>
<string name="poi_shoes_men">Masculino</string>
@ -2842,7 +2842,7 @@
<string name="poi_shoes_type">Tipo de calzado</string>
<string name="poi_fire_hydrant_type">Tipo de hidrante</string>
<string name="poi_fire_hydrant_position">Ubicación del hidrante</string>
<string name="poi_fire_hydrant_water_source">Fuente del agua</string>
<string name="poi_fire_hydrant_water_source">Origen del agua</string>
<string name="poi_payment_toll_type">Forma de pago (peaje)</string>
<string name="poi_traffic_signals_sound">Sonoro</string>
<string name="poi_highway_crossing_type">Tipo de cruce</string>

2
OsmAnd/res/values-es-rUS/strings.xml
View file

@ -2679,7 +2679,7 @@ Proporciona un código completo</string>
<string name="range_min_max">Rango = Min/Máx</string>
<string name="min_max">Min/Máx</string>
<string name="release_2_7">\\u2022 Complemento de Mapillary con imágenes a nivel de calle
<string name="release_2_7">• Complemento de Mapillary con imágenes a nivel de calle
\n
\n • Control de regla para medir distancias
\n

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

@ -944,7 +944,7 @@ Fonctionnalités principales :
<string name="target_point">Étape %1$s</string>
<string name="target_points">Itinéraire</string>
<string name="intermediate_point_too_far">Étape %1$s trop éloignée de la route la plus proche.</string>
<string name="arrived_at_intermediate_point">Vous avez atteint l\'étape intermédiaire</string>
<string name="arrived_at_intermediate_point">Vous êtes arrivés à l\'étape intermédiaire</string>
<string name="context_menu_item_intermediate_point">Ajouter comme étape</string>
<string name="map_widget_intermediate_distance">Étape</string>
<string name="ending_point_too_far">Point d\'arrivée trop éloigné de la route la plus proche.</string>
@ -2848,4 +2848,5 @@ Fonctionnalités principales :
<string name="of">%1$d de %2$d</string>
<string name="moving_time">Durée de déplacement</string>
<string name="min_max">Min / Max</string>
<string name="rendering_value_translucent_pink_name">Rose translucide</string>
</resources>

16
OsmAnd/res/values-he/strings.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="shared_string_no">לא</string>
<string name="shared_string_yes">כן</string>
<string name="close_changeset">סגירת ערכת השינויים</string>
@ -1199,4 +1200,17 @@
<string name="osm_live_enter_email">נא להזין כתובת דוא״ל חוקית</string>
<string name="osm_live_enter_user_name">נא להזין שם פומבי</string>
<string name="osm_live_month_cost_desc">תשלום חודשי</string>
<string name="store_tracks_in_monthly_directories">אחסון המסלולים המוקלטים בתיקיות לפי חודש</string>
<string name="shared_string_reset">איפוס</string>
<string name="shared_string_reload">רענון</string>
<string name="mapillary_menu_descr_tile_cache">יש לרענן את האריחים כדי לראות מידע עדכני.</string>
<string name="mapillary_menu_title_tile_cache">מטמון האריחים</string>
<string name="wrong_user_name">שם המשתמש שגוי!</string>
<string name="shared_string_to">עד</string>
<string name="mapillary_menu_date_from">מ־</string>
<string name="mapillary_menu_descr_dates">הצגת תמונות שנוספו בתקופה מסוימת.</string>
<string name="mapillary_menu_title_dates">תאריכים</string>
<string name="mapillary_menu_edit_text_hint">הקלדת שם משתמש</string>
<string name="mapillary_menu_descr_username">הצגת תמונות שנוספו על ידי משתמש מסוים.</string>
<string name="mapillary_menu_title_username">שם משתמש</string>
</resources>

8
OsmAnd/res/values-nb/strings.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
<string name="rendering_attr_roadColors_name">Veifargeskjema</string>
<string name="map_widget_show_destination_arrow">Vis retning til målet</string>
@ -353,7 +354,7 @@
<string name="shared_string_select_all">Velg alle</string>
<string name="fast_route_mode">Raskeste rute</string>
<string name="fast_route_mode_descr">"Aktiver for å beregne raskeste rute eller deaktiver for drivstoffbesparende rute "</string>
<string name="fast_route_mode_descr">Aktiver for å beregne raskeste rute eller deaktiver for drivstoffbesparende rute</string>
<string name="tiles_to_download_estimated_size">Ved zoom {0} last ned {1} fliser ({2} MB)</string>
<string name="shared_string_download_map">Last ned kart</string>
<string name="renderers">Vektor-opptegning</string>
@ -1868,7 +1869,7 @@
<string name="trip_rec_notification_settings">Turopptak (ingen data)</string>
<string name="trip_rec_notification_settings_desc">Vis merknader som lar deg starte en tur ved å trykke opptaksknappen</string>
<string name="save_track_min_speed">Minimumshastighet for logging</string>
<string name="save_track_min_speed_descr">Still inn minimumshastighet for at et punkt skal logges</string>
<string name="save_track_min_speed_descr">Filter: Still inn minimumshastighet for at et punkt skal logges</string>
<string name="save_track_min_distance">Logging ved bevegelsesoppdagelse</string>
<string name="save_track_min_distance_descr">Angi minste avstand fra siste posisjon for at et punkt skal logges</string>
<string name="save_track_precision">Minste loggingspresisjon</string>
@ -2280,4 +2281,5 @@ Representerer området: %1$s x %2$s</string>
<string name="mapillary_menu_title_dates">Datoer</string>
<string name="mapillary_menu_edit_text_hint">Skriv inn brukernavn</string>
<string name="mapillary_menu_title_username">Brukernavn</string>
<string name="shared_string_reset">Tilbakestill</string>
</resources>

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

@ -2708,6 +2708,6 @@ Pro praghere iscrie su còdighe intreu</string>
\n
\n</string>
<string name="rendering_value_translucent_pink_name">Rosa translùtzidu</string>
<string name="average">Mesanu/mèdiu</string>
<string name="average">Mèdiu</string>
<string name="ascent_descent">Ascendente/Discendente</string>
</resources>

2
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -2787,7 +2787,7 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
<string name="range_min_max">範圍 = 最小/最大</string>
<string name="min_max">最小/最大</string>
<string name="release_2_7">\\u2022 Mapillary 外掛元件與街道級影像
<string name="release_2_7">\\u2022 Mapillary 外掛元件與街道等級影像
\n
\n • 用於距離測量的尺規小工具
\n

18
OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java
View file

@ -1,6 +1,5 @@
package net.osmand.plus.quickaction;
import android.support.annotation.DrawableRes;
import android.support.annotation.StringRes;
@ -43,27 +42,21 @@ import java.util.List;
public class QuickActionFactory {
public String quickActionListToString(List<QuickAction> quickActions) {
return new Gson().toJson(quickActions);
}
public List<QuickAction> parseActiveActionsList(String json) {
Type type = new TypeToken<List<QuickAction>>() {
}.getType();
ArrayList<QuickAction> quickActions = new Gson().fromJson(json, type);
return quickActions != null ? quickActions : new ArrayList<QuickAction>();
}
public static List<QuickAction> produceTypeActionsListWithHeaders(List<QuickAction> active) {
ArrayList<QuickAction> quickActions = new ArrayList<>();
quickActions.add(new QuickAction(0, R.string.quick_action_add_create_items));
quickActions.add(new FavoriteAction());
quickActions.add(new GPXAction());
QuickAction marker = new MarkerAction();
if (!marker.hasInstanceInList(active)) {
@ -71,7 +64,6 @@ public class QuickActionFactory {
}
if (OsmandPlugin.getEnabledPlugin(AudioVideoNotesPlugin.class) != null) {
QuickAction audio = new TakeAudioNoteAction();
QuickAction photo = new TakePhotoNoteAction();
QuickAction video = new TakeVideoNoteAction();
@ -95,9 +87,7 @@ public class QuickActionFactory {
}
if (OsmandPlugin.getEnabledPlugin(ParkingPositionPlugin.class) != null) {
QuickAction parking = new ParkingAction();
if (!parking.hasInstanceInList(active)) {
quickActions.add(parking);
}
@ -109,9 +99,7 @@ public class QuickActionFactory {
if (!favorites.hasInstanceInList(active)) {
quickActions.add(favorites);
}
quickActions.add(new ShowHidePoiAction());
if (OsmandPlugin.getEnabledPlugin(OsmEditingPlugin.class) != null) {
QuickAction showHideOSMBugAction = new ShowHideOSMBugAction();
if (!showHideOSMBugAction.hasInstanceInList(active)) {
@ -120,9 +108,7 @@ public class QuickActionFactory {
}
quickActions.add(new MapStyleAction());
if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) != null) {
quickActions.add(new MapSourceAction());
quickActions.add(new MapOverlayAction());
quickActions.add(new MapUnderlayAction());
@ -157,7 +143,6 @@ public class QuickActionFactory {
quickActions.addAll(navigationQuickActions);
}
return quickActions;
}
@ -481,7 +466,8 @@ public class QuickActionFactory {
case ShowHideOSMBugAction.TYPE:
return false;
default: return true;
default:
return true;
}
}
}