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

Merge branch 'master' into AddGraphs

Browse source 
# Conflicts:
#	OsmAnd/res/values/strings.xml
This commit is contained in:
Nazar-Kutz 2020-10-13 13:39:01 +03:00
commit 7170c74145
64 changed files with 961 additions and 272 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java
View file

@ -124,9 +124,11 @@ public class Algorithms {
}
public static String getFileNameWithoutExtension(String name) {
int i = name.lastIndexOf('.');
if (i >= 0) {
name = name.substring(0, i);
if (name != null) {
int index = name.lastIndexOf('.');
if (index != -1) {
return name.substring(0, index);
}
}
return name;
}

4
OsmAnd-telegram/res/values-be/strings.xml
View file

@ -267,4 +267,8 @@
<string name="last_response_duration">Апошні адказ: %1$s таму</string>
<string name="duration_ago">%1$s таму</string>
<string name="shared_string_error_short">ERR</string>
<string name="send_report">Даслаць справаздачу</string>
<string name="shared_string_export">Экспартаваць</string>
<string name="logcat_buffer">Буфер logcat</string>
<string name="logcat_buffer_descr">Праверце і падзяліцеся падрабязнымі журналамі праграмы</string>
</resources>

4
OsmAnd-telegram/res/values-gl/strings.xml
View file

@ -268,4 +268,8 @@
<string name="time_zone_descr">Escolle a zona horaria que desexas amosar nas mensaxes de localización.</string>
<string name="buffer_time">Tempo de caducidade do búfer</string>
<string name="buffer_time_descr">Tempo máximo para almacenar puntos no búfer</string>
<string name="shared_string_export">Exportar</string>
<string name="logcat_buffer">Búfer de Logcat</string>
<string name="logcat_buffer_descr">Verifica e comparte rexistros detallados da aplicación</string>
<string name="send_report">Enviar denuncia</string>
</resources>

4
OsmAnd-telegram/res/values-nb/strings.xml
View file

@ -267,4 +267,8 @@
<string name="last_response_duration">Siste respons: %1$s siden</string>
<string name="duration_ago">%1$s siden</string>
<string name="shared_string_error_short">FEIL</string>
<string name="logcat_buffer">Logcat-mellomlager</string>
<string name="shared_string_export">Eksporter</string>
<string name="logcat_buffer_descr">Sjekk og del detaljert loggføring fra programmet</string>
<string name="send_report">Send rapport</string>
</resources>

4
OsmAnd-telegram/res/values-pl/strings.xml
View file

@ -267,4 +267,8 @@
<string name="shared_string_error_short">ERR</string>
<string name="last_response_date">Ostatnia odpowiedź: %1$s</string>
<string name="last_response_duration">Ostatnia odpowiedź: %1$s temu</string>
<string name="shared_string_export">Eksportuj</string>
<string name="logcat_buffer">Bufor katalogu dziennika</string>
<string name="logcat_buffer_descr">Sprawdzanie i udostępnianie szczegółowych logów aplikacji</string>
<string name="send_report">Wyślij raport</string>
</resources>

4
OsmAnd-telegram/res/values-pt-rPT/strings.xml
View file

@ -267,4 +267,8 @@
<string name="last_response_date">Última resposta: %1$s</string>
<string name="last_update_from_telegram_date">Última atualização do Telegram: %1$s</string>
<string name="shared_string_error_short">ERR</string>
<string name="shared_string_export">Exportar</string>
<string name="logcat_buffer">Buffer de logcat</string>
<string name="logcat_buffer_descr">Verifique e compartilhe registos detalhados da app</string>
<string name="send_report">Enviar o relatório</string>
</resources>

3
OsmAnd/build.gradle
View file

@ -331,6 +331,9 @@ task collectHelpContentsAssets(type: Copy) {
from("../../help/website/feature_articles") {
include "*.html"
}
from("../../help/website/blog_articles") {
include "osmand-3-8-released.html"
}
into "assets/feature_articles"
}

6
OsmAnd/res/layout/fragment_measurement_tool.xml
View file

@ -208,10 +208,12 @@
<include
android:id="@+id/add_point_button"
layout="@layout/bottom_sheet_dialog_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_width="@dimen/measurement_tool_button_width"
android:layout_gravity="end"
layout="@layout/bottom_sheet_dialog_button" />
android:minWidth="@dimen/measurement_tool_button_width" />
</FrameLayout>
</LinearLayout>

12
OsmAnd/res/values-ar/strings.xml
View file

@ -3901,4 +3901,16 @@
\nيمكنك إدارة وإلغاء الاشتراكات الخاصة بك عن طريق الانتقال إلى إعدادات AppGallery.</string>
<string name="routing_attr_avoid_footways_description">تجنب الممرات</string>
<string name="routing_attr_avoid_footways_name">تجنب الممرات</string>
<string name="what_is_new">ما الجديد</string>
<string name="development">تطوير</string>
<string name="use_live_public_transport">بيانات أوسماند لايف</string>
<string name="use_live_routing">بيانات أوسماند لايف</string>
<string name="use_complex_routing">التوجيه المركب</string>
<string name="complex_routing_descr">التوجيه على مرحلتين لملاحة السيارة.</string>
<string name="use_native_pt">تطوير النقل العام المحلي</string>
<string name="use_native_pt_desc">قم بالتبديل إلى Java (الآمن) حساب توجيه النقل العام</string>
<string name="perform_oauth_authorization_description">قم بإجراء تسجيل دخول إلى OAuth لاستخدام ميزات osmedit</string>
<string name="perform_oauth_authorization">تسجيل الدخول عبر OAuth</string>
<string name="clear_osm_token">مسح رمز OpenStreetMap OAuth</string>
<string name="osm_edit_logout_success">تسجيل الخروج بنجاح</string>
</resources>

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

@ -1576,7 +1576,7 @@
<string name="routing_attr_height_name">Абмежаванне па вышыні</string>
<string name="routing_attr_height_description">Пазначыць вышыню транспартнага сродку для разліку маршруту.</string>
<string name="use_fast_recalculation">Разумны пераразлік маршруту</string>
<string name="use_fast_recalculation_desc">Пераразлічваць толькі пачатак маршруту для доўгіх паездак.</string>
<string name="use_fast_recalculation_desc">Пераразлічваць толькі пачатак маршруту. Падыходзіць для доўгіх паездак.</string>
<string name="shared_string_logoff">Выйсці</string>
<string name="rendering_value_disabled_name">Выключана</string>
<string name="rendering_value_walkingRoutesOSMC_name">Афарбоўка па пешаходнаму сімвалу OSMC</string>
@ -3957,4 +3957,18 @@
<string name="sort_last_modified">Апошняя змена</string>
<string name="sort_name_descending">Назва: Я — А</string>
<string name="sort_name_ascending">Назва: А — Я</string>
<string name="what_is_new">Што новага</string>
<string name="contour_lines_thanks">Дзякуй за набыццё ўбудовы «Контурныя лініі»</string>
<string name="osm_live_payment_desc_hw">Плата за падпіску спаганяецца за абраны перыяд. Скасаваць яе на AppGallery можна у любы момант.</string>
<string name="osm_live_payment_subscription_management_hw">Пры пацвярджэнні пакупкі аплата будзе спаганяцца з рахунка, звязанага з вашым акаўнтам AppGallery.
\n
\nПадпіска аўтаматычна працягваецца, калі вы не скасуеце яе да даты працягу. З вашага рахунка будзе адзін раз спаганяцца аплата за перыяд працягу (месяц/тры месяцы/год).
\n
\nВы можаце кіраваць падпіскамі і скасоўваць іх у наладах AppGallery.</string>
<string name="routing_attr_avoid_footways_description">Пазбягаць пешаходныя дарожкі</string>
<string name="routing_attr_avoid_footways_name">Пазбягаць пешаходныя дарожкі</string>
<string name="development">Распрацоўка</string>
<string name="complex_routing_descr">Дзвюхфазная аўтанавігацыя.</string>
<string name="use_native_pt">Натыўны грамадскі транспарт (у распрацоўцы)</string>
<string name="perform_oauth_authorization">Увайсці праз OAuth</string>
</resources>

9
OsmAnd/res/values-de/strings.xml
View file

@ -1570,7 +1570,7 @@
<string name="routing_attr_height_description">Höhe des Fahrzeugs für Routenberechnung angeben.</string>
<string name="download_wikipedia_maps">Wikipedia</string>
<string name="use_fast_recalculation">Schnelle Routenneuberechnung</string>
<string name="use_fast_recalculation_desc">Bei längeren Routen nur den Anfangsteil neu berechnen.</string>
<string name="use_fast_recalculation_desc">Nur den Anfangsteil neu berechnen. Kann bei längeren Routen benutzt werden.</string>
<string name="lang_es_ar">Spanisch (Argentinien)</string>
<string name="lang_th">Thailändisch</string>
<string name="lang_ms">Malaysisch</string>
@ -3918,4 +3918,11 @@
\n Sie können Ihre Abonnements verwalten und kündigen, indem Sie zu Ihren AppGallery-Einstellungen gehen.</string>
<string name="routing_attr_avoid_footways_description">Vermeidet Fußwege</string>
<string name="routing_attr_avoid_footways_name">Keine Fußwege</string>
<string name="development">Entwicklung</string>
<string name="use_live_public_transport">OsmAnd Live Daten</string>
<string name="use_live_routing">OsmAnd Live Daten</string>
<string name="use_complex_routing">Komplexe Routenberechnung</string>
<string name="complex_routing_descr">Zwei-Phasen-Routenberechnung für die Autonavigation.</string>
<string name="use_native_pt">Native ÖPNV Entwicklung</string>
<string name="use_native_pt_desc">Wechseln zu Java (sicher) Berechnung des ÖPNV-Routings</string>
</resources>

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

@ -3837,4 +3837,5 @@
<string name="poi_departures_board_delay">prokrasto</string>
<string name="poi_departures_board">Tabulo de forveturoj</string>
<string name="poi_drinking_water_refill">Plenigi per trinkebla akvo</string>
<string name="poi_fuel_lng">tergaso likva (LNG)</string>
</resources>

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

@ -1853,7 +1853,7 @@
<string name="navigation_intent_invalid">Erara formo: %s</string>
<string name="plugin_install_needs_network">Vi devas esti konektita al la interreto por instali tiun ĉi kromprogramon.</string>
<string name="use_fast_recalculation">Inteligenta rekalkulado de kurso</string>
<string name="use_fast_recalculation_desc">Por longaj vojaĝoj, rekalkuli nur komencan parton de kurso.</string>
<string name="use_fast_recalculation_desc">Rekalkuli nur komencan parton de kurso. Uzebla por longaj kursoj.</string>
<string name="rate_this_app">Taksi tiun ĉi aplikaĵon</string>
<string name="we_really_care_about_your_opinion">Via opinio estas grava por ni.</string>
<string name="rate_this_app_long">Bonvolu taksi OsmAnd ĉe Google Play</string>
@ -1890,7 +1890,7 @@
<string name="unsaved_changes_will_be_lost">Ĉiuj nekonservitaj ŝanĝoj estos forigitaj. Ĉu pluigi?</string>
<string name="downloads_left_template">ankoraŭ %1$s elŝutoj</string>
<string name="roads">Vojoj</string>
<string name="downloading_number_of_files">Elŝutado - %1$s dosiero</string>
<string name="downloading_number_of_files">Elŝutado – %1$d dosiero</string>
<string name="show_free_version_banner">Montri reklamaĵon de senpaga versio</string>
<string name="show_free_version_banner_description">Montri reklamaĵon de senpaga versio, eĉ se vi havas pagan version.</string>
<string name="activate_seamarks_plugin">Bonvolu aktivigi la kromprogramon “mara map-vido”</string>
@ -2832,13 +2832,13 @@
<string name="osm_live_payment_3_months_title">Ĉiu-3-monate</string>
<string name="osm_live_payment_annual_title">Ĉiujare</string>
<string name="osm_live_payment_month_cost_descr">%1$s / monato</string>
<string name="osm_live_payment_month_cost_descr_ex">%1$,2f %2$s / monato</string>
<string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / monato</string>
<string name="osm_live_payment_discount_descr">Ŝparu %1$s</string>
<string name="osm_live_payment_current_subscription">Nuna kotizo</string>
<string name="osm_live_payment_renews_monthly">Reaboni ĉiumonate</string>
<string name="osm_live_payment_renews_quarterly">Reaboni ĉiukvaronjare</string>
<string name="osm_live_payment_renews_annually">Reaboni ĉiujare</string>
<string name="default_price_currency_format">%1$,2f %2$s</string>
<string name="default_price_currency_format">%1$.2f %2$s</string>
<string name="osm_live_payment_header">Intertempo de pagoj:</string>
<string name="osm_live_payment_contribute_descr">Donacoj helpos fondi kartografion de OSM.</string>
<string name="powered_by_osmand">De OsmAnd</string>
@ -3651,7 +3651,7 @@
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">La pago estos prenita el via konto Google Play post konfirmi aĉeton.
\n
\n La abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La pago estos prenita por la renoviĝa periodo (monato/tri monatoj/jaro) nur je la data de renoviĝo.
\n La abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La pago estos prenita por la renoviĝa periodo (monato/tri monatoj/jaro) nur je la dato de renoviĝo.
\n
\n Vi povas administri kaj rezigni viajn abonojn per agordoj de Google Play.</string>
<string name="search_poi_types_descr">Miksi specojn de interesejoj el diversaj kategorioj. Frapetu ŝaltilon por elekti la tutan kategorion, frapetu ĉe maldekstre por elekti detala(j)n objekto(j)n el la kategorio.</string>
@ -3894,7 +3894,7 @@
<string name="simplified_track">Simpligita spuro</string>
<string name="simplified_track_description">Nur la linio de kurso estos konservita, la navigadpunktoj estos forigitaj.</string>
<string name="shared_string_file_name">Dosiernomo</string>
<string name="number_of_gpx_files_selected_pattern">%d dosieroj de spuroj elektitaj</string>
<string name="number_of_gpx_files_selected_pattern">%s dosieroj de spuroj elektitaj</string>
<string name="disable_recording_once_app_killed_descrp">Paŭzigos registri spuron je halto de la aplikaĵo (per la menuo de lastaj aplikaĵoj). (Fona emblemo de OsmAnd malaperos de la androida sciiga zono.)</string>
<string name="gpx_monitoring_stop">Paŭzigi registri spuron</string>
<string name="gpx_monitoring_start">Daŭrigi registri spuron</string>
@ -3903,4 +3903,26 @@
<string name="previous_segment">Antaŭa segmento</string>
<string name="all_previous_segments">Ĉiuj antaŭaj segmentoj</string>
<string name="only_selected_segment_recalc">Nur la elektita segmento estos rekalkulita uzante la elektitan profilon.</string>
<string name="what_is_new">Kio estas nova</string>
<string name="osm_live_payment_subscription_management_hw">La pago estos prenita el via konto AppGallery post konfirmi aĉeton.
\n
\n La abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La pago estos prenita por la renoviĝa periodo (monato/tri monatoj/jaro) nur je la dato de renoviĝo.
\n
\n Vi povas administri kaj rezigni viajn abonojn per la agordoj de AppGallery.</string>
<string name="start_finish_icons">Emblemoj komenco/fino</string>
<string name="contour_lines_thanks">Dankon al vi por aĉeti la kromprogramon “nivelkurboj”</string>
<string name="osm_live_payment_desc_hw">Abonpago prenita por la elektita periodo. VI ĉiam povas rezigni abonon ĉe AppGallery.</string>
<string name="routing_attr_avoid_footways_description">Eviti irejojn</string>
<string name="routing_attr_avoid_footways_name">Sen trotuaroj</string>
<string name="development">Programado</string>
<string name="use_live_public_transport">Datumoj OsmAnd Live</string>
<string name="use_live_routing">Datumoj OsmAnd Live</string>
<string name="use_complex_routing">Komplika kurs-difinado</string>
<string name="complex_routing_descr">Du-faza difinado de kurso por aŭtomobila navigo.</string>
<string name="use_native_pt">Indiĝena metodo de publik-transporta navigo</string>
<string name="use_native_pt_desc">Aktivigi (sekuran) metodon por kalkuli kursojn de publika transporto uzante programlingvon Java</string>
<string name="perform_oauth_authorization_description">Ensaluti uzante OAuth por redakti la mapon OSM</string>
<string name="perform_oauth_authorization">Ensaluti per OAuth</string>
<string name="clear_osm_token">Forigi ĵetonon OpenStreetMap OAuth</string>
<string name="osm_edit_logout_success">Sukcese elsalutinta</string>
</resources>

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

@ -1541,7 +1541,7 @@
<string name="routing_attr_height_name">Límite de altura</string>
<string name="routing_attr_height_description">Indica la altura permitida del vehículo en rutas.</string>
<string name="use_fast_recalculation">Recálculo inteligente de ruta</string>
<string name="use_fast_recalculation_desc">Para viajes largos, recalcula sólo la parte inicial de la ruta.</string>
<string name="use_fast_recalculation_desc">Recalcula sólo la parte inicial de la ruta. Puede usarse para viajes largos.</string>
<string name="shared_string_logoff">Cerrar sesión</string>
<string name="rendering_value_disabled_name">Desactivado</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Color por red de afiliación</string>
@ -3917,4 +3917,16 @@
\nPuedes administrar y cancelar las suscripciones accediendo a los ajustes de AppGallery.</string>
<string name="routing_attr_avoid_footways_description">Evita pasar por las veredas o aceras</string>
<string name="routing_attr_avoid_footways_name">Evitar veredas/aceras</string>
<string name="development">Desarrollo</string>
<string name="use_live_public_transport">Datos de «OsmAnd Live»</string>
<string name="use_live_routing">Datos de «OsmAnd Live»</string>
<string name="use_complex_routing">Navegación compleja</string>
<string name="complex_routing_descr">Navegación bifásica en automóvil.</string>
<string name="use_native_pt">Desarrollo nativo del transporte público</string>
<string name="use_native_pt_desc">Cambiar al cálculo de ruta Java (seguro) del transporte público</string>
<string name="what_is_new">Novedades</string>
<string name="perform_oauth_authorization_description">Inicia sesión con OAuth para usar las funciones de edición de OSM</string>
<string name="perform_oauth_authorization">Ingresar a través de OAuth</string>
<string name="clear_osm_token">Vaciar llave OAuth de OpenStreetMap</string>
<string name="osm_edit_logout_success">Sesión finalizada</string>
</resources>

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

@ -385,15 +385,15 @@
\nCualquiera de estos mapas puede usarse como el mapa predefinido que se mostrará, o como una superposición o subyacencia de otro mapa base (como los mapas estándar de OsmAnd en línea). Ciertos elementos de los mapas vectoriales de OsmAnd pueden ocultarse a través del menú «Configurar mapa» para hacer cualquier subyacencia mas visible.
\n
\nDescarga las teselas de los mapas directamente en línea, o prepáralo para su uso sin conexión (copiar manualmente en la carpeta de datos OsmAnd) como una base de datos SQLite que puede ser producida por una variedad de herramientas de preparación de mapas de terceros.</string>
<string name="record_plugin_description">Este complemento activa la funcionalidad para registrar y guardar tus trazas manualmente pulsando el widget de grabación GPX en el mapa, o automáticamente registrando todas tus rutas navegadas en un archivo GPX.
\n
<string name="record_plugin_description">Activa la funcionalidad para registrar y guardar tus trazas manualmente pulsando el widget de grabación GPX en el mapa, o automáticamente registrando todas tus rutas navegadas en un archivo GPX.
\n
\nLas trazas grabadas pueden ser compartidas con tus amigos o ser usadas para contribuir a OSM. Los atletas pueden usar las trazas grabadas para seguir sus entrenamientos. Algunos análisis básicos de trazas se pueden realizar directamente en OsmAnd, como tiempos por vuelta, velocidad media, etc., y por supuesto las trazas pueden analizarse posteriormente con herramientas de análisis de terceros.</string>
<string name="srtm_paid_version_title">Complemento de curvas de nivel</string>
<string name="osmand_srtm_long_description_1000_chars">Este complemento proporciona una capa superpuesta de curvas de nivel y una capa (de relieve) sombreada, que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje.
\n
<string name="osmand_srtm_long_description_1000_chars">Proporciona una capa superpuesta de curvas de nivel y una capa (de relieve) sombreada, que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje.
\n
\nLos datos globales (entre 70° norte y 70° sur) se basan en mediciones de SRTM (Shuttle Radar Topography Mission, o en español Misión de Topografía por Radar desde Transbordador) y ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer, o en español Radiómetro Espacial Avanzado de Emisión Térmica y Reflexión), un instrumento de captura de imágenes a bordo de Terra, el satélite insignia del Sistema de Observación de la Tierra de la NASA. ASTER es un esfuerzo cooperativo entre la NASA, el Ministerio de Economía, Comercio e Industria de Japón (METI) y Sistemas Espaciales de Japón (J-spacesystems).</string>
<string name="srtm_plugin_description">Este complemento proporciona tanto una capa superpuesta de curvas de nivel y una capa (de relieve) sombreada, que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje. (Note que las curvas de nivel y/o los datos de relieve están disponibles en descargas adicionales separadas luego de activar el complemento.)
\n
<string name="srtm_plugin_description">Proporciona tanto una capa superpuesta de curvas de nivel y una capa (de relieve) sombreada, que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje. (Note que las curvas de nivel y/o los datos de relieve están disponibles en descargas adicionales separadas luego de activar el complemento.)
\n
\nLos datos globales (entre 70° norte y 70° sur) se basan en mediciones de SRTM (Shuttle Radar Topography Mission, o en español Misión de Topografía por Radar Shuffle) y ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer, o en español Radiómetro Espacial Avanzado de Emisión Térmica y Reflexión), un instrumento de captura de imágenes a bordo de Terra, el satélite insignia del Sistema de Observación de la Tierra de la NASA. ASTER es un esfuerzo cooperativo entre la NASA, el Ministerio de Economía, Comercio e Industria de Japón (METI) y Sistemas Espaciales de Japón (J-spacesystems).</string>
<string name="plugin_touringview_descr">Activando esta vista cambia el estilo del mapa OsmAnd a la «Vista turística», que es una vista de alto detalle especial para viajeros y conductores profesionales.
\n
@ -406,13 +406,13 @@
\nNo es necesario descargar un mapa especial, la vista es creada a partir de nuestros mapas estándar.
\n
\nEsta vista puede ser revertida desactivando de nuevo aquí, o cambiando el «Estilo del mapa» desde «Configurar mapa» cuando lo desees.</string>
<string name="plugin_nautical_descr">Este complemento enriquece el mapa y la navegación de OsmAnd al producir también mapas náuticos para el canotaje, vela y otros tipos de deportes acuáticos.
\n
\nUn mapa especial complementado para OsmAnd proporcionará toda las marcas de navegación náutica y símbolos cartográficos para el interior, así como para la navegación cerca de la costa. La descripción de cada marca de navegación proporciona los datos necesarios para su identificación y su significado (categoría, forma, color, número, referencia, etc.).
\n
<string name="plugin_nautical_descr">Enriquece el mapa y la navegación de OsmAnd al producir también mapas náuticos para el canotaje, vela y otros tipos de deportes acuáticos.
\n
\nUn mapa especial complementado para OsmAnd proporcionará toda las marcas de navegación náutica y símbolos cartográficos para el interior, así como para la navegación cerca de la costa. La descripción de cada marca de navegación proporciona los datos necesarios para su identificación y su significado (categoría, forma, color, número, referencia, etc.).
\n
\nPara volver a uno de los estilos del mapas convencionales de OsmAnd, simplemente desactiva este complemento de nuevo, o cambia el «Estilo del mapa» en «Configurar mapa» cuando lo desees.</string>
<string name="plugin_ski_descr">Este complemento para OsmAnd pone a tu alcance detalles sobre pistas de esquí de descenso, de travesía, rutas de esquí alpino, teleféricos y remontes a nivel mundial. Las rutas y pistas se muestran por código de color en función de su dificultad y representados con un estilo del mapa especial «Invierno» que lo asemeja a un paisaje invernal nevado.
\n
<string name="plugin_ski_descr">Detalles sobre pistas de esquí de descenso, de travesía, rutas de esquí alpino, teleféricos y remontes a nivel mundial. Las rutas y pistas se muestran por código de color en función de su dificultad y representados con un estilo del mapa especial «Invierno» que lo asemeja a un paisaje invernal nevado.
\n
\nActivando esta vista, cambia el estilo del mapa a «Invierno y esquí», mostrando las características del terreno en condiciones invernales. Esta vista se puede revertir desactivando de nuevo aquí o cambiando el «Estilo del mapa» en «Configurar mapa» cuando lo desees.</string>
<string name="audionotes_plugin_description">Toma notas de audio, fotografía y/o video durante un viaje, usando un botón en el mapa o el menú contextual de la ubicación.</string>
<string name="osmand_parking_plugin_description">Registra dónde se ha estacionado el automóvil, incluyendo cuánto tiempo queda.
@ -1541,7 +1541,7 @@
<string name="routing_attr_height_name">Límite de altura</string>
<string name="routing_attr_height_description">Indica la altura permitida del vehículo en rutas.</string>
<string name="use_fast_recalculation">Recálculo inteligente de ruta</string>
<string name="use_fast_recalculation_desc">Para viajes largos, recalcula sólo la parte inicial de la ruta.</string>
<string name="use_fast_recalculation_desc">Recalcula sólo la parte inicial de la ruta. Puede usarse para viajes largos.</string>
<string name="shared_string_logoff">Cerrar sesión</string>
<string name="rendering_value_disabled_name">Desactivado</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Color por red de afiliación</string>
@ -3914,4 +3914,16 @@
\nPuedes administrar y cancelar las suscripciones accediendo a los ajustes de AppGallery.</string>
<string name="routing_attr_avoid_footways_description">Evita pasar por aceras o veredas</string>
<string name="routing_attr_avoid_footways_name">Evitar aceras</string>
<string name="what_is_new">Novedades</string>
<string name="use_native_pt_desc">Cambiar al cálculo de ruta Java (seguro) del transporte público</string>
<string name="use_native_pt">Desarrollo nativo del transporte público</string>
<string name="use_live_routing">Datos de «OsmAnd Live»</string>
<string name="use_live_public_transport">Datos de «OsmAnd Live»</string>
<string name="use_complex_routing">Navegación compleja</string>
<string name="perform_oauth_authorization_description">Inicia sesión con OAuth para usar las funciones de edición de OSM</string>
<string name="perform_oauth_authorization">Ingresar a través de OAuth</string>
<string name="osm_edit_logout_success">Sesión finalizada</string>
<string name="development">Desarrollo</string>
<string name="complex_routing_descr">Navegación bifásica en automóvil.</string>
<string name="clear_osm_token">Vaciar llave OAuth de OpenStreetMap</string>
</resources>

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

