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 new_coordinate_input

Browse source 
# Conflicts:
#	OsmAnd/res/values/strings.xml
This commit is contained in:
Alexander Sytnyk 2018-02-14 11:01:10 +02:00
commit bfa4d1d497
32 changed files with 1087 additions and 350 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/AndroidManifest.xml
View file

@ -137,6 +137,11 @@
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.kmz" /> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.kmz" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.kmz" /> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.kmz" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmz" /> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmz" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.obf" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.obf" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.obf" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.obf" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.obf" />
</intent-filter> </intent-filter>
<!--trying to handle emails--> <!--trying to handle emails-->

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

@ -1444,7 +1444,7 @@
<string name="app_mode_motorcycle">Motosiklet</string> <string name="app_mode_motorcycle">Motosiklet</string>
<string name="local_osm_changes_delete_all_confirm">%1$d OSM dəyişikliyini silmək üzrəsiniz. Əminsiniz?</string> <string name="local_osm_changes_delete_all_confirm">%1$d OSM dəyişikliyini silmək üzrəsiniz. Əminsiniz?</string>
<string name="animate_routing_route_not_calculated">Zəhmət olmasa əvvəlcə marşrutu hesablayın</string> <string name="animate_routing_route_not_calculated">Zəhmət olmasa əvvəlcə marşrutu hesablayın</string>
<string name="route_is_too_long_v2">Bu marşrut, hesablamaq üçün çox uzun ola birər. Zəhmət olmasa 10 dəqiqə ərzində nəticə tapılmasa, ara təyinat nöqtələri əlavə edin.</string> <string name="route_is_too_long_v2">Bu marşrut hesablamaq üçün çox uzun ola bilər. Zəhmət olmasa 10 dəqiqə ərzində nəticə tapılmasa, ara təyinat nöqtələri əlavə edin.</string>
<string name="auto_zoom_close">İri plana</string> <string name="auto_zoom_close">İri plana</string>
<string name="auto_zoom_far">Orta plana</string> <string name="auto_zoom_far">Orta plana</string>
<string name="auto_zoom_farthest">Uzaq plana</string> <string name="auto_zoom_farthest">Uzaq plana</string>
@ -1953,4 +1953,18 @@
<string name="improve_coverage_mapillary">Mapillary ilə şəkil əhatə dairəni yaxşılaşdır</string> <string name="improve_coverage_mapillary">Mapillary ilə şəkil əhatə dairəni yaxşılaşdır</string>
<string name="mapillary_widget">Mapillary widget-i</string> <string name="mapillary_widget">Mapillary widget-i</string>
<string name="install_selected_build">{1} tarixli OsmAnd - {0} quraşdırmaq istəyirsiniz ({2} MB) ?</string> <string name="install_selected_build">{1} tarixli OsmAnd - {0} quraşdırmaq istəyirsiniz ({2} MB) ?</string>
<string name="navigate_point_olc">Açıq məkan kodu (OLC)</string>
<string name="navigate_point_olc_info_invalid">Yanlış OLC
\n</string>
<string name="navigate_point_olc_info_short">Qısa OLC
\nZəhmət olmasa tam kod daxil edin</string>
<string name="rendering_category_others">Digər xəritə xüsusiyyətləri</string>
<string name="map_widget_appearance_rem">Qalan elementlər</string>
<string name="fav_point_dublicate">Favorit nöqtə adı təkrardır</string>
<string name="background_service_int">GPS oyandırma intervalı</string>
<string name="average">Orta</string>
<string name="osmo_gpx_track_downloaded">OsMo izi %1$s endirildi.</string>
<string name="select_index_file_to_download">Heç bir şey tapılmadı. Regionunuzu tapa bilməsəniz, özünüz yarada bilərsiniz (bax: http://osmand.net).</string>
<string name="osb_author_or_password_not_specified">Parametrlərdə OSM istifadəçi adı və şifrəni daxil edin</string>
<string name="new_directions_point_dialog">Artıq müəyyənləşdirilmiş ara təyinat nöqtələriniz var.</string>
</resources> </resources>

2
OsmAnd/res/values-be-rBY/strings.xml
View file

@ -3012,4 +3012,6 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
<string name="tunnel_warning">Napieradzie tuneĺ</string> <string name="tunnel_warning">Napieradzie tuneĺ</string>
<string name="show_tunnels">Tuneli</string> <string name="show_tunnels">Tuneli</string>
<string name="make_as_start_point">Zrabić pačatkovaj kropkaj</string> <string name="make_as_start_point">Zrabić pačatkovaj kropkaj</string>
<string name="map_import_error">Pamylka impartu mapy</string>
<string name="map_imported_successfully">Mapa paspiachovaja impartavanaja</string>
</resources> </resources>

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

@ -3767,4 +3767,30 @@
<string name="poi_cannabis">Крама канопляў</string> <string name="poi_cannabis">Крама канопляў</string>
</resources> <string name="poi_socket">Раздым</string>
<string name="poi_osmand_socket_cee_blue_yes">CEE блакітны</string>
<string name="poi_osmand_socket_cee_red_16a_yes">CEE чырвоны 16A</string>
<string name="poi_osmand_socket_cee_red_32a_yes">CEE чырвоны 32A</string>
<string name="poi_osmand_socket_cee_red_64a_yes">CEE чырвоны 64A</string>
<string name="poi_osmand_socket_cee_red_125a_yes">CEE чырвоны 125A</string>
<string name="poi_osmand_socket_type1_yes">Type 1</string>
<string name="poi_osmand_socket_type1_combo_yes">Type 1 combo</string>
<string name="poi_osmand_socket_type2_yes">Type 2</string>
<string name="poi_osmand_socket_type2_combo_yes">Type 2 combo</string>
<string name="poi_osmand_socket_type3_yes">Type 3</string>
<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
<string name="poi_osmand_socket_tesla_standard_yes">Tesla standard</string>
<string name="poi_osmand_socket_tesla_supercharger_yes">Tesla Supercharger</string>
<string name="poi_osmand_socket_tesla_roadster_yes">Tesla Roadster</string>
<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
<string name="poi_osmand_socket_schuko_yes">Schuko</string>
<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</string>
</resources>

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

@ -3061,4 +3061,6 @@
<string name="tunnel_warning">Наперадзе тунэль</string> <string name="tunnel_warning">Наперадзе тунэль</string>
<string name="show_tunnels">Тунэлі</string> <string name="show_tunnels">Тунэлі</string>
<string name="make_as_start_point">Зрабіць пачатковай кропкай</string> <string name="make_as_start_point">Зрабіць пачатковай кропкай</string>
<string name="map_import_error">Памылка імпарту мапы</string>
<string name="map_imported_successfully">Мапа паспяховая імпартаваная</string>
</resources> </resources>

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

@ -3578,7 +3578,7 @@
<string name="poi_socket_cee_red_125a">Ŝtopilo: CEE ruĝa 125A</string> <string name="poi_socket_cee_red_125a">Ŝtopilo: CEE ruĝa 125A</string>
<string name="poi_socket_cee_red_125a_current">Ŝtopilo: CEE ruĝa 125A, elektroforto</string> <string name="poi_socket_cee_red_125a_current">Ŝtopilo: CEE ruĝa 125A, elektroforto</string>
<string name="poi_socket_cee_red_125a_output">Ŝtopilo: CEE ruĝa 125A, povo</string> <string name="poi_socket_cee_red_125a_output">Ŝtopilo: CEE ruĝa 125A, povo</string>
<string name="poi_socket_type1">Ŝtopilo: tipo 1</string> <string name="poi_socket_type1">Ŝtopilo: IEC 62196-2 tipo 1</string>
<string name="poi_socket_type1_current">Ŝtopilo: IEC 62196-2 tipo 1, elektroforto</string> <string name="poi_socket_type1_current">Ŝtopilo: IEC 62196-2 tipo 1, elektroforto</string>
<string name="poi_socket_type1_output">Ŝtopilo: IEC 62196-2 tipo 1, povo</string> <string name="poi_socket_type1_output">Ŝtopilo: IEC 62196-2 tipo 1, povo</string>
<string name="poi_socket_type1_combo">Ŝtopilo: IEC 62196-2 tipo 1 CCS</string> <string name="poi_socket_type1_combo">Ŝtopilo: IEC 62196-2 tipo 1 CCS</string>
@ -3738,4 +3738,27 @@
<string name="poi_osmand_socket_cee_red_16a_yes">CEE ruĝa 16A</string>
<string name="poi_osmand_socket_cee_red_32a_yes">CEE ruĝa 32A</string>
<string name="poi_osmand_socket_cee_red_64a_yes">CEE ruĝa 64A</string>
<string name="poi_osmand_socket_cee_red_125a_yes">CEE ruĝa 125A</string>
<string name="poi_osmand_socket_type1_yes">tipo 1</string>
<string name="poi_osmand_socket_type1_combo_yes">tipo 1 CCS</string>
<string name="poi_osmand_socket_type2_yes">tipo 2</string>
<string name="poi_osmand_socket_type2_combo_yes">tipo 2 CCS</string>
<string name="poi_osmand_socket_type3_yes">tipo 3</string>
<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
<string name="poi_osmand_socket_tesla_standard_yes">Tesla</string>
<string name="poi_osmand_socket_tesla_supercharger_yes">Tesla Supercharger</string>
<string name="poi_osmand_socket_tesla_roadster_yes">Tesla Roadster</string>
<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
<string name="poi_osmand_socket_schuko_yes">Schuko</string>
<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</string>
</resources> </resources>

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

@ -2969,4 +2969,6 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="first_intermediate_dest_description">Aldoni la unuan celon al la kurso</string> <string name="first_intermediate_dest_description">Aldoni la unuan celon al la kurso</string>
<string name="subsequent_dest_description">Movi celon supren kaj krei celon</string> <string name="subsequent_dest_description">Movi celon supren kaj krei celon</string>
<string name="make_as_start_point">Igi komenc-punkton</string> <string name="make_as_start_point">Igi komenc-punkton</string>
<string name="map_import_error">Eraro dum enporti mapon</string>
<string name="map_imported_successfully">Mapo enportita sukcese</string>
</resources> </resources>

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

@ -3784,4 +3784,27 @@
<string name="poi_osmand_socket_cee_red_16a_yes">CEE rojo 16A</string>
<string name="poi_osmand_socket_cee_red_32a_yes">CEE rojo 32A</string>
<string name="poi_osmand_socket_cee_red_64a_yes">CEE rojo 64A</string>
<string name="poi_osmand_socket_cee_red_125a_yes">CEE rojo 125A</string>
<string name="poi_osmand_socket_type1_yes">Tipo 1</string>
<string name="poi_osmand_socket_type1_combo_yes">Tipo 1 combo</string>
<string name="poi_osmand_socket_type2_yes">Tipo 2</string>
<string name="poi_osmand_socket_type2_combo_yes">Tipo 2 combo</string>
<string name="poi_osmand_socket_type3_yes">Tipo 3</string>
<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
<string name="poi_osmand_socket_tesla_standard_yes">Tesla estándar</string>
<string name="poi_osmand_socket_tesla_supercharger_yes">Tesla Supercharger</string>
<string name="poi_osmand_socket_tesla_roadster_yes">Tesla Roadster</string>
<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
<string name="poi_osmand_socket_schuko_yes">Schuko</string>
<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</string>
</resources> </resources>

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

@ -2930,4 +2930,6 @@ Proporciona un código completo</string>
<string name="first_intermediate_dest_description">Añade la ubicación como primer destino intermedio</string> <string name="first_intermediate_dest_description">Añade la ubicación como primer destino intermedio</string>
<string name="subsequent_dest_description">Mueve el destino hacia arriba y crea un nuevo destino</string> <string name="subsequent_dest_description">Mueve el destino hacia arriba y crea un nuevo destino</string>
<string name="make_as_start_point">Reemplazar punto de inicio</string> <string name="make_as_start_point">Reemplazar punto de inicio</string>
<string name="map_import_error">Error de importación del mapa</string>
<string name="map_imported_successfully">Mapa importado correctamente</string>
</resources> </resources>

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

@ -3540,4 +3540,30 @@
<string name="poi_cannabis">Venta de cannabis</string> <string name="poi_cannabis">Venta de cannabis</string>
<string name="poi_socket">Conector</string>
<string name="poi_osmand_socket_cee_blue_yes">CEE azul</string>
<string name="poi_osmand_socket_cee_red_16a_yes">CEE rojo 16A</string>
<string name="poi_osmand_socket_cee_red_32a_yes">CEE rojo 32A</string>
<string name="poi_osmand_socket_cee_red_64a_yes">CEE rojo 64A</string>
<string name="poi_osmand_socket_cee_red_125a_yes">CEE rojo 125A</string>
<string name="poi_osmand_socket_type1_yes">Tipo 1</string>
<string name="poi_osmand_socket_type1_combo_yes">Tipo 1 combo</string>
<string name="poi_osmand_socket_type2_yes">Tipo 2</string>
<string name="poi_osmand_socket_type2_combo_yes">Tipo 2 combo</string>
<string name="poi_osmand_socket_type3_yes">Tipo 3</string>
<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
<string name="poi_osmand_socket_tesla_standard_yes">Tesla estándar</string>
<string name="poi_osmand_socket_tesla_supercharger_yes">Tesla Supercharger</string>
<string name="poi_osmand_socket_tesla_roadster_yes">Tesla Roadster</string>
<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
<string name="poi_osmand_socket_schuko_yes">Schuko</string>
<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</string>
</resources> </resources>

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

@ -2944,4 +2944,6 @@ Proporciona un código completo</string>
<string name="first_intermediate_dest_description">Añade la ubicación como primer destino intermedio</string> <string name="first_intermediate_dest_description">Añade la ubicación como primer destino intermedio</string>
<string name="subsequent_dest_description">Mueve el destino hacia arriba y crea un nuevo destino</string> <string name="subsequent_dest_description">Mueve el destino hacia arriba y crea un nuevo destino</string>
<string name="make_as_start_point">Establecer como punto de inicio</string> <string name="make_as_start_point">Establecer como punto de inicio</string>
<string name="map_import_error">Error de importación del mapa</string>
<string name="map_imported_successfully">Mapa importado correctamente</string>
</resources> </resources>

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

@ -3047,4 +3047,7 @@
<string name="last_intermediate_dest_description">آخرین توقفگاه را به مسیر اضافه می‌کند</string> <string name="last_intermediate_dest_description">آخرین توقفگاه را به مسیر اضافه می‌کند</string>
<string name="first_intermediate_dest_description">اولین توقفگاه را به مسیر اضافه می‌کند</string> <string name="first_intermediate_dest_description">اولین توقفگاه را به مسیر اضافه می‌کند</string>
<string name="subsequent_dest_description">مقصد کنونی جلوتر می‌آید و مقصد جدیدی ایجاد می‌شود</string> <string name="subsequent_dest_description">مقصد کنونی جلوتر می‌آید و مقصد جدیدی ایجاد می‌شود</string>
<string name="map_import_error">خطای واردکردن نقشه</string>
<string name="map_imported_successfully">نقشه با موفقیت وارد شد</string>
<string name="make_as_start_point">انتخاب به‌عنوان نقطهٔ آغازین</string>
</resources> </resources>

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

@ -3105,4 +3105,6 @@ représentant la zone : %1$s x %2$s</string>
<string name="first_intermediate_dest_description">Ajoute comme première étape à l\'itinéraire</string> <string name="first_intermediate_dest_description">Ajoute comme première étape à l\'itinéraire</string>
<string name="subsequent_dest_description">Monter et créer comme destination</string> <string name="subsequent_dest_description">Monter et créer comme destination</string>
<string name="make_as_start_point">Marquer comme Point de départ</string> <string name="make_as_start_point">Marquer comme Point de départ</string>
<string name="map_import_error">Erreur d\'import de la carte</string>
<string name="map_imported_successfully">Carte importée avec succès</string>
</resources> </resources>

619
OsmAnd/res/values-hu/strings.xml
View file

File diff suppressed because it is too large Load diff

29
OsmAnd/res/values-is/phrases.xml
View file

@ -1077,7 +1077,7 @@
<string name="poi_palm">Pálmar</string> <string name="poi_palm">Pálmar</string>
<string name="poi_cypress">Sedrus</string> <string name="poi_cypress">Sedrus</string>
<string name="poi_flagpole">Flaggstöng</string> <string name="poi_flagpole">Fánastöng</string>
<string name="poi_bench_yes">Já</string> <string name="poi_bench_yes">Já</string>
<string name="poi_backcountry_yes">Já</string> <string name="poi_backcountry_yes">Já</string>
@ -2161,7 +2161,7 @@
<string name="poi_craft_plasterer">Gifsari</string> <string name="poi_craft_plasterer">Gifsari</string>
<string name="poi_craft_sailmaker">Seglagerð</string> <string name="poi_craft_sailmaker">Seglagerð</string>
<string name="poi_craft_sawmill">Sögunarmylla</string> <string name="poi_craft_sawmill">Sögunarmylla</string>
<string name="poi_craft_scaffolder">Stillansar</string> <string name="poi_craft_scaffolder">Vinnupallasmíði</string>
<string name="poi_craft_watchmaker">Úrsmiður</string> <string name="poi_craft_watchmaker">Úrsmiður</string>
<string name="poi_craft_window_construction">Gluggasmíði</string> <string name="poi_craft_window_construction">Gluggasmíði</string>
@ -3597,4 +3597,27 @@
<string name="poi_health_specialty_obstetrics_antenatal_no">Heilsutengt sérsvið: fæðingarlækningar (meðganga): nei</string> <string name="poi_health_specialty_obstetrics_antenatal_no">Heilsutengt sérsvið: fæðingarlækningar (meðganga): nei</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Fæðingarlækningar (keisaraskurður)</string> <string name="poi_health_specialty_obstetrics_caesarean_section_yes">Fæðingarlækningar (keisaraskurður)</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_no">Heilsutengt sérsvið: fæðingarlækningar (keisaraskurður): nei</string> <string name="poi_health_specialty_obstetrics_caesarean_section_no">Heilsutengt sérsvið: fæðingarlækningar (keisaraskurður): nei</string>
</resources> <string name="poi_osmand_socket_cee_red_16a_yes">CEE rautt 16A</string>
<string name="poi_osmand_socket_cee_red_32a_yes">CEE rautt 32A</string>
<string name="poi_osmand_socket_cee_red_64a_yes">CEE rautt 64A</string>
<string name="poi_osmand_socket_cee_red_125a_yes">CEE rautt 125A</string>
<string name="poi_osmand_socket_type1_yes">Type 1</string>
<string name="poi_osmand_socket_type1_combo_yes">Type 1 combo</string>
<string name="poi_osmand_socket_type2_yes">Type 2</string>
<string name="poi_osmand_socket_type2_combo_yes">Type 2 combo</string>
<string name="poi_osmand_socket_type3_yes">Type 3</string>
<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
<string name="poi_osmand_socket_tesla_standard_yes">Staðlað Tesla</string>
<string name="poi_osmand_socket_tesla_supercharger_yes">Tesla Supercharger</string>
<string name="poi_osmand_socket_tesla_roadster_yes">Tesla Roadster</string>
<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
<string name="poi_osmand_socket_schuko_yes">Schuko</string>
<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</string>
</resources>

2
OsmAnd/res/values-my/phrases.xml Normal file
View file

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>

2
OsmAnd/res/values-my/strings.xml Normal file
View file

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>

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

@ -3734,4 +3734,10 @@
<string name="poi_cannabis">Sklep z konopią</string> <string name="poi_cannabis">Sklep z konopią</string>
<string name="poi_socket">Gniazdo elektryczne</string>
<string name="poi_osmand_socket_cee_blue_yes">CEE niebieska</string>
</resources> </resources>

21
OsmAnd/res/values-pl/strings.xml
View file

@ -420,7 +420,7 @@
<string name="search_online_address">Wyszukiwanie online</string> <string name="search_online_address">Wyszukiwanie online</string>
<string name="max_level_download_tile">Maks. zoom online</string> <string name="max_level_download_tile">Maks. zoom online</string>
<string name="max_level_download_tile_descr">Wybierz maksymalny poziom przybliżenia mapy dla pobierania kafelków map online.</string> <string name="max_level_download_tile_descr">Wybierz maksymalny poziom przybliżenia mapy dla pobierania kafelków map online.</string>
<string name="route_general_information">Całkowity dystans %1$s, czas podróży %2$d h %3$d min.</string> <string name="route_general_information">Całkowita odległość %1$s, czas podróży %2$d h %3$d min.</string>
<string name="router_service_descr">Wybiera usługę nawigacyjną online lub offline.</string> <string name="router_service_descr">Wybiera usługę nawigacyjną online lub offline.</string>
<string name="router_service">Usługa nawigacyjna</string> <string name="router_service">Usługa nawigacyjna</string>
<string name="sd_dir_not_accessible">Katalog przechowywania danych na karcie SD jest niedostępny!</string> <string name="sd_dir_not_accessible">Katalog przechowywania danych na karcie SD jest niedostępny!</string>
@ -461,9 +461,9 @@
<string name="error_calculating_route">Błąd wyznaczania trasy</string> <string name="error_calculating_route">Błąd wyznaczania trasy</string>
<string name="error_calculating_route_occured">Wystąpił błąd podczas wyznaczania trasy</string> <string name="error_calculating_route_occured">Wystąpił błąd podczas wyznaczania trasy</string>
<string name="empty_route_calculated">Błąd: Wyznaczono pustą trasę</string> <string name="empty_route_calculated">Błąd: Wyznaczono pustą trasę</string>
<string name="new_route_calculated_dist">Obliczono nową trasę, dystans</string> <string name="new_route_calculated_dist">Obliczono nową trasę, odległość</string>
<string name="arrived_at_destination">Osiągnięto cel</string> <string name="arrived_at_destination">Osiągnięto cel</string>
<string name="invalid_locations">Koordynaty są nieprawidłowe!</string> <string name="invalid_locations">Współrzędne są nieprawidłowe!</string>
<string name="go_back_to_osmand">Wróć do mapy OsmAnd</string> <string name="go_back_to_osmand">Wróć do mapy OsmAnd</string>
<string name="shared_string_close">Zamknij</string> <string name="shared_string_close">Zamknij</string>
<string name="loading_data">Wczytywanie danych…</string> <string name="loading_data">Wczytywanie danych…</string>
@ -942,7 +942,7 @@ OsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej
<string name="add_tag">Dodaj znacznik</string> <string name="add_tag">Dodaj znacznik</string>
<string name="btn_advanced_mode">Tryb zaawansowany…</string> <string name="btn_advanced_mode">Tryb zaawansowany…</string>
<string name="poi_filter_parking">Parking</string> <string name="poi_filter_parking">Parking</string>
<string name="poi_filter_emergency">Niebezpieczeństwo</string> <string name="poi_filter_emergency">Służby ratunkowe</string>
<string name="poi_filter_public_transport">Transport publiczny</string> <string name="poi_filter_public_transport">Transport publiczny</string>
<string name="poi_filter_entertainment">Rozrywka</string> <string name="poi_filter_entertainment">Rozrywka</string>
<string name="poi_filter_accomodation">Zakwaterowanie</string> <string name="poi_filter_accomodation">Zakwaterowanie</string>
@ -1182,8 +1182,8 @@ OsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej
<string name="clear_intermediate_points">Wyczyść cele pośrednie</string> <string name="clear_intermediate_points">Wyczyść cele pośrednie</string>
<string name="keep_intermediate_points">Zachowaj cele pośrednie</string> <string name="keep_intermediate_points">Zachowaj cele pośrednie</string>
<string name="new_directions_point_dialog">Ustalono już cele pośrednie.</string> <string name="new_directions_point_dialog">Ustalono już cele pośrednie.</string>
<string name="context_menu_item_directions_to">Nawiguj do położenia</string> <string name="context_menu_item_directions_to">Nawiguj do</string>
<string name="context_menu_item_directions_from">Nawiguj z położenia</string> <string name="context_menu_item_directions_from">Nawiguj z</string>
<string name="route_descr_map_location">Mapa: </string> <string name="route_descr_map_location">Mapa: </string>
<string name="route_to">Cel trasy:</string> <string name="route_to">Cel trasy:</string>
<string name="route_via">Cel pośredni trasy:</string> <string name="route_via">Cel pośredni trasy:</string>
@ -2609,7 +2609,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="altitude_ascent">Wzniesienia</string> <string name="altitude_ascent">Wzniesienia</string>
<string name="altitude_range">Zakres wysokości</string> <string name="altitude_range">Zakres wysokości</string>
<string name="average_altitude">Średnia wysokość</string> <string name="average_altitude">Średnia wysokość</string>
<string name="total_distance">Całkowity dystans</string> <string name="total_distance">Calkowita odległość</string>
<string name="shared_string_time">Czas</string> <string name="shared_string_time">Czas</string>
<string name="routing_attr_driving_style_name">Styl jazdy</string> <string name="routing_attr_driving_style_name">Styl jazdy</string>
@ -2978,8 +2978,8 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="nautical_renderer">Żeglarstwo</string> <string name="nautical_renderer">Żeglarstwo</string>
<string name="make_as_start_point">Ustaw punkt początkowy</string> <string name="make_as_start_point">Ustaw punkt początkowy</string>
<string name="shared_string_current">Obecne</string> <string name="shared_string_current">Obecne</string>
<string name="last_intermediate_dest_description">Dodaje ostatni przystanek na trasie</string> <string name="last_intermediate_dest_description">Dodaje ostatni cel pośredni na trasie</string>
<string name="first_intermediate_dest_description">Dodaje pierwszy przystanek na trasie</string> <string name="first_intermediate_dest_description">Dodaje pierwszy cel pośredni na trasie</string>
<string name="show_closed_notes">Pokaż zamknięte notatki</string> <string name="show_closed_notes">Pokaż zamknięte notatki</string>
<string name="switch_osm_notes_visibility_desc">Pokaż/Ukryj Notatki OSM na mapie.</string> <string name="switch_osm_notes_visibility_desc">Pokaż/Ukryj Notatki OSM na mapie.</string>
<string name="gpx_file_desc">GPX - odpowiedni do eksportowania danych do JOSM i innych edytorów OSM.</string> <string name="gpx_file_desc">GPX - odpowiedni do eksportowania danych do JOSM i innych edytorów OSM.</string>
@ -2999,4 +2999,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="copy_location_name">Kopiuj nazwę punktu</string> <string name="copy_location_name">Kopiuj nazwę punktu</string>
<string name="toast_empty_name_error">Miejsce nie ma nazwy</string> <string name="toast_empty_name_error">Miejsce nie ma nazwy</string>
<string name="tunnel_warning">Zbliżasz się do tunelu</string> <string name="tunnel_warning">Zbliżasz się do tunelu</string>
<string name="shared_string_right">Z prawej</string>
<string name="shared_string_left">Z lewej</string>
<string name="show_number_pad">Wyświetl klawiaturę numeryczną</string>
</resources> </resources>

246
OsmAnd/res/values-ro/strings.xml
View file

@ -1852,7 +1852,7 @@
<string name="route_points">Puncte pe traseu</string> <string name="route_points">Puncte pe traseu</string>
<string name="track_segments">Segmente de traseu</string> <string name="track_segments">Segmente de traseu</string>
<string name="track_points">Puncte pe traseu</string> <string name="track_points">Puncte pe traseu</string>
<string name="shared_string_markers">Marcatori</string> <string name="shared_string_markers">Marcaje</string>
<string name="use_location">Utilizați poziția</string> <string name="use_location">Utilizați poziția</string>
<string name="my_location">Poziția mea</string> <string name="my_location">Poziția mea</string>
<string name="shared_string_finish">Sfârşit</string> <string name="shared_string_finish">Sfârşit</string>
@ -1866,18 +1866,258 @@
<string name="this_year">Anul acesta</string> <string name="this_year">Anul acesta</string>
<string name="sort_by">Sortează după</string> <string name="sort_by">Sortează după</string>
<string name="do_not_use_animations">Nu utiliza animații</string> <string name="do_not_use_animations">Nu utiliza animații</string>
<string name="do_not_use_animations_descr">Dezactivează animațiile în această app</string> <string name="do_not_use_animations_descr">Dezactivează animațiile în aplicație.</string>
<string name="line">Linie</string> <string name="line">Linie</string>
<string name="edit_line">Editează linia</string> <string name="edit_line">Editează linia</string>
<string name="shared_string_options">Opțiuni</string> <string name="shared_string_options">Opțiuni</string>
<string name="measurement_tool">Măsoară distanța</string> <string name="measurement_tool">Măsoară distanța</string>
<string name="quick_action_start_stop_navigation">Pornește/oprește navigația</string> <string name="quick_action_start_stop_navigation">Pornește/oprește navigația</string>
<string name="shared_string_reset">Resetează</string> <string name="shared_string_reset">Resetează</string>
<string name="shared_string_reload">Reîncarcă</string> <string name="shared_string_reload">Reâncarcă</string>
<string name="shared_string_to">Spre</string> <string name="shared_string_to">Spre</string>
<string name="mapillary_menu_date_from">De la</string> <string name="mapillary_menu_date_from">De la</string>
<string name="mapillary_menu_title_username">Nume de utilizator</string> <string name="mapillary_menu_title_username">Nume de utilizator</string>
<string name="shared_string_permissions">Permisiuni</string> <string name="shared_string_permissions">Permisiuni</string>
<string name="shared_string_install">Instalare</string> <string name="shared_string_install">Instalare</string>
<string name="shared_string_add_photos">Adaugă poze</string> <string name="shared_string_add_photos">Adaugă poze</string>
<string name="make_as_start_point">Adăugați ca punct de pornire</string>
<string name="shared_string_current">Actual</string>
<string name="last_intermediate_dest_description">Adaugă ultima oprire de-a lungul rutei</string>
<string name="first_intermediate_dest_description">Adauga prima oprire de-a lungul rutei</string>
<string name="subsequent_dest_description">Mută destinația sus și creează o destinație</string>
<string name="show_closed_notes">Arată notele incheiate</string>
<string name="switch_osm_notes_visibility_desc">Arată/ascunde notele OSM pe hartă.</string>
<string name="gpx_file_desc">GPX - disponibill pentru export catre JOSM sau alte editoare OSM.</string>
<string name="osc_file_desc">OSC - disponibil pentru export catre OpenStreetMap.</string>
<string name="gpx_file">Fișier GPX</string>
<string name="osc_file">Fișier OSC</string>
<string name="choose_file_type">Alege tipul de fișier</string>
<string name="osm_edits_export_desc">Alege tipul de export: Note OSM, POI, sau ambele.</string>
<string name="all_data">Toate datele</string>
<string name="osm_notes">Note OSM</string>
<string name="will_open_tomorrow_at">Se va deschide mâine la</string>
<string name="rendering_attr_hidePOILabels_name">Etichete POI</string>
<string name="shared_string_without_name">Fără nume</string>
<string name="what_is_here">Ce este aici:</string>
<string name="parked_at">parcat la</string>
<string name="pick_up_till">Ridică până</string>
<string name="without_time_limit">Fără limită de timp</string>
<string name="context_menu_read_full_article">Citește tot articolul</string>
<string name="context_menu_read_article">Citește articolul</string>
<string name="context_menu_points_of_group">Toate punctele grupului</string>
<string name="open_from">Deschide de la</string>
<string name="open_till">Deschide până</string>
<string name="will_close_at">Se va închide la</string>
<string name="will_open_at">Se va deschide la</string>
<string name="will_open_on">Se va deschide la</string>
<string name="additional_actions">Acțiuni adiționale</string>
<string name="av_locations_selected_desc">Fișier GPX cu datele și coordonatele notelor selectate.</string>
<string name="av_locations_all_desc">Fișier GPX cu datele și coordonatele tuturor notelor.</string>
<string name="release_3_0">\\022</string>
<string name="modify_the_search_query">Modifică criteriul de căutare.</string>
<string name="shared_string_actions">Acțiuni</string>
<string name="shared_string_marker">Marcaj</string>
<string name="empty_state_osm_edits">Creează sau modifica obiecte OSM</string>
<string name="empty_state_osm_edits_descr">Creează sau modifica POI OSM, deschide sau comentează notele OSM și contribuie cu fișiere GPX.</string>
<string name="shared_string_deleted">Șters</string>
<string name="shared_string_edited">Editat</string>
<string name="shared_string_added">Adăugat</string>
<string name="marker_activated">Marcaj %s activat.</string>
<string name="one_tap_active_descr">Atinge un marcaj de pe hartă pentru a fi mutat in topul marcajelor active fara a deschide meniul contextual.</string>
<string name="one_tap_active">Activ la o atingere</string>
<string name="empty_state_av_notes">Luați note!</string>
<string name="empty_state_av_notes_desc">Adaugă audio, video sau foto pentru orice punct de pe hartă, folosind widget-ul sau meniul contextual.</string>
<string name="notes_by_date">Note după dată</string>
<string name="by_date">După dată</string>
<string name="by_type">După tip</string>
<string name="looking_for_tracks_with_waypoints">Cautând trackuri cu puncte intermediare</string>
<string name="shared_string_more_without_dots">Mai mult</string>
<string name="appearance_on_the_map">Apariția pe hartă</string>
<string name="add_track_to_markers_descr">Selectează un track pentru a-i adăuga un punct intermediar la marcaje. (Numai trackurile cu puncte intermediare sunt listate.)</string>
<string name="add_favourites_group_to_markers_descr">Selectează o categorie de favorite pentru a fi adaugată la marcaje.</string>
<string name="track_waypoints">Puncte intermediare pentru track</string>
<string name="favourites_group">Categorie favorite</string>
<string name="add_group">Adaugă un grup</string>
<string name="add_group_descr">Puteți importa grupuri din favorite sau puncte intermediare de trackuri</string>
<string name="empty_state_markers_active">Creează marcaje de hartă!</string>
<string name="empty_state_markers_active_desc">Atinge lung sau scurt pe locații, apoi atinge butonul pentru steagul marcajului.</string>
<string name="empty_state_markers_groups">Importă grupuri</string>
<string name="empty_state_markers_groups_desc">Puteți importa grupuri favorite sau puncte intermediare de trackuri ca marcaje.</string>
<string name="empty_state_markers_history">\@string/shared_string_history</string>
<string name="empty_state_markers_history_desc">Marcajele marcate ca trecute vor apărea pe această fereastră.</string>
<string name="shared_string_two">Două</string>
<string name="shared_string_one">Una</string>
<string name="show_guide_line_descr">Afișați linii de ghidare de la poziția actuală către locatia marcajului.</string>
<string name="show_arrows_descr">Afișați una sau doua săgeți care sa indice direcția către marcajele active.</string>
<string name="distance_indication_descr">Alegeți cum sa fie afișată distanța către marcajele active.</string>
<string name="active_markers_descr">Alegeți câti indicatori de direcție săa fie afișați.</string>
<string name="digits_quantity">Numărul digiților zecimali</string>
<string name="shared_string_right">Dreapta</string>
<string name="shared_string_left">Stânga</string>
<string name="show_number_pad">Arată panoul cu numere</string>
<string name="shared_string_paste">Lipește</string>
<string name="coordinate_input_accuracy_description">Schimbă automat la câmpul urmator dupa ce introduceți %1$d digiți zecimali.</string>
<string name="coordinate_input_accuracy">%1$d digiți</string>
<string name="go_to_next_field">Mergi la câmpul următor</string>
<string name="rename_marker">Redenumește marcaj</string>
<string name="tap_on_map_to_hide_interface_descr">O atingere pe hartă activează butoanele de control și widgeturi-le.</string>
<string name="tap_on_map_to_hide_interface">Modul fereastră completă</string>
<string name="mark_passed">Marcaj trecut</string>
<string name="import_gpx_file_description">poate fi importat ca puncte Favorite, sau ca fișier track.</string>
<string name="import_as_gpx">Importă ca fișier GPX</string>
<string name="import_as_favorites">Importă ca Favorite</string>
<string name="import_file">Importă fișier</string>
<string name="wrong_input">Introducere greșită</string>
<string name="enter_new_name">Introduceți noul nume</string>
<string name="shared_string_back">Inapoi</string>
<string name="view">Vizualizare</string>
<string name="waypoints_added_to_map_markers">Punctele intermediare adăugate la marcajele hărții</string>
<string name="wrong_format">Format greșit</string>
<string name="shared_string_road">Road</string>
<string name="show_map">Arată harta</string>
<string name="route_is_calculated">Ruta este calculată</string>
<string name="round_trip">Dus-întors</string>
<string name="plan_route_no_markers_toast">Trebuie sa adăugați cel puțin un marcaj pentru a utilza această funcție.</string>
<string name="osn_modify_dialog_error">O exceptie a avut loc: nota nu a fost modificată</string>
<string name="osn_modify_dialog_title">Modifică nota</string>
<string name="context_menu_item_modify_note">Modifică nota OMS</string>
<string name="make_round_trip_descr">Copiază punctul de pornire ca destinație.</string>
<string name="coordinates_format">Format coordonate</string>
<string name="use_system_keyboard">Foloseste tastatura sistemului</string>
<string name="fast_coordinates_input_descr">Alege formatul coordonatelor. Puteți oricând schimba din Opțiuni.</string>
<string name="fast_coordinates_input">Introducere rapidă a coordonatelor</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Evită drumurile cu polei și traversarile râurilor</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Evită drumurile cu polei și traversarile râurilor.</string>
<string name="plan_route">Planul rutei</string>
<string name="coordinate_input">Introduce coordonatele</string>
<string name="is_saved">este salvat</string>
<string name="marker_save_as_track_descr">Exportă coordonatele intr-un fișier specificat aici:</string>
<string name="marker_save_as_track">Salvează ca track</string>
<string name="group_will_be_removed_after_restart">Grupul va fi șters după următorul restart al aplicației.</string>
<string name="show_guide_line">Arată liniile de ghidare</string>
<string name="show_arrows_on_the_map">Arată săgețile pe hartă</string>
<string name="remove_from_map_markers">Șterge din marcajele hărții</string>
<string name="descendingly">descende</string>
<string name="ascendingly">ascende</string>
<string name="date_added">Dată adaugată</string>
<string name="marker_show_distance_descr">Selectează cum să fie indicată distanța și direcția catre marcajele hărții pe ecran:</string>
<string name="all_markers_moved_to_history">Toate marcajele hărții mutate la istoric</string>
<string name="marker_moved_to_history">Marcajul hărții mutat la istoric</string>
<string name="shared_string_list">Listă</string>
<string name="passed">Ultima utilizare: %1$s</string>
<string name="make_active">Activează</string>
<string name="move_all_to_history">Mută tot la istoric</string>
<string name="show_direction">Indicație distanță</string>
<string name="keep_showing_on_map">Păstrează afișarea pe hartă</string>
<string name="exit_without_saving">Ieșiți fara să salvați?</string>
<string name="save_as_route_point">Salvează ca puncte ale rutei</string>
<string name="save_as_line">Salvează ca linie</string>
<string name="route_point">Punct de rută</string>
<string name="add_point_before">Adauga punct inainte</string>
<string name="add_point_after">Adaugă punct după</string>
<string name="measurement_tool_snap_to_road_descr">OsmAnd va conecta punctele cu rutele pentru profilul selectat.</string>
<string name="measurement_tool_save_as_new_track_descr">Puteți salva punctele fie ca rută sau ca linie.</string>
<string name="choose_navigation_type">Selectează profilul de navigație</string>
<string name="none_point_error">Adăugați cel puțin un punct.</string>
<string name="enter_gpx_name">Nume fișier GPX:</string>
<string name="show_on_map_after_saving">Arată pe hartă după salvare</string>
<string name="measurement_tool_action_bar">Navigați pe hartă și adăugați puncte</string>
<string name="quick_action_resume_pause_navigation">Reluare/pauză navigație</string>
<string name="quick_action_resume_pause_navigation_descr">Atingeți acest buton pentru pauză sau reluare navigație.</string>
<string name="quick_action_show_navigation_finish_dialog">Arată dialog finalizare Navigație/</string>
<string name="quick_action_start_stop_navigation_descr">Atingeți acest buton pentru pornire sau incheiere navigație.</string>
<string name="store_tracks_in_monthly_directories">Stochează lunar track-urile înregistrate in foldere</string>
<string name="store_tracks_in_monthly_directories_descrp">Stochează trackurile înregistrate lunar în sub-foldere (ca 2017-01).</string>
<string name="mapillary_menu_title_tile_cache">Cache tile</string>
<string name="wrong_user_name">Nume utilizator greșit!</string>
<string name="mapillary_menu_descr_dates">Vedeți doar imaginile adăugate</string>
<string name="mapillary_menu_title_dates">Dată</string>
<string name="mapillary_menu_edit_text_hint">Scrie nume utilizator</string>
<string name="mapillary_menu_descr_username">Vedeți doar imaginile adaugate de</string>
<string name="mapillary_menu_filter_description">Puteți filtra imaginile după utilizator sau după dată. Filtrele se aplica doar pentru zoom apropiat.</string>
<string name="import_gpx_failed_descr">Osmand nu poate importa fișierul. Vă rugăm să verificați dacă OsmAnd are permisiuni de citire din această locație.</string>
<string name="distance_moving">Distanța corectată</string>
<string name="mapillary_image">Imagine Mapillary</string>
<string name="open_mapillary">Deschide Mapillary</string>
<string name="improve_coverage_mapillary">Înbunătățiți acoperirea foto cu Mapillary</string>
<string name="improve_coverage_install_mapillary_desc">Puteți face propriile fotografii sau serii de fotografii si să le atașați la aceasta locație pe hartă.
\nPentru asta, trebuie să instalați aplicația Mapillary de pe Magazinul Google Play.</string>
<string name="online_photos">Fotografii online</string>
<string name="no_photos_descr">Nu avem imagini pentru această locație.</string>
<string name="mapillary_action_descr">Contribuiți cu propriile imagini la nivelul străzii pentru această locatie cu Mapillary.</string>
<string name="mapillary_widget">Widget Mapillary</string>
<string name="mapillary_widget_descr">Permite contribuția rapidă pentru Mapillary.</string>
<string name="mapillary_descr">Imagini online la nivelul străzii pentru oricine. Descoperiți locuri, colaborați, captați lumea.</string>
<string name="mapillary">Mapillary</string>
<string name="private_access_routing_req">Destinația dumneavoastră se află intr-o zonă cu acces privat. Doriți să acordati accesul la străzi private pentru această ruta?</string>
<string name="restart_search">Reporniți căutarea</string>
<string name="increase_search_radius">Măriți aria de căutare</string>
<string name="nothing_found">Nimic găsit :(</string>
<string name="nothing_found_descr">Modifică criteriile de căutare sau mărește aria de căutare.</string>
<string name="quick_action_showhide_osmbugs_title">Arată/ascunde notele OSM</string>
<string name="quick_action_osmbugs_show">Arată notele OSM</string>
<string name="quick_action_osmbugs_hide">Ascunde notele OSM</string>
<string name="quick_action_showhide_osmbugs_descr">Atingând butonul pe ecran, notele OSM de pe hartă vor fi afișate sau ascunse.</string>
<string name="sorted_by_distance">Sortat după distanță</string>
<string name="search_favorites">Caută favorite</string>
<string name="hillshade_menu_download_descr">Pentru a vedea relieful pe hartă, trebuie să descărcați harta cu relieful 3D pentru această regiune.</string>
<string name="hillshade_purchase_header">Pentru a vedea relieful pe hartă, trebuie să cumparați si să instalați extensia Contour Lines</string>
<string name="hide_from_zoom_level">Ascunde de la nivelul de zoom</string>
<string name="shared_string_plugin">Extensie</string>
<string name="srtm_color_scheme">Schemă culori</string>
<string name="routing_attr_allow_private_name">Permite accesul privat</string>
<string name="routing_attr_allow_private_description">Permite accesul în zonele private.</string>
<string name="display_zoom_level">Afisează nivelul de zoom: %1$s</string>
<string name="favorite_group_name">Numele grupului</string>
<string name="change_color">Schimbă culoarea</string>
<string name="edit_name">Modifică numele</string>
<string name="animate_my_location">Animeaza Poziția Mea</string>
<string name="shared_string_overview">Prezentare generală</string>
<string name="select_street">Selectează strada</string>
<string name="shared_string_in_name">în %1$s</string>
<string name="type_address">Scrie adresa</string>
<string name="type_city_town">Scrie orașul</string>
<string name="type_postcode">Scrie codul poștal</string>
<string name="nearest_cities">Orașe apropiate</string>
<string name="select_city">Selectează oraș</string>
<string name="select_postcode">Selectează cod poștal</string>
<string name="quick_action_auto_zoom">Auto zoom hartă pornit/oprit</string>
<string name="quick_action_auto_zoom_on">Activare auto zoom hartă</string>
<string name="quick_action_auto_zoom_off">Dezactivare auto zoom hartă</string>
<string name="quick_action_add_destination">Adaugă destinație</string>
<string name="quick_action_replace_destination">Înlocuiește destinația</string>
<string name="quick_action_add_first_intermediate">Adaugă primul punct intermediar</string>
<string name="subscribe_email_error">Eroare</string>
<string name="shared_string_visible">Vizibil</string>
<string name="restore_purchases">Restaurare cumpărături</string>
<string name="fonts_header">Fonturi pentru hartă</string>
<string name="right_side_navigation">Conducere pe dreapta</string>
<string name="driving_region_automatic">Automatic</string>
<string name="do_not_send_anonymous_app_usage">Nu trimite statistici de utilizare anonime ale aplicației</string>
<string name="do_not_send_anonymous_app_usage_desc">OsmAnd colecteaza informații despre părțile din aplicatie folosite. Locația dumneavoastră si datele introduse în aplicație nu vor fi niciodată trimise, sau detalii despre zona in care vă aflați, căutari sau descărcări.</string>
<string name="do_not_show_startup_messages">Nu arăta mesaje la pornire</string>
<string name="parking_options">Opțiuni parcare</string>
<string name="full_version_thanks">"Va muțumim pentru că ați cumpărat versiunea completă OsmAnd! "</string>
<string name="routing_attr_relief_smoothness_factor_hills_name">Deluros</string>
<string name="routing_attr_relief_smoothness_factor_plains_name">Mai puțin deluros</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Plat</string>
<string name="routing_attr_driving_style_speed_name">Rute scurte</string>
<string name="routing_attr_driving_style_balance_name">Echilibrat</string>
<string name="relief_smoothness_factor_descr">Teren preferat: plat sau deluros</string>
<string name="shared_string_slope">Pantă</string>
<string name="add_new_folder">Adaugă dosar nou</string>
<string name="gpx_track">Track(pistă)</string>
<string name="max_speed">Viteza maximă</string>
<string name="average_speed">Viteza medie</string>
<string name="shared_string_max">Maxim</string>
<string name="shared_string_start_time">Timp de pornire</string>
<string name="shared_string_end_time">Timp de oprire</string>
<string name="shared_string_color">Culoare</string>
<string name="select_gpx_folder">Selectează dosarul cu track-uri</string>
<string name="file_can_not_be_moved">Fișierul nu poate fi mutat.</string>
<string name="shared_string_move">Mută</string>
<string name="shared_string_tracks">Track-uri</string>
<string name="routing_attr_driving_style_name">Stil de conducere</string>
<string name="shared_string_time">Timp</string>
<string name="total_distance">Distanța totală</string>
</resources> </resources>

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

@ -2955,4 +2955,6 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="last_intermediate_dest_description">Annanghet s\'ùrtima firmada a s\'àndala</string> <string name="last_intermediate_dest_description">Annanghet s\'ùrtima firmada a s\'àndala</string>
<string name="first_intermediate_dest_description">Annanghet sa prima firmada a s\'àndala</string> <string name="first_intermediate_dest_description">Annanghet sa prima firmada a s\'àndala</string>
<string name="subsequent_dest_description">Moe sa destinatzione in subra, e crea una destinatzione</string> <string name="subsequent_dest_description">Moe sa destinatzione in subra, e crea una destinatzione</string>
<string name="map_import_error">Errore cun s\'importatzione de sa mapa</string>
<string name="map_imported_successfully">Mapa importada cun sutzessu</string>
</resources> </resources>

172
OsmAnd/res/values-sr/strings.xml
View file

@ -1758,7 +1758,7 @@
<string name="osc_file_desc">ОСЦ - погодно за извоз у OpenStreetMap.</string> <string name="osc_file_desc">ОСЦ - погодно за извоз у OpenStreetMap.</string>
<string name="osc_file">ОСЦ датотека</string> <string name="osc_file">ОСЦ датотека</string>
<string name="osm_edits_export_desc">Одаберити тип извоза: ОСМ белешке, тачке од интереса или оба.</string> <string name="osm_edits_export_desc">Одаберити тип извоза: ОСМ белешке, тачке од интереса или оба.</string>
<string name="empty_state_markers_history"></string> <string name="empty_state_markers_history"/>
<string name="lang_ml">Малајалам</string> <string name="lang_ml">Малајалам</string>
<string name="lang_lo">Лаоски</string> <string name="lang_lo">Лаоски</string>
<string name="lang_vo">Волапук</string> <string name="lang_vo">Волапук</string>
@ -1771,7 +1771,7 @@
<string name="navigate_point_olc_info_invalid">Неисправни кôд локације <string name="navigate_point_olc_info_invalid">Неисправни кôд локације
\n</string> \n</string>
<string name="navigate_point_olc_info_short">Прекратак кôд локације <string name="navigate_point_olc_info_short">Прекратак кôд локације
\nНаведите пуни кôд.</string> \nНаведите пуни кôд</string>
<string name="navigate_point_olc_info_area">Исправан кôд локације <string name="navigate_point_olc_info_area">Исправан кôд локације
\nПредставља површину: %1$s x %2$s</string> \nПредставља површину: %1$s x %2$s</string>
<string name="save_track_to_gpx">Аутоматски снимај путању за време навођења</string> <string name="save_track_to_gpx">Аутоматски снимај путању за време навођења</string>
@ -1889,7 +1889,7 @@
<string name="navigate_point_format">Формат</string> <string name="navigate_point_format">Формат</string>
<string name="navpoint_search_desc">Координате</string> <string name="navpoint_search_desc">Координате</string>
<string name="left_side_navigation">Вожња на левој страни</string> <string name="left_side_navigation">Вожња на левој страни</string>
<string name="left_side_navigation_descr">Одаберите за земље у којима се вози левом страном</string> <string name="left_side_navigation_descr">Одаберите за земље у којима се вози левом страном.</string>
<string name="unknown_location">Положај још није познат</string> <string name="unknown_location">Положај још није познат</string>
<string name="confirm_interrupt_download">Желите ли да поништите скидање ове датотеке?</string> <string name="confirm_interrupt_download">Желите ли да поништите скидање ове датотеке?</string>
<string name="plugins_screen">Прикључци</string> <string name="plugins_screen">Прикључци</string>
@ -1922,4 +1922,168 @@
<string name="altitude">Надморска висина</string> <string name="altitude">Надморска висина</string>
<string name="no_info">Нема информација</string> <string name="no_info">Нема информација</string>
<string name="i_am_here">Ја сам овде</string> <string name="i_am_here">Ја сам овде</string>
</resources> <string name="release_2_7">\\022 Мапилар прикључак са сликама са улице
\n
\n • Лењир за мерење раздаљина
\n
\n • ГПИкс дељење интервала са детаљним подацима о путањи
\n
\n • И друга побољшања и исправке грешака
\n
\n</string>
<string name="osmo_no_connection_msg">Не могу да се повежем са ОсМо сервером:
\n- проверите интернет везу;
\n- проверите поставке;
\n- проверите наш Твитер: https://twitter.com/OsMomobi</string>
<string name="osmo_plugin_description">Овај додатак пружа делимичну функционалност OpenStreetMap Monitoring-а, види https://osmo.mobi
\n
\nМожете пратити све уређаје из групе уживо. Можете такође и видети све тачке и путање отпремљене у групе у којима се налазите.
\n
\nГрупа није уклоњена месецима, освежите је са правилима са којима се праве групе на сајту OsMo.mobi</string>
<string name="poi_filter_sightseeing">Разгледање знаменитости</string>
<string name="screen_is_locked">Притисните иконицу за закључавање да откључате екран</string>
<string name="bg_service_interval">Подесите интервал буђења:</string>
<string name="continue_follow_previous_route_auto">Претходно навођење није завршено. Желите ли да га наставите? (%1$s секунди)</string>
<string name="global_app_allocated_memory_descr">Заузета меморија %1$s MB (Андроид лимит %2$s MB, Dalvik %3$s MB).</string>
<string name="osmand_parking_event">Узмите кола са паркинга</string>
<string name="osmand_parking_delete_confirm">Да ли желите да обришете ознаку положаја паркинга?</string>
<string name="osmand_parking_delete">Избриши ознаку паркинга</string>
<string name="osmand_parking_add_event">Додајте обавештење у календар</string>
<string name="osmand_parking_position_description">Положај паркирања Ваших кола. %1$s</string>
<string name="osmand_parking_position_description_add">Узети ауто са паркинга у:</string>
<string name="context_menu_item_add_parking_point">Означи као позицију паркинга</string>
<string name="context_menu_item_delete_parking_point">Избриши ознаку паркинга</string>
<string name="local_index_routing_data">Подаци у рутирању</string>
<string name="unknown_from_location">Још није одређена полазна тачка</string>
<string name="modify_transparency">Измени транспарентност (0 - скроз транспарентно, 255 - скроз непровидно)</string>
<string name="local_indexes_cat_map">Стандардне карте (векторске)</string>
<string name="gpx_tags_txt">Ознаке</string>
<string name="validate_gpx_upload_name_pwd">Да бисте отпремили ГПИкс датотеке морате навести ОСМ корисничко име и лозинку.</string>
<string name="support_new_features">Подржите нове функционалности</string>
<string name="show_ruler_level">Прикажи лењир</string>
<string name="back_to_location">Назад на положај</string>
<string name="accessibility_mode">Режим приступачности</string>
<string name="accessibility_mode_descr">Укључите функционалности за бољу приступачност.</string>
<string name="accessibility_default">Према општим системским поставкама</string>
<string name="zoomIs">Ниво зума је</string>
<string name="arrival_distance_factor_early">Рано</string>
<string name="arrival_distance_factor_normally">Нормално</string>
<string name="arrival_distance_factor_late">Касно</string>
<string name="arrival_distance_factor_at_last">У последњих пар метара</string>
<string name="arrival_distance">Обавештење о доласку</string>
<string name="arrival_distance_descr">Колико брзо желите да добијете обавештење о пристизању?</string>
<string name="offline_edition_descr">Користи уређивање без мреже.</string>
<string name="local_openstreetmap_uploading">Отпремам…</string>
<string name="local_openstreetmap_were_uploaded">{0} тачака од интереса/белешки отпремљено</string>
<string name="local_openstreetmap_uploadall">Отпреми све</string>
<string name="local_openstreetmap_upload">Отпреми измене у ОСМ</string>
<string name="local_openstreetmap_delete">Избриши измене</string>
<string name="local_openstreetmap_descr_title">Асинхроно ОСМ уређивање:</string>
<string name="local_openstreetmap_settings">Локално сачуване тачке од интереса/белешке са ОСМ-а</string>
<string name="local_openstreetmap_settings_descr">Приказуј и управљај ОСМ тачкама од интереса/белешкама из локалне базе података.</string>
<string name="show_current_gpx_title">Прикажи тренутну путању</string>
<string name="free_version_title">Бесплатна верзија</string>
<string name="poi_context_menu_showdescription">Приказуј опис тачака од интереса.</string>
<string name="index_name_north_america">Северна Америка</string>
<string name="index_name_netherlands">Европа - Холандија</string>
<string name="index_name_us">Северна Америка - Сједињене Америчке Државе</string>
<string name="index_name_central_america">Централна Америка</string>
<string name="index_name_south_america">Јужна Америка</string>
<string name="index_name_europe">Европа</string>
<string name="index_name_france">Европа - Француска</string>
<string name="index_name_germany">Европа - Немачка</string>
<string name="index_name_russia">Русија</string>
<string name="index_name_africa">Африка</string>
<string name="index_name_asia">Азија</string>
<string name="index_name_oceania">Аустралија и Океанија</string>
<string name="index_name_wiki">Светске тачке од интереса са Википедије</string>
<string name="amenity_type_osmwiki">Википедија (ван мреже)</string>
<string name="routing_settings">Навођење</string>
<string name="global_settings">Опште поставке</string>
<string name="general_settings">Опште</string>
<string name="global_app_settings">Опште поставке апликације</string>
<string name="user_name">Ваше ОСМ корисничко име</string>
<string name="user_password">Ваша ОСМ лозинка</string>
<string name="use_transparent_map_theme">Прозирна тема</string>
<string name="delete_confirmation_msg">Обриши %1$s?</string>
<string name="city_type_hamlet">Засеок</string>
<string name="city_type_city">Град</string>
<string name="poi_query_by_name_matches_categories">За овај упит је нађено неколико категорија тачака од интереса:</string>
<string name="route_successfully_saved_at">Пут успешно сачуван као \'%1$s\'.</string>
<string name="favorite_home_category">Кућа</string>
<string name="shared_string_release">Издат</string>
<string name="local_index_action_do">Треба да %1$s %2$s ставку(е). Наставити?</string>
<string name="gpx_option_destination_point">Користи тренутно одредиште</string>
<string name="internet_not_available">За ову операцију је потребна интернет веза, али је она недоступна.</string>
<string name="install_more">Инсталирај још…</string>
<string name="level_to_switch_vector_raster_descr">Најмањи ниво увећања да би се користиле векторске карте.</string>
<string name="level_to_switch_vector_raster">Мин ниво увећања за векторске карте</string>
<string name="system_locale">Систем</string>
<string name="preferred_locale_descr">Изаберите језик за приказ (и рестартујте ОсмАнд после промене).</string>
<string name="preferred_locale">Језик приказа</string>
<string name="incomplete_locale">непотпун</string>
<string name="unit_of_length_descr">Промени јединицу за дужину.</string>
<string name="unit_of_length">Јединица за дужину</string>
<string name="si_mi_feet">Миље/стопе</string>
<string name="si_mi_yard">Миље/јарди</string>
<string name="si_km_m">Километри/метри</string>
<string name="yard">yd</string>
<string name="foot">ft</string>
<string name="mile_per_hour">mph</string>
<string name="mile">mi</string>
<string name="send_location">Пошаљи положај</string>
<string name="context_menu_item_share_location">Подели положај</string>
<string name="add_waypoint_dialog_title">Додај пролазну тачку на снимљену ГПИкс путању</string>
<string name="context_menu_item_add_waypoint">Додај ГПИкс пролазну тачку</string>
<string name="amenity_type_administrative">Администрација</string>
<string name="amenity_type_barrier">Препрека</string>
<string name="amenity_type_education">Образовање</string>
<string name="amenity_type_emergency">Хитна помоћ</string>
<string name="amenity_type_entertainment">Забава</string>
<string name="amenity_type_finance">Финансије</string>
<string name="amenity_type_geocache">Геокеш</string>
<string name="amenity_type_healthcare">Здравство</string>
<string name="amenity_type_historic">Историјско место</string>
<string name="amenity_type_landuse">Земља у употреби</string>
<string name="amenity_type_leisure">Слободно време</string>
<string name="amenity_type_man_made">Грађевине</string>
<string name="amenity_type_military">Војска</string>
<string name="amenity_type_natural">Природа</string>
<string name="amenity_type_office">Канцеларија</string>
<string name="amenity_type_other">Остало</string>
<string name="amenity_type_shop">Трговина</string>
<string name="amenity_type_sport">Спорт</string>
<string name="amenity_type_sustenance">Прехрана</string>
<string name="amenity_type_tourism">Туризам</string>
<string name="amenity_type_transportation">Превоз</string>
<string name="indexing_address">Индексирам адресе…</string>
<string name="indexing_map">Индексирам карту…</string>
<string name="indexing_poi">Индексирам тачке од интереса…</string>
<string name="indexing_transport">Индексирам превоз…</string>
<string name="km">km</string>
<string name="km_h">km/h</string>
<string name="m">m</string>
<string name="poi_filter_closest_poi">Најближе тачке од интереса</string>
<string name="router_service">Услуга навођења</string>
<string name="download_question">Преузми {0} - {1}?</string>
<string name="address">Адреса</string>
<string name="techical_articles_item">Технички чланци</string>
<string name="versions_item">Верзије</string>
<string name="contact_us">Контактирајте нас</string>
<string name="quick_action_btn_tutorial_title">Помери дугме</string>
<string name="quick_action_btn_tutorial_descr">Дуго држите и превуците дугме да га померате по екрану.</string>
<string name="shared_string_action_name">Име радње</string>
<string name="mappilary_no_internet_desc">Потребан је интернет да бисте видели слике са Мапилара.</string>
<string name="retry">Покушај поново</string>
<string name="empty_state_my_tracks">Додај и снимај путање</string>
<string name="empty_state_my_tracks_desc">Сними или увези путање за преглед.</string>
<string name="empty_state_favourites">Додај омиљене</string>
<string name="empty_state_favourites_desc">Додајте омиљене путање на карти или их увезите из датотеке.</string>
<string name="import_track">Увези путање</string>
<string name="winter_and_ski_renderer">Зима и скијање</string>
<string name="nautical_renderer">Поморско</string>
<string name="copy_location_name">Копирај име тачке</string>
<string name="toast_empty_name_error">Положај нема име</string>
<string name="tunnel_warning">Тунел испред</string>
<string name="show_tunnels">Тунели</string>
</resources>

27
OsmAnd/res/values-zh-rTW/phrases.xml
View file

@ -3623,8 +3623,8 @@
<string name="poi_socket_tesla_standard">插座：特斯拉標準</string> <string name="poi_socket_tesla_standard">插座：特斯拉標準</string>
<string name="poi_socket_tesla_standard_current">插座：特斯拉標準：電流</string> <string name="poi_socket_tesla_standard_current">插座：特斯拉標準：電流</string>
<string name="poi_socket_tesla_standard_output">插座：特斯拉標準：輸出</string> <string name="poi_socket_tesla_standard_output">插座：特斯拉標準：輸出</string>
<string name="poi_socket_tesla_supercharger">插座：特斯拉超級充電器</string> <string name="poi_socket_tesla_supercharger">插座：特斯拉超級充電站</string>
<string name="poi_socket_tesla_supercharger_current">插座：特斯拉超級充電器：電流</string> <string name="poi_socket_tesla_supercharger_current">插座：特斯拉超級充電站：電流</string>
<string name="poi_socket_tesla_supercharger_output">插座：特斯拉超級充電器：輸出</string> <string name="poi_socket_tesla_supercharger_output">插座：特斯拉超級充電器：輸出</string>
<string name="poi_socket_tesla_roadster">插座：特斯拉 Roadster</string> <string name="poi_socket_tesla_roadster">插座：特斯拉 Roadster</string>
<string name="poi_socket_tesla_roadster_current">插座：特斯拉 Roadster：電流</string> <string name="poi_socket_tesla_roadster_current">插座：特斯拉 Roadster：電流</string>
@ -3760,4 +3760,27 @@
<string name="poi_osmand_socket_cee_red_16a_yes">CEE 紅色 16A</string>
<string name="poi_osmand_socket_cee_red_32a_yes">CEE 紅色 32A</string>
<string name="poi_osmand_socket_cee_red_64a_yes">CEE 紅色 64A</string>
<string name="poi_osmand_socket_cee_red_125a_yes">CEE 紅色 125A</string>
<string name="poi_osmand_socket_type1_yes">種類 1</string>
<string name="poi_osmand_socket_type1_combo_yes">種類 1 二合一</string>
<string name="poi_osmand_socket_type2_yes">種類 2</string>
<string name="poi_osmand_socket_type2_combo_yes">種類 2 二合一</string>
<string name="poi_osmand_socket_type3_yes">種類 3</string>
<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
<string name="poi_osmand_socket_tesla_standard_yes">特斯拉標準</string>
<string name="poi_osmand_socket_tesla_supercharger_yes">特斯拉超級充電站</string>
<string name="poi_osmand_socket_tesla_roadster_yes">特斯拉 Roadster</string>
<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
<string name="poi_osmand_socket_schuko_yes">Schuko</string>
<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</string>
</resources> </resources>

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

@ -3038,4 +3038,6 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
<string name="first_intermediate_dest_description">新增在路線上的第一站</string> <string name="first_intermediate_dest_description">新增在路線上的第一站</string>
<string name="subsequent_dest_description">向上移動目標，並建立目的地</string> <string name="subsequent_dest_description">向上移動目標，並建立目的地</string>
<string name="make_as_start_point">作為起點</string> <string name="make_as_start_point">作為起點</string>
<string name="map_import_error">地圖匯入錯誤</string>
<string name="map_imported_successfully">地圖已成功匯入</string>
</resources> </resources>

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

@ -3710,6 +3710,26 @@
<string name="poi_cannabis">Cannabis store</string> <string name="poi_cannabis">Cannabis store</string>
<string name="poi_osmand_socket_cee_blue_yes">CEE blue</string> <string name="poi_osmand_socket_cee_blue_yes">CEE blue</string>
<string name="poi_osmand_socket_cee_red_16a_yes">CEE red 16A</string>
<string name="poi_osmand_socket_cee_red_32a_yes">CEE red 32A</string>
<string name="poi_osmand_socket_cee_red_64a_yes">CEE red 64A</string>
<string name="poi_osmand_socket_cee_red_125a_yes">CEE red 125A</string>
<string name="poi_osmand_socket_type1_yes">Type 1</string>
<string name="poi_osmand_socket_type1_combo_yes">Type 1 combo</string>
<string name="poi_osmand_socket_type2_yes">Type 2</string>
<string name="poi_osmand_socket_type2_combo_yes">Type 2 combo</string>
<string name="poi_osmand_socket_type3_yes">Type 3</string>
<string name="poi_osmand_socket_chademo_yes">CHAdeMO</string>
<string name="poi_osmand_socket_tesla_standard_yes">Tesla standard</string>
<string name="poi_osmand_socket_tesla_supercharger_yes">Tesla Supercharger</string>
<string name="poi_osmand_socket_tesla_roadster_yes">Tesla Roadster</string>
<string name="poi_osmand_socket_nema_5_15_yes">NEMA 5-15R</string>
<string name="poi_osmand_socket_nema_5_20_yes">NEMA 5-20</string>
<string name="poi_osmand_socket_nema_14_30_yes">NEMA 14-30</string>
<string name="poi_osmand_socket_nema_14_50_yes">NEMA 14-50</string>
<string name="poi_osmand_socket_schuko_yes">Schuko</string>
<string name="poi_osmand_socket_bs1363_yes">BS 1363</string>
<string name="poi_osmand_socket_as3112_yes">AS/NZS 3112</string>

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

@ -14,6 +14,8 @@
<string name="south_abbreviation">S</string> <string name="south_abbreviation">S</string>
<string name="north_abbreviation">N</string> <string name="north_abbreviation">N</string>
<string name="optional_point_name">Optional point name</string> <string name="optional_point_name">Optional point name</string>
<string name="map_import_error">Map import error</string>
<string name="map_imported_successfully">Map imported successfully</string>
<string name="make_as_start_point">Make as Start Point</string> <string name="make_as_start_point">Make as Start Point</string>
<string name="shared_string_current">Current</string> <string name="shared_string_current">Current</string>
<string name="last_intermediate_dest_description">Adds the last stop along the route</string> <string name="last_intermediate_dest_description">Adds the last stop along the route</string>

16
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -89,8 +89,8 @@ import net.osmand.plus.firstusage.FirstUsageWizardFragment;
import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.helpers.DiscountHelper; import net.osmand.plus.helpers.DiscountHelper;
import net.osmand.plus.helpers.ExternalApiHelper; import net.osmand.plus.helpers.ExternalApiHelper;
import net.osmand.plus.helpers.GpxImportHelper; import net.osmand.plus.helpers.ImportHelper;
import net.osmand.plus.helpers.GpxImportHelper.ImportGpxBottomSheetDialogFragment; import net.osmand.plus.helpers.ImportHelper.ImportGpxBottomSheetDialogFragment;
import net.osmand.plus.helpers.WakeLockHelper; import net.osmand.plus.helpers.WakeLockHelper;
import net.osmand.plus.inapp.InAppHelper; import net.osmand.plus.inapp.InAppHelper;
import net.osmand.plus.mapcontextmenu.AdditionalActionsBottomSheetDialogFragment; import net.osmand.plus.mapcontextmenu.AdditionalActionsBottomSheetDialogFragment;
@ -189,7 +189,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
private List<DialogProvider> dialogProviders = new ArrayList<>(2); private List<DialogProvider> dialogProviders = new ArrayList<>(2);
private StateChangedListener<ApplicationMode> applicationModeListener; private StateChangedListener<ApplicationMode> applicationModeListener;
private GpxImportHelper gpxImportHelper; private ImportHelper importHelper;
private WakeLockHelper wakeLockHelper; private WakeLockHelper wakeLockHelper;
private boolean intentLocation = false; private boolean intentLocation = false;
@ -310,7 +310,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
} }
addDialogProvider(mapActions); addDialogProvider(mapActions);
OsmandPlugin.onMapActivityCreate(this); OsmandPlugin.onMapActivityCreate(this);
gpxImportHelper = new GpxImportHelper(this, getMyApplication(), getMapView()); importHelper = new ImportHelper(this, getMyApplication(), getMapView());
wakeLockHelper = new WakeLockHelper(getMyApplication()); wakeLockHelper = new WakeLockHelper(getMyApplication());
if (System.currentTimeMillis() - tm > 50) { if (System.currentTimeMillis() - tm > 50) {
System.err.println("OnCreate for MapActivity took " + (System.currentTimeMillis() - tm) + " ms"); System.err.println("OnCreate for MapActivity took " + (System.currentTimeMillis() - tm) + " ms");
@ -509,8 +509,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
} }
} }
public GpxImportHelper getGpxImportHelper() { public ImportHelper getImportHelper() {
return gpxImportHelper; return importHelper;
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ -697,10 +697,10 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
final Uri data = intent.getData(); final Uri data = intent.getData();
final String scheme = data.getScheme(); final String scheme = data.getScheme();
if ("file".equals(scheme)) { if ("file".equals(scheme)) {
gpxImportHelper.handleFileImport(data, new File(data.getPath()).getName(), true); importHelper.handleFileImport(data, new File(data.getPath()).getName(), true);
setIntent(null); setIntent(null);
} else if ("content".equals(scheme)) { } else if ("content".equals(scheme)) {
gpxImportHelper.handleContentImport(data, true); importHelper.handleContentImport(data, true);
setIntent(null); setIntent(null);
} else if ("google.navigation".equals(scheme) || "osmand.navigation".equals(scheme)) { } else if ("google.navigation".equals(scheme) || "osmand.navigation".equals(scheme)) {
parseNavigationIntent(data); parseNavigationIntent(data);

2
OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
View file

@ -781,7 +781,7 @@ public class GpxUiHelper {
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
if (resultData != null) { if (resultData != null) {
Uri uri = resultData.getData(); Uri uri = resultData.getData();
if (mapActivity.getGpxImportHelper().handleGpxImport(uri, false)) { if (mapActivity.getImportHelper().handleGpxImport(uri, false)) {
dialog.dismiss(); dialog.dismiss();
} }
} }

109
OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java → OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
View file

@ -1,5 +1,6 @@
package net.osmand.plus.helpers; package net.osmand.plus.helpers;
import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -12,6 +13,7 @@ import android.os.Bundle;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.provider.OpenableColumns; import android.provider.OpenableColumns;
import android.provider.Settings; import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
@ -27,6 +29,7 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import net.osmand.IProgress;
import net.osmand.IndexConstants; import net.osmand.IndexConstants;
import net.osmand.data.FavouritePoint; import net.osmand.data.FavouritePoint;
import net.osmand.plus.FavouritesDbHelper; import net.osmand.plus.FavouritesDbHelper;
@ -38,13 +41,16 @@ import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.MenuBottomSheetDialogFragment; import net.osmand.plus.base.MenuBottomSheetDialogFragment;
import net.osmand.plus.myplaces.FavoritesActivity; import net.osmand.plus.myplaces.FavoritesActivity;
import net.osmand.plus.views.OsmandMapTileView; import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.util.Algorithms;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -57,7 +63,7 @@ import java.util.zip.ZipInputStream;
/** /**
* @author Koen Rabaey * @author Koen Rabaey
*/ */
public class GpxImportHelper { public class ImportHelper {
public static final String KML_SUFFIX = ".kml"; public static final String KML_SUFFIX = ".kml";
public static final String KMZ_SUFFIX = ".kmz"; public static final String KMZ_SUFFIX = ".kmz";
@ -71,7 +77,7 @@ public class GpxImportHelper {
void onComplete(boolean success); void onComplete(boolean success);
} }
public GpxImportHelper(final AppCompatActivity activity, final OsmandApplication app, final OsmandMapTileView mapView) { public ImportHelper(final AppCompatActivity activity, final OsmandApplication app, final OsmandMapTileView mapView) {
this.activity = activity; this.activity = activity;
this.app = app; this.app = app;
this.mapView = mapView; this.mapView = mapView;
@ -129,6 +135,8 @@ public class GpxImportHelper {
handleKmlImport(intentUri, fileName, saveFile, useImportDir); handleKmlImport(intentUri, fileName, saveFile, useImportDir);
} else if (fileName != null && fileName.endsWith(KMZ_SUFFIX)) { } else if (fileName != null && fileName.endsWith(KMZ_SUFFIX)) {
handleKmzImport(intentUri, fileName, saveFile, useImportDir); handleKmzImport(intentUri, fileName, saveFile, useImportDir);
} else if (fileName != null && fileName.endsWith(IndexConstants.BINARY_MAP_INDEX_EXT)) {
handleObfImport(intentUri, fileName);
} else { } else {
handleFavouritesImport(intentUri, fileName, saveFile, useImportDir, false); handleFavouritesImport(intentUri, fileName, saveFile, useImportDir, false);
} }
@ -153,6 +161,7 @@ public class GpxImportHelper {
return name; return name;
} }
@SuppressLint("StaticFieldLeak")
private void handleGpxImport(final Uri gpxFile, final String fileName, final boolean save, final boolean useImportDir) { private void handleGpxImport(final Uri gpxFile, final String fileName, final boolean save, final boolean useImportDir) {
new AsyncTask<Void, Void, GPXFile>() { new AsyncTask<Void, Void, GPXFile>() {
ProgressDialog progress = null; ProgressDialog progress = null;
@ -193,6 +202,7 @@ public class GpxImportHelper {
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} }
@SuppressLint("StaticFieldLeak")
private void handleFavouritesImport(final Uri gpxFile, final String fileName, final boolean save, final boolean useImportDir, final boolean forceImportFavourites) { private void handleFavouritesImport(final Uri gpxFile, final String fileName, final boolean save, final boolean useImportDir, final boolean forceImportFavourites) {
new AsyncTask<Void, Void, GPXFile>() { new AsyncTask<Void, Void, GPXFile>() {
ProgressDialog progress = null; ProgressDialog progress = null;
@ -233,6 +243,7 @@ public class GpxImportHelper {
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} }
@SuppressLint("StaticFieldLeak")
private void importFavoritesImpl(final GPXFile gpxFile, final String fileName, final boolean forceImportFavourites) { private void importFavoritesImpl(final GPXFile gpxFile, final String fileName, final boolean forceImportFavourites) {
new AsyncTask<Void, Void, GPXFile>() { new AsyncTask<Void, Void, GPXFile>() {
ProgressDialog progress = null; ProgressDialog progress = null;
@ -269,6 +280,7 @@ public class GpxImportHelper {
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} }
@SuppressLint("StaticFieldLeak")
private void handleKmzImport(final Uri kmzFile, final String name, final boolean save, final boolean useImportDir) { private void handleKmzImport(final Uri kmzFile, final String name, final boolean save, final boolean useImportDir) {
new AsyncTask<Void, Void, GPXFile>() { new AsyncTask<Void, Void, GPXFile>() {
ProgressDialog progress = null; ProgressDialog progress = null;
@ -324,6 +336,7 @@ public class GpxImportHelper {
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} }
@SuppressLint("StaticFieldLeak")
private void handleKmlImport(final Uri kmlFile, final String name, final boolean save, final boolean useImportDir) { private void handleKmlImport(final Uri kmlFile, final String name, final boolean save, final boolean useImportDir) {
new AsyncTask<Void, Void, GPXFile>() { new AsyncTask<Void, Void, GPXFile>() {
ProgressDialog progress = null; ProgressDialog progress = null;
@ -370,6 +383,86 @@ public class GpxImportHelper {
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} }
@SuppressLint("StaticFieldLeak")
private void handleObfImport(final Uri obfFile, final String name) {
new AsyncTask<Void, Void, String>() {
ProgressDialog progress;
@Override
protected void onPreExecute() {
progress = ProgressDialog.show(activity, app.getString(R.string.loading_smth, ""), app.getString(R.string.loading_data));
}
@Override
protected String doInBackground(Void... voids) {
File dest = getObfDestFile(name);
if (dest.exists()) {
return app.getString(R.string.file_with_name_already_exists);
}
String message = app.getString(R.string.map_imported_successfully);
InputStream in = null;
OutputStream out = null;
try {
final ParcelFileDescriptor pFD = app.getContentResolver().openFileDescriptor(obfFile, "r");
if (pFD != null) {
in = new FileInputStream(pFD.getFileDescriptor());
out = new FileOutputStream(dest);
Algorithms.streamCopy(in, out);
app.getResourceManager().reloadIndexes(IProgress.EMPTY_PROGRESS, new ArrayList<String>());
app.getDownloadThread().updateLoadedFiles();
try {
pFD.close();
} catch (IOException e) {
e.printStackTrace();
}
}
} catch (FileNotFoundException e) {
e.printStackTrace();
message = app.getString(R.string.map_import_error) + ": " + e.getMessage();
} catch (IOException e) {
e.printStackTrace();
message = app.getString(R.string.map_import_error) + ": " + e.getMessage();
} finally {
if (in != null) {
try {
in.close();
} catch (IOException e) {
e.printStackTrace();
}
}
if (out != null) {
try {
out.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return message;
}
@Override
protected void onPostExecute(String message) {
if (isActivityNotDestroyed(activity)) {
progress.dismiss();
}
Toast.makeText(activity, message, Toast.LENGTH_SHORT).show();
}
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
@NonNull
private File getObfDestFile(@NonNull String name) {
if (name.endsWith(IndexConstants.BINARY_ROAD_MAP_INDEX_EXT)) {
return app.getAppPath(IndexConstants.ROADS_INDEX_DIR + name);
} else if (name.endsWith(IndexConstants.BINARY_WIKI_MAP_INDEX_EXT)) {
return app.getAppPath(IndexConstants.WIKI_INDEX_DIR + name);
}
return app.getAppPath(name);
}
private boolean isActivityNotDestroyed(Activity activity) { private boolean isActivityNotDestroyed(Activity activity) {
if (Build.VERSION.SDK_INT >= 17) { if (Build.VERSION.SDK_INT >= 17) {
return !activity.isFinishing() && !activity.isDestroyed(); return !activity.isFinishing() && !activity.isDestroyed();
@ -558,7 +651,7 @@ public class GpxImportHelper {
} else { } else {
ImportGpxBottomSheetDialogFragment fragment = new ImportGpxBottomSheetDialogFragment(); ImportGpxBottomSheetDialogFragment fragment = new ImportGpxBottomSheetDialogFragment();
fragment.setUsedOnMap(true); fragment.setUsedOnMap(true);
fragment.setGpxImportHelper(this); fragment.setImportHelper(this);
fragment.setGpxFile(gpxFile); fragment.setGpxFile(gpxFile);
fragment.setFileName(fileName); fragment.setFileName(fileName);
fragment.setSave(save); fragment.setSave(save);
@ -622,15 +715,15 @@ public class GpxImportHelper {
public static final String TAG = "ImportGpxBottomSheetDialogFragment"; public static final String TAG = "ImportGpxBottomSheetDialogFragment";
private GpxImportHelper gpxImportHelper; private ImportHelper importHelper;
private GPXFile gpxFile; private GPXFile gpxFile;
private String fileName; private String fileName;
private boolean save; private boolean save;
private boolean useImportDir; private boolean useImportDir;
public void setGpxImportHelper(GpxImportHelper gpxImportHelper) { public void setImportHelper(ImportHelper importHelper) {
this.gpxImportHelper = gpxImportHelper; this.importHelper = importHelper;
} }
public void setGpxFile(GPXFile gpxFile) { public void setGpxFile(GPXFile gpxFile) {
@ -674,14 +767,14 @@ public class GpxImportHelper {
mainView.findViewById(R.id.import_as_favorites_row).setOnClickListener(new View.OnClickListener() { mainView.findViewById(R.id.import_as_favorites_row).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
gpxImportHelper.importFavoritesImpl(gpxFile, fileName, false); importHelper.importFavoritesImpl(gpxFile, fileName, false);
dismiss(); dismiss();
} }
}); });
mainView.findViewById(R.id.import_as_gpx_row).setOnClickListener(new View.OnClickListener() { mainView.findViewById(R.id.import_as_gpx_row).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
gpxImportHelper.handleResult(gpxFile, fileName, save, useImportDir, false); importHelper.handleResult(gpxFile, fileName, save, useImportDir, false);
dismiss(); dismiss();
} }
}); });

2
OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java
View file

@ -26,7 +26,7 @@ import net.osmand.plus.helpers.AndroidUiHelper;
import java.io.File; import java.io.File;
import java.util.Date; import java.util.Date;
import static net.osmand.plus.helpers.GpxImportHelper.GPX_SUFFIX; import static net.osmand.plus.helpers.ImportHelper.GPX_SUFFIX;
public class SaveAsTrackBottomSheetDialogFragment extends BottomSheetDialogFragment { public class SaveAsTrackBottomSheetDialogFragment extends BottomSheetDialogFragment {

2
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
View file

@ -76,7 +76,7 @@ import java.util.Locale;
import static net.osmand.plus.OsmandSettings.LANDSCAPE_MIDDLE_RIGHT_CONSTANT; import static net.osmand.plus.OsmandSettings.LANDSCAPE_MIDDLE_RIGHT_CONSTANT;
import static net.osmand.plus.OsmandSettings.MIDDLE_TOP_CONSTANT; import static net.osmand.plus.OsmandSettings.MIDDLE_TOP_CONSTANT;
import static net.osmand.plus.helpers.GpxImportHelper.GPX_SUFFIX; import static net.osmand.plus.helpers.ImportHelper.GPX_SUFFIX;
public class MeasurementToolFragment extends BaseOsmAndFragment { public class MeasurementToolFragment extends BaseOsmAndFragment {

18
OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
View file

@ -3,14 +3,12 @@
*/ */
package net.osmand.plus.myplaces; package net.osmand.plus.myplaces;
import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.RequiresApi;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v7.widget.SearchView; import android.support.v7.widget.SearchView;
@ -20,7 +18,6 @@ import android.text.style.ImageSpan;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.ImageView; import android.widget.ImageView;
import net.osmand.IndexConstants;
import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
@ -28,10 +25,9 @@ import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.FavoritesTreeFragment; import net.osmand.plus.activities.FavoritesTreeFragment;
import net.osmand.plus.activities.TabActivity; import net.osmand.plus.activities.TabActivity;
import net.osmand.plus.helpers.GpxImportHelper; import net.osmand.plus.helpers.ImportHelper;
import net.osmand.plus.views.controls.PagerSlidingTabStrip; import net.osmand.plus.views.controls.PagerSlidingTabStrip;
import java.io.File;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -53,7 +49,7 @@ public class FavoritesActivity extends TabActivity {
public static final int FAV_TAB = R.string.shared_string_my_favorites; public static final int FAV_TAB = R.string.shared_string_my_favorites;
protected List<WeakReference<Fragment>> fragList = new ArrayList<>(); protected List<WeakReference<Fragment>> fragList = new ArrayList<>();
private int tabSize; private int tabSize;
private GpxImportHelper gpxImportHelper; private ImportHelper importHelper;
private String groupNameToShow; private String groupNameToShow;
@Override @Override
@ -64,7 +60,7 @@ public class FavoritesActivity extends TabActivity {
app.logEvent(this, "myplaces_open"); app.logEvent(this, "myplaces_open");
gpxImportHelper = new GpxImportHelper(this, getMyApplication(), null); importHelper = new ImportHelper(this, getMyApplication(), null);
//noinspection ConstantConditions //noinspection ConstantConditions
getSupportActionBar().setTitle(R.string.shared_string_my_places); getSupportActionBar().setTitle(R.string.shared_string_my_places);
@ -128,17 +124,17 @@ public class FavoritesActivity extends TabActivity {
if (gpxFragment!= null) { if (gpxFragment!= null) {
gpxFragment.startImport(); gpxFragment.startImport();
} }
gpxImportHelper.setGpxImportCompleteListener(new GpxImportHelper.OnGpxImportCompleteListener() { importHelper.setGpxImportCompleteListener(new ImportHelper.OnGpxImportCompleteListener() {
@Override @Override
public void onComplete(boolean success) { public void onComplete(boolean success) {
AvailableGPXFragment gpxFragment = getGpxFragment(); AvailableGPXFragment gpxFragment = getGpxFragment();
if (gpxFragment!= null) { if (gpxFragment!= null) {
gpxFragment.finishImport(success); gpxFragment.finishImport(success);
} }
gpxImportHelper.setGpxImportCompleteListener(null); importHelper.setGpxImportCompleteListener(null);
} }
}); });
if (!gpxImportHelper.handleGpxImport(uri, false)) { if (!importHelper.handleGpxImport(uri, false)) {
if (gpxFragment!= null) { if (gpxFragment!= null) {
gpxFragment.finishImport(false); gpxFragment.finishImport(false);
} }
@ -147,7 +143,7 @@ public class FavoritesActivity extends TabActivity {
} else if (requestCode == IMPORT_FAVOURITES_REQUEST && resultCode == Activity.RESULT_OK) { } else if (requestCode == IMPORT_FAVOURITES_REQUEST && resultCode == Activity.RESULT_OK) {
if (data != null) { if (data != null) {
Uri uri = data.getData(); Uri uri = data.getData();
gpxImportHelper.handleFavouritesImport(uri); importHelper.handleFavouritesImport(uri);
} }
} else { } else {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);