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

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

Browse source
This commit is contained in:
GaidamakUA 2016-01-05 13:18:15 +02:00
commit 7518f88a48
3 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OsmAnd/res/values-bg/strings.xml
View file

@ -576,7 +576,7 @@
<string name="poi_filter_nominatim">Онлайн Nominatim</string>
<string name="search_position_current_location_search">Търсене на място…</string>
<string name="search_position_current_location_found">Позиция (намерена)</string>
<string name="search_position_current_location_found">Моето място (намерено)</string>
<string name="search_position_address">Адрес…</string>
<string name="search_position_favorites">Любими…</string>
<string name="search_position_undefined">Неопределена</string>
@ -2031,4 +2031,13 @@
<string name="rec_split_storage_size_desc">Големина на определената за видео клипове памет</string>
<string name="updates_size">Актуализации: %s</string>
<string name="last_map_change">Последна промяна на картата: %s</string>
<string name="shared_string_not_selected">Няма избран</string>
<string name="rec_split_desc">Презаписване върху стари клипове при недостиг на място</string>
<string name="rec_split_title">Разделяне на клиповете чрез камерата</string>
<string name="update_time">Дата/час на актуализация</string>
<string name="hourly">На всеки час</string>
<string name="daily">Всеки ден</string>
<string name="weekly">Всяка седмица</string>
<string name="morning">Сутрин</string>
<string name="Night">През нощта</string>
</resources>

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

@ -4,7 +4,7 @@
<string name="show_warnings_title">Mostra els missatges d\'avís…</string>
<string name="map_widget_fluorescent">Rutes amb fluorescència</string>
<string name="map_widget_show_ruler">Mostra el regle</string>
<string name="map_widget_transparent">Aparença amb transparència</string>
<string name="map_widget_transparent">Ginys transparents</string>
<string name="map_widget_top_text">Nom del carrer</string>
<string name="map_widget_back_to_loc">On sou</string>
<string name="map_widget_reset">Reinicia els valors per defecte</string>
@ -226,7 +226,7 @@
<string name="poi_filter_by_name">Cerca pel nom</string>
<string name="poi_filter_nominatim">Nominatim en línia</string>
<string name="search_position_current_location_search">S\'està cercant la posició…</string>
<string name="search_position_current_location_found">Posició (trobada)</string>
<string name="search_position_current_location_found">La meva posició (trobada)</string>
<string name="search_position_address">Adreça…</string>
<string name="search_position_undefined">Indefinida</string>
<string name="search_position_current_location">Posició actual…</string>
@ -1897,4 +1897,14 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="last_map_change">Darrer canvi del mapa: %s</string>
<string name="rec_split_storage_size">Mida per l\'emmagatzematge</string>
<string name="shared_string_not_selected">No seleccionat</string>
</resources>
<string name="rec_split_desc">Sobreescriu fragments quan l\'espai utilitzat assoleixi la mida per l\'emmagatzematge</string>
<string name="rec_split_clip_length">Durada del fragment</string>
<string name="rec_split_clip_length_desc">La durada de qualsevol dels fragments registrats no pot superar l\'interval de temps especificat</string>
<string name="rec_split_storage_size_desc">Mida de l\'espai que pot utilitzar el conjunt de fragments registrats</string>
<string name="update_time">Temps d\'actualització</string>
<string name="hourly">Cada hora</string>
<string name="daily">Cada dia</string>
<string name="weekly">Cada setmana</string>
<string name="morning">Matí</string>
<string name="Night">Nit</string>
</resources>

21
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -321,6 +321,10 @@ public class OsmandSettings {
if(defaultValues != null && defaultValues.containsKey(mode)){
return defaultValues.get(mode);
}
ApplicationMode pt = mode.getParent();
if(pt != null){
return getProfileDefaultValue(pt);
}
if(settingsAPI.contains(defaultProfilePreferences, getId())) {
return getValue(defaultProfilePreferences, defaultValue);
} else {
@ -887,12 +891,19 @@ public class OsmandSettings {
public final CommonPreference<Boolean> BETA_TESTING_LIVE_UPDATES = new BooleanPreference("live_updates_beta", false).makeGlobal();
public final OsmandPreference<Boolean> SHOW_TRAFFIC_WARNINGS = new BooleanPreference("show_traffic_warnings", true).makeProfile().cache();
public final CommonPreference<Boolean> SHOW_PEDESTRIAN = new BooleanPreference("show_pedestrian", true).makeProfile().cache();
public final OsmandPreference<Boolean> SHOW_CAMERAS = new BooleanPreference("show_cameras", false).makeProfile().cache();
public final CommonPreference<Boolean> SHOW_LANES = new BooleanPreference("show_lanes", true).makeProfile().cache();
public final CommonPreference<Boolean> SHOW_TRAFFIC_WARNINGS = new BooleanPreference("show_traffic_warnings", false).makeProfile().cache();
{
SHOW_LANES.setModeDefaultValue(ApplicationMode.DEFAULT, false);
SHOW_TRAFFIC_WARNINGS.setModeDefaultValue(ApplicationMode.CAR, true);
}
public final CommonPreference<Boolean> SHOW_PEDESTRIAN = new BooleanPreference("show_pedestrian", false).makeProfile().cache();
{
SHOW_PEDESTRIAN.setModeDefaultValue(ApplicationMode.CAR, true);
}
public final OsmandPreference<Boolean> SHOW_CAMERAS = new BooleanPreference("show_cameras", false).makeProfile().cache();
public final CommonPreference<Boolean> SHOW_LANES = new BooleanPreference("show_lanes", false).makeProfile().cache();
{
SHOW_LANES.setModeDefaultValue(ApplicationMode.CAR, true);
SHOW_LANES.setModeDefaultValue(ApplicationMode.BICYCLE, true);
}
public final OsmandPreference<Boolean> SHOW_WPT = new BooleanPreference("show_gpx_wpt", true).makeGlobal().cache();
public final OsmandPreference<Boolean> SHOW_NEARBY_FAVORITES = new BooleanPreference("show_nearby_favorites", false).makeGlobal().cache();