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

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

Browse source
This commit is contained in:
Victor Shcherb 2015-09-14 13:18:01 +08:00
commit 179f1cd9c8
11 changed files with 307 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
OsmAnd/res/values-ca/phrases.xml
View file

@ -502,14 +502,14 @@
<string name="poi_wilderness_hut">Cabana</string>
<string name="poi_place_of_worship">Temple</string>
<string name="poi_religion_christian">Temple: cristià</string>
<string name="poi_religion_jewish">Temple: sinagoga</string>
<string name="poi_religion_muslim">Temple: mesquita</string>
<string name="poi_religion_sikh">Temple: sikhisme</string>
<string name="poi_religion_buddhist">Temple budista</string>
<string name="poi_religion_hindu">Temple hindú</string>
<string name="poi_religion_shinto">Temple sintoista</string>
<string name="poi_religion_taoist">Temple taoista</string>
<string name="poi_religion_christian">Cristianisme</string>
<string name="poi_religion_jewish">Judaisme</string>
<string name="poi_religion_muslim">Islamisme</string>
<string name="poi_religion_sikh">Sikhisme</string>
<string name="poi_religion_buddhist">Budisme</string>
<string name="poi_religion_hindu">Hinduisme</string>
<string name="poi_religion_shinto">Xintoisme</string>
<string name="poi_religion_taoist">Taoisme</string>
<string name="poi_internet_access_wlan">Accés a Internet: wifi</string>
<string name="poi_internet_access_terminal">Accés a Internet: terminal</string>
@ -1068,11 +1068,11 @@
<string name="poi_tax_advisor">Assessoria fiscal</string>
<string name="poi_religion_voodoo">Religió vudú</string>
<string name="poi_religion_unitarian_universalist">Religió unitarista universalista</string>
<string name="poi_religion_unitarian_universalist">Universalisme unitarista</string>
<string name="poi_religion_multifaith">Multi-religiós</string>
<string name="poi_religion_jain">Jainisme</string>
<string name="poi_religion_spiritualist">Espiritualisme</string>
<string name="poi_religion_bahai">Fe Bahai</string>
<string name="poi_religion_bahai">Bahaisme</string>
<string name="poi_religion_scientologist">Cienciologia</string>
<string name="poi_religion_pagan">Paganisme</string>
<string name="poi_religion_tenrikyo">Tenrikyo</string>
@ -1095,7 +1095,7 @@
<string name="poi_denomination_jehovahs_witness">Testimonis de Jehovà</string>
<string name="poi_denomination_greek_orthodox">Ortodox grec</string>
<string name="poi_denomination_reformed">Calvinisme</string>
<string name="poi_denomination_seventh_day_adventist">Adventistes del setè dia</string>
<string name="poi_denomination_seventh_day_adventist">Adventisme del setè dia</string>
<string name="poi_denomination_new_apostolic">Nova apostòlica</string>
<string name="poi_denomination_church_of_england">Església d\'Anglaterra</string>
<string name="poi_denomination_episcopal">Episcopal</string>
@ -1144,4 +1144,31 @@
<string name="poi_start_date">Data d\'inici</string>
<string name="poi_wheelchair">Cadira de rodes</string>
<string name="poi_generator_source_diesel">Font d\'energia: dièsel</string>
<string name="poi_generator_source_nuclear">Font d\'energia: nuclear</string>
<string name="poi_generator_source_solar">Font d\'energia: solar</string>
<string name="poi_generator_source_hydro">Font d\'energia: hidràulica</string>
<string name="poi_generator_source_wind">Font d\'energia: eòlica</string>
<string name="poi_generator_source_geothermal">Font d\'energia: geotèrmica</string>
<string name="poi_generator_source_oil">Font d\'energia: petroli</string>
<string name="poi_seats">Seients</string>
<string name="poi_backrest_yes">Respatller: sí</string>
<string name="poi_backrest_no">Respatller: no</string>
<string name="poi_intermittent">Intermitent</string>
<string name="poi_deadlock">Atzucac</string>
<string name="poi_generator_source_coal">Font d\'energia: carbó</string>
<string name="poi_generator_source_gas">Font d\'energia: gas</string>
<string name="poi_power_tower">Torre d\'alta tensió</string>
<string name="poi_power_pole">Pal d\'electricitat</string>
<string name="poi_cooling_tower">Torre de refrigeració</string>
<string name="poi_height">Alçada</string>
<string name="poi_ele">Alçada sobre el nivell del mar</string>
<string name="poi_wholesale">Venda majorista</string>
<string name="poi_content_water">Aigua (contingut)</string>
</resources>

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