@ -245,7 +245,7 @@
<string name="select_animate_speedup">Teekonna simuleerimise kiirus:</string>
<string name="share_route_as_gpx">Jaga teekonda GPX failina</string>
<string name="share_route_subject">OsmAnd abil jagatud teekond</string>
<string name="route_roundabout">Ringristmik: vali %1d väljumine ja sõida otse</string>
<string name="route_roundabout">Ringristmik: vali %1$d väljumine ja sõida otse</string>
<string name="route_kl">Hoia vasakule ja sõida otse</string>
<string name="route_kr">Hoia paremale ja sõida otse</string>
<string name="use_fluorescent_overlays_descr">Kasuta helkivaid värve radade ja teekondade kuvamisel.</string>
@ -271,7 +271,7 @@
<string name="empty_route_calculated">Arvutatud teekond on tühi.</string>
<string name="use_online_routing_descr">Kasuta internetti teekonna arvutamiseks.</string>
<string name="use_fast_recalculation">Tark teekonna arvutamine</string>
<string name="use_fast_recalculation_desc">Pikemate vahemaade korral arvuta uuesti ainult teekonna algusosa.</string>
<string name="use_fast_recalculation_desc">Arvuta uuesti ainult teekonna algusosa. Seda võid kasutada pikemate vahemaade korral.</string>
<string name="simulate_your_location_descr">Simuleeri arvutatud või salvestatud GPX teekonda.</string>
<string name="hillshade_layer_disabled">Künkavarjutuse kiht keelatud</string>
<string name="rendering_attr_horseRoutes_name">Ratsutamisteed</string>
@ -1720,25 +1720,25 @@
\n
\n OsmAnd on aktiivselt arendamisel ning meie projekt ja selle jätkuv edasiminek sõltub rahalisest toetusest uute funktsioonide väljatöötamiseks ja testimiseks. Palun kaalu OsmAnd+ ostmist või konkreetsete uute funktsioonide rahastamist või üldise annetuse tegemist leheküljel https://osmand.net.</string>
<string name="osmand_plus_play_title_30_chars">OsmAnd+ kaardid ja navigeerimine</string>
<string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM automatiseeritud navigeerimisjuhised)
\n
\n OsmAnd+ on avatud lähtekoodiga tarkvara navigeerimisrakendus, millel on juurdepääs paljudele globaalsetele OpenStreetMap (OSM) andmetele. Kõiki kaardiandmeid (vektor- või paanikaarte) saab salvestada telefoni mälukaardile võrguühenduseta kasutamiseks. Pakutakse ka võrguühenduseta ja veebipõhist teekonna leidmise funktsiooni, sealhulgas hääljuhiseid.
\n
\n OsmAnd+ on rakenduse tasuline versioon, seda ostes toetate projekti, rahastate uute funktsioonide arendamist ja saate kõige värskemaid uuendusi.
\n
\n Mõned põhifunktsioonid:
\n - Täielik võrguühenduseta funktsioon (salvestage alla laetud vektor- või paanikaardid seadme mällu)
\n - Saadaval on kompaktsed võrguühenduseta vektorkaardid üle kogu maailma
\n - Riigi või piirkonna kaartide piiramatu allalaadimine otse rakendusest
\n - Võrguühenduseta Vikipeedia funktsioon (laadige Vikipeedia huvipunktid alla), sobib suurepäraselt vaatamisväärsustega tutvumiseks
\n - Võimalik on mitme kaardikihi ülekatmine, näiteks GPX või navigeerimisrajad, huvipunktid, eelistused, kõrgusjooned, ühistranspordi peatused, täiendavad kaardid kohandatava läbipaistvusega
\n
\n - Aadresside ja kohtade (huvipunktide) otsing võrguühenduseta
\n - Võrguühenduseta teekonna leidmine keskmise vahemaa jaoks
\n - Auto-, jalgratta- ja jalakäijarežiim valikuliselt:
\n - Automatiseeritud päeva/öö ekraanivaate vahetamine
\n - Kiirusest sõltuv kaardi suurendustase
\n - Kaardi joondamine vastavalt kompassile või liikumissuunale
<string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM automatiseeritud navigeerimisjuhised)
\n
\n OsmAnd+ on avatud lähtekoodiga tarkvara navigeerimisrakendus, millel on juurdepääs paljudele globaalsetele OpenStreetMap (OSM) andmetele. Kõiki kaardiandmeid (vektor- ja paanikaarte) saab salvestada telefoni mälukaardile võrguühenduseta kasutamiseks. Võimalik on nii võrguühenduseta kui ka -ühendusega teekonna leidmise funktsioon, milles on ka hääljuhiseid.
\n
\n OsmAnd+ on rakenduse tasuline versioon, mida ostes toetate projekti, rahastate uute funktsioonide arendamist ja saate kõige värskemaid uuendusi.
\n
\n Mõned põhifunktsioonid:
\n - Täielik võrguühenduseta funktsioon (salvestage alla laetud vektor- ja paanikaardid seadme mällu)
\n - Saadaval on kompaktsed kogu maailma vektorkaardid (võrguühenduseta režiim)
\n - Riigi või piirkonna kaartide piiramatu allalaadimine otse rakendusest
\n - Võrguühenduseta Vikipeedia funktsioon (laadige Vikipeedia huvipunktid alla), sobib suurepäraselt vaatamisväärsustega tutvumiseks
\n - Võimalik on mitme kaardikihi ülekatmine, näiteks GPX või navigeerimisrajad, huvipunktid, eelistused, kõrgusjooned, ühistranspordi peatused, täiendavad kaardid kohandatava läbipaistvusega
\n
\n - Aadresside ja kohtade (huvipunktide) otsing võrguühenduseta
\n - Võrguühenduseta teekonna leidmine keskmise vahemaa jaoks
\n - Auto-, jalgratta- ja jalakäijarežiim valikuliselt:
\n - Automatiseeritud päeva/öö ekraanivaate vahetamine
\n - Kiirusest sõltuv kaardi suurendustase
\n - Kaardi joondamine vastavalt kompassile või liikumissuunale
\n - Raja juhtimine, kiiruspiirangu kuvamine, salvestatud ja kõnesünteesi hääled
\n</string>
<string name="filterpoi_activity">Loo huvipunktide filter</string>
@ -3593,7 +3593,7 @@
<string name="height_limit_description">Kuna mõnedel marsruutidel võidakse kohaldada sõidukite kõrguspiiranguid, siis palun märkige oma sõiduki kõrgus.</string>
<string name="lenght_limit_description">Kuna mõnedel marsruutidel võidakse kohaldada piiranguid pikkade sõidukite suhtes, siis palun märkige oma sõiduki pikkus.</string>
<string name="weight_limit_description">Kuna mõnedel marsruutidel võidakse kohaldada sõidukite kaalupiiranguid, siis palun märkige oma sõiduki kaal.</string>
<string name="gpx_parse_error">OsmAnd GPX faili vorming pole korrektne. Täpsemaks uurimiseks palun suhtle meie tugimeeskonnaga.</string>
<string name="gpx_parse_error">OsmAnd GPX-andmestiku vorming on vigane. Täpsemaks uurimiseks palun võta ühendust meie kasutajatoega.</string>
<string name="sort_by_category">Sorteeri kategooria järgi</string>
<string name="shared_string_resume">Jätka</string>
<string name="import_profile_dialog_description">Imporditavas profiilis leidub täiendavaid andmeid. Vajutades „Impordi“ imporditakse vaid profiili andmed, täiendavate andmete jaoks pead märkima vastava valiku.</string>
@ -3719,8 +3719,8 @@
\nVastavalt oma maa seadustele pead sa otsuse tegema.
\n
\nValides %1$s sa saad kiiruskaamerate-kohaseid teateid ja hoiatusi.
\n
\nValides %s$s kustutatakse kõik kiiruskaameratega seotud andmed, nagu hoiatused, teated ja huvipunktid seniks, kuni sa OsmAnd\'ile ei tee täiesti uut paigaldust.</string>
\n
\nValides %2$s kustutatakse kõik kiiruskaameratega seotud andmed, nagu hoiatused, teated ja huvipunktid seniks, kuni sa OsmAnd\'ile ei tee täiesti uut paigaldust.</string>
<string name="quick_action_remove_next_destination_descr">Praegune teekonna vahepunkt saab kustutatud. Kui ta osutub sihtkohaks, siis navigatsioon lõppeb.</string>
<string name="plan_route_change_route_type_after">Muuda teekonna tüüpi pärast</string>
<string name="plan_route_change_route_type_before">Muuda teekonna tüüpi enne</string>
@ -3773,4 +3773,6 @@
\n
\nTellimust saad hallata ja tühistada AppGallery seadistustest.</string>
<string name="osm_live_payment_desc_hw">Arveldame tellimuse eest valitud ajavahemiku alusel. Seda saad sa vabalt valitud ajal tühistada AppGallery\'s.</string>
<string name="use_complex_routing">Keeruka teekonna koostamine</string>
<string name="osm_edit_logout_success">Väljalogimine õnnestus</string>
</resources>

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

@ -2063,7 +2063,7 @@
<string name="poi_dialog_reopen">بازگشایی</string>
<string name="get_plugin">دریافت</string>
<string name="use_fast_recalculation">محاسبهٔ مجدد هوشمند</string>
<string name="use_fast_recalculation_desc">برای سفرهای طولانی فقط بخش ابتدایی مسیر را مجدداً محاسبه می‌کند.</string>
<string name="use_fast_recalculation_desc">فقط بخش ابتدایی مسیر را مجدداً محاسبه می‌کند. برای سفرهای طولانی مفید است.</string>
<string name="do_you_like_osmand">آیا از OsmAnd راضی هستید؟</string>
<string name="we_really_care_about_your_opinion">دیدگاه و بازخورد شما ارزشمند است.</string>
<string name="rate_this_app">به این برنامه امتیاز بدهید</string>
@ -3933,4 +3933,13 @@
<string name="app_mode_motor_scooter">اسکوتر موتوری</string>
<string name="app_mode_wheelchair_forward">ویلچر رو به جلو</string>
<string name="threshold_distance">فاصله آستانه</string>
<string name="start_finish_icons">نمادهای ابتدا/انتها</string>
<string name="routing_attr_avoid_footways_name">راه‌های پیاده</string>
<string name="routing_attr_avoid_footways_description">از راه‌های پیاده پرهیز می‌کند</string>
<string name="development">توسعه</string>
<string name="use_live_public_transport">دادهٔ OsmAnd Live</string>
<string name="use_live_routing">دادهٔ OsmAnd Live</string>
<string name="complex_routing_descr">مسیریابی دومرحله‌ای برای ناوبری خودرویی.</string>
<string name="use_complex_routing">مسیریابی پیچیده</string>
<string name="use_native_pt_desc">برای مسیریابی حمل‌ونقل عمومی از محاسبات جاوا (امن) استفاده می‌کند</string>
</resources>

12
OsmAnd/res/values-fr/phrases.xml
View file

@ -968,7 +968,7 @@
<string name="poi_recycling_waste">Poubelle (sacs noirs)</string>
<string name="poi_recycling_cardboard">Carton</string>
<string name="poi_recycling_magazines">Magazines</string>
<string name="poi_recycling_small_appliances">Petits appareils électriques</string>
<string name="poi_recycling_small_appliances">Petits appareils</string>
<string name="poi_recycling_foil">Papier aluminium</string>
<string name="poi_recycling_hardcore">Blocaille</string>
<string name="poi_recycling_light_bulbs">Ampoules électriques</string>
@ -3834,4 +3834,14 @@
<string name="poi_borough">Arrondissement</string>
<string name="poi_traffic_signals_arrow_no">Flèche : non</string>
<string name="poi_pump_status_missing_beam">État de la pompe : faisceau manquant</string>
<string name="poi_departures_board_delay">Délai</string>
<string name="poi_fuel_lng">GNL</string>
<string name="poi_beehive">Ruche</string>
<string name="poi_departures_board_timetable">Tableau horaire</string>
<string name="poi_departures_board_realtime">Temps réel</string>
<string name="poi_recycling_small_electrical_appliances">Petits appareils électriques</string>
<string name="poi_departures_board_yes">Oui</string>
<string name="poi_departures_board_no">Tableau des départs : non</string>
<string name="poi_elevator">Ascenseur</string>
<string name="poi_departures_board">Tableau des départs</string>
</resources>

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

@ -1532,7 +1532,7 @@
<string name="routing_attr_height_name">Limite de hauteur</string>
<string name="routing_attr_height_description">Précisez la hauteur du véhicule à respecter sur les routes.</string>
<string name="use_fast_recalculation">Recalcule intelligent de l\'itinéraire</string>
<string name="use_fast_recalculation_desc">Pour les longs trajets, recalculer uniquement le début de l\'itinéraire</string>
<string name="use_fast_recalculation_desc">Recalculer uniquement le début de l\'itinéraire (utile pour les longs trajets).</string>
<string name="shared_string_logoff">Se déconnecter</string>
<string name="rendering_value_disabled_name">Désactivé</string>
<string name="rendering_value_walkingRoutesOSMC_name">Couleur de l\'itinéraire basée sur les symboles de randonnée OSMC</string>
@ -2610,7 +2610,7 @@
<string name="context_menu_read_full_article">Lire l\'article complet</string>
<string name="context_menu_read_article">Lire l\'article</string>
<string name="context_menu_points_of_group">Tous les points du groupe</string>
<string name="open_from">Ouvert du</string>
<string name="open_from">Ouvre à</string>
<string name="open_till">Ouvert jusqu\'à</string>
<string name="will_close_at">Ferme à</string>
<string name="will_open_at">Ouvre à</string>
@ -3888,4 +3888,16 @@
<string name="osm_live_payment_desc_hw">Abonnement facturé pour chaque période sélectionnée. Annulation possible à tout moment sur AppGallery.</string>
<string name="routing_attr_avoid_footways_description">Éviter les trottoirs</string>
<string name="routing_attr_avoid_footways_name">Éviter les trottoirs</string>
<string name="development">Développement</string>
<string name="use_live_public_transport">OsmAnd Live data</string>
<string name="use_live_routing">OsmAnd Live data</string>
<string name="use_native_pt_desc">Basculer vers le calcul d\'itinéraire Transport Public Java (sécurisé)</string>
<string name="perform_oauth_authorization_description">Connectez-vous avec OAuth pour utiliser les fonctionnalités osmedit</string>
<string name="what_is_new">Nouveautés</string>
<string name="use_complex_routing">Routage complexe</string>
<string name="complex_routing_descr">Routage en 2 phases pour la navigation en voiture.</string>
<string name="use_native_pt">Développement du transport public autochtone</string>
<string name="perform_oauth_authorization">Connectez-vous avec OAuth</string>
<string name="clear_osm_token">Supprimer le jeton OAuth d\'OpenStreetMap</string>
<string name="osm_edit_logout_success">Déconnexion réussie</string>
</resources>

3
OsmAnd/res/values-gl/phrases.xml
View file

@ -65,7 +65,7 @@
<string name="poi_traffic_calming_bump">Lomba pequena de velocidade</string>
<string name="poi_service_tyres">Rodas</string>
<string name="poi_vehicle_inspection">Inspección técnica de vehículos</string>
<string name="poi_car_wash">Lavadura de automóbiles</string>
<string name="poi_car_wash">Lavado de automóbiles</string>
<string name="poi_fuel">Gasolineira;Estación de combustíbel;Estación de servizo</string>
<string name="poi_compressed_air">Ar comprimido</string>
<string name="poi_parking">Aparcadoiro</string>
@ -3837,4 +3837,5 @@
<string name="poi_recycling_small_electrical_appliances">Pequenos aparellos eléctricos</string>
<string name="poi_departures_board">Taboleiro de saídas</string>
<string name="poi_drinking_water_refill">Recarga de auga potábel</string>
<string name="poi_fuel_lng">GNL</string>
</resources>

30
OsmAnd/res/values-gl/strings.xml
View file

@ -1061,7 +1061,7 @@
<string name="shared_string_share">Compartir</string>
<string name="share_fav_subject">Favoritos compartidos mediante OsmAnd</string>
<string name="error_occurred_loading_gpx">Non foi posíbel cargar o GPX.</string>
<string name="send_report">Send report</string>
<string name="send_report">Enviar denuncia</string>
<string name="none_region_found">Non foi posíbel atopar datos para as rexións no cartón de memoria.</string>
<string name="poi_namefinder_query_empty">Escribir para atopar un PDI</string>
<string name="any_poi">Calquera</string>
@ -1554,7 +1554,7 @@ Lon %2$s</string>
<string name="shared_string_release">Publicado</string>
<string name="plugin_install_needs_network">Precisas estar conectado para instalar este plugin.</string>
<string name="get_plugin">Obter</string>
<string name="use_fast_recalculation_desc">Nas viaxes longas, recalcula só o anaco inicial da rota.</string>
<string name="use_fast_recalculation_desc">Recalcular só a parte inicial da ruta para viaxes longas.</string>
<string name="do_you_like_osmand">Gosta do OsmAnd?</string>
<string name="we_really_care_about_your_opinion">A túa opinión e comentarios son valorados.</string>
<string name="rate_this_app">Avalía esta aplicación</string>
@ -3454,7 +3454,7 @@ Lon %2$s</string>
<string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">A icona amósase mentres se navega ou se move pola pantalla.</string>
<string name="select_map_icon_descr">A icona amósase en asueto.</string>
<string name="logcat_buffer_descr">Verifica e comparte os rexistros detallados da aplicación</string>
<string name="logcat_buffer_descr">Verifica e comparte rexistros detallados da aplicación</string>
<string name="search_offline_geo_error">Non foi posíbel analizar a intención xeográfica \'%s\'.</string>
<string name="permission_is_required">Precísase permiso para empregar esta opción.</string>
<string name="monitoring_min_speed_descr">Este é un filtro de corte de baixa velocidade para non gravar puntos por baixo dunha determinada velocidade. Isto pode facer que as pistas gravadas parezan máis suaves cando se amosan no mapa.</string>
@ -3675,7 +3675,7 @@ Lon %2$s</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="osm_live_payment_subscription_management">"O pagamento será cobrado na túa conta da Google Play na confirmación da compra.
\n
\n A subscrición é renovada de xeito automático, a menos que sexa desbotada antes da data de renovación. A túa conta será cobrada polo período de renovación (més/trimestre/ano) soamente na data de renovación.
\n A subscrición é renovada de xeito automático, a menos que sexa desbotada antes da data de renovación. A túa conta será cobrada polo período de renovación (mes/trimestre/ano) soamente na data de renovación.
\n
\n Podes xestionar e desbotar as túas subscricións entrando nos axustes da Google Play."</string>
<string name="search_poi_types">Procurar tipos de PDI</string>
@ -3928,4 +3928,26 @@ Lon %2$s</string>
<string name="sort_last_modified">Última modificación</string>
<string name="sort_name_descending">Nome: Z – A</string>
<string name="sort_name_ascending">Nome: A – Z</string>
<string name="start_finish_icons">Iconas de comezo/final</string>
<string name="contour_lines_thanks">Grazas por mercar \'Curvas de nivel\'</string>
<string name="osm_live_payment_desc_hw">Subscrición cobrada por período escollido. Cancélaa na AppGallery en calquera intre.</string>
<string name="osm_live_payment_subscription_management_hw">O pagamento será cargado na túa conta da AppGallery no mesmo intre da confirmación da compra.
\n
\nA subscrición é renovada de xeito automático a menos que sexa cancelada antes da data de renovación. A túa conta será cargada polo período de renovación (mes/trimestre/ano) só na data de renovación.
\n
\nPodes xestionar e cancelar as túas subscricións indo ós axustes da AppGallery.</string>
<string name="routing_attr_avoid_footways_description">Evitar sendas peonís, camiños e beirarrúas</string>
<string name="routing_attr_avoid_footways_name">Evitar sendas peonís</string>
<string name="development">Desenvolvemento</string>
<string name="use_live_public_transport">Datos do OsmAnd Live</string>
<string name="use_live_routing">Datos do OsmAnd Live</string>
<string name="use_complex_routing">Enrutamento complexo</string>
<string name="complex_routing_descr">Enrutamento de dúas fases para a navegación de automóbil</string>
<string name="use_native_pt">Desenvolvemento do transporte público nativo</string>
<string name="use_native_pt_desc">Activar cálculo de enrutamento de transporte público do Java (seguro)</string>
<string name="what_is_new">Novidades</string>
<string name="perform_oauth_authorization_description">Inicia sesión co OAuth para empregar as funcións de edición do OSM</string>
<string name="perform_oauth_authorization">Entrar polo OAuth</string>
<string name="clear_osm_token">Limpar token do OpenStreetMap OAuth</string>
<string name="osm_edit_logout_success">Sesión rematada</string>
</resources>

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

