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 Fix_4735

Browse source
This commit is contained in:
Chumva 2018-07-23 10:31:07 +03:00
commit 45dc8343a2
14 changed files with 170 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/res/values-be/phrases.xml
View file

@ -3905,4 +3905,12 @@
<string name="poi_payment_contactless_yes">Безкантактная</string>
<string name="poi_payment_contactless_no">Безкантактная аплата не прымаецца</string>
<string name="poi_hazard_nuclear">Ядзерная небяспека</string>
<string name="poi_hazard_erosion">Небяспека эрозіі</string>
<string name="poi_hazard_avalanche">Небяспека лавіны</string>
<string name="poi_hazard_slippery_road">Слізкая дарога</string>
<string name="poi_hazard_flood">Небяспека паводкі</string>
<string name="poi_hazard_minefield">Міннае поле</string>
</resources>

63
OsmAnd/res/values-cs/phrases.xml
View file

@ -51,7 +51,7 @@
<string name="poi_service_tyres">Pneuservis</string>
<string name="poi_car_wash">Myčka</string>
<string name="poi_fuel">Čerpací stanice;Benzínová pumpa</string>
<string name="poi_electricity_combined_charging">Dobíjecí stanice</string>
<string name="poi_electricity_combined_charging">Nabíjecí stanice</string>
<string name="poi_parking">Parkoviště</string>
<string name="poi_garages">Garáže</string>
@ -218,7 +218,7 @@
<string name="poi_traffic_calming_bump">Retardér</string>
<string name="poi_traffic_calming_hump">Dlouhý retardér</string>
<string name="poi_vehicle_inspection">Kontrola vozidel</string>
<string name="poi_parking_entrance">Vjezd parkoviště</string>
<string name="poi_parking_entrance">Vjezd na parkoviště</string>
<string name="poi_tram_stop">Tramvajová zastávka</string>
<string name="poi_historic_mine">Historický důl</string>
<string name="poi_education">Vzdělání</string>
@ -3674,4 +3674,63 @@
<string name="poi_socket_type2">Počet konektorů typu 2 (tzv.Mennekes)</string>
<string name="poi_socket_type2_current">Maximální proud konektoru typu 2 (tzv. Mennekes) [A]</string>
<string name="poi_socket_type2_output">Maximální výkon konektoru typu 2 (tzv. Mennekes) [kW]</string>
<string name="poi_socket_type1_combo">"Počet konektorů typu 1 combo "</string>
<string name="poi_socket_type1_combo_current">Maximální proud konektoru 1 combo [A]</string>
<string name="poi_socket_type1_combo_output">Maximální výkon konektoru typu 1 combo [kW]</string>
<string name="poi_socket_type2_combo">Počet konektorů typu CCS (Typ 2 kombinovaný)</string>
<string name="poi_socket_type2_combo_current">Maximální proud konektoru CCS (Typ 2 kombinovaný) [A]</string>
<string name="poi_socket_type2_combo_output">Maximální výkon konektoru CCS (Typ 2 kombinovaný) [kW]</string>
<string name="poi_socket_chademo">Počet konektorů CHAdeMO</string>
<string name="poi_socket_chademo_current">Maximální proud konektoru CHAdeMO [A]</string>
<string name="poi_socket_chademo_output">Maximální výkon konektoru CHAdeMO [kW]</string>
<string name="poi_socket_tesla_supercharger">Počet stanic Tesla Supercharger</string>
<string name="poi_socket_tesla_supercharger_current">Maximální proud stanice Tesla Supercharger [A]</string>
<string name="poi_socket_tesla_supercharger_output">Maximální výkon stanice Tesla Supercharger [kW]</string>
<string name="poi_socket_nema_5_15">Počet zásuvek amerického typu NEMA 5-15R</string>
<string name="poi_socket_nema_5_20">Počet zásuvek amerického typu NEMA 5-20</string>
<string name="poi_socket_nema_14_30">Počet zásuvek amerického typu NEMA 14-30</string>
<string name="poi_socket_nema_14_50">Počet zásuvek amerického typu NEMA 14-50</string>
<string name="poi_socket_schuko">Počet zásuvek typu Schuko</string>
<string name="poi_socket_schuko_current">Maximální proud zásuvky Schuko [A]</string>
<string name="poi_socket_schuko_output">Maximální výkon zásuvky Schuko [kW]</string>
<string name="poi_socket_bs1363">Počet zásuvek britského typu BS 1363</string>
<string name="poi_socket_bs1363_current">Maximální proud zásuvky britského typu BS 1363 [A]</string>
<string name="poi_socket_bs1363_output">Maximální výkon zásuvky britského typu BS 1363 [kW]</string>
<string name="poi_socket_as3112">Počet zásuvek australského typu AS 3112</string>
<string name="poi_socket_as3112_current">Maximální proud zásuvky australského typu AS 3112 [A]</string>
<string name="poi_socket_as3112_output">Maximální výkon zásuvky australského typu AS 3112 [kW]</string>
<string name="poi_car_yes">Vjezd autem povolen</string>
<string name="poi_car_no">Vjezd autem zakázán</string>
<string name="poi_bicycle_yes">Vjezd na kole povolen</string>
<string name="poi_bicycle_no">Vjezd na kole zakázán</string>
<string name="poi_scooter_yes">Vjezd na skútru povolen</string>
<string name="poi_scooter_no">Vjezd na skútru zakázán</string>
<string name="poi_truck_yes">Vjezd nákladním autem povolen</string>
<string name="poi_truck_no">Vjezd nákladním autem zakázán</string>
<string name="poi_parking_fee_yes">Parkoviště s poplatkem</string>
<string name="poi_parking_fee_no">Parkoviště bez poplatku</string>
<string name="poi_parking_fee">Poplatek za parkování</string>
<string name="poi_amperage">Maximální proud [A]</string>
<string name="poi_charging_station_output">Maximální výkon nabíjecí stanice [kW]</string>
<string name="poi_map_type_topo">Topografická mapa</string>
<string name="poi_map_type_street">Podrobná mapa okolí</string>
<string name="poi_map_type_scheme">Schematická mapa</string>
<string name="poi_map_type_toposcope">Toposkop (tabulka s významnými body nadohled)</string>
<string name="poi_map_size_site">Zobrazuje jen nejbližší okolí</string>
<string name="poi_map_size_city">Zobrazuje celou obec</string>
<string name="poi_map_size_region">Zobrazuje okolní region</string>
<string name="poi_charging_station_filter">Nabíjecí stanice</string>
<string name="poi_depot">Depo</string>
<string name="poi_letter_box">Poštovní schránka</string>
<string name="poi_post_street">Ulice</string>
<string name="poi_post_housenumber">Číslo popisné</string>
<string name="poi_ref_post">PSČ</string>
</resources>

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