@ -1050,7 +1050,7 @@
<string name="tip_altitude_offset">Correcció de l\'altitud</string>
<string name="map_widget_max_speed">Límit de velocitat</string>
<string name="monitoring_control_start">Inicia</string>
<string name="monitoring_control_start">GPX</string>
<string name="route_descr_current_location">Posició actual</string>
<string name="incremental_search_city">Cerca progressiva de municipis</string>
<string name="safe_mode_description">Executeu l\'aplicació en mode segur (usant codi d\'Android, més lent que el codi nadiu).</string>
@ -2118,4 +2118,6 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="recent_places">Llocs recents</string>
<string name="favourites">Favorits</string>
<string name="saved_at_time">S\'ha desat correctament a: %1$s</string>
<string name="poi_deleted_localy">El PDI s\'eliminara un cop pugeu els vostres canvis</string>
<string name="show_gpx">Mostra GPX</string>
</resources>

21
OsmAnd/res/values-da/phrases.xml
View file

@ -1261,4 +1261,23 @@
<string name="poi_lighting_tower">Lysmast</string>
<string name="poi_urban">Bymæssig</string>
</resources>
<string name="poi_car_wash_self_service">Selvbetjening</string>
<string name="poi_int_name">International navn</string>
<string name="poi_nat_name">National navn</string>
<string name="poi_reg_name">Regional navn</string>
<string name="poi_loc_name">Lokalt navn</string>
<string name="poi_old_name">Gammelt navn</string>
<string name="poi_alt_name">Alternativt navn</string>
<string name="poi_pump_manual">Manuel pumpe</string>
<string name="poi_pump_powered">Drevet pumpe</string>
<string name="poi_pump_no">Ingen pumpe</string>
<string name="poi_water_characteristic_mineral">Vand karakteristisk: mineral</string>
<string name="poi_water_characteristic_mud">Vand karakteristisk: mudder</string>
<string name="poi_water_characteristic_sulfuric">Vand karakteristisk: svovlsyre</string>
<string name="poi_water_point">Vand punkt</string>
</resources>

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

@ -1242,4 +1242,23 @@
<string name="poi_generator_source_oil">Fuente de energía: petróleo</string>
<string name="poi_generator_source_diesel">Fuente de energía: diésel</string>
<string name="poi_car_wash_self_service">Auto servicio</string>
<string name="poi_int_name">Nombre internacional</string>
<string name="poi_nat_name">Nombre nacional</string>
<string name="poi_reg_name">Nombre regional</string>
<string name="poi_loc_name">Nombre local</string>
<string name="poi_old_name">Antiguo nombre</string>
<string name="poi_alt_name">Nombre alternativo</string>
<string name="poi_pump_manual">Bomba manual</string>
<string name="poi_pump_powered">Bomba energética</string>
<string name="poi_pump_no">Sin bomba</string>
<string name="poi_water_characteristic_mineral">Característica de agua: mineralizada</string>
<string name="poi_water_characteristic_mud">Característica de agua: lodosa</string>
<string name="poi_water_characteristic_sulfuric">Característica de agua: sulfúrica</string>
<string name="poi_water_point">Toma de agua</string>
</resources>

20
OsmAnd/res/values-es/phrases.xml
View file

@ -1244,4 +1244,24 @@
<string name="poi_generator_source_oil">Fuente de energía: petróleo</string>
<string name="poi_generator_source_diesel">Fuente de energía: diésel</string>
<string name="poi_trees_nectorine">Nectarina</string>
<string name="poi_car_wash_self_service">Auto servicio</string>
<string name="poi_int_name">Nombre internacional</string>
<string name="poi_nat_name">Nombre nacional</string>
<string name="poi_reg_name">Nombre regional</string>
<string name="poi_loc_name">Nombre local</string>
<string name="poi_old_name">Antiguo nombre</string>
<string name="poi_alt_name">Nombre alternativo</string>
<string name="poi_pump_manual">Bomba manual</string>
<string name="poi_pump_powered">Bomba accionada</string>
<string name="poi_pump_no">Sin bomba</string>
<string name="poi_water_characteristic_mineral">Característica del agua: mineralizada</string>
<string name="poi_water_characteristic_mud">Característica del agua: lodosa</string>
<string name="poi_water_characteristic_sulfuric">Característica del agua: sulfúrica</string>
<string name="poi_water_point">Toma de agua</string>
</resources>

72
OsmAnd/res/values-et/strings.xml
View file