@ -1534,7 +1534,7 @@
<string name="routing_attr_height_name">Magasságkorlátozás</string>
<string name="routing_attr_height_description">Adja meg az útvonalakon a járművekre vonatkozó magasságkorlátozást.</string>
<string name="use_fast_recalculation">Intelligens útvonal újraszámítás</string>
<string name="use_fast_recalculation_desc">Hosszú utaknál csak az útvonal kezdeti részének újraszámítása.</string>
<string name="use_fast_recalculation_desc">Csak az útvonal kezdeti részét számítja újra. Hosszú utakhoz használható.</string>
<string name="shared_string_logoff">Naplózás ki</string>
<string name="rendering_value_disabled_name">Letiltva</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Színezés hálózathoz tartozás szerint</string>
@ -3739,11 +3739,11 @@
<string name="shared_string_include_data">Kiegészítő adatok átvétele</string>
<string name="import_profile_dialog_description">Az importált profil kiegészítő adatokat is tartalmaz. Koppintson az \"Importál\" gombra kizálólag a profiladatok importálásához vagy válassza a kiegészítő adatokat.</string>
<string name="import_complete_description">Összes adat importálva innen: %1$s, az alábbi gombokkal megnyithatja az alkalmazás megfelelő részét az adatok kezeléséhez.</string>
<string name="osm_live_payment_subscription_management">A fizetés a Google Play fiókhoz lesz felszámítva a vásárlás megerősítésekor.
<string name="osm_live_payment_subscription_management">A fizetést a vásárlás visszaigazolásakor a Google Play számlájára terheljük.
\n
\nAz előfizetés automatikusan megújul, kivéve ha a meghosszabbítás napja előtt lemondásra kerül. A fókjához az új időszak (hónap/három hónap/év) díja kizárólag a meghosszabítás napján lesz felszámolva.
\nAz előfizetés automatikusan megújul, kivéve, ha azt a megújítási dátum előtt lemondja. A megújítási időszakra (hónap / 3 hónap / év) vonatkozóan a számláját csak a megújítás napján terheljük meg.
\n
\nAz előfizetéseit a Google Play beállításainál tudja kezelni és lemondani.</string>
\nAz előfizetéseket a Google Play beállításai között kezelheti és törölheti.</string>
<string name="quick_action_remove_next_destination_descr">Törli az útvonal soron következő célpontját. Amennyiben ez a végző célpont, a navigáció megáll.</string>
<string name="plugin_wikipedia_description">Tudjon meg többet az érdekes pontokról a Wikipédiából. Ez az Ön offline zsebútikönyve – egyszerűen kapcsolja be a Wikipédia-bővítményt, és élvezze az Ön körüli objektumokról szóló cikkeket.</string>
<string name="app_mode_enduro_motorcycle">Salakmotor</string>
@ -3898,4 +3898,24 @@
<string name="sort_name_ascending">Név: A–Z</string>
<string name="start_finish_icons">Kiindulás/érkezés ikonjai</string>
<string name="contour_lines_thanks">Köszönjük, hogy megvásárolta a szintvonalbővítményt (Contour lines)</string>
<string name="osm_live_payment_desc_hw">Az előfizetés díja a kiválasztott időszakonként lesz kiszámítva. Bármikor törölheti az AppGallery webhelyen.</string>
<string name="osm_live_payment_subscription_management_hw">A fizetést a vásárlás visszaigazolásakor az AppGallery számlájára terheljük.
\n
\nAz előfizetés automatikusan megújul, kivéve, ha azt a megújítási dátum előtt lemondja. A megújítási időszakra (hónap / 3 hónap / év) vonatkozóan a számláját csak a megújítás napján terheljük meg.
\n
\nAz előfizetéseket az AppGallery beállításai között kezelheti és törölheti.</string>
<string name="routing_attr_avoid_footways_description">Gyalogutak elkerülése</string>
<string name="routing_attr_avoid_footways_name">Gyalogutak elkerülése</string>
<string name="development">Fejlesztés</string>
<string name="use_live_public_transport">OsmAnd Live adatok</string>
<string name="use_live_routing">OsmAnd Live adatok</string>
<string name="use_complex_routing">Összetett útvonaltervezés</string>
<string name="complex_routing_descr">Kétszakaszos útvonaltervezés autós navigációhoz.</string>
<string name="use_native_pt">Natív tömegközlekedési fejlesztés</string>
<string name="use_native_pt_desc">Váltás Java (biztonságos) tömegközlekedési útvonaltervezésre</string>
<string name="what_is_new">Újdonságok</string>
<string name="perform_oauth_authorization_description">Az OSM-szerkesztési funkciók használatához jelentkezzék be az OAuth segítségével</string>
<string name="perform_oauth_authorization">Bejelentkezés OAuth segítségével</string>
<string name="clear_osm_token">OpenStreetMap OAuth token törlése</string>
<string name="osm_edit_logout_success">Sikeresen kijelentkezett</string>
</resources>

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

@ -3827,4 +3827,7 @@
<string name="poi_elevator">Lyfta</string>
<string name="poi_recycling_small_electrical_appliances">Smærri raftæki</string>
<string name="poi_drinking_water_refill">Áfylling drykkjarvatns</string>
<string name="poi_fuel_lng">LNG</string>
<string name="poi_departures_board_no">Brottfaratafla: nei</string>
<string name="poi_departures_board">Brottfaratafla</string>
</resources>

79
OsmAnd/res/values-is/strings.xml
View file

@ -530,7 +530,7 @@
<string name="global_settings">Víðværar stillingar</string>
<string name="general_settings">Almennt</string>
<string name="osmand_service">Bakgrunnshamur</string>
<string name="delete_confirmation_msg">Eyða \'%s\'?</string>
<string name="delete_confirmation_msg">Eyða %1$s\?</string>
<string name="city_type_suburb">Úthverfi</string>
<string name="city_type_hamlet">Byggðakjarni</string>
<string name="city_type_village">Þorp</string>
@ -709,8 +709,8 @@
<string name="routing_attr_allow_motorway_description">Leyfa hraðbrautir.</string>
<string name="wiki_around">Wikipedia-greinar í nágrenninu</string>
<string name="route_calculation">Útreikningur leiðar</string>
<string name="gpx_no_tracks_title">Þú ert ekki með neina GPX-ferla ennþá</string>
<string name="gpx_no_tracks_title_folder">Þú getur líka bætt GPX-skrám í möppuna</string>
<string name="gpx_no_tracks_title">Þú ert ekki ennþá með neina ferla</string>
<string name="gpx_no_tracks_title_folder">Þú getur líka bætt ferilskrám í möppuna</string>
<string name="trip_rec_notification_settings">Virkja hraðskráningu ferðar</string>
<string name="shared_string_trip">Ferð</string>
<string name="shared_string_recorded">Skráð</string>
@ -723,7 +723,7 @@
<string name="no_inet_connection">Engin internettenging</string>
<string name="no_inet_connection_desc_map">Nauðsynleg til að sækja kort.</string>
<string name="search_location">Leita að stað…</string>
<string name="storage_place_description">Gagnageymsla OsmAnd (fyrir kort, GPX-ferla, o.s.frv.): %1$s.</string>
<string name="storage_place_description">Gagnageymsla OsmAnd (fyrir kort, ferilskrár, o.s.frv.): %1$s.</string>
<string name="give_permission">Gefa heimild</string>
<string name="no_update_info">Ekki sýna nýjar útgáfur</string>
<string name="get_started">Komast í gang</string>
@ -1718,7 +1718,7 @@
<string name="map_text_size_descr">Stærð leturs fyrir nöfn á kortinu:</string>
<string name="trace_rendering">Aflúsunarupplýsingar myndgerðar</string>
<string name="trace_rendering_descr">Birta afköst myndgerðar.</string>
<string name="gpx_option_reverse_route">Snúa við stefnu GPX</string>
<string name="gpx_option_reverse_route">Snúa við stefnu ferils</string>
<string name="choose_audio_stream">Frálag raddleiðsagnar</string>
<string name="voice_stream_music">Hljóð í margmiðlun/tónlist</string>
<string name="level_to_switch_vector_raster_descr">Nota rastakort fyrir allt undir þessu aðdráttarstigi.</string>
@ -1746,7 +1746,7 @@
<string name="incremental_search_building">Stigvaxandi leit byggingar</string>
<string name="poi_error_info_not_loaded">Upplýsingum um hnút var ekki hlaðið inn</string>
<string name="use_fast_recalculation">Snjöll endurreiknun leiðar</string>
<string name="use_fast_recalculation_desc">Einungis endurreikna upphafshluta leiðar fyrir langar ferðir.</string>
<string name="use_fast_recalculation_desc">Endurreiknar aðeins upphafshluta leiðar. Má nota fyrir langar ferðir.</string>
<string name="confirm_download_roadmaps">Kortið sem eingöngu er með vegum er ekki nauðsynlegt, þar sem þú ert þegar með staðlaða (fulla útgáfu) kortsins. Sækja það samt?</string>
<string name="rendering_attr_depthContours_description">Birta dýptarlínur og punkta.</string>
<string name="rendering_attr_depthContours_name">Dýptarlínur sjávar</string>
@ -2116,7 +2116,7 @@
<string name="import_gpx_failed_descr">Gat ekki flutt skrána inn. Vinsamlegast athugið hvort OsmAnd hafi réttindi til að lesa skrána þar sem hún er.</string>
<string name="open_mapillary">Opna Mapillary</string>
<string name="mapillary_widget">Mapillary græja</string>
<string name="mapillary">Götumyndir</string>
<string name="mapillary">Mapillary götumyndir</string>
<string name="mapillary_image">Mapillary-mynd</string>
<string name="map_widget_ruler_control">Mælistika út frá miðju hrings</string>
<string name="shared_string_permissions">Heimildir</string>
@ -2904,10 +2904,10 @@
<string name="routeInfo_road_types_name">Gerðir vega</string>
<string name="exit_at">Fara útaf við</string>
<string name="sit_on_the_stop">Fara um borð við stöðvunina</string>
<string name="quick_action_show_hide_gpx_tracks">Birta/Fela GPX-ferla</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Hnappur til að birta eða fela valda GPX-ferla á kortinu.</string>
<string name="quick_action_gpx_tracks_hide">Fela GPX-ferla</string>
<string name="quick_action_gpx_tracks_show">Birta GPX-ferla</string>
<string name="quick_action_show_hide_gpx_tracks">Birta/Fela ferla</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Hnappur til að birta eða fela valda ferla á kortinu.</string>
<string name="quick_action_gpx_tracks_hide">Fela ferla</string>
<string name="quick_action_gpx_tracks_show">Birta ferla</string>
<string name="release_3_3">• Nýr skjár fyrir \'Leiðir\': Birtir leiðarhnappa fyrir \'Heim\' og \'Vinna\', flýtileið á fyrri leið, listi yfir virka GPX-ferla og merki, leitarferill
\n
\n • Viðbótarupplýsingar undir \'Nánar um leið\': gerð vegar, yfirborð, bratti, áferð
@ -3766,7 +3766,7 @@
<string name="quick_action_showhide_mapillary_descr">Víxlhnappur til að birta eða fela Mapillary-lagið á kortinu.</string>
<string name="shared_string_bearing">Stefna</string>
<string name="item_deleted">%1$s eytt</string>
<string name="speed_cameras_restart_descr">Endurræsing er nauðsynleg til að geta fjarlægt alveg gögn um hraðamyndavélar.</string>
<string name="speed_cameras_restart_descr">Endurræstu forritið til að fjarlægja öll gögn um hraðamyndavélar.</string>
<string name="shared_string_uninstall_and_restart">Fjarlægja og endurræsa</string>
<string name="shared_string_uninstall">Fjarlægja</string>
<string name="speed_cameras_legal_descr">Aðvaranir vegna hraðamyndavéla eru bannaðar með lögum í sumum löndum.
@ -3777,19 +3777,19 @@
\n
\nVeldu %2$s: öllum gögnum sem tengjast hraðamyndavélum; t.d. aðvaranir, tilkynningar, staðsetningar o.fl. verður eytt þar til OsmAnd er sett inn aftur frá grunni.</string>
<string name="route_between_points_add_track_desc">Veldu ferilskrá þar sem nýjum bút verður bætt inn.</string>
<string name="route_between_points_desc">Veldu hvernig eigi að tengja punkta; með beinni línu eða reikna leið milli þeirra með þessu sniði.</string>
<string name="route_between_points_desc">Veldu hvernig eigi að tengja punkta; með beinni línu eða reikna leið milli þeirra eins og tiltekið er hér að neðan.</string>
<string name="route_between_points_whole_track_button_desc">Allur ferillinn verður endurreiknaður með völdu sniði.</string>
<string name="osm_edit_closed_note">Lokaður OSM-minnispunktur</string>
<string name="whole_track">Allur ferillinn</string>
<string name="track_show_start_finish_icons">Sýna tákn fyrir upphaf/enda</string>
<string name="track_show_start_finish_icons">Sýna tákn fyrir upphaf og enda</string>
<string name="speed_cameras_removed_descr">Þetta tæki er ekki með hraðamyndavélar.</string>
<string name="app_mode_go_cart">Gókart</string>
<string name="set_working_days_to_continue">Þú verður að skilgreina virka daga til að halda áfram</string>
<string name="set_working_days_to_continue">Skilgreindu virka daga til að halda áfram</string>
<string name="quick_action_remove_next_destination">Eyða næsta markpunkti</string>
<string name="navigation_profile">Leiðsagnarsnið</string>
<string name="app_mode_wheelchair_forward">Hjólastóll áfram</string>
<string name="plugin_wikipedia_description">Náðu í upplýsingar um merka staði frá Wikipedia. Þetta er þá orðið að vasaleiðsögn án nettengingar - bara virkjaðu Wikipedia-viðbótina og njóttu þess að geta lesið um hlutina í kringum þig.</string>
<string name="use_volume_buttons_as_zoom_descr">Virkja þetta til að hægt sé að stýra aðdráttarstigi korts með hljóðstyrkshnöppum.</string>
<string name="use_volume_buttons_as_zoom_descr">Stýrðu aðdráttarstigi korts með hljóðstyrkshnöppum tækisins.</string>
<string name="routing_attr_length_description">Tilgreindu lengd farartækis sem leyfð er á leiðum.</string>
<string name="in_case_of_reverse_direction">Ef stefna er öfug</string>
<string name="route_between_points_next_segment_button_desc">Aðeins næsti bútur verður endurreiknaður með völdu sniði.</string>
@ -3840,7 +3840,7 @@
\n</string>
<string name="gpx_split_interval_descr">Veldu bilið þar sem merki með tíma eða vegalengd á ferlinum verða birt.</string>
<string name="attach_to_the_roads">Tengja við vegina</string>
<string name="plan_route_exit_dialog_descr">Ertu viss um að þú viljir loka leiðaskipulagningu án þess að vista\? Þú munt tapa öllum breytingum.</string>
<string name="plan_route_exit_dialog_descr">Ertu viss um að þú viljir loka leiðaskipulagningu án þess að vista\?</string>
<string name="marker_save_as_track">Vista sem ferilskrá</string>
<string name="threshold_distance">Þolvik vegalengdar</string>
<string name="save_track_to_gpx_globally">Skrifa feril í GPX-skrá</string>
@ -3856,11 +3856,9 @@
<string name="start_of_the_track">Upphaf ferils</string>
<string name="shared_string_gpx_files">Ferlar</string>
<string name="access_hint_enter_address">Settu inn heimilisfang</string>
<string name="import_track_descr">Veldu ferilskrá til að fylgja eða flyttu inn úr tæki.</string>
<string name="import_track_descr">Veldu ferilskrá til að fylgja eða flyttu hana inn úr tækinu þínu.</string>
<string name="add_segment_to_the_track">Bæta í ferilskrá</string>
<string name="route_between_points_warning_desc">Til að nota þennan valkost þarf OsmAnd að festa ferilinn þinn við vegi á kortinu.
\n
\nÍ næsta skrefi þarftu að velja leiðsagnarsnið svo hægt sé að finna hvaða vegir séu leyfilegir og hvaða þolvik vegalengdar eigi að miða við til að nálga ferilinn þinn við fyrirliggjandi vegi.</string>
<string name="route_between_points_warning_desc">Í næsta skrefi þarftu að velja leiðsagnarsnið svo hægt sé að finna hvaða vegir séu leyfilegir og hvaða þolvik vegalengdar eigi að miða við til að nálga ferilinn þinn við fyrirliggjandi vegi.</string>
<string name="empty_state_my_tracks">Bæta við ferilskrám</string>
<string name="app_mode_inline_skates">Línuskautar</string>
<string name="add_address">Bæta við heimilisfangi</string>
@ -3868,7 +3866,7 @@
<string name="map_widget_monitoring">Skráning ferðar</string>
<string name="nearest_point">Næsti punktur</string>
<string name="show_gpx">Ferlar</string>
<string name="monitoring_control_start">GPX</string>
<string name="monitoring_control_start">REC</string>
<string name="plan_route_trim_before">Klippa á undan</string>
<string name="context_menu_item_add_waypoint">Bæta við leiðarpunkti í feril</string>
<string name="plan_route_change_route_type_after">Skipta um gerð leiðar eftir</string>
@ -3879,4 +3877,41 @@
<string name="shared_string_gpx_route">Skrá leið í feril</string>
<string name="select_another_track">Velja annan feril</string>
<string name="save_track_to_gpx">Skrifa feril sjálfkrafa í GPX-skrá á meðan leiðsögn stendur</string>
<string name="what_is_new">Nýjungar</string>
<string name="simplified_track">Einfaldaður ferill</string>
<string name="simplified_track_description">Aðeins leiðarlínan verður vistuð, ferilpunktunum verður eytt.</string>
<string name="shared_string_file_name">Skráarheiti</string>
<string name="system_default_theme">Sjálfgefið í kerfinu</string>
<string name="all_next_segments">Allir bútar í kjölfarið</string>
<string name="previous_segment">Fyrri bútur</string>
<string name="all_previous_segments">Allir fyrri bútar</string>
<string name="only_selected_segment_recalc">Aðeins valinn bútur verður endurreiknaður með völdu sniði.</string>
<string name="all_next_segments_will_be_recalc">Allir bútar sem á eftir fylgja verða endurreiknaðir með völdu sniði.</string>
<string name="all_previous_segments_will_be_recalc">Allir fyrri bútar verða endurreiknaðir með völdu sniði.</string>
<string name="open_saved_track">Opna vistaðan feril</string>
<string name="shared_string_is_saved">er vistað</string>
<string name="one_point_error">Bættu við a.m.k. tveimur punktum.</string>
<string name="shared_string_redo">Endurtaka</string>
<string name="sort_last_modified">Síðast breytt</string>
<string name="sort_name_descending">Nafn: Ö – A</string>
<string name="sort_name_ascending">Nafn: A – Ö</string>
<string name="start_finish_icons">Tákn við upphaf/enda</string>
<string name="routing_attr_avoid_footways_description">Forðast gangstéttir</string>
<string name="routing_attr_avoid_footways_name">Forðast gangstéttir</string>
<string name="development">Þróun</string>
<string name="use_live_public_transport">OsmAnd Live gögn</string>
<string name="use_live_routing">OsmAnd Live gögn</string>
<string name="use_complex_routing">Flókin leiðagerð</string>
<string name="complex_routing_descr">Tveggja-þátta leiðagerð fyrir bílaleiðsögn.</string>
<string name="use_native_pt">Innbyggð þróun almenningssamgangna</string>
<string name="use_native_pt_desc">Skipta yfir í Java (öruggt) útreikning fyrir almenningssamgöngur</string>
<string name="perform_oauth_authorization_description">Framkvæma OAuth-innskráningu til að nota osmedit-eiginleika</string>
<string name="perform_oauth_authorization">Skrá inn í gegnum OAuth</string>
<string name="clear_osm_token">Hreinsa OAuth-teikn OpenStreetMap</string>
<string name="osm_edit_logout_success">Útskráning tókst</string>
<string name="number_of_gpx_files_selected_pattern">%s GPX-skrár valdar</string>
<string name="disable_recording_once_app_killed_descrp">Mun setja GPX-skráningu í bið þegar forritið er drepið (slökkt á því í gegnum skjáinn fyrir nýleg forrit - bakgrunnsvísir OsmAnd hverfur þar með úr tilkynningastiku Android-kerfisins.)</string>
<string name="save_global_track_interval_descr">Veldu millibil skráninga í almenna leiðarskráningu (virkjað með viðmótshlutanum fyrir GPX-skráningu á kortinu).</string>
<string name="gpx_monitoring_stop">Setja skráningu í bið</string>
<string name="gpx_monitoring_start">Halda áfram með skráningu</string>
</resources>

47
OsmAnd/res/values-it/phrases.xml
View file