@ -3949,4 +3949,12 @@
<string name="poi_payment_contactless_yes">Kontaktløs</string>
<string name="poi_payment_contactless_no">Kontaktløs ikke accepteret</string>
<string name="poi_hazard_nuclear">Nukleare fare</string>
<string name="poi_hazard_erosion">Erosionsfare</string>
<string name="poi_hazard_avalanche">Lavinefare</string>
<string name="poi_hazard_slippery_road">Glat vejbane</string>
<string name="poi_hazard_flood">Oversvømmelse fare</string>
<string name="poi_hazard_minefield">Minefelt</string>
</resources>

8
OsmAnd/res/values-eo/phrases.xml
View file

@ -3874,4 +3874,12 @@
<string name="poi_payment_contactless_yes">senkontakta (alproksima)</string>
<string name="poi_payment_contactless_no">Senkontakta pagmaniero malakceptata</string>
<string name="poi_hazard_nuclear">Danĝero: radiado</string>
<string name="poi_hazard_erosion">Danĝero: terglitejo</string>
<string name="poi_hazard_avalanche">Danĝero: lavango</string>
<string name="poi_hazard_slippery_road">Danĝero: glita vojo</string>
<string name="poi_hazard_flood">Danĝero: superakvego</string>
<string name="poi_hazard_minefield">Danĝero: minkampo</string>
</resources>

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

@ -2387,7 +2387,7 @@
<string name="poi_cross">Cruz</string>
<string name="poi_summit_cross">Cumbre a la cruz: sí</string>
<string name="poi_prison_camp">Ex campo de prisioneros</string>
<string name="poi_prison_camp">Ex campo de prisioneros;Ex centro clandestino de detención</string>
<string name="poi_concentration_camp">Tipo: campo de concentración</string>
<string name="poi_pow_camp">Tipo: prisioneros de guerra</string>
<string name="poi_labor_camp">Tipo: trabajos forzados</string>
@ -3921,4 +3921,12 @@
<string name="poi_payment_contactless_yes">Pago sin contacto</string>
<string name="poi_payment_contactless_no">No acepta Pagos sin contacto</string>
<string name="poi_hazard_nuclear">Peligro nuclear</string>
<string name="poi_hazard_erosion">Peligro de erosión</string>
<string name="poi_hazard_avalanche">Peligro de avalancha</string>
<string name="poi_hazard_slippery_road">Camino resbaladizo</string>
<string name="poi_hazard_flood">Peligro de inundación</string>
<string name="poi_hazard_minefield">Campo minado</string>
</resources>

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