@ -17,4 +17,74 @@
<string name="action_create">Tegevuse loomine</string>
<string name="action_modify">Tegevuse muutmine</string>
<string name="action_delete">Tegevuse kustutamine</string>
</resources>
<string name="osmand_parking_time_left">vasak</string>
<string name="routing_settings_2">Navigatsiooni seaded</string>
<string name="general_settings_2">Üld seaded</string>
<string name="shared_string_ellipsis">…</string>
<string name="shared_string_ok">OK</string>
<string name="shared_string_cancel">Tühista</string>
<string name="shared_string_yes">Jah</string>
<string name="shared_string_no">Ei</string>
<string name="shared_string_on">Sees</string>
<string name="shared_string_off">Väljas</string>
<string name="shared_string_previous">Eelmine</string>
<string name="shared_string_next">Järgmine</string>
<string name="shared_string_and">ja</string>
<string name="shared_string_or">või</string>
<string name="shared_string_help">Abi</string>
<string name="shared_string_settings">Seaded</string>
<string name="shared_string_history">Ajalugu</string>
<string name="shared_string_save">Salvesta</string>
<string name="shared_string_delete">Kustuta</string>
<string name="shared_string_delete_all">Kustuta kõik</string>
<string name="shared_string_share">Jaga</string>
<string name="shared_string_control_start">Start</string>
<string name="shared_string_control_stop">Stop</string>
<string name="shared_string_import">Import</string>
<string name="shared_string_export">Eksport</string>
<string name="shared_string_more">Veel…</string>
<string name="shared_string_more_actions">Veel tegevusi</string>
<string name="shared_string_do_not_show_again">Ära enam näita</string>
<string name="shared_string_remember_my_choice">Mäleta mu valikut</string>
<string name="shared_string_refresh">Värskenda</string>
<string name="shared_string_download">Laealla</string>
<string name="shared_string_downloading">Allalaadimine</string>
<string name="shared_string_download_successful">Allalaadimine õnnestus</string>
<string name="shared_string_close">Sule</string>
<string name="shared_string_exit">Välju</string>
<string name="shared_string_show">Näita</string>
<string name="shared_string_show_all">Näita kõik</string>
<string name="shared_string_show_on_map">Näita kaardil</string>
<string name="shared_string_map">Kaart</string>
<string name="shared_string_favorite">Lemmik</string>
<string name="shared_string_favorites">Lemmikud</string>
<string name="shared_string_address">Aadress</string>
<string name="shared_string_add">Lisa</string>
<string name="shared_string_add_to_favorites">Lisa Lemmikutesse</string>
<string name="shared_string_my_location">Minu Asukoht</string>
<string name="shared_string_my_places">Minu Kohad</string>
<string name="shared_string_my_favorites">Minu Lemmikud</string>
<string name="shared_string_audio">Audio</string>
<string name="shared_string_video">Video</string>
<string name="shared_string_photo">Foto</string>
<string name="online_map_settings">Online kaardid</string>
<string name="record_plugin_name">Reisi salvestus</string>
<string name="osmo_plugin_name">OsMo (OSM Monitoorimine)</string>
<string name="plugin_nautical_name">Merendus kaardi vaade</string>
<string name="audionotes_plugin_name">Audio/video märkmed</string>
<string name="accessibility_preferences">Juurdepääs</string>
<string name="debugging_and_development">OsmAnd arendus</string>
<string name="back_to_map">Tagasi kaardile</string>
<string name="share_note">Jaga märget</string>
<string name="location_on_map">Asukoht:\n Lat %1$s\n Lon %2$s</string>
<string name="notes">Märkmed</string>
<string name="online_map">Online kaart</string>
<string name="roads_only">Ainult teed</string>
<string name="rendering_attr_pisteRoutes_name">Suusarajad</string>
<string name="free">"Vaba %1$s "</string>
<string name="device_memory">Seadme mälu</string>
<string name="edit_group">Grupi muutmine</string>
<string name="parking_place">Parkimise asukohad</string>
<string name="gps_status">GPS staatus</string>
<string name="rendering_attr_streetLighting_name">Tänava valgustus</string>
</resources>

49
OsmAnd/res/values-pt-rBR/phrases.xml
View file