@ -93,7 +93,7 @@
<string name="poi_motorcycle">Negozio di moto</string>
<string name="poi_musical_instrument">Strumenti musicali</string>
<string name="poi_optician">Optometrista</string>
<string name="poi_organic">Alimenti biologici</string>
<string name="poi_organic">Prodotti biologici</string>
<string name="poi_outdoor">Negozio articoli per l\'attività all\'aperto</string>
<string name="poi_paint">Negozio articoli pittura</string>
<string name="poi_pet">Negozio animali domestici</string>
@ -748,7 +748,7 @@
<string name="poi_fee">Costi</string>
<string name="poi_smoking">Fumatori</string>
<string name="poi_delivery">Consegna</string>
<string name="poi_drive_in">Drive in</string>
<string name="poi_drive_in">Drive-in</string>
<string name="poi_takeaway">Cibo da asporto</string>
<string name="poi_cocktails">Cocktail</string>
<string name="poi_microbrewery">Microbirrificio</string>
@ -1057,7 +1057,7 @@
<string name="poi_tactile_paving_yes">sì</string>
<string name="poi_tactile_paving_no">Senza pavimentazione tattile</string>
<string name="poi_traffic_signals_sound_yes">sì</string>
<string name="poi_traffic_signals_sound_no">no</string>
<string name="poi_traffic_signals_sound_no">Suono: no</string>
<string name="poi_traffic_signals_sound_walk">Solo quando è consentito camminare</string>
<string name="poi_rescue_station">Stazione di soccorso</string>
<string name="poi_bird_hide">Posto per birdwatching</string>
@ -1077,7 +1077,7 @@
<string name="poi_piste_grooming_classic_skating">Classic + skating</string>
<string name="poi_piste_grooming_no">no</string>
<string name="poi_garden_type_residential">Giardino: residenziale</string>
<string name="poi_garden_type_community">Tipo di giardino: comunità</string>
<string name="poi_garden_type_community">Tipo di giardino: comunitario</string>
<string name="poi_garden_type_private">Giardino: privato</string>
<string name="poi_garden_type_botanical">Giardino: botanica</string>
<string name="poi_garden_style_kitchen">Giardino: cucina</string>
@ -1164,7 +1164,7 @@
<string name="poi_payment_cheque_yes">Assegni</string>
<string name="poi_payment_pikepass_yes">PIKEPASS</string>
<string name="poi_payment_pikepass_no">PIKEPASS non accettato</string>
<string name="poi_payment_pikepass_designated">PIKEPASS (indicato)</string>
<string name="poi_payment_pikepass_designated">PIKEPASS (riservato)</string>
<string name="poi_payment_visa_debit_yes">Carte di debito Visa</string>
<string name="poi_payment_visa_debit_no">Carte di debito Visa non accettato</string>
<string name="poi_payment_cryptocurrencies_no">Cryptomonete non accettate</string>
@ -1384,13 +1384,13 @@
<string name="poi_service_electrical">Riparazione di veicoli elettrici</string>
<string name="poi_motorcycle_repair">Riparazione Motocicli</string>
<string name="poi_self_service_yes">sì</string>
<string name="poi_self_service_no">No Self-Service</string>
<string name="poi_self_service_no">No</string>
<string name="poi_automated_yes">sì</string>
<string name="poi_automated_no">Non automatizzato</string>
<string name="poi_full_service_yes">Servizio completo</string>
<string name="poi_brushless_yes">sì</string>
<string name="poi_brushless_no">Senza spazzola: no</string>
<string name="poi_car_wash_no">Lavaggio auto: no</string>
<string name="poi_car_wash_no">No</string>
<string name="poi_public_bath">Bagno pubblico</string>
<string name="poi_indoor_no">Esterno</string>
<string name="poi_toilets_yes">sì</string>
@ -1505,7 +1505,7 @@
<string name="poi_bridge_pedestrian">Ponte pedonale</string>
<string name="poi_bridge_bicycle">Ponte di biciclette</string>
<string name="poi_bridge_railway">Ponte ferroviera</string>
<string name="poi_bridge_structure_beam">Struttura ponte: fascio</string>
<string name="poi_bridge_structure_beam">Struttura ponte: trave</string>
<string name="poi_bridge_structure_simple_suspension">Struttura ponte: sospensione semplice</string>
<string name="poi_bridge_structure_suspension">Struttura ponte: sospensione</string>
<string name="poi_bridge_structure_arch">Struttura ponte: arco</string>
@ -1801,7 +1801,7 @@
<string name="poi_depth">Profondità</string>
<string name="poi_salt_yes">Sale</string>
<string name="poi_salt_no">Sale: no</string>
<string name="poi_wheelchair_designated">indicato</string>
<string name="poi_wheelchair_designated">Riservato</string>
<string name="poi_summer_camp">Campo estivo</string>
<string name="poi_crossing_bell_yes">Campana di attraversamento</string>
<string name="poi_crossing_bell_no">Campana di attraversamento: no</string>
@ -2559,7 +2559,7 @@
<string name="poi_pump_status_broken">Stato della pompa: rotta</string>
<string name="poi_craft_electronics_repair">Riparazioni elettroniche</string>
<string name="poi_operational_status_closed">Chiusa</string>
<string name="poi_operational_status_restricted">Privata</string>
<string name="poi_operational_status_restricted">Privato</string>
<string name="poi_operational_status_broken">Rotta</string>
<string name="poi_water_purification_none">Nessuno</string>
<string name="poi_water_purification_chlorine">Cloro</string>
@ -2579,30 +2579,30 @@
<string name="poi_bulk_purchase_yes">sì</string>
<string name="poi_park_ride_yes">sì</string>
<string name="poi_snowmobile_yes">sì</string>
<string name="poi_snowmobile_designated">indicato</string>
<string name="poi_snowmobile_designated">Riservato</string>
<string name="poi_snowmobile_permissive">permissiva</string>
<string name="poi_bus_yes">sì</string>
<string name="poi_bus_designated">indicato</string>
<string name="poi_bus_designated">Riservato</string>
<string name="poi_caravan_yes">sì</string>
<string name="poi_caravan_designated">indicato</string>
<string name="poi_caravan_designated">Riservato</string>
<string name="poi_motorhome_yes">sì</string>
<string name="poi_motorhome_designated">indicato</string>
<string name="poi_motorhome_designated">Riservato</string>
<string name="poi_trailer_yes">sì</string>
<string name="poi_trailer_designated">indicato</string>
<string name="poi_trailer_designated">Riservato</string>
<string name="poi_motorcycle_yes">sì</string>
<string name="poi_motorcycle_permissive">permissiva</string>
<string name="poi_motorcycle_designated">indicato</string>
<string name="poi_motorcycle_designated">Riservato</string>
<string name="poi_moped_yes">sì</string>
<string name="poi_moped_designated">indicato</string>
<string name="poi_moped_designated">Riservato</string>
<string name="poi_mofa_yes">sì</string>
<string name="poi_mofa_designated">indicato</string>
<string name="poi_mofa_designated">Riservato</string>
<string name="poi_hgv_yes">sì</string>
<string name="poi_hgv_permissive">permissiva</string>
<string name="poi_hgv_designated">indicato</string>
<string name="poi_hgv_designated">Riservato</string>
<string name="poi_goods_yes">sì</string>
<string name="poi_goods_designated">indicato</string>
<string name="poi_goods_designated">Riservato</string>
<string name="poi_disabled_yes">sì</string>
<string name="poi_disabled_designated">indicato</string>
<string name="poi_disabled_designated">Riservato</string>
<string name="poi_denomination_united_methodist">Metodista unita</string>
<string name="poi_snowmobile_filter">Accesso alle motoslitte</string>
<string name="poi_access_bus">Accesso agli autobus</string>
@ -2655,7 +2655,7 @@
<string name="poi_trailer_no">Accesso al rimorchio: no</string>
<string name="poi_bus_no">Accesso all\'autobus: no</string>
<string name="poi_tourist_bus_yes">Accesso all\'autobus turistico: sì</string>
<string name="poi_tourist_bus_designated">Accesso all\'autobus turistico: designato</string>
<string name="poi_tourist_bus_designated">Accesso autobus turistici: riservato</string>
<string name="poi_tourist_bus_no">Accesso all\'autobus turistico: no</string>
<string name="poi_ski_yes">Accesso sci: sì</string>
<string name="poi_ski_no">Accesso sci: no</string>
@ -2664,7 +2664,7 @@
<string name="poi_agricultural_yes">Accesso agricolo: sì</string>
<string name="poi_agricultural_no">Accesso agricolo: no</string>
<string name="poi_taxi_yes">Accesso taxi: sì</string>
<string name="poi_taxi_designated">Accesso taxi: designato</string>
<string name="poi_taxi_designated">Accesso taxi: riservato</string>
<string name="poi_taxi_no">Accesso taxi: no</string>
<string name="poi_disabled_no">Accesso per disabili: no</string>
<string name="poi_motorcycle_destination">Destinazione</string>
@ -2819,4 +2819,5 @@
<string name="poi_resource_aggregate">Aggregato</string>
<string name="poi_resource_beryl">Berillio</string>
<string name="poi_shop_wholesale">Negozio all\'ingrosso</string>
<string name="poi_psv_designated">Accesso PSV: riservato</string>
</resources>

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

@ -19,7 +19,7 @@
<string name="live_monitoring_url">Indirizzo internet per il tracking in diretta</string>
<string name="gpx_monitoring_disabled_warn">Registra la traccia usando il widget GPX o le impostazioni \'Registrazione viaggi\'.</string>
<string name="show_current_gpx_title">Visualizza la traccia corrente</string>
<string name="free_version_message">Puoi scaricare o caricare %1$s mappe.</string>
<string name="free_version_message">Puoi scaricare o aggiornare %1$s mappe.</string>
<string name="free_version_title">Versione gratuita</string>
<string name="poi_context_menu_showdescription">Visualizza descrizione PDI.</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>

14
OsmAnd/res/values-iw/strings.xml
View file

@ -2171,7 +2171,7 @@
<string name="plugin_install_needs_network">צריך חיבור לאינטרנט כדי להתקין את התוסף הזה.</string>
<string name="get_plugin">קבלה</string>
<string name="use_fast_recalculation">חישוב חכם לנתיב מחדש</string>
<string name="use_fast_recalculation_desc">לטיולים ארוכים, יש לחשב מחדש רק את החלק ההתחלתי של הנתיב.</string>
<string name="use_fast_recalculation_desc">לחשב מחדש רק את החלק ההתחלתי של המסלול, יכול לשמש לטיולים ארוכים.</string>
<string name="do_you_like_osmand">OsmAnd נושא חן בעיניך?</string>
<string name="we_really_care_about_your_opinion">הדעה והמשוב שלך יקרים לנו.</string>
<string name="rate_this_app">דירוג היישומון הזה</string>
@ -3919,4 +3919,16 @@
\nהמינוי מתחדש אוטומטי אלא אם כן בוטל בטרם תאריך החידוש. החשבון שלך יחויב על תקופת החידוש (חודש/שלושה חודשים/שנה) רק בתאריך החידוש.
\n
\nניתן לנהל ולבטל את המינויים שלך דרך ההגדרות ב־AppGallery שלך.</string>
<string name="what_is_new">מה חדש</string>
<string name="development">פיתוח</string>
<string name="use_live_public_transport">נתוני זמן אמת של OsmAnd</string>
<string name="use_live_routing">נתוני זמן אמת של OsmAnd</string>
<string name="use_complex_routing">חישוב מורכב של מסלול</string>
<string name="complex_routing_descr">חישוב מסלול דו־שלבי לניווט במכונית.</string>
<string name="use_native_pt">פיתוח עצמי לתחבורה ציבורית</string>
<string name="use_native_pt_desc">מעבר לחישוב ניווט בתחבורה ציבורית ב־Java (בטוח)</string>
<string name="perform_oauth_authorization_description">יש להיכנס עם OAuth כדי להשתמש ביכולות של osmedit</string>
<string name="perform_oauth_authorization">להיכנס דרך OAuth</string>
<string name="clear_osm_token">למחוק את אסימון ה־OAuth של OpenStreetMap</string>
<string name="osm_edit_logout_success">היציאה הצליחה</string>
</resources>

22
OsmAnd/res/values-ja/strings.xml
View file

@ -1553,7 +1553,7 @@ POIの更新は利用できません</string>
<string name="routing_attr_height_name">高さ制限</string>
<string name="routing_attr_height_description">ルート上で通行可能な車両の高さを指定します。</string>
<string name="use_fast_recalculation">スマートなルート再計算</string>
<string name="use_fast_recalculation_desc">経路が長い場合、最初の部分のみ再計算します。</string>
<string name="use_fast_recalculation_desc">ルートの最初の部分のみを再計算します。旅程(設定ルート)がとても長い場合に効果的です。</string>
<string name="light_theme">明色</string>
<string name="dark_theme">暗色</string>
<string name="lang_pms">ピエモンテ語</string>
@ -3307,7 +3307,7 @@ POIの更新は利用できません</string>
<string name="osmand_settings_descr">アプリ全体に反映されます</string>
<string name="osmand_settings">OsmAnd設定</string>
<string name="copy_from_other_profile">他のプロファイルからコピー</string>
<string name="turn_screen_on">画面表示機能</string>
<string name="turn_screen_on">画面の復帰設定</string>
<string name="map_during_navigation_info">ナビゲーション中のマップ表示</string>
<string name="map_during_navigation">ナビゲーション中のマップ表示</string>
<string name="shared_string_other">その他</string>
@ -3705,7 +3705,7 @@ POIの更新は利用できません</string>
<string name="lang_gu">グジャラート語</string>
<string name="lang_cv">チュヴァシ語</string>
<string name="gpx_parse_error">OsmAnd GPXの形式が正しくありません。サポートチームに連絡しての調査をおすすめします。</string>
<string name="screen_timeout">画面のタイムアウト</string>
<string name="screen_timeout">画面の消灯設定</string>
<string name="turn_screen_on_descr">画面復帰オプションを選択します(端末設定でロックされる場合は、OsmAndがバックグラウンド動作でないことを確認してください):</string>
<string name="system_screen_timeout_descr">端末側の画面オフ(省電力)設定に従って画面を消灯します。</string>
<string name="system_screen_timeout">端末側の画面オフ設定を使用</string>
@ -3760,7 +3760,7 @@ POIの更新は利用できません</string>
<string name="weight_limit_description">車両の重量を入力してください。一部のルートにおいては、大型車両では通行できない場合があります。</string>
<string name="lenght_limit_description">車の長さを入力してください。一部のルートにおいては、長い車両では通行できない場合があります。</string>
<string name="shared_string_always">常に</string>
<string name="screen_control">画面制御</string>
<string name="screen_control">画面の制御</string>
<string name="turn_screen_on_power_button_disabled">現在無効。 \'画面を表示する時間\'の下にある\'画面を常に表示\'への設定が必要です。</string>
<string name="keep_screen_off">画面オフを維持</string>
<string name="pseudo_mercator_projection">疑似メルカトル図法</string>
@ -3801,7 +3801,7 @@ POIの更新は利用できません</string>
<string name="shared_string_uninstall">アンインストール</string>
<string name="speed_cameras_alert">一部の国では、スピードカメラの事前警告は法律で禁止されています。</string>
<string name="screen_timeout_descr">\"%1$s\"がオンの場合、設定された動作時間はそちらに依存します。</string>
<string name="default_screen_timeout">デフォルトの画面タイムアウト時間</string>
<string name="default_screen_timeout">端末設定の画面スリープ時間に従う</string>
<string name="shared_string_tones">トーン</string>
<string name="shared_string_meters">メートル</string>
<string name="details_dialog_decr">追加マップの詳細を表示または非表示にします</string>
@ -3900,4 +3900,16 @@ POIの更新は利用できません</string>
<string name="sort_last_modified">最終更新日</string>
<string name="sort_name_descending">名称: 降順(Z-A)</string>
<string name="sort_name_ascending">名称: 昇順(A-Z)</string>
<string name="use_native_pt_desc">Java(セーフモード)での公共交通機関ルーティング計算に切り替えます</string>
<string name="perform_oauth_authorization_description">OsmEdit機能を利用するには、OAuthでのログインが必要です。</string>
<string name="perform_oauth_authorization">OAuthでログイン</string>
<string name="clear_osm_token">OpenStreetMapOAuthトークンを消去する</string>
<string name="osm_edit_logout_success">ログアウトしました</string>
<string name="routing_attr_avoid_footways_description">歩道を使わないようにします</string>
<string name="routing_attr_avoid_footways_name">歩道を避ける</string>
<string name="development">開発</string>
<string name="use_live_public_transport">OsmAnd Liveデータ</string>
<string name="use_live_routing">OsmAnd Liveデータ</string>
<string name="use_complex_routing">複雑なルート計算</string>
<string name="complex_routing_descr">カーナビゲーション向けの2段階ルート計算です。</string>
</resources>

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

@ -1618,4 +1618,10 @@
<string name="poi_direction_clockwise">Retning: med urviseren</string>
<string name="poi_direction_nnw">Retning: nord-nordvest</string>
<string name="poi_direction_nw">Retning: nordvest</string>
<string name="poi_drinking_water_refill">Drikkevannspåfylling</string>
<string name="poi_traffic_signals_arrow">Pil</string>
<string name="poi_traffic_signals_vibration">Vibrasjon</string>
<string name="poi_video_telephone">Video</string>
<string name="poi_volcano_status">Status</string>
<string name="poi_volcano_type">Type</string>
</resources>

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