@ -3680,4 +3680,12 @@
<string name="poi_payment_contactless_yes">Pago sin contacto</string>
<string name="poi_payment_contactless_no">"No acepta Pagos sin contacto "</string>
<string name="poi_hazard_nuclear">Peligro nuclear</string>
<string name="poi_hazard_erosion">Peligro de erosión</string>
<string name="poi_hazard_avalanche">Peligro de avalancha</string>
<string name="poi_hazard_slippery_road">Camino resbaladizo</string>
<string name="poi_hazard_flood">Peligro de inundación</string>
<string name="poi_hazard_minefield">Campo minado</string>
</resources>

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

@ -3062,7 +3062,7 @@
<string name="poi_payment_fuel_type">Tarjetas de combustible</string>
<string name="poi_additional_type">Adicional</string>
<string name="poi_internet_access_type">Tipo de conexión a Internet</string>
<string name="poi_vending_type">Tipo de expendio</string>
<string name="poi_vending_type">Tipo de expendedora</string>
<string name="poi_bicycle_service">Servicio para bicicletas</string>
<string name="poi_clothes_type">Tipo</string>
<string name="poi_shoes_type">Tipo</string>
@ -3082,7 +3082,7 @@
<string name="poi_subway_station_filter">Estación de metro</string>
<string name="poi_ferry_terminal_cargo">Mercancías</string>
<string name="poi_bicycle_parking_type">Tipo</string>
<string name="poi_aerialway_bicycle">Transporte para bicicletas</string>
<string name="poi_aerialway_bicycle">Transporte de bicicletas</string>
<string name="poi_aerialway_heating">Calefacción</string>
<string name="poi_pump">Bomba</string>
<string name="poi_observatory_designation">Designación</string>
@ -3093,7 +3093,7 @@
<string name="poi_healthcare_alternative_types">Especialidad</string>
<string name="poi_free_flying_characteristics">Característica</string>
<string name="poi_archaeological_site_type">Tipo</string>
<string name="poi_star_rating">Valoración de estrellas</string>
<string name="poi_star_rating">Valoración por estrellas</string>
<string name="poi_religion_type">Religión</string>
<string name="poi_denomination">Denominación</string>
<string name="poi_information_type">Tipo</string>
@ -3900,4 +3900,15 @@
<string name="poi_outcrop">Afloramiento</string>
<string name="poi_payment_contactless_yes">Sin contacto</string>
<string name="poi_payment_contactless_no">Sin contacto: no se acepta</string>
<string name="poi_hazard_nuclear">Peligro nuclear</string>
<string name="poi_hazard_erosion">Peligro de erosión</string>
<string name="poi_hazard_avalanche">Peligro de avalancha</string>
<string name="poi_hazard_slippery_road">Carretera resbaladiza</string>
<string name="poi_hazard_flood">Peligro de inundación</string>
<string name="poi_hazard_minefield">Campo de minas</string>
</resources>

1
OsmAnd/res/values-es/strings.xml
View file

@ -2956,4 +2956,5 @@
<string name="error_notification_desc">Por favor, envíe la captura de pantalla de esta notificación a support@osmand.net</string>
<string name="quick_action_edit_actions">Editar acciones</string>
<string name="point_deleted">Punto %1$s eliminado</string>
<string name="shared_string_world">Mundo</string>
</resources>

1
OsmAnd/res/values-eu/strings.xml
View file

@ -3117,4 +3117,5 @@ Area honi dagokio: %1$s x %2$s</string>
<string name="coord_input_save_as_track">Gorde lorratz gisa</string>
<string name="coord_input_save_as_track_descr">%1$s puntu gehitu dituzu. Idatzi fitxategi-izena eta sakatu \"Gorde\".</string>
<string name="point_deleted">%1$s puntua ezabatuta</string>
<string name="shared_string_world">Mundua</string>
</resources>

34
OsmAnd/res/values-nb/phrases.xml
View file