@ -1214,4 +1214,53 @@
<string name="poi_trees_meadow_orchard">Prado com pomar</string>
<string name="poi_height">Altura</string>
<string name="poi_ele">Altura acima do nível do mar</string>
<string name="poi_aerialway_pylon">Torre de teleférico</string>
<string name="poi_power_tower">Torre de transmissão</string>
<string name="poi_power_pole">Poste de transmissão</string>
<string name="poi_lighting_tower">Torre de iluminação</string>
<string name="poi_urban">Urbano</string>
<string name="poi_rural">Rural</string>
<string name="poi_backrest_yes">Encosto: sim</string>
<string name="poi_backrest_no">Encosto: não</string>
<string name="poi_seats">Assentos</string>
<string name="poi_intermittent">Intermitente</string>
<string name="poi_generator_source_coal">Fonte de energia: carvão</string>
<string name="poi_generator_source_gas">Fonte de energia: gás</string>
<string name="poi_generator_source_nuclear">Fonte de energia: nuclear</string>
<string name="poi_generator_source_solar">Fonte de energia: solar</string>
<string name="poi_generator_source_hydro">Fonte de energia: hidráulica</string>
<string name="poi_generator_source_wind">Fonte de energia: vento</string>
<string name="poi_generator_source_geothermal">Fonte de energia: geotérmica</string>
<string name="poi_generator_source_oil">Fonte de energia: petróleo</string>
<string name="poi_generator_source_diesel">Fonte de energia: diesel</string>
<string name="poi_car_wash_self_service">Auto-serviço</string>
<string name="poi_int_name">Nome internacional</string>
<string name="poi_nat_name">Nome nacional</string>
<string name="poi_reg_name">Nome regional</string>
<string name="poi_loc_name">Nome local</string>
<string name="poi_old_name">Nome antigo</string>
<string name="poi_alt_name">Nome alternativo</string>
<string name="poi_pump_manual">Bomba manual</string>
<string name="poi_pump_powered">Bomba elétrica</string>
<string name="poi_pump_no">Sem bomba</string>
<string name="poi_water_characteristic_mineral">Característica d\'água: mineral</string>
<string name="poi_water_characteristic_mud">Característica d\'água: barrenta</string>
<string name="poi_water_characteristic_sulfuric">Característica d\'água: sulfurosa</string>
<string name="poi_water_point">Ponto de água</string>
<string name="poi_cooling_tower">Torre de resfriamento</string>
<string name="poi_bicycle_parking_wall_loops">Suporte de parede</string>
<string name="poi_bicycle_parking_rack">Prateleira</string>
<string name="poi_deadlock">Impasse</string>
</resources>

26
OsmAnd/res/values-ru/phrases.xml
View file

@ -629,8 +629,8 @@
<string name="poi_beacon_safe_water">Бакен безопасности</string>
<string name="poi_beacon_special_purpose">Бакен специального назначения</string>
<string name="poi_berth">Причал</string>
<string name="poi_seamark_building">Здание</string>
<string name="poi_seamark_bridge">Мост</string>
<string name="poi_seamark_building">Здание (навигационный ориентир)</string>
<string name="poi_seamark_bridge">Мост (навигационный ориентир)</string>
<string name="poi_buoy_cardinal">Кардинальный буй</string>
<string name="poi_buoy_installation">Знак изолированной опасности</string>
<string name="poi_buoy_isolated_danger">Буй (изолированная опасность)</string>
@ -645,7 +645,7 @@
<string name="poi_harbour_basin">Акватория гавани</string>
<string name="poi_seamark_harbour">Гавань</string>
<string name="poi_landmark">Ориентир</string>
<string name="poi_seamark_light">Маяк</string>
<string name="poi_seamark_light">Маяк (навигационный ориентир)</string>
<string name="poi_mooring">Причал</string>
<string name="poi_notice">Уведомление</string>
<string name="poi_radio_station">Радиостанция</string>
@ -973,4 +973,24 @@
<string name="poi_generator_source_geothermal">Источник энергии: геотермальный</string>
<string name="poi_generator_source_oil">Источник энергии: мазут</string>
<string name="poi_generator_source_diesel">Источник энергии: дизельное топливо</string>
<string name="poi_car_wash_self_service">Самообслуживание</string>
<string name="poi_int_name">Интернациональное название</string>
<string name="poi_nat_name">Общенациональное название</string>
<string name="poi_reg_name">Региональное название</string>
<string name="poi_loc_name">Местное название</string>
<string name="poi_old_name">Историческое название</string>
<string name="poi_alt_name">Альтернативное название</string>
<string name="poi_pump_manual">Ручной насос</string>
<string name="poi_pump_powered">Автоматический насос</string>
<string name="poi_pump_no">Без насоса</string>
<string name="poi_water_characteristic_mineral">Характеристика воды: минеральная</string>
<string name="poi_water_characteristic_mud">Характеристика воды: грязь</string>
<string name="poi_water_characteristic_sulfuric">Характеристика воды: серная</string>
<string name="poi_water_point">Пункт водоснабжения</string>
</resources>