@ -346,7 +346,7 @@
<string name="rotate_map_to_bearing_descr">Kartjustering:</string>
<string name="rotate_map_to_bearing">Kartorientering</string>
<string name="show_route">Rutedetaljer</string>
<string name="fav_imported_sucessfully">Favoritter er importert</string>
<string name="fav_imported_sucessfully">Favoritter importert</string>
<string name="fav_file_to_load_not_found">GPX-fil som inneholder favoritter er ikke funnet på {0}</string>
<string name="fav_saved_sucessfully">Favoritter lagret til {0}</string>
<string name="no_fav_to_save">Ingen favorittpunkter å lagre</string>
@ -418,7 +418,7 @@
<string name="update_existing">Erstatt</string>
<string name="only_show">Vis rute</string>
<string name="follow">Start veiledning</string>
<string name="mark_final_location_first">Velg reisemål først</string>
<string name="mark_final_location_first">Angi reisemålet først</string>
<string name="get_directions">Anvisninger</string>
<string name="opening_hours">Åpningstider</string>
<string name="poi">Interessepunkt</string>
@ -443,7 +443,7 @@
<string name="show_view_angle">Vis synsretning</string>
<string name="map_view_3d_descr">Aktiver 3D-visning av kartet.</string>
<string name="map_view_3d">3D-kartvisning</string>
<string name="show_poi_over_map_description">Vis sist valgte interessepunktsoverlegg.</string>
<string name="show_poi_over_map_description">Vis sist brukte interessepunktoverlegg.</string>
<string name="show_poi_over_map">Vis interessepunktoverlegg</string>
<string name="map_tile_source_descr">Velg kilde for nettbaserte eller hurtiglagrede kart.</string>
<string name="map_tile_source">Fliskartkilde</string>
@ -469,7 +469,7 @@
<string name="app_mode_pedestrian">Gåing</string>
<string name="position_on_map_center">Senter</string>
<string name="position_on_map_bottom">Nederst</string>
<string name="navigate_point_top_text">Oppfør bredde- og lengdegrad i det valgte formatet (G - grader, M - minutter, S - sekunder)</string>
<string name="navigate_point_top_text">Angi bredde- og lengdegrad i det valgte formatet (G - grader, M - minutter, S - sekunder)</string>
<string name="navigate_point_latitude">Breddegrad</string>
<string name="navigate_point_longitude">Lengdegrad</string>
<string name="navigate_point_format_D">DDD.DDDDD</string>
@ -489,7 +489,7 @@
<string name="shared_string_no">Nei</string>
<string name="add_favorite_dialog_top_text">Oppfør favorittnavn</string>
<string name="add_favorite_dialog_default_favourite_name">Favoritt</string>
<string name="add_favorite_dialog_favourite_added_template">Favorittpunkt \'\'{0}\'\' er lagt til.</string>
<string name="add_favorite_dialog_favourite_added_template">Favorittpunkt \'\'{0}\'\' lagt til.</string>
<string name="favourites_context_menu_edit">Rediger favoritt</string>
<string name="favourites_context_menu_delete">Slett favoritt</string>
<string name="favourites_remove_dialog_msg">Slett favorittpunkt \'%s\'\?</string>
@ -945,7 +945,7 @@
<string name="local_openstreetmap_uploading">Laster opp…</string>
<string name="osmand_service">Bakgrunnsmodus</string>
<string name="osmand_service_descr">OsmAnd kjører i bakgrunnen med skjermen av.</string>
<string name="overlay_transparency_descr">Endre overleggsgjennomsiktigheten.</string>
<string name="overlay_transparency_descr">Juster overleggsgjennomsiktighet.</string>
<string name="overlay_transparency">Overleggsgjennomsiktighet</string>
<string name="map_transparency_descr">Juster gjennomsiktighet for basiskartet.</string>
<string name="map_transparency">Gjennomsiktighet for basiskart</string>
@ -1285,7 +1285,7 @@
<string name="recent_places">Nylige steder</string>
<string name="saved_at_time">Nå lagret her: %1$s</string>
<string name="new_version">Ny versjon</string>
<string name="begin_with_osmand_menu_group">Første steg med OsmAnd</string>
<string name="begin_with_osmand_menu_group">Første trinn med OsmAnd</string>
<string name="features_menu_group">Funksjoner</string>
<string name="help_us_to_improve_menu_group">Hjelp til med å forbedre OsmAnd</string>
<string name="plugins_menu_group">Programtillegg</string>
@ -1458,7 +1458,7 @@
<string name="failed_to_upload">Klarte ikke å laste opp</string>
<string name="buy">Kjøp</string>
<string name="faq_item">Ofte stilte spørsmål</string>
<string name="number_of_edits">Antall endringer</string>
<string name="number_of_edits">Antall redigeringer</string>
<string name="number_of_contributors">Antall bidragsytere</string>
<string name="morning">Morgen</string>
<string name="night">Natt</string>
@ -2218,7 +2218,7 @@
<string name="layer_yandex_traffic">Yandex-trafikk</string>
<string name="background_service_provider">Stedsbestemmelsestjeneste</string>
<string name="off_router_service_no_gps_available">Bakgrunnsnavigeringen krever aktivert stedsbestemmelsestjeneste.</string>
<string name="opening_hours_not_supported">Åpningstidsformat kan ikke endres.</string>
<string name="opening_hours_not_supported">Kan ikke endre åpningstidsformat.</string>
<string name="update_poi_error_loading">Kunne ikke laste inn data fra tjener.</string>
<string name="auth_failed">Identitetsbekreftelse mislyktes</string>
<string name="error_occurred_saving_gpx">Kunne ikke lagre GPX-fil.</string>
@ -2248,7 +2248,7 @@
<string name="quick_action_item_screen">Skjerm %d</string>
<string name="quick_action_add_marker">Legg til kartmarkør</string>
<string name="quick_action_map_style">Endre kartstil</string>
<string name="quick_action_map_style_switch">Kartstil endret til «%s».</string>
<string name="quick_action_map_style_switch">Kartstil endret til \"%s\".</string>
<string name="quick_action_take_audio_note">Nytt lydnotat</string>
<string name="quick_action_take_video_note">Nytt videonotat</string>
<string name="quick_action_take_photo_note">Nytt bildenotat</string>
@ -2463,7 +2463,7 @@
<string name="vector_data_missing">Last ned (\'nettfrakoblede\') data for å kunne bruke kart nettfrakoblet.</string>
<string name="create_poi_link_to_osm_doc"><u>Online OSM</u> – kartklassifisering med bilder.</string>
<string name="quick_action_duplicates">Hurtighandlingsnavn endret til %1$s for å unngå duplisering.</string>
<string name="quick_action_duplicate">Navneduplisering for hurtighandling</string>
<string name="quick_action_duplicate">Navneduplikat for hurtighandling</string>
<string name="osm_recipients_label">OSM-mottakere</string>
<string name="total_donations">Donasjoner totalt</string>
<string name="enter_the_file_name">Skriv inn filnavnet.</string>
@ -2475,9 +2475,9 @@
<string name="optional_point_name">Valgfritt punktnavn</string>
<string name="transport_nearby_routes_within">Ruter i nærheten innen</string>
<string name="transport_nearby_routes">Innenfor</string>
<string name="enter_lon">Oppfør lengdegrad</string>
<string name="enter_lat">Oppfør breddegrad</string>
<string name="enter_lat_and_lon">Oppfør bredde- og lengdegrad</string>
<string name="enter_lon">Angi lengdegrad</string>
<string name="enter_lat">Angi breddegrad</string>
<string name="enter_lat_and_lon">Angi bredde- og lengdegrad</string>
<string name="dd_mm_ss_format">GG°MM′SS″</string>
<string name="dd_dddddd_format">GG,GGGGGG°</string>
<string name="dd_ddddd_format">GG,GGGGG°</string>
@ -2966,7 +2966,7 @@
<string name="rendering_attr_highway_class_road_name">Vei</string>
<string name="rendering_attr_highway_class_street_name">Gate</string>
<string name="rendering_attr_highway_class_service_name">Tjeneste</string>
<string name="rendering_attr_highway_class_footway_name">Tursti</string>
<string name="rendering_attr_highway_class_footway_name">Gangvei</string>
<string name="rendering_attr_highway_class_track_name">Turvei</string>
<string name="rendering_attr_highway_class_bridleway_name">Ridesti</string>
<string name="rendering_attr_highway_class_steps_name">Trapper</string>
@ -3086,8 +3086,8 @@
<string name="application_profiles">Programprofiler</string>
<string name="zoom_by_wunderlinq">Bruk WunderLINQ for styring</string>
<string name="routing_attr_piste_type_downhill_name">Alpint/utfor</string>
<string name="routing_attr_piste_type_sled_name">Slede</string>
<string name="routing_attr_piste_type_sled_description">Løyper for sledebruk.</string>
<string name="routing_attr_piste_type_sled_name">Kjelke</string>
<string name="routing_attr_piste_type_sled_description">Løyper for kjelkebruk.</string>
<string name="routing_attr_allow_advanced_name">Tillat avanserte ruter</string>
<string name="routing_attr_allow_expert_name">Tillat ekspertruter</string>
<string name="routing_attr_allow_skating_only_name">Tillat løyper kun for skøyting</string>
@ -3672,11 +3672,11 @@
<string name="use_volume_buttons_as_zoom">Lydstyrkeknapper til forstørring</string>
<string name="search_download_wikipedia_maps">Last ned Wikipedia-kart</string>
<string name="accessibility_mode_disabled">Tilgjengelighetsmodus er slått av i Android-systemet.</string>
<string name="listed_exist"/>
<string name="listed_exist">Angitt %1$s finnes allerede i OsmAnd.</string>
<string name="turn_screen_on_navigation_instructions">Navigasjonsinstruks</string>
<string name="speed_cameras_restart_descr"/>
<string name="speed_cameras_restart_descr">Start opp programmet igjen for å slette all fotoboksdata.</string>
<string name="shared_string_uninstall_and_restart">Avinstaller og start på nytt</string>
<string name="quick_action_remove_next_destination_descr"/>
<string name="quick_action_remove_next_destination_descr">Nåværende målpunkt på ruten vil slettes. Hvis det er målet, vil navigasjonen stoppe.</string>
<string name="app_mode_wheelchair">Rullestol</string>
<string name="app_mode_go_cart">Gokart</string>
<string name="plan_a_route">Planlegg en rute</string>
@ -3758,4 +3758,112 @@
<string name="number_of_gpx_files_selected_pattern">%s sporfiler valgt</string>
<string name="gpx_monitoring_stop">Sett turopptak på pause</string>
<string name="gpx_monitoring_start">Gjenoppta turopptak</string>
<string name="pass_whole_track_descr">Punkt i sporet å navigere</string>
<string name="monitoring_min_speed_descr_remark">Merk: Hastighet &gt; 0-sjekk: De fleste GPS-brikkesett rapporterer en hastighetsverdi kun hvis algoritmen fastslår at du er i bevegelse, og ingen hvis du ikke er det. Derav vil bruk av &gt; 0-innstillingen i dette filteret bruke bevegelsesoppdagelsen fra GPS-brikkesettet. Selv om det ikke filtreres har ved opptak, har man fremdeles denne funksjonen i GPX-analyse for å fastslå korrigert distanse, altså verdien som vises i feltet er distanse tatt opp i bevegelse.</string>
<string name="monitoring_min_speed_descr_recommendation">Anbefaling: Prøv å bruke bevegelsesoppdagelse via avstandsfilteret for minimumsmåling (B) først, det kan gi bedre resultater, og du vil ikke gå glipp av data. Hvis dine spor fremdeles er fulle av støy ved lave hastigheter, kan du prøve andre verdier enn null her. Merk at noen målinger ikke rapporterer hastighetsverdi i det hele tatt (som nettverksbaserte metoder), og i sådant fall vil du ikke ta opp noe.</string>
<string name="monitoring_min_speed_descr_side_effect">Bieffekt: Sporet ditt vil mangle alle deler der minimumshastigheten ikke er oppfylt (f.eks. når du dytter sykkelen din opp en bratt bakke). Pauser går også tapt siden det ikke er noen bevegelse. Dette forringer også analyse eller etterbehandling, som å forsøke å anslå total turlengde, tid i bevegelse, eller gjennomsnittshastighet.</string>
<string name="monitoring_min_speed_descr">Dette lavhastighetsfilteret tar ikke opp punkter under en gitt hastighet. Dette kan gjøre innspilte spor jevnere når de vises på kartet.</string>
<string name="monitoring_min_accuracy_descr">Dette tar opp punkter målt med minimal nøyaktighetsindikasjon (i meter/fot, som det rapporteres av Android av brikkesettet ditt). Nøyaktighet er nærheten av målinger til sann posisjon, og er ikke direkte relatert til presisjon, som er en spredning av gjentatte målinger.</string>
<string name="monitoring_min_accuracy_descr_side_effect">Bivirkning: Som et resultat av filtrering etter nøyaktighet, kan noen punkter mangle helt, f.eks. under broer, under trær, mellom høye bygninger, eller under gitte værforhold.</string>
<string name="monitoring_min_accuracy_descr_recommendation">Anbefaling: Det er vanskelig å forutsi hva som blir tatt opp og ikke, det kan være best å skru dette filteret av.</string>
<string name="monitoring_min_accuracy_descr_remark">Merk: Hvis GPS har vært av rett før et opptak, kan første punkt ha dårligere nøyaktighet, slik at man fra kodehold kan la det gå et sekund før et punkt blir tatt opp (eller man tar opp det beste av 3 punkter), men dette er ikke implementert enda.</string>
<string name="monitoring_min_distance_descr">Filteret unngår dupliserte punkter fra å bli tatt opp der det er for lite bevegelse. Lager et penere resultat uten bruk av etterbehandling.</string>
<string name="monitoring_min_distance_descr_side_effect">Bivirkning: Pauseperioder tas ikke opp i det hele tatt, eller kun med ett punkt. Små (faktiske) bevegelser (f.eks. til siden, for å markere en mulig avkjørsel i turen din) kan bli filtrert ut. Din fil inneholder mindre info for etterbehandling, og har dårligere data ved å filtrere ut åpenbart overflødige punkter ved opptak, mens arte-fakter potensielt blir beholdt som følge av dårlige forhold eller GPS-brikkesetteffekter.</string>
<string name="monitoring_min_distance_descr_recommendation">Anbefaling: En innstilling på 5 meter kan fungere for deg hvis du ikke vil fange finmaskede detaljer, og ikke ønsker å ta opp data mens du har pause.</string>
<string name="live_monitoring_adress_descr">Angi nettadressen med parametersyntaks: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
<string name="multimedia_rec_split_title">Opptaksoppdeling</string>
<string name="search_offline_geo_error">Kunne ikke tolke geo-intensjon «%s».</string>
<string name="osm_authorization_success">Autorisert</string>
<string name="use_system_screen_timeout_promo">Avskrudd som forvalg: Skjermen vil ikke slås av så lenge OsmAnd kjører i forgrunnen.
\n
\nHvis påskrudd vil OsmAnd bruke systemets innstilling for skjermtidsavbrudd.</string>
<string name="terrain_empty_state_text">Skru på for å vise relieffskygge eller skråningskart. Du kan lese mer om disse karttypene på siden vår.</string>
<string name="reset_to_default_category_button_promo">«Tilbakestill til forvalg» gjenoppretter sorteringsrekkefølgen til installasjonsforvalg.</string>
<string name="hillshade_description">Relieffskyggekart som bruker mørke skygger for å vise skråninger, topper og lavland.</string>
<string name="recalculate_route_distance_promo">Ruten vil regnes ut igjen hvis avstanden fra ruten til nåværende posisjon er mer enn valgt verdi.</string>
<string name="osm_live_payment_subscription_management">Betaling vil bli belastet din Google Play-konto ved bekreftelse av kjøp.
\n
\n Abonnement fornyes automatisk med mindre det avbrytes før fornyelsesdatoen. Din konto vil bli belastet for fornyelsesperioden (måned/tre måneder/år) kun på fornyelsesdatoen.
\n
\n Du kan håndtere og avbryte dine abonnementer ved å gå til dine Google Play-innstillinger.</string>
<string name="turn_screen_on_descr">Angi når skjermen skal vekkes opp (forsikre deg om at OsmAnd er i forgrunnen når enheten låses):</string>
<string name="map_source_zoom_levels">Sett minste og største forstørrelsesnivå å vise eller laste inn på nettbasert kart.</string>
<string name="map_source_zoom_levels_descr">Har innvirkning på om skjermen skal brukes som kart eller overlag/underlag.
\n
\n%1$s: Kartet er begrenset til valgt forstørrelsesrekkevidde.
\n
\n%2$s er nivåene de opprinnelige flisene vil være synlige, oppskalering eller nedskalering finner sted utenfor disse verdiene.</string>
<string name="app_mode_inline_skates">Rulleskøyter</string>
<string name="speed_cameras_legal_descr">I noen land og områder, er bruk av fotoboksvarsling forbudt ved lov.
\n
\nDu må vurdere dette selv i henhold til lovene i ditt land.
\n
\nVelg %1$s og du vil motta varsler og advarsler om fotobokser.
\n
\nVelg %1$s. All data som har med fotobokser å gjøre, varsler, merknader og interessepunkter vil bli slettet til OsmAnd reinstalleres helt og holdent.</string>
<string name="clear_tiles_warning">Å utføre disse endringene vil tømme hurtiglagret data for denne fliskilden.</string>
<string name="plugin_wikipedia_description">Hent info om interessepunkter fra Wikipedia. Det er din frakoblede lommeguide - bare skru på Wikipedia-programtillegget og få artikler om objekter rundt deg.</string>
<string name="track_coloring_solid">Utfylt</string>
<string name="osm_live_payment_subscription_management_hw">Betaling vil bli belastet din programgalleri-konto ved bekreftelse av kjøp.
\n
\nAbonnementet fornyes automatisk med mindre det avbrytes før fornyelsesdatoen. Din konto bil bli belastet for fornyelse for hver fornyelsesperiode (måned/tre måneder/år) kun på fornyelsesdatoen.
\n
\nDu kan håndtere og avbryte ditt abonnement ved å gå gjennom dine programgalleri-innstillinger.</string>
<string name="gpx_parse_error">OsmAnd-GPX er feilformatert, kontakt brukerstøtte for videre etterforskning.</string>
<string name="system_screen_timeout_descr">Skrur av skjermen i henhold til systemets skjermtidsavbrudd.</string>
<string name="lenght_limit_description">Angi lengden på ditt kjøretøy, noen rutebegrensninger kan gjelde for lange kjøretøy.</string>
<string name="turn_screen_on_power_button_disabled">Avskrudd. Krever «Behold skjerm på» under «Tidsavbrudd etter oppvåkning».</string>
<string name="turn_screen_on_power_button_descr">Å trykke på enhetens på-knapp vil skru skjermen på med OsmAnd på toppen av låseskjermen.</string>
<string name="pseudo_mercator_projection">Pseudo-Mercatorprojeksjon</string>
<string name="keep_active">Behold på</string>
<string name="speed_cameras_alert">Fotoboksvarsling er forbudt ved lov i noen land.</string>
<string name="quick_action_showhide_mapillary_descr">Bryter for å vise eller skjule Mapillary-lag på kartet.</string>
<string name="speed_cameras_removed_descr">Denne enheten har ikke fotobokser.</string>
<string name="in_case_of_reverse_direction">I tilfelle motsatt retning</string>
<string name="simplified_track_description">Kun rutelinjen vil lagres, rutepunktene vil slettes.</string>
<string name="context_menu_item_add_waypoint">Legg til spor-rutepunkt</string>
<string name="quick_action_add_gpx">Legg til spor-rutepunkt</string>
<string name="complex_routing_descr">To-delt ruting for bilkjøring.</string>
<string name="osm_live_payment_desc_hw">Abonnement påløper per valgte periode. Avbryt det når som helst fra programgalleriet.</string>
<string name="attach_to_the_roads">Følg veier</string>
<string name="monitoring_min_distance">Minimumsforskyvning</string>
<string name="radius_ruler_item">Radiuspasser</string>
<string name="turn_screen_on_navigation_instructions_descr">Hver navigasjonsinstruksjon skrur skjermen på.</string>
<string name="turn_screen_on_wake_time_descr">Velg skjermtidsavbrudd etter oppvåkning. («%1$s» skrur av tidsavbrudd.)</string>
<string name="keep_screen_off">Hold skjermen av</string>
<string name="expire_time_descr">Hurtiglagrede fliser blir lastet ned på nytt etter det angitte antall minutter. La dette feltet stå tomt for å aldri gjenoppfriske fliser for denne kilden.
\n
\nÉn dag er 1440 minutter.
\nÉn uke er 10080 minutter.
\nÉn måned er 43829 minutter.</string>
<string name="screen_timeout_descr">Hvis «%1$s» er på, vil aktivitetstiden avhenge av den.</string>
<string name="routing_attr_length_description">Angi kjøretøylengde som tillates på rutene.</string>
<string name="routing_attr_length_name">Lengdebegrensning</string>
<string name="plan_route_exit_dialog_descr">Er du sikker på at du ønsker å forkaste alle endringer i planlagt rute ved å lukke den\?</string>
<string name="navigate_to_track_descr">Naviger fra min posisjon til sporet</string>
<string name="use_native_pt">Innebygd utvikling for offentlig transport</string>
<string name="use_native_pt_desc">Bytt til Java (trykk) ruteberegning for offentlig transport</string>
<string name="contour_lines_thanks">Takk for at du kjøpte «Koter»</string>
<string name="use_complex_routing">Kompleks ruting</string>
<string name="routing_attr_avoid_footways_name">Unngå gangveier</string>
<string name="routing_attr_avoid_footways_description">Unngå gangveier</string>
<string name="recalc_angle_dialog_descr">Ekstra rett segment mellom min posisjon og utregnet rute vil bli vist til den er regnet ut på ny</string>
<string name="checking_for_duplicate_description">OsmAnd sjekker %1$d for duplikater med eksisterende elementer i programmet.
\n
\nDet kan ta sin tid.</string>
<string name="export_import_quick_actions_with_profiles_promo">Du kan eksportere eller importere hurtighandlinger med programprofiler.</string>
<string name="delete_all_actions_message_q">Er du sikker på at du vil slette %d hurtighandlinger for godt\?</string>
<string name="screen_timeout">Skjermtidsavbrudd</string>
<string name="default_screen_timeout">Forvalgt skjermtidsavbrudd</string>
<string name="street_level_imagery">Gatenivåbildedata</string>
<string name="plan_route_trim_before">Beskjær før</string>
<string name="plan_route_trim_after">Beskjær før</string>
<string name="development">Utvikling</string>
<string name="use_live_public_transport">OsmAnd-sanntidsdata</string>
<string name="use_live_routing">OsmAnd-sanntidsdata</string>
<string name="perform_oauth_authorization_description">Utfør OAuth-innlogging for å bruke osmedit-funksjoner</string>
<string name="clear_osm_token">Fjern OpenStreetmap-OAuth-symbol</string>
<string name="perform_oauth_authorization">Logg inn via OAuth</string>
<string name="what_is_new">Hva er nytt</string>
<string name="osm_edit_logout_success">Utlogget</string>
</resources>

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

@ -3834,7 +3834,14 @@
<string name="poi_pump_status_missing_beam">Stan pompy: brak wiązki</string>
<string name="poi_traffic_signals_arrow_no">Strzałka: nie</string>
<string name="poi_elevator">Winda</string>
<string name="poi_recycling_small_electrical_appliances">Małogabarytowe urządzenia elektryczne</string>
<string name="poi_departures_board">Tablica odjazdów/odlotów</string>
<string name="poi_recycling_small_electrical_appliances">Małe urządzenia elektryczne</string>
<string name="poi_departures_board">Tablica odlotów</string>
<string name="poi_drinking_water_refill">Uzupełnianie wody pitnej</string>
<string name="poi_fuel_lng">LNG</string>
<string name="poi_nuts">Sklep z orzechami</string>
<string name="poi_departures_board_timetable">Rozkład jazdy</string>
<string name="poi_departures_board_realtime">Czas rzeczywisty</string>
<string name="poi_departures_board_delay">Opóźnienie</string>
<string name="poi_departures_board_yes">Tak</string>
<string name="poi_departures_board_no">Tablica odlotów: nie</string>
</resources>

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

@ -264,7 +264,7 @@
<string name="no_fav_to_save">Brak ulubionych punktów do zapisania</string>
<string name="shared_string_import">Importuj</string>
<string name="error_occurred_loading_gpx">Nie można wczytać GPX.</string>
<string name="send_report">Wyślij zgłoszenie</string>
<string name="send_report">Wyślij raport</string>
<string name="none_region_found">Nie znaleziono pobranych map na karcie pamięci.</string>
<string name="poi_namefinder_query_empty">Napisz, aby odnaleźć POI</string>
<string name="any_poi">Jakiekolwiek</string>
@ -1319,7 +1319,7 @@
<string name="traffic_warning_border_control">Kontrola graniczna</string>
<string name="traffic_warning_payment">Punkt poboru opłat</string>
<string name="traffic_warning_stop">Znak Stop</string>
<string name="traffic_warning_calming">Spowolnienie ruchu</string>
<string name="traffic_warning_calming">Uspokojenie ruchu</string>
<string name="traffic_warning_speed_camera">Fotoradar</string>
<string name="traffic_warning">Ostrzeżenia drogowe</string>
<string name="local_index_description">Kliknij istniejący element, aby zobaczyć szczegóły, naciśnij i przytrzymaj, aby wyłączyć lub usunąć. Aktualne dane na urządzeniu (%1$s wolne):</string>
@ -1541,7 +1541,7 @@
<string name="routing_attr_height_name">Ograniczenie wysokości</string>
<string name="routing_attr_height_description">Określa dozwoloną wysokość pojazdu na trasach.</string>
<string name="use_fast_recalculation">Inteligentne przeliczanie trasy</string>
<string name="use_fast_recalculation_desc">Wyznacza ponownie tylko początkową część trasy dla długich podróży.</string>
<string name="use_fast_recalculation_desc">Ponownie oblicza tylko początkową część trasy. Może być stosowany do długich podróży.</string>
<string name="shared_string_logoff">Wyloguj się</string>
<string name="rendering_value_walkingRoutesOSMC_name">Linia w kolorze oznakowania OSMC</string>
<string name="rendering_value_disabled_name">Wyłączenie</string>
@ -3431,7 +3431,7 @@
<string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">Ikona wyświetlana podczas nawigacji lub ruchu.</string>
<string name="select_map_icon_descr">Ikona wyświetlana podczas spoczynku.</string>
<string name="logcat_buffer_descr">Sprawdź i udostępnij szczegółowe dzienniki aplikacji</string>
<string name="logcat_buffer_descr">Sprawdzanie i udostępnianie szczegółowych logów aplikacji</string>
<string name="file_does_not_contain_routing_rules">Brak reguł wyznaczania trasy w „%1$s”. Proszę wybrać inny plik.</string>
<string name="permission_is_required">Wymagane jest zezwolenie na korzystanie z tej opcji.</string>
<string name="not_support_file_type_with_ext">Proszę wybrać obsługiwany plik z rozszerzeniem %1$s.</string>
@ -3802,7 +3802,7 @@
<string name="use_volume_buttons_as_zoom">Przyciski głośności jako powiększenie</string>
<string name="app_mode_wheelchair">Wózek inwalidzki</string>
<string name="app_mode_go_cart">Gokart</string>
<string name="osm_edit_closed_note">Zamknięte Uwagi OSM</string>
<string name="osm_edit_closed_note">Zamknięta notatka OSM</string>
<string name="set_working_days_to_continue">Aby kontynuować, musisz ustawić dni robocze</string>
<string name="route_between_points">Droga pomiędzy punktami</string>
<string name="plan_a_route">Zaplanuj trasę</string>
@ -3859,7 +3859,7 @@
<string name="empty_state_my_tracks_desc">Importowanie lub rejestrowanie plików śladu</string>
<string name="context_menu_item_add_waypoint">Dodaj punkt trasy</string>
<string name="quick_action_add_gpx">Dodaj punkt trasy</string>
<string name="map_widget_monitoring">Rejestrowanie śladu</string>
<string name="map_widget_monitoring">Rejestrowanie śladów</string>
<string name="marker_save_as_track">Zapisz jako plik śladu</string>
<string name="follow_track_descr">Wybiera plik śladu do podążania</string>
<string name="select_another_track">Wybierz inną trasę</string>
@ -3911,4 +3911,26 @@
<string name="sort_last_modified">Ostatnia modyfikacja</string>
<string name="sort_name_descending">Nazwa: Z – A</string>
<string name="sort_name_ascending">Nazwa: A – Z</string>
<string name="what_is_new">Co nowego</string>
<string name="start_finish_icons">Ikony start/koniec</string>
<string name="contour_lines_thanks">Dziękujemy za zakup linii konturowych</string>
<string name="osm_live_payment_desc_hw">Subskrypcja naliczona za wybrany okres. Anuluj ją w AppGallery w dowolnym momencie.</string>
<string name="osm_live_payment_subscription_management_hw">Płatność zostanie pobrana z konta AppGallery po potwierdzeniu zakupu.
\n
\nSubskrypcja jest automatycznie odnawiana, chyba że zostanie anulowana przed datą odnowienia. Twoje konto zostanie obciążone opłatą za okres odnowienia (miesiąc/trzy miesiące/rok) tylko w dniu odnowienia.
\n
\nMożesz zarządzać subskrypcjami i anulować je, przechodząc do ustawień Galerii aplikacji.</string>
<string name="routing_attr_avoid_footways_description">Unikaj chodników</string>
<string name="routing_attr_avoid_footways_name">Unikaj chodników</string>
<string name="development">Rozwój</string>
<string name="use_live_public_transport">Dane na żywo z OsmAnd</string>
<string name="use_live_routing">Dane na żywo z OsmAnd</string>
<string name="use_complex_routing">Routing złożony</string>
<string name="complex_routing_descr">Dwufazowe wyznaczanie tras do nawigacji samochodowej.</string>
<string name="use_native_pt">Rozwój rodzimego transportu publicznego</string>
<string name="use_native_pt_desc">Przejdź do (bezpiecznego) obliczania tras transportu publicznego w języku Java</string>
<string name="perform_oauth_authorization_description">Wykonaj logowanie OAuth, aby korzystać z funkcji osmedit</string>
<string name="perform_oauth_authorization">Zaloguj się przez OAuth</string>
<string name="clear_osm_token">Wyczyść token OpenStreetMap OAuth</string>
<string name="osm_edit_logout_success">Wylogowanie powiodło się</string>
</resources>

16
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -1538,7 +1538,7 @@
<string name="routing_attr_height_name">Limite de altura</string>
<string name="routing_attr_height_description">Especifique a altura permitida do veículo nas rotas.</string>
<string name="use_fast_recalculation">Recálculo de rota inteligente</string>
<string name="use_fast_recalculation_desc">Recalcular apenas a parte inicial da rota para viagens longas.</string>
<string name="use_fast_recalculation_desc">Recalcular apenas a parte inicial da rota. Pode ser usado para viagens longas.</string>
<string name="rendering_value_disabled_name">Desativado</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Cor por afiliação de rede</string>
<string name="rendering_value_walkingRoutesOSMC_name">Cor por símbolo de caminhada OSMC</string>
@ -2821,7 +2821,7 @@
<string name="osm_live_payment_renews_annually">Renova anualmente</string>
<string name="osm_live_payment_renews_quarterly">Renova trimestralmente</string>
<string name="powered_by_osmand">Por OsmAnd</string>
<string name="default_price_currency_format">%1$,2f %2$s</string>
<string name="default_price_currency_format">%1$.2f %2$s</string>
<string name="osm_live_payment_header">Período de pagamento:</string>
<string name="osm_live_payment_contribute_descr">As doações ajudam a financiar a cartografia no OSM.</string>
<string name="release_3_1">• Navegação: Corrige barra de progresso, inversão rápida de início e fim de rota
@ -3909,4 +3909,16 @@
\nVocê pode gerenciar e cancelar suas assinaturas acessando as configurações do AppGallery.</string>
<string name="routing_attr_avoid_footways_description">Evite passarelas</string>
<string name="routing_attr_avoid_footways_name">Evite passarelas</string>
<string name="development">Desenvolvimento</string>
<string name="use_live_public_transport">Dados do OsmAnd Live</string>
<string name="use_live_routing">Dados do OsmAnd Live</string>
<string name="use_complex_routing">Roteamento complexo</string>
<string name="complex_routing_descr">Roteamento de duas fases para navegação automotiva.</string>
<string name="use_native_pt">Desenvolvimento de transporte público nativo</string>
<string name="use_native_pt_desc">Mudar para cálculo de roteamento de transporte público em Java (seguro)</string>
<string name="what_is_new">O que há de novo</string>
<string name="perform_oauth_authorization_description">Entre no OAuth para usar os recursos de edição do osm</string>
<string name="perform_oauth_authorization">Entrar via OAuth</string>
<string name="clear_osm_token">Limpar token do OpenStreetMap OAuth</string>
<string name="osm_edit_logout_success">Saída bem sucedida</string>
</resources>

14
OsmAnd/res/values-pt/strings.xml
View file

@ -2691,7 +2691,7 @@
<string name="av_camera_pic_size_descr">Definir o tamanho da imagem da câmara</string>
<string name="get_plugin">Obter</string>
<string name="use_fast_recalculation">Recálculo de rota inteligente</string>
<string name="use_fast_recalculation_desc">Recalcular apenas a parte inicial da rota para viagens longas.</string>
<string name="use_fast_recalculation_desc">Recalcula apenas a parte inicial da rota. Pode ser usado para viagens longas.</string>
<string name="do_you_like_osmand">Está a gostar do OsmAnd\?</string>
<string name="we_really_care_about_your_opinion">A sua opinião e o seu feedback são importantes.</string>
<string name="rate_this_app">Avalie esta aplicação</string>
@ -3916,4 +3916,16 @@
\nPode gerir e cancelar as suas subscrições a ir às definições da sua AppGallery.</string>
<string name="routing_attr_avoid_footways_description">Evitar passeios</string>
<string name="routing_attr_avoid_footways_name">Evitar passeios</string>
<string name="what_is_new">Novidades</string>
<string name="development">Desenvolvimento</string>
<string name="use_live_public_transport">Dados do OsmAnd ao vivo</string>
<string name="use_live_routing">Dados do OsmAnd ao vivo</string>
<string name="use_complex_routing">Roteamento complexo</string>
<string name="complex_routing_descr">Roteamento em duas fases para a navegação automotiva.</string>
<string name="use_native_pt">Desenvolvimento nativos de transportes públicos</string>
<string name="use_native_pt_desc">Mudar para Cálculo de rotas de transporte público Java (seguro)</string>
<string name="perform_oauth_authorization_description">Realize um login OAuth para usar as funcionalidades do osmedit</string>
<string name="perform_oauth_authorization">Fazer login via OAuth</string>
<string name="clear_osm_token">Limpar token do OpenStreetMap OAuth</string>
<string name="osm_edit_logout_success">Logout bem sucedido</string>
</resources>

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

@ -1177,8 +1177,8 @@
<string name="poi_filter_restaurants">Рестораны</string>
<string name="poi_filter_sightseeing">Достопримечательности</string>
<string name="context_menu_item_last_intermediate_point">Последний промежуточный пункт</string>
<string name="context_menu_item_first_intermediate_point">Сделать начальной остановкой</string>
<string name="add_as_last_destination_point">Сделать последней остановкой</string>
<string name="context_menu_item_first_intermediate_point">Первый промежуточный пункт</string>
<string name="add_as_last_destination_point">Последний промежуточный пункт</string>
<string name="add_as_first_destination_point">Первый промежуточный пункт</string>
<string name="replace_destination_point">Заменить пункт назначения</string>
<string name="new_destination_point_dialog">Пункт назначения уже задан</string>
@ -1819,7 +1819,7 @@
<string name="routing_attr_height_name">Предельная высота</string>
<string name="routing_attr_height_description">Укажите высоту транспортного средства для учёта при построении маршрута.</string>
<string name="use_fast_recalculation">Умный пересчёт маршрута</string>
<string name="use_fast_recalculation_desc">Для больших маршрутов пересчитывать только начало.</string>
<string name="use_fast_recalculation_desc">Пересчитывается только начальная часть маршрута. Может использоваться для дальних поездок.</string>
<string name="osm_edit_context_menu_delete">Удалить правки OSM</string>
<string name="rendering_value_disabled_name">Выключено</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Раскраска по сетевой принадлежности</string>
@ -2269,7 +2269,7 @@
<string name="quick_actions_delete">Удалить действие</string>
<string name="quick_actions_delete_text">Вы уверены, что хотите удалить действие «%s»\?</string>
<string name="quick_action_favorites_show">Показать избранные</string>
<string name="quick_action_favorites_hide">Скрыть сохранённые</string>
<string name="quick_action_favorites_hide">Скрыть избранные</string>
<string name="quick_action_showhide_poi_title">Показать/скрыть POI</string>
<string name="quick_action_poi_show">Показать %1$s</string>
<string name="quick_action_poi_hide">Скрыть %1$s</string>
@ -2668,8 +2668,8 @@
<string name="copy_location_name">Копировать местоположение/название POI</string>
<string name="toast_empty_name_error">Место без названия</string>
<string name="shared_string_current">Текущий</string>
<string name="last_intermediate_dest_description">Добавить последним промежуточным пунктом</string>
<string name="first_intermediate_dest_description">Добавить первым промежуточным пунктом</string>
<string name="last_intermediate_dest_description">Добавляет промежуточную остановку</string>
<string name="first_intermediate_dest_description">Добавить первую остановку на маршруте</string>
<string name="subsequent_dest_description">Ранее выбранный пункт назначения станет последним промежуточным пунктом</string>
<string name="show_closed_notes">Показать закрытые заметки</string>
<string name="switch_osm_notes_visibility_desc">Показать/скрыть заметки OSM на карте.</string>
@ -3911,4 +3911,13 @@
\nПодписка продлевается автоматически, если она не будет отменена до даты продления. С вашего счета будет взиматься плата за период продления (месяц/три месяца/год) только в дату продления.
\n
\nВы можете управлять своими подписками и отменять их, перейдя в настройки AppGallery.</string>
<string name="use_live_public_transport">Данные OsmAnd Live</string>
<string name="use_live_routing">Данные OsmAnd Live</string>
<string name="use_complex_routing">Комплексная маршрутизация</string>
<string name="complex_routing_descr">Двухфазная маршрутизация для автомобильной навигации.</string>
<string name="what_is_new">Что нового</string>
<string name="perform_oauth_authorization_description">Выполните вход OAuth, чтобы использовать функции osmedit</string>
<string name="perform_oauth_authorization">Войти через OAuth</string>
<string name="clear_osm_token">Очистить токен OAuth OpenStreetMap</string>
<string name="osm_edit_logout_success">Выход выполнен</string>
</resources>

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

@ -3653,4 +3653,15 @@
<string name="poi_sms_no">Nie</string>
<string name="poi_sms_yes">Áno</string>
<string name="poi_taxi_office">Kancelária taxislužby</string>
<string name="poi_cash_withdrawal_postbank">Postbank</string>
<string name="poi_surface_decoturf">DecoTurf</string>
<string name="poi_health_specialty_podology_yes">Podológia</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_no">Zdravotná špecializácia: pôrodníctvo (cisársky rez): nie</string>
<string name="poi_health_specialty_social_paediatrics_no">Zdravotná špecializácia: sociálna pediatria: nie</string>
<string name="poi_health_specialty_social_paediatrics_yes">Sociálna pediatria</string>
<string name="poi_health_specialty_obstetrics_antenatal_no">Zdravotná špecializácia: pôrodníctvo (prenatálne): nie</string>
<string name="poi_health_specialty_obstetrics_antenatal_yes">Pôrodníctvo (prenatálne)</string>
<string name="poi_health_specialty_obstetrics_postnatal_no">Zdravotná špecializácia: pôrodníctvo (postnatálne): nie</string>
<string name="poi_wetland_palsa_bog">Rašelinisko</string>
<string name="poi_wetland_fen">Slatina</string>
</resources>

14
OsmAnd/res/values-sk/strings.xml
View file

@ -1537,7 +1537,7 @@
<string name="routing_attr_height_name">Výškový limit</string>
<string name="routing_attr_height_description">Zadajte výšku vozidla, ktorá musí byť povolená na cestách.</string>
<string name="use_fast_recalculation">Inteligentné prepočítanie trasy</string>
<string name="use_fast_recalculation_desc">Pri dlhých výletoch prepočítať iba začiatočný úsek trasy.</string>
<string name="use_fast_recalculation_desc">Prepočíta iba začiatočný úsek trasy. Môže byť použité pre dlhé výlety.</string>
<string name="shared_string_logoff">Odhlásiť</string>
<string name="rendering_value_disabled_name">Vypnuté</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Zafarbenie podľa príslušnosti k sieti</string>
@ -3914,4 +3914,16 @@
\n Vaše predplatné môžete spravovať a zrušiť v nastaveniach AppGallery.</string>
<string name="routing_attr_avoid_footways_description">Vyhnúť sa chodníkom pre chodcov</string>
<string name="routing_attr_avoid_footways_name">Vyhnúť sa chodníkom</string>
<string name="development">Vývoj</string>
<string name="use_live_public_transport">Údaje OsmAnd Live</string>
<string name="use_live_routing">Údaje OsmAnd Live</string>
<string name="use_complex_routing">Komplexný výpočet trasy</string>
<string name="complex_routing_descr">Dvojfázový výpočet trasy pre navigáciu auta.</string>
<string name="use_native_pt">Natívna hromadná doprava (vo vývoji)</string>
<string name="use_native_pt_desc">Prepnúť na výpočet trasy hromadnej dopravy v Jave (bezpečné)</string>
<string name="what_is_new">Čo je nové</string>
<string name="perform_oauth_authorization_description">Vykonať prihlásenie cez OAuth pre použitie funkcií upravovania OSM</string>
<string name="perform_oauth_authorization">Prihlásiť pomocou OAuth</string>
<string name="clear_osm_token">Vymazať token OpenStreetMap OAuth</string>
<string name="osm_edit_logout_success">Odhlásenie úspešné</string>
</resources>

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

@ -3863,4 +3863,10 @@
<string name="plan_route_trim_after">Скрати после</string>
<string name="plan_route_change_route_type_before">Промените врсту руте пре</string>
<string name="plan_route_change_route_type_after">Промените врсту руте након</string>
<string name="what_is_new">Шта је ново</string>
<string name="shared_string_file_name">Име фајла</string>
<string name="number_of_gpx_files_selected_pattern"></string>
<string name="gpx_monitoring_stop">Паузирај снимање пута</string>
<string name="one_point_error">Додајте бар две тачке.</string>
<string name="osm_edit_logout_success">Одјава успешна</string>
</resources>

88
OsmAnd/res/values-tr/phrases.xml
View file

@ -366,7 +366,7 @@
<string name="poi_landfill">Depolama</string>
<string name="poi_waste_disposal">Çöp bertaraf</string>
<string name="poi_waste_basket">Çöp tenekesi</string>
<string name="poi_industrial">Sanayi Bölgesi</string>
<string name="poi_industrial">Sanayi bölgesi</string>
<string name="poi_quarry">Taş ocağı</string>
<string name="poi_vineyard">Üzüm bağı</string>
<string name="poi_orchard">Meyve bahçesi</string>
@ -2801,7 +2801,7 @@
<string name="poi_counselling_type_drugs_yes">Danışma (uyuşturucu): evet</string>
<string name="poi_counselling_type_addiction_no">Danışma (bağımlılık): evet</string>
<string name="poi_counselling_type_addiction_yes">Danışma (bağımlılık): evet</string>
<string name="poi_health_person_type_psychologist">Sağlık çalışanının işi: psikolog</string>
<string name="poi_health_person_type_psychologist">Sağlık çalışanının rolü: psikolog</string>
<string name="poi_health_amenity_type_first_aid_kit">İlk yardım çantası</string>
<string name="poi_fire_hydrant_type_wall">Duvar</string>
<string name="poi_fire_hydrant_type_underground">Yeraltı</string>
@ -2915,4 +2915,88 @@
<string name="poi_cuisine_deli">Şarküteri</string>
<string name="poi_cuisine_pie">Turta</string>
<string name="poi_cuisine_tea_shop">Çay dükkanı</string>
<string name="poi_health_person_type_witchdoctor">Sağlık çalışanının rolü: büyücü</string>
<string name="poi_health_person_type_technician">Sağlık çalışanının rolü: teknisyen</string>
<string name="poi_health_person_type_physician_assitant">Sağlık çalışanının rolü: doktor asistanı</string>
<string name="poi_health_person_type_therapist">Sağlık çalışanının rolü: terapist</string>
<string name="poi_health_person_type_podologist">Sağlık çalışanının rolü: podolog</string>
<string name="poi_health_person_type_physician">Sağlık çalışanının rolü: doktor</string>
<string name="poi_health_person_type_paramedic">Sağlık çalışanının rolü: sağlık görevlisi</string>
<string name="poi_health_person_type_nurse">Sağlık çalışanının rolü: hemşire</string>
<string name="poi_health_person_type_midwife">Sağlık çalışanının rolü: ebe</string>
<string name="poi_health_person_type_healer">Sağlık çalışanının rolü: şifacı</string>
<string name="poi_health_person_type_assistant">Sağlık çalışanının rolü: asistan</string>
<string name="poi_suction_point">Emme noktası</string>
<string name="poi_health_facility_type_support_group_home">Sağlık tesisi türü: destek grubu evi</string>
<string name="poi_health_facility_type_nursing_home">Sağlık tesisi türü: huzurevi</string>
<string name="poi_health_facility_type_department">Sağlık merkezi türü: bölüm</string>
<string name="poi_health_service_test_no">Sağlık hizmeti: test: hayır</string>
<string name="poi_health_service_test_yes">Sağlık hizmeti: test: evet</string>
<string name="poi_health_service_support_no">Sağlık hizmeti: destek: hayır</string>
<string name="poi_health_service_support_yes">Sağlık hizmeti: destek: evet</string>
<string name="poi_health_service_prevention_no">Sağlık hizmeti: önleme: hayır</string>
<string name="poi_health_service_prevention_yes">Sağlık hizmeti: önleme: evet</string>
<string name="poi_health_service_child_care_no">Sağlık hizmeti: çocuk bakımı: hayır</string>
<string name="poi_health_service_child_care_yes">Sağlık hizmeti: çocuk bakımı: evet</string>
<string name="poi_health_service_examination_no">Sağlık hizmeti: muayene: hayır</string>
<string name="poi_health_service_examination_yes">Sağlık hizmeti: muayene: evet</string>
<string name="poi_health_facility_type_first_aid">Sağlık merkezi türü: ilk yardım</string>
<string name="poi_health_facility_type_dispensary">Sağlık merkezi türü: dispanser</string>
<string name="poi_health_facility_type_therapy">Sağlık merkezi türü: terapi</string>
<string name="poi_health_facility_type_counselling_centre">Sağlık merkezi türü: danışma merkezi</string>
<string name="poi_health_facility_type_office">Tıbbi ofis</string>
<string name="poi_free_flying_rigid_no">Sert serbest uçuş: hayır</string>
<string name="poi_free_flying_rigid_yes">Sert</string>
<string name="poi_free_flying_hanggliding_no">Yelken kanatla uçuş: hayır</string>
<string name="poi_free_flying_hanggliding_yes">Yelken kanatla uçuş</string>
<string name="poi_free_flying_paragliding_no">Yamaç paraşütü: hayır</string>
<string name="poi_free_flying_paragliding_yes">Yamaç paraşütü</string>
<string name="poi_free_flying_official_no">Resmi: hayır</string>
<string name="poi_free_flying_official_yes">Resmi: evet</string>
<string name="poi_free_flying_site_training">Eğitim alanı</string>
<string name="poi_free_flying_site_towing">Çekme alanı</string>
<string name="poi_free_flying_site_toplanding">Zirve iniş alanı</string>
<string name="poi_free_flying_site_landing">İniş alanı</string>
<string name="poi_free_flying_site_takeoff">Kalkış alanı</string>
<string name="poi_button_operated_no">Düğme ile etkinleştirilir: hayır</string>
<string name="poi_button_operated_yes">Düğme ile etkinleştirilir: evet</string>
<string name="poi_sport_free_flying">Serbest uçuş (spor)</string>
<string name="poi_nuclear_explosion_device">Patlama: aygıt</string>
<string name="poi_nuclear_explosion_warhead">Patlama: savaş başlığı</string>
<string name="poi_nuclear_explosion_crater_diameter">Patlama: krater çapı</string>
<string name="poi_nuclear_explosion_salvo_second_or_later_detonation">Patlama salvosu: bir salvo testinin ikinci veya daha sonraki patlaması</string>
<string name="poi_nuclear_explosion_salvo_first_detonation">Patlama salvosu: bir salvo testinin ilk patlaması</string>
<string name="poi_nuclear_explosion_body_wave_magnitude">Vücut dalgası büyüklüğü</string>
<string name="poi_nuclear_explosion_ground_zero_altitude">Patlama merkezinin yüksekliği</string>
<string name="poi_nuclear_explosion_height_of_burst">Patlama boyu</string>
<string name="poi_nuclear_explosion_hole">Patlama deliği</string>
<string name="poi_nuclear_explosion_yield">Patlama gücü</string>
<string name="poi_nuclear_explosion_purpose_industrial_application_earth_moving">Patlama amacı: sanayi uygulaması, toprak kaydırma</string>
<string name="poi_nuclear_explosion_purpose_industrial_application">Patlama amacı: sanayi uygulaması</string>
<string name="poi_nuclear_explosion_purpose_industrial_application_oil_stimulation">Patlama amacı: sanayi uygulaması, petrol uyarımı</string>
<string name="poi_nuclear_explosion_purpose_industrial_application_seismic_sounding">Patlama amacı: sanayi uygulaması, sismik sondaj</string>
<string name="poi_nuclear_explosion_purpose_industrial_application_cavity_excavation">Patlama amacı: sanayi uygulaması, kazı çalışması</string>
<string name="poi_nuclear_explosion_purpose_fundamental_science">Patlama amacı: temel bilim</string>
<string name="poi_nuclear_explosion_purpose_research_for_peaceful_applications">Patlama amacı: barışçıl uygulamalar için araştırma</string>
<string name="poi_nuclear_explosion_purpose_safety_experiment">Patlama amacı: güvenlik deneyi</string>
<string name="poi_nuclear_explosion_purpose_weapons_effects">Patlama amacı: silah etkileri</string>
<string name="poi_nuclear_explosion_purpose_nuclear_weapons_related">Patlama amacı: nükleer silahlarla ilgili</string>
<string name="poi_nuclear_explosion_series">Patlama serisi</string>
<string name="poi_nuclear_explosion_shot_name_en">Kod adı (ingilizce)</string>
<string name="poi_nuclear_explosion_type_underwater">Patlama türü: su altı</string>
<string name="poi_nuclear_explosion_type_space">Patlama türü: uzay (80 km\'nin üzerindeki yükseklik)</string>
<string name="poi_nuclear_explosion_type_atmospheric_rocket_or_missile">Patlama türü: atmosferik, roket veya füze</string>
<string name="poi_nuclear_explosion_type_cratering_burst">Patlama türü: krater patlaması (sığ yüzey altı)</string>
<string name="poi_nuclear_explosion_type_atmospheric_water_surface_barge">Patlama türü: atmosferik, su yüzeyi, mavna</string>
<string name="poi_nuclear_explosion_type_atmospheric_atmospheric_surface">Patlama türü: atmosferik, yüzey</string>
<string name="poi_nuclear_explosion_type_atmospheric_balloon">Patlama türü: atmosferik, balon</string>
<string name="poi_nuclear_explosion_type_atmospheric_surface_tower">Patlama türü: atmosferik, yüzey, kule</string>
<string name="poi_nuclear_explosion_type_atmospheric_airdrop">Patlama türü: atmosferik, havadan atma</string>
<string name="poi_nuclear_explosion_type_atmospheric">Patlama türü: atmosferik</string>
<string name="poi_nuclear_explosion_type_underground_shaft">Patlama türü: yeraltı, kuyu</string>
<string name="poi_nuclear_explosion_site">Patlama: alan</string>
<string name="poi_protection_title">Koruma türü</string>
<string name="poi_bandy">Bandy</string>
<string name="poi_street_cabinet">Sokak dolabı</string>
<string name="poi_firepit">Ateş çukuru</string>
</resources>

26
OsmAnd/res/values-tr/strings.xml
View file

@ -633,7 +633,7 @@
<string name="local_index_installed">Yerel sürüm</string>
<string name="local_index_items_backuped">%1$d/%2$d öge devre dışı bırakıldı.</string>
<string name="local_index_items_deleted">%1$d/%2$d öge silindi.</string>
<string name="local_index_items_restored">%1$d/%2$d öge aktifleştirildi.</string>
<string name="local_index_items_restored">%1$d/%2$d öge etkinleştirildi.</string>
<string name="local_index_descr_title">Harita dosyalarını yönetin.</string>
<string name="local_index_mi_restore">Aktifleştir</string>
<string name="local_index_mi_backup">Pasifleştir</string>
@ -641,7 +641,7 @@
<string name="local_index_address_data">Adres Verisi</string>
<string name="local_index_transport_data">Toplu taşıma verileri</string>
<string name="local_index_map_data">Harita Verisi</string>
<string name="local_indexes_cat_backup">Pasifleştir</string>
<string name="local_indexes_cat_backup">Devre dışı</string>
<string name="local_indexes_cat_tts">Sesli uyarılar (TTS)</string>
<string name="local_indexes_cat_voice">Sesli uyarılar (kaydedilmiş)</string>
<string name="local_indexes_cat_poi">POI Verisi</string>
@ -1393,7 +1393,7 @@
<string name="plugin_install_needs_network">Bu eklentiyi yüklemek için çevrim içi olmanız gerekmektedir.</string>
<string name="get_plugin">Al</string>
<string name="use_fast_recalculation">Akıllı rota yeniden hesaplama</string>
<string name="use_fast_recalculation_desc">Uzun seyahatler için rotanın yalnızca ilk bölümünü yeniden hesapla.</string>
<string name="use_fast_recalculation_desc">Güzergahın yalnızca ilk bölümünü yeniden hesaplar. Uzun yolculuklar için kullanılabilir.</string>
<string name="do_you_like_osmand">OsmAnd\'ı Sevdinizmi?</string>
<string name="we_really_care_about_your_opinion">Fikir ve geri bildirimleriniz değerlidir.</string>
<string name="rate_this_app">Bu Uygulamayı Oyla</string>
@ -1459,7 +1459,7 @@
<string name="use_trackball">İzleme topu kullan</string>
<string name="background_service_int_descr">Arka plan servisi tarafından kullanılan uyanma aralığı:</string>
<string name="background_service_provider_descr">Arka plan servisi tarafından kullanılan konum yöntemi:</string>
<string name="route_head">Baş</string>
<string name="route_head">Düz gidin</string>
<string name="map_screen_orientation">Ekran yönlendirme</string>
<string name="no_address_found">Hiçbir adres belirlenmedi</string>
<string name="voices">Sesli uyarılar</string>
@ -2094,7 +2094,7 @@
<string name="shared_string_deleted">Silindi</string>
<string name="shared_string_edited">Değiştirildi</string>
<string name="shared_string_added">Eklendi</string>
<string name="marker_activated">İşaretleyici %s aktifleştirildi.</string>
<string name="marker_activated">%s işaretleyicisi etkinleştirildi.</string>
<string name="one_tap_active_descr">İçerik menüsünü açmadan, harita üzerinde bir belirtecin üzerine bas ve aktif belirteçlerin üzerine sürükle.</string>
<string name="one_tap_active">\'Tek basış\' aktif</string>
<string name="empty_state_av_notes">Not alın!</string>
@ -3578,7 +3578,7 @@
<string name="select_wikipedia_article_langs">Haritadaki Wikipedia makalelerinin dillerini seçin. Makaleyi okurken kullanılabilir herhangi bir dile geçiş yapın.</string>
<string name="some_articles_may_not_available_in_lang">Bazı Wikipedia makaleleri sizin dilinizde mevcut olmayabilir.</string>
<string name="lang_zhyue">Kantonca</string>
<string name="lang_zhminnan">Güney Min</string>
<string name="lang_zhminnan">Güney Mince</string>
<string name="lang_yo">Yorubaca</string>
<string name="lang_war">Varayca</string>
<string name="lang_uz">Özbekçe</string>
@ -3591,7 +3591,7 @@
<string name="lang_ne">Nepalce</string>
<string name="lang_nap">Napolice</string>
<string name="lang_my">Birmanca</string>
<string name="lang_min">Minangkabau dili</string>
<string name="lang_min">Minangkabauca</string>
<string name="lang_mg">Malgaşça</string>
<string name="lang_ky">Kırgızca</string>
<string name="lang_kk">Kazakça</string>
@ -3869,4 +3869,16 @@
\n AppGallery ayarlarınıza giderek aboneliklerinizi yönetebilir ve iptal edebilirsiniz.</string>
<string name="routing_attr_avoid_footways_description">Yaya yollarından kaçın</string>
<string name="routing_attr_avoid_footways_name">Yaya yollarından kaçın</string>
<string name="development">Geliştirme</string>
<string name="use_live_public_transport">OsmAnd Live verileri</string>
<string name="use_live_routing">OsmAnd Live verileri</string>
<string name="use_complex_routing">Karmaşık yönlendirme</string>
<string name="complex_routing_descr">Araç navigasyonu için iki aşamalı yönlendirme.</string>
<string name="use_native_pt">Yerel Toplu Taşıma geliştirme</string>
<string name="use_native_pt_desc">Java (güvenli) Toplu Taşıma yönlendirme hesaplamasına geçin</string>
<string name="what_is_new">Yenilikler</string>
<string name="perform_oauth_authorization_description">osmedit özelliklerini kullanmak için OAuth oturum açma işlemi gerçekleştirin</string>
<string name="perform_oauth_authorization">OAuth ile oturum aç</string>
<string name="clear_osm_token">OpenStreetMap OAuth belirtecini temizle</string>
<string name="osm_edit_logout_success">Oturum kapatma başarılı</string>
</resources>

22
OsmAnd/res/values-uk/strings.xml
View file

@ -1542,7 +1542,7 @@
<string name="routing_attr_height_name">Обмеження по висоті</string>
<string name="routing_attr_height_description">Вкажіть висоту транспортного засобу для розрахунку маршрутів.</string>
<string name="use_fast_recalculation">Інтелектуальне переобчислення маршруту</string>
<string name="use_fast_recalculation_desc">Для довгих подорожей перераховувати лише початкову частину маршруту.</string>
<string name="use_fast_recalculation_desc">Перераховувати лише початкову частину маршруту. Можна застосовувати для тривалих мандрівок.</string>
<string name="light_theme">Світла</string>
<string name="dark_theme">Темна</string>
<string name="lang_pms">П’ємонтський</string>
@ -3902,4 +3902,24 @@
<string name="sort_name_ascending">За назвою: А — Я</string>
<string name="start_finish_icons">Значки початку/завершення</string>
<string name="contour_lines_thanks">Дякуємо за придбання «Горизонталей»</string>
<string name="what_is_new">Що нового</string>
<string name="osm_live_payment_desc_hw">Передплата стягується за вибраний період. Скасуйте її в AppGallery у будь-який час.</string>
<string name="osm_live_payment_subscription_management_hw">Оплату буде стягнено з вашого рахунку AppGallery за підтвердження покупки.
\n
\nПередплата автоматично поновлюється, якщо її скасувати до дати поновлення. З вашого рахунку буде стягнено плату за період поновлення (місяць/три місяці/рік) лише на дату поновлення.
\n
\nВи можете керувати та скасовувати передплати, переходячи до налаштувань AppGallery.</string>
<string name="use_live_routing">OsmAnd дані в реальному часі</string>
<string name="use_complex_routing">Комплексна маршрутизація</string>
<string name="complex_routing_descr">Двофазна маршрутизація для автомобільної навігації.</string>
<string name="use_native_pt">Розвиток власного громадського транспорту</string>
<string name="use_native_pt_desc">Перемкнутися на розрахунок маршруту громадським транспортом за допомогою Java (безпечний)</string>
<string name="perform_oauth_authorization_description">Виконати вхід OAuth для користування функцією osmedit</string>
<string name="perform_oauth_authorization">Увійти через OAuth</string>
<string name="clear_osm_token">Очистити токен OAuth OpenStreetMap</string>
<string name="osm_edit_logout_success">Ви успішно вийшли</string>
<string name="use_live_public_transport">OsmAnd дані в реальному часі</string>
<string name="routing_attr_avoid_footways_description">Уникати пішохідних шляхів</string>
<string name="routing_attr_avoid_footways_name">Уникати пішохідних шляхів</string>
<string name="development">Розробка</string>
</resources>

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

@ -40,7 +40,7 @@
<string name="poi_blood_donation">献血</string>
<string name="poi_denotation_landmark">地标</string>
<string name="poi_car_rental">车辆租赁</string>
<string name="poi_toilets">洗手间</string>
<string name="poi_toilets">洗手间; 厕所</string>
<string name="poi_shower">淋浴</string>
<string name="poi_smoking_area">吸烟区</string>
<string name="poi_internet_cafe">网咖</string>
@ -101,13 +101,13 @@
<string name="poi_finance">金融</string>
<string name="poi_natural">自然</string>
<string name="poi_military">军事</string>
<string name="poi_alcohol">酒商店</string>
<string name="poi_alcohol">贩酒商店</string>
<string name="poi_chocolate">巧克力店</string>
<string name="poi_coffee">咖啡馆</string>
<string name="poi_beverages">饮料店</string>
<string name="poi_ice_cream">冰淇淋馆</string>
<string name="poi_tea">茶馆</string>
<string name="poi_wine">葡萄酒店</string>
<string name="poi_wine">葡萄酒商店</string>
<string name="poi_books">书店</string>
<string name="poi_bicycle">自行车店</string>
<string name="poi_bag">袋子店</string>
@ -407,7 +407,7 @@
<string name="poi_covered_yes">是</string>
<string name="poi_tactile_paving_yes">是</string>
<string name="poi_traffic_signals_sound_yes">是</string>
<string name="poi_traffic_signals_sound_no">否</string>
<string name="poi_traffic_signals_sound_no">声音：无</string>
<string name="poi_railway_crossing">铁道交口</string>
<string name="poi_horse_riding">骑马</string>
<string name="poi_garden">花园</string>

11
OsmAnd/res/values-zh-rCN/strings.xml
View file

@ -1164,8 +1164,8 @@
<string name="map_preferred_locale_descr">地图上标签显示的偏好语言（如果不可用，将会切换至英文或者本地名称）</string>
<string name="wake_on_voice">点亮屏幕</string>
<string name="impassable_road_desc">选择您在导航时想要避开的道路。</string>
<string name="routing_attr_avoid_shuttle_train_name">避开通勤火车</string>
<string name="routing_attr_avoid_shuttle_train_description">避开通勤火车</string>
<string name="routing_attr_avoid_shuttle_train_name">无区间列车</string>
<string name="routing_attr_avoid_shuttle_train_description">避免使用区间列车</string>
<string name="impassable_road">避开道路…</string>
<string name="routing_attr_avoid_toll_name">无收费公路</string>
<string name="routing_attr_avoid_toll_description">避开收费公路</string>
@ -1570,8 +1570,8 @@
<string name="lang_kab">卡布列语</string>
<string name="lang_ber">柏柏尔文</string>
<string name="archive_wikipedia_data">已下载的旧的不兼容维基百科的数据。你想要将其存档吗？</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">按线路从属标色</string>
<string name="rendering_value_walkingRoutesOSMC_name">由 OSMC 徒步旅行符号标色</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">按网络从属着色</string>
<string name="rendering_value_walkingRoutesOSMC_name">按 OSMC 徒步旅行标志着色</string>
<string name="application_dir_change_warning3">你想 OsmAnd 也将其数据文件复制到新的目标吗？</string>
<string name="specified_directiory_not_writeable">不能在指定目录中创建地图</string>
<string name="confirm_usage_speed_cameras">在许多国家（德国、法国、意大利和其它）法律上不容许使用测速照相警示。如果您违反了法律，OsmAnd 并不承担任何的责任。请只在您有资格使用此功能时，才按下 \"是\" 。</string>
@ -2891,7 +2891,7 @@
<string name="slope_description">坡度使用颜色来可视化地形陡度。</string>
<string name="accessibility_prefs_descr">选择图标、颜色与名称</string>
<string name="track_coloring_solid">实线</string>
<string name="rendering_attr_surface_compacted_name">马路</string>
<string name="rendering_attr_surface_compacted_name">紧凑的</string>
<string name="rendering_attr_surface_pebblestone_name">卵石</string>
<string name="rendering_attr_surface_grass_paver_name">草坪砖</string>
<string name="rendering_attr_surface_fine_gravel_name">细砂砾</string>
@ -3147,4 +3147,5 @@
<string name="delete_address">删除地址</string>
<string name="add_address">添加地址</string>
<string name="access_hint_enter_address">输入地址</string>
<string name="monitoring_control_start">REC</string>
</resources>

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

@ -1534,7 +1534,7 @@
<string name="routing_attr_height_name">高度限制</string>
<string name="routing_attr_height_description">指定被許可在道路上行駛的車輛高度。</string>
<string name="use_fast_recalculation">智慧路線重新計算</string>
<string name="use_fast_recalculation_desc">對於長途航行，只重算路線的初始部分。</string>
<string name="use_fast_recalculation_desc">僅重新計算路線的初始部份。可用於長途旅程。</string>
<string name="shared_string_logoff">登出</string>
<string name="rendering_value_disabled_name">已停用</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">依網絡從屬著色</string>
@ -3909,4 +3909,16 @@
\n您可以在您的 AppGallery 設定中管理與取消您的訂閱。</string>
<string name="routing_attr_avoid_footways_description">避免人行道</string>
<string name="routing_attr_avoid_footways_name">避免人行道</string>
<string name="development">開發</string>
<string name="use_live_public_transport">OsmAnd Live 資料</string>
<string name="use_live_routing">OsmAnd Live 資料</string>
<string name="use_complex_routing">複雜路線</string>
<string name="complex_routing_descr">汽車導航的兩階段路線。</string>
<string name="use_native_pt">原生公共運輸發展</string>
<string name="use_native_pt_desc">切換到 Java（安全）公共運輸路線計算</string>
<string name="what_is_new">有什麼新鮮事</string>
<string name="perform_oauth_authorization_description">執行 OAuth 登入以使用 osmedit 功能</string>
<string name="perform_oauth_authorization">透過 OAuth 登入</string>
<string name="clear_osm_token">清除 OpenStreetMap OAuth 權杖</string>
<string name="osm_edit_logout_success">成功登出</string>
</resources>

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

@ -3935,20 +3935,20 @@
<string name="poi_park_ride_tram">Tram</string>
<string name="poi_park_ride_ferry">Ferry</string>
<string name="poi_rtsa_scale_nc">н/к</string>
<string name="poi_rtsa_scale_nc_asterisk">н/к*</string>
<string name="poi_rtsa_scale_1a">1А</string>
<string name="poi_rtsa_scale_1a_asterisk">1А*</string>
<string name="poi_rtsa_scale_1b">1Б</string>
<string name="poi_rtsa_scale_1b_asterisk">1Б*</string>
<string name="poi_rtsa_scale_2a">2А</string>
<string name="poi_rtsa_scale_2a_asterisk">2А*</string>
<string name="poi_rtsa_scale_2b">2Б</string>
<string name="poi_rtsa_scale_2b_asterisk">2Б*</string>
<string name="poi_rtsa_scale_3a">3А</string>
<string name="poi_rtsa_scale_3a_asterisk">3А*</string>
<string name="poi_rtsa_scale_3b">3Б</string>
<string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
<string name="poi_rtsa_scale_nc">n/c</string>
<string name="poi_rtsa_scale_nc_asterisk">n/c*</string>
<string name="poi_rtsa_scale_1a">1A</string>
<string name="poi_rtsa_scale_1a_asterisk">1A*</string>
<string name="poi_rtsa_scale_1b">1B</string>
<string name="poi_rtsa_scale_1b_asterisk">1B*</string>
<string name="poi_rtsa_scale_2a">2A</string>
<string name="poi_rtsa_scale_2a_asterisk">2A*</string>
<string name="poi_rtsa_scale_2b">2B</string>
<string name="poi_rtsa_scale_2b_asterisk">2B*</string>
<string name="poi_rtsa_scale_3a">3A</string>
<string name="poi_rtsa_scale_3a_asterisk">3A*</string>
<string name="poi_rtsa_scale_3b">3B</string>
<string name="poi_rtsa_scale_3b_asterisk">3B*</string>
<string name="poi_flare">Gas flare;Flare stack</string>
<string name="poi_change_delete">Deleted object</string>

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

@ -11,9 +11,8 @@
Thx - Hardy
-->
<string name="message_graph_will_be_available_after_recalculation">Wait for the route recalculation.\nGraph will be available after recalculation.</string>
<string name="message_need_calculate_route_before_show_graph">%1$s data available only on the roads, you need to calculate a route using “Route between points” to get it.</string>
<string name="shared_string_graph">Graph</string>
<string name="use_two_phase_routing">Use 2-phase A* routing algorithm</string>
<string name="file_already_imported">File is already imported in OsmAnd</string>
<string name="osm_edit_logout_success">Logout successful</string>
<string name="clear_osm_token">Clear OpenStreetMap OAuth token</string>
<string name="perform_oauth_authorization">Log in via OAuth</string>
@ -22,13 +21,12 @@
<string name="use_native_pt">Native Public Transport development</string>
<string name="use_fast_recalculation_desc">Recalculates only the initial part of the route. Can be used for long trips.</string>
<string name="complex_routing_descr">Two-phase routing for car navigation.</string>
<string name="use_complex_routing">Complex routing</string>
<string name="use_live_routing">OsmAnd Live data</string>
<string name="use_live_public_transport">OsmAnd Live data</string>
<string name="development">Development</string>
<string name="routing_attr_avoid_footways_name">Avoid footways</string>
<string name="routing_attr_avoid_footways_description">Avoid footways</string>
<string name="osm_live_payment_subscription_management_hw">Payment will be charged to your AppGallery account at the confirmation of purchase.\n\nSubscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period(month/three month/year) only on the renewal date.\n\nYou can manage and cancel your subscriptions by going to your AppGallery settings.</string>
<string name="osm_live_payment_subscription_management_hw">Payment will be charged to your AppGallery account at the confirmation of purchase.\n\nSubscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period (month/three month/year) only on the renewal date.\n\nYou can manage and cancel your subscriptions by going to your AppGallery settings.</string>
<string name="osm_live_payment_desc_hw">Subscription charged per selected period. Cancel it on AppGallery at any time.</string>
<string name="contour_lines_thanks">Thank you for purchasing \'Contour lines\'</string>
<string name="start_finish_icons">Start/finish icons</string>
@ -256,7 +254,7 @@
<string name="extra_maps_menu_group">Extra maps</string>
<string name="search_poi_types_descr">Combine POI types from different categories. Tap switch to select all, tap left side to category selection.</string>
<string name="search_poi_types">Search for POI types</string>
<string name="osm_live_payment_subscription_management">Payment will be charged to your Google Play account at the confirmation of purchase.\n\n Subscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period(month/three month/year) only on the renewal date.\n\n You can manage and cancel your subscriptions by going to your Google Play settings.</string>
<string name="osm_live_payment_subscription_management">Payment will be charged to your Google Play account at the confirmation of purchase.\n\n Subscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period (month/three month/year) only on the renewal date.\n\n You can manage and cancel your subscriptions by going to your Google Play settings.</string>
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="custom_color">Custom color</string>
<string name="lang_lmo">Lombard</string>

10
OsmAnd/src/net/osmand/AndroidUtils.java
View file

@ -153,16 +153,6 @@ public class AndroidUtils {
R.color.icon_color_default_light, R.color.wikivoyage_active_dark);
}
public static String trimExtension(String src) {
if (src != null) {
int index = src.lastIndexOf('.');
if (index != -1) {
return src.substring(0, index);
}
}
return src;
}
public static String addColon(OsmandApplication app, @StringRes int stringRes) {
return app.getString(R.string.ltr_or_rtl_combine_via_colon, app.getString(stringRes), "").trim();
}

3
OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
View file

@ -8,7 +8,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import net.osmand.AndroidUtils;
import net.osmand.FileUtils;
import net.osmand.GPXUtilities;
import net.osmand.GPXUtilities.GPXFile;
@ -526,7 +525,7 @@ public class MapMarkersHelper {
private MapMarkersGroup createGPXMarkerGroup(File fl) {
return new MapMarkersGroup(getMarkerGroupId(fl),
AndroidUtils.trimExtension(fl.getName()),
Algorithms.getFileNameWithoutExtension(fl.getName()),
MapMarkersGroup.GPX_TYPE);
}

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

@ -173,7 +173,7 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
contextMenuAdapter.addItem(createItem(R.string.versions_item, NULL_ID,
"feature_articles/changes.html"));
contextMenuAdapter.addItem(createItem(R.string.what_is_new, NULL_ID,
"feature_articles/blog.html"));
"feature_articles/osmand-3-8-released.html"));
String releasedate = "";
if (!this.getString(R.string.app_edition).equals("")) {

8
OsmAnd/src/net/osmand/plus/dialogs/ImportGpxBottomSheetDialogFragment.java
View file

@ -23,6 +23,8 @@ public class ImportGpxBottomSheetDialogFragment extends MenuBottomSheetDialogFra
private GPXFile gpxFile;
private String fileName;
private long fileSize;
private boolean save;
private boolean useImportDir;
@ -38,6 +40,10 @@ public class ImportGpxBottomSheetDialogFragment extends MenuBottomSheetDialogFra
this.fileName = fileName;
}
public void setFileSize(long fileSize) {
this.fileSize = fileSize;
}
public void setSave(boolean save) {
this.save = save;
}
@ -84,7 +90,7 @@ public class ImportGpxBottomSheetDialogFragment extends MenuBottomSheetDialogFra
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
importHelper.handleGpxImport(gpxFile, fileName, save, useImportDir);
importHelper.handleGpxImport(gpxFile, fileName, fileSize, save, useImportDir);
dismiss();
}
})