@ -1292,4 +1292,38 @@
<string name="poi_video">Videobutikk</string>
<string name="poi_window_blind">Solskjermingsbutikk</string>
<string name="poi_atv">Firhjulingsbutikk</string>
<string name="poi_backcountry">Utmark</string>
<string name="poi_piste_difficulty">Løypevanskelighetsgrad</string>
<string name="poi_piste_grooming">Løypevedlikehold</string>
<string name="poi_drive_in">Drive-in</string>
<string name="poi_drive_through">Drive-through</string>
<string name="poi_takeaway">Avhenting</string>
<string name="poi_recycling_accepted_waste">Akseptert avfall</string>
<string name="poi_animal_shelter_type">Aksepterte dyr</string>
<string name="poi_water_place_access">Tilgang til vannforsyning</string>
<string name="poi_socket_chademo_output_filter">CHAdeMO-uttak</string>
<string name="poi_socket_type2_output_filter">Type 2-uttak</string>
<string name="poi_socket_type2_combo_output_filter">Type 2-kombinasjonsuttak</string>
<string name="poi_socket_type3_output_filter">Type 3-uttak</string>
<string name="poi_socket_cee_blue_output_filter">Blått CEE-uttak</string>
<string name="poi_socket_schuko_output_filter">Schuko-uttak</string>
<string name="poi_charity">Veldedighetsbutikk</string>
<string name="poi_shop_yes">Landhandel</string>
<string name="poi_medical_supply">Medisinsk utstyr</string>
<string name="poi_stationery">Kontorrekvisita</string>
<string name="poi_tobacco">Tobakksbutikk</string>
<string name="poi_variety_store">Billigbutikk</string>
<string name="poi_energy">Energibutikk</string>
<string name="poi_ford_stepping_stones">Steinstegsbro</string>
<string name="poi_lift_gate">Vippebom</string>
<string name="poi_fuel_octane_91">81-oktan</string>
<string name="poi_fuel_octane_92">92-oktan</string>
<string name="poi_fuel_octane_95">95-oktan</string>
<string name="poi_fuel_octane_98">98-oktan</string>
<string name="poi_fuel_octane_100">100-oktan</string>
<string name="poi_fuel_cng">Komprimert naturgass</string>
<string name="poi_fuel_electricity">Elektisitet</string>
<string name="poi_aeroway_fuel">Flybrenselstasjon</string>
<string name="poi_waterway_fuel">Båtbensinstasjon</string>
<string name="poi_helipad">Helikopterlandingsplass</string>
</resources>

8
OsmAnd/res/values-sc/phrases.xml
View file

@ -3883,4 +3883,12 @@
<string name="poi_payment_contactless_yes">Chene cuntatu (Contactless)</string>
<string name="poi_payment_contactless_no">Cartas chene cuntatu non atzetadas</string>
<string name="poi_hazard_nuclear">Perìgulu nucleare</string>
<string name="poi_hazard_erosion">Perìgulu de erosione</string>
<string name="poi_hazard_avalanche">Perìgulu de valanga</string>
<string name="poi_hazard_slippery_road">Carrera lassinosa</string>
<string name="poi_hazard_flood">Perìgulu de alluvione</string>
<string name="poi_hazard_minefield">Campu minadu</string>
</resources>

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

@ -3178,8 +3178,8 @@
<string name="poi_parking_fee_no">Poplatok za parkovanie: nie</string>
<string name="poi_parking_fee">Poplatok za parkovanie</string>
<string name="poi_amperage">Napätie</string>
<string name="poi_charging_station_output">Výstup nabíjacej stanice</string>
<string name="poi_amperage">Maximálny prúd [A]</string>
<string name="poi_charging_station_output">Maximálny výkon nabíjacej stanice [kW]</string>
<string name="poi_map_type_topo">Typ mapy: topografická</string>
<string name="poi_map_type_street">Typ mapy: ulice</string>

6
OsmAnd/res/values-sr/phrases.xml
View file

@ -1486,4 +1486,10 @@
<string name="poi_wetland_mud">Блато</string>
<string name="poi_beach_sand">Песак</string>
<string name="poi_denomination_old_believers">Староверци</string>
<string name="poi_denomination_spiritist">Спиритисти</string>
<string name="poi_denomination_armenian_apostolic">Јерменски апостоли</string>
<string name="poi_denomination_dutch_reformed">Холандски реформисти</string>
<string name="poi_denomination_apostolic">Апостолска црква</string>
<string name="poi_denomination_reform">Реформисти</string>
</resources>

3
OsmAnd/res/values-zh-rCN/phrases.xml
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources><string name="poi_fuel_avia_type"></string>
<resources><string name="poi_fuel_avia_type"/>
<string name="poi_payment_type">支付类别</string>
<string name="poi_clothes_type">类型</string>
<string name="poi_shoes_type">类型</string>
@ -25,4 +25,5 @@
<string name="poi_osmwiki">维基百科</string>
<string name="poi_user_defined_other">用户自定义</string>
<string name="poi_hazard_flood">洪水灾害</string>
</resources>