44
OsmAnd/res/values-sk/phrases.xml
View file

@ -1170,4 +1170,46 @@
<string name="poi_ele">Nadmorská výška</string>
<string name="poi_height">Výška</string>
</resources>
<string name="poi_aerialway_pylon">Stožiar lanovky</string>
<string name="poi_power_tower">Elektrický stožiar</string>
<string name="poi_power_pole">Elektrický stĺp</string>
<string name="poi_cooling_tower">Chladiaca veža</string>
<string name="poi_lighting_tower">Osvetľovacia veža</string>
<string name="poi_seats">Sedadlá</string>
<string name="poi_backrest_yes">Operadlo: áno</string>
<string name="poi_backrest_no">Operadlo: nie</string>
<string name="poi_intermittent">Občasné</string>
<string name="poi_generator_source_coal">Zdroj energie: uhlie</string>
<string name="poi_generator_source_gas">Zdroj energie: plyn</string>
<string name="poi_generator_source_nuclear">Zdroj energie: jadro</string>
<string name="poi_generator_source_solar">Zdroj energie: slnko</string>
<string name="poi_generator_source_hydro">Zdroj energie: voda</string>
<string name="poi_generator_source_wind">Zdroj energie: vietor</string>
<string name="poi_generator_source_geothermal">Zdroj energie: geotermálny</string>
<string name="poi_generator_source_oil">Zdroj energie: ropa</string>
<string name="poi_generator_source_diesel">Zdroj energie: nafta</string>
<string name="poi_car_wash_self_service">Samoobslužné</string>
<string name="poi_int_name">Medzinárodný názov</string>
<string name="poi_nat_name">Národný názov</string>
<string name="poi_reg_name">Regionálny názov</string>
<string name="poi_loc_name">Miestny názov</string>
<string name="poi_old_name">Starý názov</string>
<string name="poi_alt_name">Alternatívny názov</string>
<string name="poi_pump_manual">Ručná pumpa</string>
<string name="poi_pump_powered">Poháňaná pumpa</string>
<string name="poi_pump_no">Žiadna pumpa</string>
<string name="poi_water_characteristic_mineral">Vlastnosti vody: minerálna</string>
<string name="poi_water_characteristic_mud">Vlastnosti vody: blato</string>
<string name="poi_water_characteristic_sulfuric">Vlastnosti vody: sírnatá</string>
<string name="poi_water_point">Vodný bod</string>
</resources>

19
OsmAnd/res/values/phrases.xml
View file

@ -1229,4 +1229,23 @@
<string name="poi_generator_source_oil">Energy source: oil</string>
<string name="poi_generator_source_diesel">Energy source: diesel</string>
<string name="poi_car_wash_self_service">Self service</string>
<string name="poi_int_name">International name</string>
<string name="poi_nat_name">National name</string>
<string name="poi_reg_name">Regional name</string>
<string name="poi_loc_name">Local name</string>
<string name="poi_old_name">Old name</string>
<string name="poi_alt_name">Alternative name</string>
<string name="poi_pump_manual">Manual pump</string>
<string name="poi_pump_powered">Powered pump</string>
<string name="poi_pump_no">No pump</string>
<string name="poi_water_characteristic_mineral">Water characteristic: mineral</string>
<string name="poi_water_characteristic_mud">Water characteristic: mud</string>
<string name="poi_water_characteristic_sulfuric">Water characteristic: sulfuric</string>
<string name="poi_water_point">Water point</string>
</resources>

2
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -127,6 +127,7 @@ public class MapActivityActions implements DialogProvider {
getMyApplication().getAppCustomization().prepareLocationMenu(mapActivity, adapter);
final Builder builder = new AlertDialog.Builder(mapActivity);
builder.setTitle(R.string.get_directions);
final ArrayAdapter<?> listAdapter =
adapter.createListAdapter(mapActivity, getMyApplication().getSettings().isLightContent());
builder.setAdapter(listAdapter, new DialogInterface.OnClickListener() {
@ -355,6 +356,7 @@ public class MapActivityActions implements DialogProvider {
getMyApplication().getAppCustomization().prepareLocationMenu(mapActivity, adapter);
final Builder builder = new AlertDialog.Builder(mapActivity);
builder.setTitle(R.string.show_point_options);
final ArrayAdapter<?> listAdapter =
adapter.createListAdapter(mapActivity, getMyApplication().getSettings().isLightContent());
builder.setAdapter(listAdapter, new DialogInterface.OnClickListener() {