12
OsmAnd/src/net/osmand/plus/importfiles/GpxImportTask.java
View file

@ -10,6 +10,7 @@ import net.osmand.GPXUtilities.GPXFile;
import net.osmand.util.Algorithms;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
class GpxImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
@ -17,13 +18,15 @@ class GpxImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
private ImportHelper importHelper;
private Uri gpxFile;
private String fileName;
private long fileSize;
private boolean save;
private boolean useImportDir;
private boolean showInDetailsActivity;
public GpxImportTask(@NonNull ImportHelper importHelper, @NonNull FragmentActivity activity,
@NonNull Uri gpxFile, @NonNull String fileName, boolean save, boolean useImportDir,
boolean showInDetailsActivity) {
@NonNull Uri gpxFile, @NonNull String fileName, boolean save, boolean useImportDir,
boolean showInDetailsActivity) {
super(activity);
this.importHelper = importHelper;
this.gpxFile = gpxFile;
@ -39,10 +42,13 @@ class GpxImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
try {
is = app.getContentResolver().openInputStream(gpxFile);
if (is != null) {
fileSize = is.available();
return GPXUtilities.loadGPXFile(is);
}
} catch (FileNotFoundException e) {
//
} catch (IOException e) {
ImportHelper.log.error(e.getMessage(), e);
} catch (SecurityException e) {
ImportHelper.log.error(e.getMessage(), e);
} finally {
@ -54,6 +60,6 @@ class GpxImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
@Override
protected void onPostExecute(GPXFile result) {
hideProgress();
importHelper.handleResult(result, fileName, save, useImportDir, false, showInDetailsActivity);
importHelper.handleResult(result, fileName, fileSize, save, useImportDir, false, showInDetailsActivity);
}
}

28
OsmAnd/src/net/osmand/plus/importfiles/GpxOrFavouritesImportTask.java
View file

@ -10,25 +10,28 @@ import net.osmand.GPXUtilities.GPXFile;
import net.osmand.util.Algorithms;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import static net.osmand.plus.importfiles.KmlImportTask.loadGpxFromKml;
import static net.osmand.plus.importfiles.KmlImportTask.convertKmlToGpxStream;
class GpxOrFavouritesImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
private ImportHelper importHelper;
private Uri fileUri;
private String fileName;
private long fileSize;
private boolean save;
private boolean useImportDir;
private boolean forceImportFavourites;
private boolean forceImportGpx;
private boolean forceImportFavourites;
public GpxOrFavouritesImportTask(@NonNull ImportHelper importHelper, @NonNull FragmentActivity activity,
@NonNull Uri fileUri, String fileName, boolean save, boolean useImportDir,
boolean forceImportFavourites, boolean forceImportGpx) {
@NonNull Uri fileUri, String fileName, boolean save, boolean useImportDir,
boolean forceImportFavourites, boolean forceImportGpx) {
super(activity);
this.importHelper = importHelper;
this.fileUri = fileUri;
@ -46,15 +49,24 @@ class GpxOrFavouritesImportTask extends BaseImportAsyncTask<Void, Void, GPXFile>
try {
is = app.getContentResolver().openInputStream(fileUri);
if (is != null) {
fileSize = is.available();
if (fileName != null && fileName.endsWith(ImportHelper.KML_SUFFIX)) {
return loadGpxFromKml(is);
InputStream gpxStream = convertKmlToGpxStream(is);
if (gpxStream != null) {
fileSize = gpxStream.available();
return GPXUtilities.loadGPXFile(gpxStream);
}
} else if (fileName != null && fileName.endsWith(ImportHelper.KMZ_SUFFIX)) {
try {
zis = new ZipInputStream(is);
ZipEntry entry;
while ((entry = zis.getNextEntry()) != null) {
if (entry.getName().endsWith(ImportHelper.KML_SUFFIX)) {
return loadGpxFromKml(zis);
InputStream gpxStream = convertKmlToGpxStream(is);
if (gpxStream != null) {
fileSize = gpxStream.available();
return GPXUtilities.loadGPXFile(gpxStream);
}
}
}
} catch (Exception e) {
@ -66,6 +78,8 @@ class GpxOrFavouritesImportTask extends BaseImportAsyncTask<Void, Void, GPXFile>
}
} catch (FileNotFoundException e) {
//
} catch (IOException e) {
ImportHelper.log.error(e.getMessage(), e);
} catch (SecurityException e) {
ImportHelper.log.error(e.getMessage(), e);
} finally {
@ -78,6 +92,6 @@ class GpxOrFavouritesImportTask extends BaseImportAsyncTask<Void, Void, GPXFile>
@Override
protected void onPostExecute(GPXFile result) {
hideProgress();
importHelper.importGpxOrFavourites(result, fileName, save, useImportDir, forceImportFavourites, forceImportGpx);
importHelper.importGpxOrFavourites(result, fileName, fileSize, save, useImportDir, forceImportFavourites, forceImportGpx);
}
}

57
OsmAnd/src/net/osmand/plus/importfiles/ImportHelper.java
View file

@ -31,6 +31,8 @@ import net.osmand.plus.activities.ActivityResultListener;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.TrackActivity;
import net.osmand.plus.dialogs.ImportGpxBottomSheetDialogFragment;
import net.osmand.plus.helpers.GpxUiHelper;
import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
import net.osmand.plus.measurementtool.MeasurementToolFragment;
import net.osmand.plus.settings.backend.SettingsHelper;
import net.osmand.plus.settings.backend.SettingsHelper.SettingsItem;
@ -128,8 +130,8 @@ public class ImportHelper {
importFavoritesImpl(gpxFile, fileName, false);
}
public void handleGpxImport(GPXFile result, String name, boolean save, boolean useImportDir) {
handleResult(result, name, save, useImportDir, false);
public void handleGpxImport(GPXFile result, String name, long fileSize, boolean save, boolean useImportDir) {
handleResult(result, name, fileSize, save, useImportDir, false);
}
public boolean handleGpxImport(final Uri contentUri, final boolean useImportDir) {
@ -387,12 +389,12 @@ public class ImportHelper {
return intent;
}
protected void handleResult(GPXFile result, String name, boolean save,
protected void handleResult(GPXFile result, String name, long fileSize, boolean save,
boolean useImportDir, boolean forceImportFavourites) {
handleResult(result, name, save, useImportDir, forceImportFavourites, true);
handleResult(result, name, fileSize, save, useImportDir, forceImportFavourites, true);
}
protected void handleResult(final GPXFile result, final String name, final boolean save,
protected void handleResult(final GPXFile result, final String name, long fileSize, final boolean save,
final boolean useImportDir, boolean forceImportFavourites, boolean showInDetailsActivity) {
if (result != null) {
if (result.error != null) {
@ -402,9 +404,15 @@ public class ImportHelper {
}
} else {
if (save) {
executeImportTask(new SaveAsyncTask(result, name, useImportDir, showInDetailsActivity));
String existingFilePath = getExistingFilePath(name, fileSize);
if (existingFilePath != null) {
app.showToastMessage(R.string.file_already_imported);
showGpxInDetailsActivity(existingFilePath);
} else {
executeImportTask(new SaveAsyncTask(result, name, useImportDir, showInDetailsActivity));
}
} else {
showGpxInDetailsActivity(result);
showGpxInDetailsActivity(result.path);
}
if (gpxImportCompleteListener != null) {
gpxImportCompleteListener.onImportComplete(true);
@ -445,6 +453,20 @@ public class ImportHelper {
}
}
@Nullable
private String getExistingFilePath(String name, long fileSize) {
File dir = app.getAppPath(GPX_INDEX_DIR);
List<GPXInfo> gpxInfoList = GpxUiHelper.getSortedGPXFilesInfoByDate(dir, true);
for (GPXInfo gpxInfo : gpxInfoList) {
String fileName = gpxInfo.getFileName();
String nameWithoutDirs = Algorithms.getFileWithoutDirs(fileName);
if (nameWithoutDirs.equals(name) && gpxInfo.getFileSize() == fileSize) {
return fileName;
}
}
return null;
}
private String saveImport(final GPXFile gpxFile, final String fileName, final boolean useImportDir) {
final String warning;
@ -531,7 +553,7 @@ public class ImportHelper {
}
if (success) {
if (showInDetailsActivity) {
showGpxInDetailsActivity(result);
showGpxInDetailsActivity(result.path);
} else {
showPlanRouteFragment();
}
@ -553,10 +575,10 @@ public class ImportHelper {
}
}
private void showGpxInDetailsActivity(final GPXFile gpxFile) {
if (gpxFile.path != null) {
private void showGpxInDetailsActivity(String gpxFilePath) {
if (!Algorithms.isEmpty(gpxFilePath)) {
Intent newIntent = new Intent(activity, app.getAppCustomization().getTrackActivity());
newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, gpxFile.path);
newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, gpxFilePath);
newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
activity.startActivity(newIntent);
}
@ -576,9 +598,9 @@ public class ImportHelper {
}
}
protected void importGpxOrFavourites(final GPXFile gpxFile, final String fileName, final boolean save,
final boolean useImportDir, final boolean forceImportFavourites,
final boolean forceImportGpx) {
protected void importGpxOrFavourites(final GPXFile gpxFile, final String fileName, final long fileSize,
final boolean save, final boolean useImportDir,
final boolean forceImportFavourites, final boolean forceImportGpx) {
if (gpxFile == null || gpxFile.isPointsEmpty()) {
if (forceImportFavourites) {
final DialogInterface.OnClickListener importAsTrackListener = new DialogInterface.OnClickListener() {
@ -586,7 +608,7 @@ public class ImportHelper {
public void onClick(DialogInterface dialog, int which) {
switch (which) {
case DialogInterface.BUTTON_POSITIVE:
handleResult(gpxFile, fileName, save, useImportDir, true);
handleResult(gpxFile, fileName, fileSize, save, useImportDir, true);
break;
case DialogInterface.BUTTON_NEGATIVE:
dialog.dismiss();
@ -602,7 +624,7 @@ public class ImportHelper {
.setNegativeButton(R.string.shared_string_cancel, importAsTrackListener)
.show();
} else {
handleResult(gpxFile, fileName, save, useImportDir, false);
handleResult(gpxFile, fileName, fileSize, save, useImportDir, false);
}
return;
}
@ -611,13 +633,14 @@ public class ImportHelper {
importFavoritesImpl(gpxFile, fileName, true);
} else if (fileName != null) {
if (forceImportGpx) {
handleResult(gpxFile, fileName, save, useImportDir, false);
handleResult(gpxFile, fileName, fileSize, save, useImportDir, false);
} else {
ImportGpxBottomSheetDialogFragment fragment = new ImportGpxBottomSheetDialogFragment();
fragment.setUsedOnMap(true);
fragment.setImportHelper(this);
fragment.setGpxFile(gpxFile);
fragment.setFileName(fileName);
fragment.setFileSize(fileSize);
fragment.setSave(save);
fragment.setUseImportDir(useImportDir);
activity.getSupportFragmentManager().beginTransaction()

21
OsmAnd/src/net/osmand/plus/importfiles/KmlImportTask.java
View file

@ -12,6 +12,7 @@ import net.osmand.util.Algorithms;
import java.io.ByteArrayInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
@ -20,11 +21,13 @@ class KmlImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
private ImportHelper importHelper;
private Uri uri;
private String name;
private long fileSize;
private boolean save;
private boolean useImportDir;
public KmlImportTask(@NonNull ImportHelper importHelper, @NonNull FragmentActivity activity,
@NonNull Uri uri, String name, boolean save, boolean useImportDir) {
@NonNull Uri uri, String name, boolean save, boolean useImportDir) {
super(activity);
this.importHelper = importHelper;
this.uri = uri;
@ -39,12 +42,18 @@ class KmlImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
try {
is = app.getContentResolver().openInputStream(uri);
if (is != null) {
return loadGpxFromKml(is);
InputStream gpxStream = convertKmlToGpxStream(is);
if (gpxStream != null) {
fileSize = gpxStream.available();
return GPXUtilities.loadGPXFile(gpxStream);
}
}
} catch (FileNotFoundException e) {
//
} catch (SecurityException e) {
ImportHelper.log.error(e.getMessage(), e);
} catch (IOException e) {
ImportHelper.log.error(e.getMessage(), e);
} finally {
Algorithms.closeStream(is);
}
@ -54,16 +63,16 @@ class KmlImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
@Override
protected void onPostExecute(GPXFile result) {
hideProgress();
importHelper.handleResult(result, name, save, useImportDir, false);
importHelper.handleResult(result, name, fileSize, save, useImportDir, false);
}
protected static GPXFile loadGpxFromKml(@NonNull InputStream is) {
protected static InputStream convertKmlToGpxStream(@NonNull InputStream is) {
String result = Kml2Gpx.toGpx(is);
if (result != null) {
try {
return GPXUtilities.loadGPXFile(new ByteArrayInputStream(result.getBytes("UTF-8")));
return new ByteArrayInputStream(result.getBytes("UTF-8"));
} catch (UnsupportedEncodingException e) {
return null;
ImportHelper.log.error(e.getMessage(), e);
}
}
return null;

15
OsmAnd/src/net/osmand/plus/importfiles/KmzImportTask.java
View file

@ -5,6 +5,7 @@ import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
import net.osmand.GPXUtilities;
import net.osmand.GPXUtilities.GPXFile;
import net.osmand.util.Algorithms;
@ -13,18 +14,20 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import static net.osmand.plus.importfiles.ImportHelper.KML_SUFFIX;
import static net.osmand.plus.importfiles.KmlImportTask.loadGpxFromKml;
import static net.osmand.plus.importfiles.KmlImportTask.convertKmlToGpxStream;
class KmzImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
private ImportHelper importHelper;
private Uri uri;
private String name;
private long fileSize;
private boolean save;
private boolean useImportDir;
public KmzImportTask(@NonNull ImportHelper importHelper, @NonNull FragmentActivity activity,
@NonNull Uri uri, @NonNull String name, boolean save, boolean useImportDir) {
@NonNull Uri uri, @NonNull String name, boolean save, boolean useImportDir) {
super(activity);
this.importHelper = importHelper;
this.uri = uri;
@ -45,7 +48,11 @@ class KmzImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
ZipEntry entry;
while ((entry = zis.getNextEntry()) != null) {
if (entry.getName().endsWith(KML_SUFFIX)) {
return loadGpxFromKml(is);
InputStream gpxStream = convertKmlToGpxStream(is);
if (gpxStream != null) {
fileSize = gpxStream.available();
return GPXUtilities.loadGPXFile(gpxStream);
}
}
}
}
@ -61,6 +68,6 @@ class KmzImportTask extends BaseImportAsyncTask<Void, Void, GPXFile> {
@Override
protected void onPostExecute(GPXFile result) {
hideProgress();
importHelper.handleResult(result, name, save, useImportDir, false);
importHelper.handleResult(result, name, fileSize, save, useImportDir, false);
}
}

3
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/IPFSImageCard.java
View file

@ -1,8 +1,10 @@
package net.osmand.plus.mapcontextmenu.builders.cards;
import android.view.View;
import androidx.core.content.ContextCompat;
import net.osmand.AndroidNetworkUtils;
import net.osmand.PlatformUtil;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;
@ -24,6 +26,7 @@ public class IPFSImageCard extends ImageCard {
url = BASE_URL + cid;
imageHiresUrl = BASE_URL + cid;
imageUrl = BASE_URL + cid;
icon = ContextCompat.getDrawable(getMyApplication(), R.drawable.ic_logo_openplacereview);
if (!Algorithms.isEmpty(getUrl())) {
View.OnClickListener onClickListener = new View.OnClickListener() {
@Override

15
OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java
View file

@ -298,13 +298,15 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
return (menuState & (MenuState.HEADER_ONLY | MenuState.HALF_SCREEN)) != 0;
}
public static void showInstance(@NonNull FragmentManager fm, @Nullable Fragment targetFragment, @NonNull LocationsHolder locationsHolder) {
public static void showInstance(@NonNull FragmentManager fm, @Nullable Fragment targetFragment,
@NonNull LocationsHolder locationsHolder, @Nullable ApplicationMode appMode) {
try {
if (!fm.isStateSaved()) {
GpxApproximationFragment fragment = new GpxApproximationFragment();
fragment.setRetainInstance(true);
fragment.setTargetFragment(targetFragment, REQUEST_CODE);
fragment.setLocationsHolder(locationsHolder);
fragment.setSnapToRoadAppMode(appMode);
fm.beginTransaction()
.replace(R.id.fragmentContainer, fragment, TAG)
.addToBackStack(TAG)
@ -348,12 +350,19 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
@Override
public void onProfileSelect(ApplicationMode applicationMode) {
if (snapToRoadAppMode != applicationMode) {
snapToRoadAppMode = applicationMode;
if (setSnapToRoadAppMode(applicationMode)) {
calculateGpxApproximation();
}
}
public boolean setSnapToRoadAppMode(ApplicationMode appMode) {
if (appMode != null && snapToRoadAppMode != appMode) {
snapToRoadAppMode = appMode;
return true;
}
return false;
}
public LocationsHolder getLocationsHolder() {
return locationsHolder;
}

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

@ -78,6 +78,7 @@ import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarControll
import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarControllerType;
import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarView;
import net.osmand.router.RoutePlannerFrontEnd.GpxRouteApproximation;
import net.osmand.util.Algorithms;
import java.io.File;
import java.lang.ref.WeakReference;
@ -734,8 +735,12 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
case SnapTrackWarningFragment.CONTINUE_RESULT_CODE:
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
ApplicationMode mode = editingCtx.getAppMode();
if (mode == ApplicationMode.DEFAULT || "public_transport".equals(mode.getRoutingProfile())) {
mode = null;
}
GpxApproximationFragment.showInstance(mapActivity.getSupportFragmentManager(),
this, new LocationsHolder(editingCtx.getPoints()));
this, new LocationsHolder(editingCtx.getPoints()), mode);
}
break;
}
@ -1542,12 +1547,20 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
private String getSuggestedFileName() {
GpxData gpxData = editingCtx.getGpxData();
String displayedName;
if (gpxData == null) {
String displayedName = null;
if (gpxData != null) {
GPXFile gpxFile = gpxData.getGpxFile();
if (!Algorithms.isEmpty(gpxFile.path)) {
displayedName = Algorithms.getFileNameWithoutExtension(new File(gpxFile.path).getName());
} else if (!Algorithms.isEmpty(gpxFile.tracks)) {
displayedName = gpxFile.tracks.get(0).name;
}
}
if (gpxData == null || displayedName == null) {
String suggestedName = new SimpleDateFormat("EEE dd MMM yyyy", Locale.US).format(new Date());
displayedName = FileUtils.createUniqueFileName(requireMyApplication(), suggestedName, GPX_INDEX_DIR, GPX_FILE_EXT);
} else {
displayedName = AndroidUtils.trimExtension(new File(gpxData.getGpxFile().path).getName());
displayedName = Algorithms.getFileNameWithoutExtension(new File(gpxData.getGpxFile().path).getName());
}
return displayedName;
}

1
OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java
View file

@ -179,7 +179,6 @@ public class SettingsOsmEditingActivity extends SettingsBaseActivity {
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
Uri uri = intent.getData();
System.out.println("URI=" + uri);
if (uri != null && uri.toString().startsWith("osmand-oauth")) {
String oauthVerifier = uri.getQueryParameter("oauth_verifier");
client.authorize(oauthVerifier);

15
OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java
View file

@ -37,6 +37,7 @@ import androidx.viewpager.widget.ViewPager;
import net.osmand.AndroidUtils;
import net.osmand.FileUtils;
import net.osmand.GPXUtilities;
import net.osmand.GPXUtilities.GPXFile;
import net.osmand.IndexConstants;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
@ -482,12 +483,18 @@ public class ChooseRouteFragment extends BaseOsmAndFragment implements ContextMe
OsmandApplication app = mapActivity.getMyApplication();
GPXRouteParamsBuilder paramsBuilder = app.getRoutingHelper().getCurrentGPXRoute();
String fileName;
if (paramsBuilder == null || paramsBuilder.getFile() == null || paramsBuilder.getFile().path == null) {
String fileName = null;
if (paramsBuilder != null && paramsBuilder.getFile() != null) {
GPXFile gpxFile = paramsBuilder.getFile();
if (!Algorithms.isEmpty(gpxFile.path)) {
fileName = Algorithms.getFileNameWithoutExtension(new File(gpxFile.path).getName());
} else if (!Algorithms.isEmpty(gpxFile.tracks)) {
fileName = gpxFile.tracks.get(0).name;
}
}
if (Algorithms.isEmpty(fileName)) {
String suggestedName = new SimpleDateFormat("EEE dd MMM yyyy", Locale.US).format(new Date());
fileName = FileUtils.createUniqueFileName(app, suggestedName, IndexConstants.GPX_INDEX_DIR, GPX_FILE_EXT);
} else {
fileName = AndroidUtils.trimExtension(new File(paramsBuilder.getFile().path).getName());
}
SaveAsNewTrackBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(),
ChooseRouteFragment.this, null, fileName,

30
OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java
View file

@ -25,6 +25,7 @@ import net.osmand.AndroidUtils;
import net.osmand.CallbackWithObject;
import net.osmand.GPXUtilities.GPXFile;
import net.osmand.GPXUtilities.TrkSegment;
import net.osmand.GPXUtilities.WptPt;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.ValueHolder;
@ -205,7 +206,6 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
SelectTrackCard selectTrackCard = new SelectTrackCard(mapActivity);
selectTrackCard.setListener(this);
cardsContainer.addView(selectTrackCard.build(mapActivity));
cardsContainer.addView(buildDividerView(cardsContainer, false));
ApplicationMode mode = app.getRoutingHelper().getAppMode();
@ -213,13 +213,16 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
GPXRouteParamsBuilder rparams = routingHelper.getCurrentGPXRoute();
boolean osmandRouter = mode.getRouteService() == RouteProvider.RouteService.OSMAND;
if (rparams != null && osmandRouter) {
if (!gpxFile.hasRoute() || gpxFile.hasRtePt()) {
boolean showReverseCard = !routingHelper.isCurrentGPXRouteV2();
if (showReverseCard) {
cardsContainer.addView(buildDividerView(cardsContainer, false));
ReverseTrackCard reverseTrackCard = new ReverseTrackCard(mapActivity, rparams.isReverse());
reverseTrackCard.setListener(this);
cardsContainer.addView(reverseTrackCard.build(mapActivity));
}
if (!gpxFile.hasRtePt() && !gpxFile.hasRoute()) {
cardsContainer.addView(buildDividerView(cardsContainer, true));
cardsContainer.addView(buildDividerView(cardsContainer, showReverseCard));
AttachTrackToRoadsCard attachTrackCard = new AttachTrackToRoadsCard(mapActivity);
attachTrackCard.setListener(this);
@ -431,14 +434,11 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
if (mapActivity != null) {
if (card instanceof ImportTrackCard) {
importTrack();
} else if (card instanceof TrackEditCard) {
openPlanRoute(true);
} else if (card instanceof TrackEditCard || card instanceof AttachTrackToRoadsCard) {
openPlanRoute();
close();
} else if (card instanceof SelectTrackCard) {
updateSelectionMode(true);
} else if (card instanceof AttachTrackToRoadsCard) {
openPlanRoute(false);
close();
} else if (card instanceof ReverseTrackCard
|| card instanceof NavigateTrackOptionsCard) {
updateMenu();
@ -486,6 +486,14 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
this.gpxFile = gpxFile;
List<WptPt> points = gpxFile.getRoutePoints();
if (!points.isEmpty()) {
ApplicationMode mode = ApplicationMode.valueOfStringKey(points.get(0).getProfileType(), null);
if (mode != null) {
app.getRoutingHelper().setAppMode(mode);
app.initVoiceCommandPlayer(mapActivity, mode, true, null, false, false, true);
}
}
mapActivity.getMapActions().setGPXRouteParams(gpxFile);
app.getTargetPointsHelper().updateRouteAndRefresh(true);
app.getRoutingHelper().recalculateRouteDueToSettingsChange();
@ -542,7 +550,7 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
}
}
public void openPlanRoute(boolean useAppMode) {
public void openPlanRoute() {
MapActivity mapActivity = getMapActivity();
if (mapActivity != null && gpxFile != null) {
editingTrack = true;
@ -552,9 +560,7 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
GpxData gpxData = new GpxData(gpxFile, rect, actionType, segment);
MeasurementEditingContext editingContext = new MeasurementEditingContext();
editingContext.setGpxData(gpxData);
if (useAppMode) {
editingContext.setAppMode(app.getRoutingHelper().getAppMode());
}
editingContext.setAppMode(app.getRoutingHelper().getAppMode());
MeasurementToolFragment.showInstance(mapActivity.getSupportFragmentManager(), editingContext, true);
}
}

11
OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java
View file

@ -16,6 +16,7 @@ import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentManager;
import net.osmand.AndroidUtils;
import net.osmand.GPXUtilities.GPXFile;
import net.osmand.StateChangedListener;
import net.osmand.plus.OsmAndLocationSimulation;
import net.osmand.plus.OsmandApplication;
@ -47,6 +48,7 @@ import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.router.GeneralRouter;
import net.osmand.util.Algorithms;
import java.io.File;
import java.util.Arrays;
@ -342,14 +344,19 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
private BaseBottomSheetItem createGpxRoutingItem(final LocalRoutingParameter optionsItem) {
RouteProvider.GPXRouteParamsBuilder routeParamsBuilder = mapActivity.getRoutingHelper().getCurrentGPXRoute();
String description;
String description = null;
int descriptionColorId;
if (routeParamsBuilder == null) {
descriptionColorId = nightMode ? R.color.text_color_secondary_dark : R.color.text_color_secondary_light;
description = mapActivity.getString(R.string.follow_track_descr);
} else {
descriptionColorId = nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light;
description = new File(routeParamsBuilder.getFile().path).getName();
GPXFile gpxFile = routeParamsBuilder.getFile();
if (!Algorithms.isEmpty(gpxFile.path)) {
description = new File(gpxFile.path).getName();
} else if (!Algorithms.isEmpty(gpxFile.tracks)) {
description = gpxFile.tracks.get(0).name;
}
}
return new BottomSheetItemWithDescription.Builder()

10
OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/TracksCard.java
View file

@ -12,6 +12,7 @@ import androidx.appcompat.view.ContextThemeWrapper;
import androidx.core.content.ContextCompat;
import net.osmand.AndroidUtils;
import net.osmand.GPXUtilities;
import net.osmand.GPXUtilities.GPXFile;
import net.osmand.IndexConstants;
import net.osmand.plus.GPXDatabase.GpxDataItem;
@ -19,6 +20,7 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.GpxUiHelper;
import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
import net.osmand.plus.settings.backend.ApplicationMode;
import java.io.File;
import java.util.ArrayList;
@ -115,6 +117,14 @@ public class TracksCard extends BaseCard {
v.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
List<GPXUtilities.WptPt> points = item.file.getRoutePoints();
if (!points.isEmpty()) {
ApplicationMode mode = ApplicationMode.valueOfStringKey(points.get(0).getProfileType(), null);
if (mode != null) {
app.getRoutingHelper().setAppMode(mode);
app.initVoiceCommandPlayer(mapActivity, mode, true, null, false, false, true);
}
}
mapActivity.getMapActions().setGPXRouteParams(item.file);
app.getTargetPointsHelper().updateRouteAndRefresh(true);
}

5
OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
View file

@ -162,6 +162,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
useOsmLiveForPublicTransport.setDescription(getString(R.string.use_osm_live_public_transport_description));
useOsmLiveForPublicTransport.setSummaryOn(R.string.shared_string_enabled);
useOsmLiveForPublicTransport.setSummaryOff(R.string.shared_string_disabled);
useOsmLiveForPublicTransport.setIcon(getContentIcon(R.drawable.ic_action_osm_live));
useOsmLiveForPublicTransport.setIconSpaceReserved(true);
getPreferenceScreen().addPreference(useOsmLiveForPublicTransport);
}
@ -184,13 +185,14 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
useOsmLiveForRouting.setDescription(getString(R.string.use_osm_live_routing_description));
useOsmLiveForRouting.setSummaryOn(R.string.shared_string_enabled);
useOsmLiveForRouting.setSummaryOff(R.string.shared_string_disabled);
useOsmLiveForRouting.setIcon(getContentIcon(R.drawable.ic_action_osm_live));
useOsmLiveForRouting.setIconSpaceReserved(true);
getPreferenceScreen().addPreference(useOsmLiveForRouting);
}
private void setupDisableComplexRoutingPref() {
SwitchPreferenceEx disableComplexRouting = createSwitchPreferenceEx(settings.DISABLE_COMPLEX_ROUTING.getId(),
R.string.use_complex_routing, R.layout.preference_with_descr_dialog_and_switch);
R.string.use_two_phase_routing, R.layout.preference_with_descr_dialog_and_switch);
disableComplexRouting.setDescription(getString(R.string.complex_routing_descr));
disableComplexRouting.setSummaryOn(R.string.shared_string_enabled);
disableComplexRouting.setSummaryOff(R.string.shared_string_disabled);
@ -204,6 +206,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
useFastRecalculation.setDescription(getString(R.string.use_fast_recalculation_desc));
useFastRecalculation.setSummaryOn(R.string.shared_string_enabled);
useFastRecalculation.setSummaryOff(R.string.shared_string_disabled);
useFastRecalculation.setIcon(getContentIcon(R.drawable.ic_action_route_part));
useFastRecalculation.setIconSpaceReserved(true);
getPreferenceScreen().addPreference(useFastRecalculation);
}