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

This commit is contained in:
Victor Shcherb 2014-07-18 10:29:36 +02:00
commit aa68c75528
19 changed files with 248 additions and 121 deletions

View file

@ -12,7 +12,8 @@ public class TurnType {
public static final String KR = "KR"; // keep right//$NON-NLS-1$
public static final String TU = "TU"; // U-turn //$NON-NLS-1$
public static final String TRU = "TRU"; // Right U-turn //$NON-NLS-1$
public static String[] predefinedTypes = new String[] { C, KL, KR, TL, TSLL, TSHL, TR, TSLR, TSHR, TU, TRU };
public static final String OFFR = "OFFR"; // Off route //$NON-NLS-1$
public static String[] predefinedTypes = new String[] { C, KL, KR, TL, TSLL, TSHL, TR, TSLR, TSHR, TU, TRU, OFFR };
public static TurnType sraight() {
return valueOf(C, false);
@ -138,6 +139,8 @@ public class TurnType {
return "Keep left";
} else if(value.equals(KR)) {
return "Keep right";
} else if(value.equals(OFFR)) {
return "Off route";
}
return super.toString();
}

View file

@ -48,6 +48,7 @@
android:layout_marginRight="2dip"
android:button="@drawable/ic_btn_wocheckbox"
android:focusable="false"
android:clickable="false"
/>
</LinearLayout>

View file

@ -46,7 +46,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="2dip"
android:focusable="false" />
android:focusable="false"
android:clickable="false"/>
</LinearLayout>
</LinearLayout>

View file

@ -370,7 +370,7 @@
<string name="osmand_extra_settings_description">Vis indstillinger for avanceret kortkonfiguration (som at øge kortdetaljer) og nogle enhedsspecifikke indstillinger.</string>
<string name="osmand_development_plugin_description">Vis indstillinger for udviklings- og fejlretningsfunktioner som rutesimulering eller optegningsydeevne.</string>
<string name="plugins_screen">Udvidelser</string>
<string name="select_plugin_to_activate">Tryk på en udvidelse for at aktivere eller deaktivere den. (Kan kræve genstart af OsmAnd.)</string>
<string name="select_plugin_to_activate">Tryk på en udvidelse for at aktivere eller deaktivere den. (Genstart af OsmAnd kan være nødvendig.)</string>
<string name="prefs_plugins_descr">Udvidelser aktiverer avancerede indstillinger og ekstra funktionalitet</string>
<string name="prefs_plugins">Udvidelser</string>
<string name="osm_editing_plugin_description">Vis indstillinger, der kræves for OSM tilbagemelding, som f.eks. at indsamle/ændre OSM interessepunkter (IP), åbne/kommentere OSM fejl, og bidrage med optagede GPX-filer (kræver OSM legitimationsoplysninger).</string>
@ -933,7 +933,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
<string name="map_overlay_descr">Vælg kort til overlejring</string>
<string name="tile_source_already_installed">Kort er allerede installeret, indstillinger bliver opdateret</string>
<string name="select_tile_source_to_install">Vælg (del)kort der skal installeres eller opdateres</string>
<string name="internet_not_available">Internetforbindelse krævet for handlingen, men er ikke tilgængelig</string>
<string name="internet_not_available">Internetforbindelse er nødvendig for handlingen, men er ikke tilgængelig</string>
<string name="install_more">Installer flere…</string>
<string name="level_to_switch_vector_raster_descr">Minimum zoomniveau for at bruge vektorkort</string>
<string name="level_to_switch_vector_raster">Min. vektor zoomniveau</string>
@ -1920,7 +1920,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
<string name="forward">Frem</string>
<string name="home">Hjem</string>
<string name="live_monitoring_m_descr">Send sporing til en beestemt webtjeneste, hvis GPX optagelse er aktiveret.</string>
<string name="live_monitoring_m">Online sporing (GPX påkrævet)</string>
<string name="live_monitoring_m">Online sporing (GPX nødvendig)</string>
<string name="live_monitoring_start">Start online sporing</string>
<string name="live_monitoring_stop">Stop online sporing</string>
<string name="gpx_monitoring_start">Start GPX optagelse</string>
@ -1933,5 +1933,5 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
<string name="enable_sleep_mode">Aktiver dvaletilstand</string>
<string name="gps_wake_up_timer">GPS vågn-op interval</string>
<string name="sleep_mode_stop_dialog">Hold GPS aktiv?</string>
<string name="keep_navigation_service">Holde</string>
<string name="keep_navigation_service">Hold</string>
</resources>

View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="layer_map_appearance">Configura pantalla</string>
<string name="show_lanes">Mostrar carriles</string>
@ -1149,7 +1150,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
<string name="recording_context_menu_play">Reproducir</string>
<string name="recording_default_name">grabación</string>
<string name="av_control_stop">Parar</string>
<string name="av_control_start">Grabar</string>
<string name="av_control_start">Iniciar</string>
<string name="map_widget_av_notes">Notas de audio</string>
<string name="av_def_action_video">Grabar vídeo</string>
<string name="av_def_action_audio">Grabar audio</string>
@ -1182,7 +1183,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
<string name="precise_routing_mode_descr">Habilitar para calcular rutas precisas sin interferencias. Aún está limitado por la distancia y es lento.</string>
<string name="precise_routing_mode">Enrutado preciso (alfa)</string>
<string name="local_indexes_cat_av">Datos de Audio/Vídeo</string>
<string name="dist_control_start">Medir</string>
<string name="dist_control_start">Iniciar</string>
<string name="support_new_features_descr">Dona para ver nuevas características implementadas en la aplicación</string>
<string name="download_hillshade_item">Sombreado</string>
<string name="download_hillshade_maps">Mapas de sombreado</string>
@ -1283,10 +1284,10 @@ La lista de países incluídos (¡básicamente todo el mundo!): Afganistán, Alb
<string name="hno">Número</string>
<string name="tip_recent_changes_1_3_t">"Cambio en 1.5:\n\t* Tema Holo (personalización de tema) "
</string>
<string name="monitoring_settings">Servicios de registro y Modo de suspensión</string>
<string name="monitoring_settings">Servicios de registro</string>
<string name="monitoring_settings_descr">Configura la forma de registrar los recorridos y activar el modo de suspensión</string>
<string name="osmand_monitoring_plugin_description">Activa el seguimiento y la navegación en modo suspensión (pantalla apagada) despertando periódicamente el dispositivo GPS. Muestra opciones que permiten registrar tus recorridos en archivos GPX locales o en línea mediante un servicio web.</string>
<string name="osmand_monitoring_plugin_name">Servicios de registro y Modo de suspensión</string>
<string name="osmand_monitoring_plugin_name">Servicios de registro</string>
<string name="choose_osmand_theme_descr">Elije el tema, el aspecto, de la aplicación</string>
<string name="choose_osmand_theme">Tema</string>
<string name="accessibility_options">Opciones de accesibilidad</string>
@ -1795,7 +1796,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
<string name="rendering_attr_showSurfaces_name">Mostrar superficie de carreteras</string>
<string name="rendering_attr_showCycleRoutes_name">Mostrar rutas ciclistas</string>
<string name="osmo_auth_error_short">Falló la autorización</string>
<string name="osmo_auth_error">Error de autorización OsMo: %1$s.\nPuede deberse a que el servicio esté temporalmente caído o que tu registro ha expirado.\n¿Quieres realizar un nuevo registro?</string>
<string name="osmo_auth_error">Error de autorización OsMo: %1$s.\n Puede deberse a que el servicio esté temporalmente caído o que tu registro ha expirado.\n ¿Quieres realizar un nuevo registro?</string>
<string name="osmo_group_by_invite">Entrar por invitación</string>
<string name="osmo_group_information_desc">" - ¡Todos los grupos creados son públicos!. Si quieres ser anónimo, conecta dispositivos directamente a través de identificadores Tracker.\n - El grupo puede ser registrado hasta por 16 personas.\n - En caso de inactividad o que sólo 1 persona esté activa durante 2 semanas, se eliminará el grupo.\n - Puede restringir la entrada de grupo, como sólo por invitación, pero para controlar el grupo tienes que ir a la consola de administración.\n - Si tienes que crear un grupo, pero con otras condiciones, por favor contacta con http://osmo.mobi"</string>
<string name="osmo_group_information">¡Por favor, lea antes de crear un grupo!</string>
@ -1805,4 +1806,24 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
<string name="osmo_auto_connect">Autoconectar</string>
<string name="osmo_start_service">Servicio OsMo</string>
<string name="osmo_gpx_track_downloaded">Pista OsMo %1$s descargada.</string>
</resources>
<string name="keep_navigation_service">Mantener</string>
<string name="stop_navigation_service">Parar</string>
<string name="enable_sleep_mode">Habilitar modo de reposo</string>
<string name="gps_wake_up_timer">Intervalo despertar GPS</string>
<string name="sleep_mode_stop_dialog">¿Mantener el GPS encendido?</string>
<string name="map_preferred_locale_descr">Lenguaje preferido para las etiquetas en el mapa (si no está disponible se cambiará a Ingles o a los nombres locales)</string>
<string name="map_preferred_locale">Lenguaje preferido del mapa</string>
<string name="local_map_names">Nombres locales</string>
<string name="lang_sw">Swahili</string>
<string name="lang_he">Hebreo</string>
<string name="forward">Siguiente</string>
<string name="home">Casa</string>
<string name="live_monitoring_m_descr">Enviar seguimiento a un servicio web específico si la grabación GPS está habilitada.</string>
<string name="live_monitoring_m">Seguimiento online (requiere GPX)</string>
<string name="live_monitoring_start">Iniciar seguimiento online</string>
<string name="live_monitoring_stop">Parar seguimiento online</string>
<string name="gpx_monitoring_start">Iniciar grabación GPX</string>
<string name="gpx_monitoring_stop">Parar grabación GPX</string>
<string name="gpx_start_new_segment">Iniciar nuevo segmento</string>
<string name="lang_fa">Persa</string>
</resources>

View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="local_osm_changes_backup_failed">پشتیبان‌گیری از تغییرات OsmAnd ناموفق بود</string>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="local_osm_changes_backup_failed">پشتیبان‌گیری از تغییرات OsmAnd ناموفق بود</string>
<string name="plugin_distance_point_time">زمان</string>
<string name="plugin_distance_point_hdop">دقت</string>
<string name="plugin_distance_point_speed">سرعت</string>
@ -917,7 +918,7 @@
\n\t* بسته سایه تپه برای افزونه منحنی‌های هم‌تراز
\n\t* رفع اشکال (بهینه سازی مسیریابی)
</string>
<string name="osmand_srtm_long_description_1000_chars">این افزونه، منحنی‌های هم‌تراز را که در نقشه‌&#157;های آفلاین OsmAnd نمایش داده میشوند فراهم میکند. داده‌های جهانی (بین 70 درجه شمالی و 70 درجه جنوبی) در این زمینه براساس اندازه گیری‌های SRTM (مأموریت توپوگرافی رادار شاتل) و ASTER (رادیومتر انعکاسی و پرتویی حرارتی هوایی پیشرفته)، یک ابزار تصویربرداری پردازنده ترا و ماهواره فوق پیشرفته سیستم نظارتی زمین ناسا مییباشند. ASTER محصول تلاش مشترک میان ناسا، وزارت اقتصاد ژاپن، صنعت و تجارت (متی)، و سیستم های فضایی ژاپن (جی-اسپیس سیستم) است.</string>
<string name="osmand_srtm_long_description_1000_chars">این افزونه، منحنی‌های هم‌تراز را که در نقشه‌های آفلاین OsmAnd نمایش داده میشوند فراهم میکند. داده‌های جهانی (بین 70 درجه شمالی و 70 درجه جنوبی) در این زمینه براساس اندازه گیری‌های SRTM (مأموریت توپوگرافی رادار شاتل) و ASTER (رادیومتر انعکاسی و پرتویی حرارتی هوایی پیشرفته)، یک ابزار تصویربرداری پردازنده ترا و ماهواره فوق پیشرفته سیستم نظارتی زمین ناسا مییباشند. ASTER محصول تلاش مشترک میان ناسا، وزارت اقتصاد ژاپن، صنعت و تجارت (متی)، و سیستم های فضایی ژاپن (جی-اسپیس سیستم) است.</string>
<string name="srtm_plugin_description">تسهیل دانلود خطوط هم‌تراز و سایه تپه (\'تنظیمات\'-&gt;\'مدیریت نقشه ها\'-&gt;\'دانلود\'-&gt;\'انتخاب نوع نقشه\' مورد نظر).</string>
<string name="monitoring_control_start">جی پی ایکس</string>
<string name="rendering_attr_noPolygons_description">محو کردن همه عوارض زمین روی نقشه</string>
@ -1661,7 +1662,7 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
\n\t* نکته مهم: نقشه‌ها باید جدیدتر از بهمن 1392 باشند.
\n\t* سیستم مسیریابی کاملاً به‌روزرسانی شد (از لحاظ سرعت و دقت)-
\n\t* صفحه جدید برای برنامه‌ریزی مسیر سفر (بسیار زیباتر و کارآمدتر)
\n\t** نکته: فایل&#157;&#157;‌های GPX از طریق دکمه تنظیمات قابل دستیابی هستند.
\n\t** نکته: فایل‌های GPX از طریق دکمه تنظیمات قابل دستیابی هستند.
\n\t* دکمه‌ها در حالت مسیریابی به صورت خودکار مخفی میشوند.
\n\t* محاسبه مسیر آفلاین بسته به اولین نقطه مسیر GPX
\n\t* شبیه‌سازی مسیریابی در داخل تونلها
@ -1891,4 +1892,14 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
<string name="no_index_file_to_download">هیچ چیز برای دانلود وجود ندارد، لطفا اتصال به اینترنت را بررسی نمایید.</string>
<string name="osmo_auth_error_short">مجوز های شکست خورده</string>
<string name="osmo_auth_error">مجوز OSMO با خطا مواجه شد : %1$s.↵\n این سرویس یا به طور موقت پایین است و یا ثبت نام به اتمام رسیده است.↵\n آیا شما میخواهید ثبت نام جدید انجام دهید.</string>
</resources>
<string name="keep_navigation_service">حفظ</string>
<string name="stop_navigation_service">ایست</string>
<string name="enable_sleep_mode">فعال کردن حالت خواب</string>
<string name="gps_wake_up_timer">فاصله زمان اتصال GPS</string>
<string name="sleep_mode_stop_dialog">حفظ GPS?</string>
<string name="map_preferred_locale">زبان نقشه</string>
<string name="lang_sw">سواحیلی</string>
<string name="lang_he">عبری</string>
<string name="forward">جلو</string>
<string name="home">خانه</string>
</resources>

View file

@ -1449,10 +1449,10 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
\n\t* Impostazioni aggiuntive per la stabilizzazione della bussola
\n\t* Il pulsante in alto a sinistra nella schermata della vista mappa sostituisce il pulsante Menu
</string>
<string name="monitoring_settings">Servizi di registrazione &amp; Modalità quiescente</string>
<string name="monitoring_settings">Servizi di registrazione</string>
<string name="monitoring_settings_descr">Configura come registrare viaggi e attivare la modalità quiescente</string>
<string name="osmand_monitoring_plugin_description">Attivare il monitoraggio e la navigazione nella modalità quiescente (schermo spento) attraverso periodici risvegli del dispositivo GPS. Mostra le impostazioni che facilitano la registrazione dei vostri viaggi in file GPX locali o online usando un servizio web.</string>
<string name="osmand_monitoring_plugin_name">Servizi di registrazione e modalità quiescente</string>
<string name="osmand_monitoring_plugin_name">Servizi di registrazione</string>
<string name="choose_osmand_theme_descr">Scegli il tema dell\'applicazione</string>
<string name="choose_osmand_theme">Tema dell\'app</string>
<string name="accessibility_options">Opzioni di accessibilità</string>
@ -1794,7 +1794,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="osmo_session_not_available">Sessione non disponibile, per favore controllare che \'Invia posizioni\' sia attivo.</string>
<string name="osmo_share_session">Condividi sessione</string>
<string name="osmo_session_id_share">Url della sessione per tracciare il dispositivo (%1$s)</string>
<string name="osmo_tracker_id_share">Per collegarsi al dispositivo desiderato %2$s, cliccare sul link %3$ o specificarne l\'id di monitoraggio (%1$s)</string>
<string name="osmo_tracker_id_share">Per collegarsi al dispositivo desiderato %2$s, cliccare sul link %3$s o specificarne l\'id di monitoraggio (%1$s)</string>
<string name="osmo_track_interval">Intervallo di registrazione</string>
<string name="osmo_track_interval_descr">Scegli l\'intervallo di tempo per l\'invio della posizione</string>
<string name="int_days">giorni</string>
@ -1922,7 +1922,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="live_monitoring_m">Tracciamento online (GPX richiesto)</string>
<string name="live_monitoring_start">Avvia il tracciamento online</string>
<string name="live_monitoring_stop">Ferma il tracciamento online</string>
<string name="gpx_monitoring_start">Registrazione GPX</string>
<string name="gpx_monitoring_start">Avvio la registrazione GPX</string>
<string name="gpx_monitoring_stop">Ferma la registrazione GPX</string>
<string name="gpx_start_new_segment">Avvia un nuovo segmento</string>
<string name="lang_fa">Persiano</string>

View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
<string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string>
<string name="debugging_and_development">OsmAnd 개발</string>
@ -35,7 +36,7 @@
<string name="accessibility_mode_descr">접근성(내게 필요한 옵션) 기능을 켭니다</string>
<string name="accessibility_on">접근성 켜기</string>
<string name="accessibility_off">접근성 끄기</string>
<string name="accessibility_default">전체 시스템 설정에 따름</string>
<string name="accessibility_default">일반 시스템 설정에 따름</string>
<string name="backToMenu">메뉴로 돌아감</string>
<string name="zoomOut">줌아웃(축소)</string>
@ -126,14 +127,14 @@
<string name="settings_preset_descr">각 프로필마다 지도보기 와 운행설정을 기억합니다. 여기에 기본 프로필을 설정합니다.</string>
<string name="routing_settings">운행</string>
<string name="routing_settings">길안내</string>
<string name="routing_settings_descr">운행을 위한 옵션을 지정합니다</string>
<string name="global_settings">전체 설정</string>
<string name="index_settings">지도파일 관리</string>
<string name="global_settings">일반 설정</string>
<string name="index_settings">지도 관리</string>
<string name="index_settings_descr">기기에 저장된 오프라인 지도를 다운로드하고 관리합니다</string>
<string name="general_settings">일반 설정</string>
<string name="general_settings_descr">앱에 대한 디스플레이와 일반 설정을 구성합니다</string>
<string name="global_app_settings">전체 앱 설정</string>
<string name="global_app_settings">일반 앱 설정</string>
<string name="user_name">OSM 사용자 이름</string>
<string name="user_name_descr">http://openstreetmap.org 에 데이터 제출을 위해 필요합니다</string>
<string name="user_password">OSM 패스워드</string>
@ -421,7 +422,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
<string name="tip_app_mode">프로필 사용하기</string>
<string name="tip_navigation">운행</string>
<string name="tip_navigation">길안내</string>
<string name="tip_navigation_t">To get directions to a place, either directly long-click on it on the map, (then tap its description marker and select \'Directions to\'), or select \'Directions\' after tapping any entry in a search results list or favorite list.
네비게이션 (경로)를 시작하기 전에 목적지를 선택하여야 합니다. 그런 다음 맵 상에서 \'메뉴\' -&gt; \'방향\' 을 누르고 네비게이션 종류를 선택합니다.
@ -431,7 +432,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
\n\nIf you use \'Directions from\' together with \'Start navigation\', OsmAnd will switch to your actual position as soon as it is found (so this can be used to jump-start routing before the position is found), while \'Directions from\' in combination with \'Display route\' just shows you the route from any arbitrary point you had selected without subsequent updates.
</string>
<string name="tip_search">검색</string>
<string name="tip_search">검색</string>
<string name="tip_map_context_menu">[위치 사용] 메뉴</string>
<string name="tip_map_context_menu_t">
</string>
@ -500,7 +501,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
<string name="version_index_is_big_for_memory">인덱스 \'\'{0}\'\' 가 메모리에 적합하지 않습니다</string>
<string name="version_index_is_not_supported">인덱스 \'\'{0}\'\' 버전은 지원되지 않습니다</string>
<string name="use_osmand_routing_service">OsmAnd 운행&gt;20km</string>
<string name="use_osmand_routing_service">OsmAnd 길안내&gt;20km</string>
<string name="use_osmand_routing_service_descr">20km 이상 긴 거리를 위해 CloudMade 대신에 OsmAnd 오프라인 운행 (실험적)를 사용합니다</string>
<string name="osmand_routing_experimental">OsmAnd 오프라인 길안내는 실험적인 기능이며 20 km 이상의 거리에서는 동작하지 않습니다.\n\n길안내 서비스는 일시적으로 온라인 CloudMade로 변경합니다.</string>
<string name="specified_dir_doesnt_exist">지정한 폴더를 찾을 수 없습니다.</string>
@ -710,9 +711,9 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
<string name="search_online_address">온라인 검색</string>
<string name="max_level_download_tile">최대 온라인 줌</string>
<string name="max_level_download_tile_descr">다운로드할 최대 줌 레벨을 선택하세요</string>
<string name="route_general_information">전체 거리 {0}, 여행 시간 {1} h {2} m.</string>
<string name="route_general_information">전체거리 %1$s, 여행시간 %2$d h %3$d m.</string>
<string name="router_service_descr">온라인 또는 오프라인 운행 서비스를 선택합니다</string>
<string name="router_service">운행 서비스</string>
<string name="router_service">길안내 서비스</string>
<string name="sd_dir_not_accessible">저장할 SD 카드 디렉토리에 접근할 수 없습니다</string>
<string name="download_question">{0} - {1} 을 다운로드할까요?</string>
<string name="download_question_exist">{0} 에 대한 오프라인 데이터가 이미 존재합니다({1}). 업데이트할까요({2}) ?</string>
@ -729,7 +730,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
<string name="fav_points_not_exist">즐겨찾기 포인트가 하나도 존재하지 않습니다</string>
<string name="update_existing">대체</string>
<string name="only_show">루트 표시하기</string>
<string name="follow">운행 시작</string>
<string name="follow">길안내 시작</string>
<string name="recalculate_route_to_your_location">전송 모드 :</string>
<string name="mark_final_location_first">먼저 목적지 포인트를 선택하세요</string>
<string name="get_directions">길안내</string>
@ -757,7 +758,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
<string name="invalid_locations">좌표가 유효하지 않습니다!</string>
<string name="go_back_to_osmand">OsmAnd 맵으로 되돌아감</string>
<string name="close">닫기</string>
<string name="loading_data">데이터 적재중</string>
<string name="loading_data">데이터 로딩</string>
<string name="reading_indexes">로컬 데이터 읽기…</string>
<string name="previous_run_crashed">이전에 실행한 앱이 죽었습니다. 로그 파일은 {0}입니다. 문제를 알리고 로그 파일을 첨부하세요.</string>
<string name="saving_gpx_tracks">GPX 트랙파일을 SD로 저장 중…</string>
@ -767,7 +768,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
<string name="download_indexes_descr">오프라인 용 데이터를 인터넷으로부터 다운로드합니다</string>
<string name="download_indexes">오프라인 데이터 다운로드</string>
<string name="use_online_routing_descr">루트를 찾기위해 인터넷을 사용합니다</string>
<string name="use_online_routing">온라인 운행 사용</string>
<string name="use_online_routing">온라인 길안내 사용</string>
<string name="osm_settings_descr">OSM 로그인에 필요한 OSM 설정을 지정합니다</string>
<string name="data_settings_descr">언어를 지정하고, 데이터를 다운로드/재로드 합니다</string>
<string name="data_settings">데이터</string>
@ -812,14 +813,14 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
<string name="map_source">맵 소스</string>
<string name="use_internet">인터넷 사용</string>
<string name="show_location">위치 표시</string>
<string name="map_preferences"></string>
<string name="map_preferences">지도</string>
<string name="settings_activity">설정</string>
<string name="show_gps_coordinates_text">맵에 GPS 좌표 표시</string>
<string name="use_internet_to_download_tile">누락된 맵 타일을 다운로드하기 위해 인터넷을 사용합니다</string>
<string name="app_description">네비게이션 앱</string>
<string name="exit_Button">종료</string>
<string name="map_Button"></string>
<string name="map_Button">지도</string>
<string name="settings_Button">설정</string>
<string name="favorites_Button">즐겨찾기</string>
<string name="search_button">검색</string>
@ -1023,7 +1024,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
<string name="tip_map_styles">지도 스타일</string>
<string name="about_version">버전:</string>
<string name="about_settings_descr">버전 정보, 라이센스, 프로젝트 멤버</string>
<string name="tips_and_tricks">변경사항</string>
<string name="tips_and_tricks">Tips (도움말)</string>
<string name="about_settings">소개</string>
<string name="local_index_tile_data_zooms">다운로드된 줌 : %1$s</string>
<string name="local_index_tile_data_expire">만료(분) : %1$s</string>
@ -1041,8 +1042,8 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
<string name="driving_region_japan">일본</string>
<string name="driving_region_us">미국</string>
<string name="driving_region_canada">캐나다</string>
<string name="driving_region_europe_asia">아시아 및 유럽</string>
<string name="driving_region_uk">영국, 인도 , 호주 및 기타</string>
<string name="driving_region_europe_asia">한국(아시아 &amp; 유렵)</string>
<string name="driving_region_uk">영국(인도, 호주 및 기타)</string>
<string name="osmodroid_mode_on">OsMoDroid 정지</string>
<string name="osmodroid_mode_off">OsMoDroid 시작</string>
<string name="osmodroid_refresh">채널 새로 고침</string>
@ -1067,7 +1068,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
<string name="lang_sl">슬로베니아어</string>
<string name="lang_cy">웨일스어</string>
<string name="route_preferences">루트 선호도</string>
<string name="guidance_preferences_descr">운행 선호도</string>
<string name="guidance_preferences_descr">길안내 선호도</string>
<string name="disable_complex_routing_descr">자동차 운행에 대한 2길 길찾기(라우팅)을 사용하지 않도록 설정합니다</string>
<string name="app_modes_choose_descr">앱에서 볼 수있는 사용자 프로필를 선택합니다</string>
<string name="map_widget_appearance">나머지 요소 :</string>
@ -1149,7 +1150,7 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다.</string>
<string name="files_limit">%1$d 파일 남음</string>
<string name="install_paid">정식 버전</string>
<string name="cancel_route">루트 해제</string>
<string name="cancel_navigation">운행 정지</string>
<string name="cancel_navigation">길안내 정지</string>
<string name="clear_destination">목적지 지우기</string>
<string name="download_using_mobile_internet">현재 와이파이가 연결되어 있지 않습니다. 현재의 인터넷 연결(3G)을 통해서 계속 다운로드 하시겠습니까?</string>
<string name="street_name">거리</string>
@ -1160,10 +1161,10 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다.</string>
         \n\t* 나침반을 안정화하기 위해 추가 설정
         \n\t* 지도 화면에서 좌상단 버튼는 메뉴버튼을 대체
</string>
<string name="monitoring_settings">트랙로깅 및 절전 모드</string>
<string name="monitoring_settings">트랙로깅 서비스</string>
<string name="monitoring_settings_descr">트랙을 기록하는 방법을 구성하고 절전 모드를 활성화합니다</string>
<string name="osmand_monitoring_plugin_description">절전모드(스크린 끄기)에서 트랙 및 운행 활성화, 주기적으로 GPS 장치를 통해. 표시 설정은 로컬 GPX 파일이나 웹 서비스를 사용하는 온라인에 트랙을 기록하는 설비 가능.</string>
<string name="osmand_monitoring_plugin_name">트랙로깅 및 절전 모드</string>
<string name="osmand_monitoring_plugin_name">트랙로깅 서비스</string>
<string name="osmand_background_plugin_description">주기적으로 GPS 장치를 깨어 통해 절전모드(스크린 끄기)에서 트랙 및 항법을 가능하게 하는 설정 표시.</string>
<string name="choose_osmand_theme_descr">앱 테마(색상)를 선택</string>
<string name="choose_osmand_theme">앱 테마</string>
@ -1316,7 +1317,7 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다.</string>
<string name="use_compass_navigation_descr">GPS로 진행방향이 탐지되지 않을 때 나침반을 사용</string>
<string name="use_compass_navigation">나침반 사용</string>
<string name="avoid_motorway">전용도로 회피</string>
<string name="snap_to_road_descr">운행 중 도로에 위치를 밀착</string>
<string name="snap_to_road_descr">길안내할 동안 차량을 도로에 밀착시킴</string>
<string name="snap_to_road">도로에 밀착</string>
<string name="osmand_play_title_30_chars">OsmAnd 지도 및 네비게이션</string>
<string name="osmand_short_description_80_chars">글로벌 모바일 지도 보기 및 오프라인 및 온라인 OSM지도를 위한 운행</string>
@ -1924,25 +1925,21 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
</string>
<string name="osmo_settings_uuid">고유 장치 id</string>
<string name="osmo_settings_descr">모니터링 설정 및 설정 개인 모니터링 채널을 구성</string>
<string name="osmo_plugin_description">OpenStreetMap-Monitoring - Advanced Live Monitoring. It provides possibilities to track other devices and be tracked.
Create anonymous groups, share each other location and comminucate. It has various settings for session tracking or permanent tracking.
Anonymous groups are limited for a number of days and for some feature, i.e. there is no remote control and group administrator.
Fully functional groups should be created on the website and only registered users have access to them.
Please read more on http://osmo.mobi.</string>
<string name="osmo_plugin_description">"OpenStreetMap 모니터링 - 고급 실시간 모니터링. 다른 장치를 추적하고 추적받는 가능성을 제공 합니다. 익명 그룹을 만들고, 서로의 위치를 공유하고 소통한다. 세션 트래킹 또는 영구 트래킹에 대한 다양한 설정을 합니다. 익명그룹는 수많은 날에 제한되며 일부 기능 즉, 원격 제어 및 그룹 관리자는 제한된다. 완벽하게 기능적인 그룹은 웹사이트에 생성하고 그들에게 등록된 사용자만 액세스할 수 있습니다. 이에 대해서는 http://osmo.mobi를 참조 하십시오."</string>
<string name="osmo_plugin_name">OSMo (고급 라이브 모니터링)</string>
<string name="osmo_settings">OSMo(오스모:OpenStreetMap-Monitoring)</string>
<string name="osmo_settings">OsMo (실시간 친구찾기)</string>
<string name="share_route_as_gpx">GPX 파일로 루트 공유</string>
<string name="share_route_subject">OsmAnd 통해 공유된 루트</string>
<string name="arrival_distance">도착 알림</string>
<string name="arrival_distance_descr">도착 알림을 원하세요 ?</string>
<string name="keep_informing_never">결코</string>
<string name="keep_informing_descr">정기적으로 탐색 지시를 다시 발표</string>
<string name="keep_informing">운행 명령을 반복</string>
<string name="keep_informing">길안내 명령을 반복</string>
<string name="navigation_intent_invalid">잘못된 포맷 : %s</string>
<string name="osmo_io_error">OSMo 연결 문제 : </string>
<string name="osmo_mode_on">OSMo 중지</string>
<string name="osmo_mode_off">OSMo 시작</string>
<string name="osmo_io_error">"OsMo 연결 문제 : "</string>
<string name="osmo_mode_on">OsMo 세션 중지</string>
<string name="osmo_mode_off">OsMo 세션 시작</string>
<string name="share_fav">공유</string>
<string name="share_fav_subject">OsmAnd를 통해 공유된 즐겨찾기</string>
<string name="hours_ago">시간 전</string>
@ -2014,7 +2011,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
<string name="osmo_follow">따라가기</string>
<string name="osmo_sign_in">로그인</string>
<string name="osmo_create_groups_confirm">그룹을 만들려면 OsMo의 사용자 등록이 필요합니다.</string>
<string name="osmo_credentials_not_valid">OsMo 자격 증명이 유효하지 않습니다.</string>
<string name="osmo_credentials_not_valid">OsMo 자격증명이 유효하지 않습니다.</string>
<string name="osmo_regenerate_login_ids_confirm">개인 ID를 재발급 받으시겠습니까? 연결된 모든 장치는 더 이상 트랙을 기록할 수 없습니다.</string>
<string name="osmo_regenerate_login_ids">사용자 ID 재생성</string>
<string name="osmo_cancel_moving_target">이동 목적지 취소</string>
@ -2033,8 +2030,8 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
<string name="selected_track">선택한 트랙</string>
<string name="my_tracks">모든 트랙</string>
<string name="my_favorites">내 즐겨찾기</string>
<string name="my_data_Button">내 데이터</string>
<string name="my_data_activity">내 데이터</string>
<string name="my_data_Button">즐겨찾기</string>
<string name="my_data_activity">즐겨찾기</string>
<string name="gpx_info_subtracks">하위트랙 : %1$s </string>
<string name="gpx_info_distance">거리: %1$s (%2$s points) </string>
<string name="gpx_info_start_time">시작 시간: %1$tF, %1$tR </string>
@ -2098,4 +2095,24 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
<string name="rendering_attr_showSurfaceGrade_name">도로의 품질 표시</string>
<string name="rendering_attr_showSurfaces_name">도로 표면 표시</string>
<string name="rendering_attr_showCycleRoutes_name">자전거 노선 표시하기</string>
</resources>
<string name="keep_navigation_service">계속</string>
<string name="stop_navigation_service">중지</string>
<string name="enable_sleep_mode">절전 모드 활성화</string>
<string name="gps_wake_up_timer">GPS 위치탐색 주기</string>
<string name="sleep_mode_stop_dialog">GPS를 계속 On 할까요?</string>
<string name="map_preferred_locale_descr">지도에 레이블에 대한 선호하는 언어 (사용할 수 없는 경우 영어 또는 지역 이름으로 전환 됩니다 )</string>
<string name="map_preferred_locale">지도, 선호하는 언어</string>
<string name="local_map_names">로컬 이름</string>
<string name="lang_sw">스와힐리어</string>
<string name="lang_he">히브리어</string>
<string name="forward">앞으로</string>
<string name="home"></string>
<string name="live_monitoring_m_descr">GPX 트랙을 기록할 때, 지정된 웹 서비스에 트래킹을 전송합니다.</string>
<string name="live_monitoring_m">온라인 트래킹 (GPX트랙 파일 필요)</string>
<string name="live_monitoring_start">온라인 트래킹 시작</string>
<string name="live_monitoring_stop">온라인 트래킹 중지</string>
<string name="gpx_monitoring_start">GPX 트랙기록 시작</string>
<string name="gpx_monitoring_stop">GPX 트랙기록 중지</string>
<string name="gpx_start_new_segment">새로운 세그먼트 시작</string>
<string name="lang_fa">페르시아어</string>
</resources>

View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
<string name="shared_location">Bendrinta vieta</string>
<string name="osmand_parking_warning">Dėmesio</string>
<string name="osmand_parking_warning_text">Perspėjimas pasiimti automobilį jau buvo įtrauktas į jūsų kalendorių. Perspėjimas ten liks tol, kol jo nepanaikinsite.</string>
@ -1444,10 +1445,10 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
\n\t* Papildomi kompaso stabilizavimo nustatymai
\n\t* Žemėlapio viršutiniame kairiame kampe esantis mygtukas pakeičia Meniu mygtuką
</string>
<string name="monitoring_settings">Sekimo paslaugos ir Miego režimas</string>
<string name="monitoring_settings">Sekimo paslaugos</string>
<string name="monitoring_settings_descr">Nustatykite kaip įrašinėti maršrutus ir įjungti miego režimą</string>
<string name="osmand_monitoring_plugin_description">Įjunkite sekimą ir navigaciją miego režime (išjungus ekraną) periodiškai pažadinant GPC įrenginį. Koreguokite nustatymus, kurie reikalingi įrašant jūsų maršrutus į GPX failą ar sekant interneto pagalba.</string>
<string name="osmand_monitoring_plugin_name">Stebėjimo paslaugos ir Miego režimas</string>
<string name="osmand_monitoring_plugin_name">Stebėjimo paslaugos</string>
<string name="choose_osmand_theme_descr">Pasirinkite išvaizdos temą</string>
<string name="choose_osmand_theme">Išv. tema</string>
<string name="accessibility_options">Prieigos nustatymai</string>
@ -1908,4 +1909,24 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="rendering_attr_showSurfaceGrade_name">Rodyti kelių kokybę</string>
<string name="rendering_attr_showSurfaces_name">Rodyti kelių paviršiaus tipą</string>
<string name="rendering_attr_showCycleRoutes_name">Rodyti dviračiu maršrutus</string>
</resources>
<string name="keep_navigation_service">Išlaikyti</string>
<string name="stop_navigation_service">Stabdyti</string>
<string name="enable_sleep_mode">Įjungti miego režimą</string>
<string name="gps_wake_up_timer">GPS prabudimo intervalas</string>
<string name="sleep_mode_stop_dialog">Palikti GPS įjungtą?</string>
<string name="map_preferred_locale_descr">Pageidaujama kalba užrašams ant žemėlapio (jei jos nėra, užrašai bus rodomi anglų arba vietine kalba)</string>
<string name="map_preferred_locale">Pageidaujama žemėlapio kalba</string>
<string name="local_map_names">Vietiniai pavadinimai</string>
<string name="lang_sw">Svahili</string>
<string name="lang_he">Hebrajų</string>
<string name="forward">Pirmyn</string>
<string name="home">Namo</string>
<string name="live_monitoring_m_descr">Siųsti stebėjomo duomenis į pasirinktą tarnybą kai įjungtas GPX išsaugojimas.</string>
<string name="live_monitoring_m">Sekimas internete (reikalingas GPX)</string>
<string name="live_monitoring_start">Pradėti sekimą internete</string>
<string name="live_monitoring_stop">Stabdyti sekimą internete</string>
<string name="gpx_monitoring_start">Pradėti GPX įrašymą</string>
<string name="gpx_monitoring_stop">Stabdyti GPX įrašymą</string>
<string name="gpx_start_new_segment">Pradėti naują segmentą</string>
<string name="lang_fa">Persų</string>
</resources>

View file

@ -1430,11 +1430,11 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
\n\t* Extra instellingen voor kompasstabilisatie
\n\t* Menuknop vervangen door knop linksboven in het kaartvenster
</string>
<string name="monitoring_settings">Registratiediensten &amp; Slaapmodus</string>
<string name="monitoring_settings">Logboek registratie</string>
<string name="monitoring_settings_descr">Stel in hoe lokaal of via online tracking reizen op te nemen</string>
<string name="osmand_monitoring_plugin_description">Activeren van tracking en navigatie in slaapmodus (scherm uit). De GPS gaat dan regelmatig aan. Toon de instellingen om uw reis vast te leggen als GPX-bestand of online via een webdienst.</string>
<string name="street_name">Straat</string>
<string name="osmand_monitoring_plugin_name">Registratiediensten &amp; Slaapmodus</string>
<string name="osmand_monitoring_plugin_name">Logboek registratie</string>
<string name="choose_osmand_theme_descr">Kies applicatie-thema</string>
<string name="choose_osmand_theme">Applicatie-thema</string>
<string name="accessibility_options">Toegankelijkheidsopties</string>
@ -1724,7 +1724,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="navigation_intent_invalid">ongeldig formaat: %s</string>
<string name="osmo_settings_uuid">Uniek device-ID</string>
<string name="osmo_settings_descr">Configureer monitor instellingen en maak een persoonlijk monitor-kanaal</string>
<string name="osmo_plugin_description">OpenStreetmap-monitoring - Geavanceerde live monitoring. Volg andere toestellen en/of laat jezelf volgen. Maak een anonieme of eigen groep en deel je positie met elkaar. Er zijn verschillende instellingen voor het permanent of tijdelijk volgen. Anonieme groepen kunnen maar een beperkt aantal dagen gebruikt worden en zijn beperkt in de mogelijkheden, zoals het ontbreken van beheer op afstand en een groepsbeheerder. Een eigen groep is niet beperkt. Als geregistreerde gebruiker, maak je eigen groep aan op de de website. Voor meer info, ga naar http://osmo.mobi.</string>
<string name="osmo_plugin_description">OpenStreetmap-monitoring - Geavanceerde live monitoring. Volg andere toestellen en/of laat jezelf volgen. Maak een anonieme of volledig functionele groep en deel je positie. Er zijn verschillende instellingen voor het permanent of tijdelijk volgen. Anonieme groepen kunnen maar een beperkt aantal dagen gebruikt worden en zijn beperkt in de mogelijkheden: zoals het ontbreken van beheer op afstand en een groepsbeheerder. Volledig functionele groepen moeten worden aangemaakt op de website en alleen geregistreerde gebruikers kunnen ze gebruiken. Voor meer info, ga naar http://osmo.mobi.</string>
<string name="osmo_plugin_name">OsMo (geavanceerde live monitoring)</string>
<string name="osmo_settings">OsMo OpenStreetMap Monitoring (beta)</string>
<string name="keep_informing_never">Niet herhalen</string>
@ -1883,33 +1883,35 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="osmo_auth_error_short">Aanmelding mislukt</string>
<string name="osmo_auth_error">OsMo aanmeldings fout: %1$s.\nMogelijk is de service tijdelijk niet beschikbaar of is uw registratie verlopen.\nWilt u verder gaan met een nieuwe registratie.</string>
<string name="rendering_attr_hideBuildings_name">Verberg gebouwen</string>
<string name="rendering_attr_hideNonVehicleHighways_name">Verberg voet- en fietspaden</string>
<string name="rendering_attr_hideNonVehicleHighways_name">Verberg voetpaden</string>
<string name="rendering_attr_hideText_name">Verberg tekst</string>
<string name="rendering_attr_hideWoodScrubs_name">Verberg bossen en beplanting</string>
<string name="rendering_attr_buildings15zoom_name">Gebouwen op zoom 15</string>
<string name="rendering_attr_buildings15zoom_name">Gebouwen op zoomniveau 15</string>
<string name="rendering_attr_moreDetailed_name">Meer details</string>
<string name="rendering_attr_lessDetailed_name">Minder details</string>
<string name="rendering_attr_hideAccess_name">Verberg toegestane gebruik</string>
<string name="rendering_attr_showAccess_name">Toon toegestane gebruik</string>
<string name="rendering_attr_hideAccess_name">Het type toegang verbergen</string>
<string name="rendering_attr_showAccess_name">Het type toegang tonen</string>
<string name="rendering_attr_showSurfaceGrade_name">Toon kwaliteit van wegen</string>
<string name="rendering_attr_showSurfaces_name">Toon wegoppervlak</string>
<string name="rendering_attr_showCycleRoutes_name">Toon fietsroutes</string>
<string name="map_preferred_locale_descr">Gewenste taal voor aanduidingen op de kaart (indien niet beschikbaar worden Engelse of plaatselijke namen getoond)</string>
<string name="map_preferred_locale">Taalkeuze kaart</string>
<string name="map_preferred_locale_descr">Gewenste taal voor aanduidingen op de kaart (indien niet beschikbaar worden Engelse of plaatselijke namen gebruikt)</string>
<string name="map_preferred_locale">Kaart voorkeurstaal</string>
<string name="local_map_names">Plaatselijke namen</string>
<string name="lang_sw">Swahili</string>
<string name="lang_he">Hebreeuws</string>
<string name="forward">Vooruit</string>
<string name="home">Thuis</string>
<string name="live_monitoring_m_descr">Stuur tracking naar een webservice als een GPX-track wordt gemaakt</string>
<string name="live_monitoring_m">Track on line vastleggen (GPX tracking nodig)</string>
<string name="live_monitoring_m">Online tracking (GPX vereist)</string>
<string name="live_monitoring_start">Start online tracking</string>
<string name="live_monitoring_stop">Stop online tracking</string>
<string name="gpx_monitoring_start">GPX-track opnemen</string>
<string name="gpx_monitoring_stop">GPX-track opname stoppen</string>
<string name="gpx_monitoring_start">Start GPX opname</string>
<string name="gpx_monitoring_stop">Stop GPX opname</string>
<string name="gpx_start_new_segment">Start nieuw segment</string>
<string name="keep_navigation_service">Houden</string>
<string name="stop_navigation_service">Stop</string>
<string name="enable_sleep_mode">Slaapstand inschakelen</string>
<string name="gps_wake_up_timer">GPS ontwaak interval</string>
<string name="sleep_mode_stop_dialog">GPS aanlaten?</string>
<string name="lang_fa">Perzisch</string>
</resources>

View file

@ -1199,7 +1199,7 @@
<string name="background_service_is_enabled_question">OsmAnd 休眠模式服務仍在執行。您想要關閉它嗎?</string>
<string name="osmand_play_title_30_chars">OsmAnd 地圖和導航</string>
<string name="osmand_plus_play_title_30_chars">OsmAnd+ 地圖和導航</string>
<string name="native_app_allocated_memory_descr">原生記憶體總計由應用程式 %1$s MB (Dalvik %2$s MB其它 %3$s MB) 。Proportional memory %4$s MB (Android 限制 %5$s MBDalvik %6$ MB)分配佔用。</string>
<string name="native_app_allocated_memory_descr">原生記憶體總計由應用程式 %1$s MB (Dalvik %2$s MB其它 %3$s MB) 。Proportional memory %4$s MB (Android 限制 %5$s MBDalvik %6$s MB)分配佔用。</string>
<string name="context_menu_item_destination_point">設定為目的地</string>
<string name="please_select_address">首先選擇城市或街道</string>
<string name="available_downloads_left">還可下載 %1$d 個檔案</string>

View file

@ -71,8 +71,8 @@ public class RoutingHelper {
private RouteProvider provider = new RouteProvider();
private VoiceRouter voiceRouter;
private boolean makeUturnWhenPossible = false;
private long makeUTwpDetected = 0;
private boolean isDeviatedFromRoute = false;
private long deviateFromRouteDetected = 0;
//private long wrongMovementDetected = 0;
private RouteCalculationProgressCallback progressRoute;
@ -80,11 +80,10 @@ public class RoutingHelper {
// private ProgressBar progress;
// private Handler progressHandler;
public boolean makeUturnWhenPossible() {
return makeUturnWhenPossible;
public boolean isDeviatedFromRoute() {
return isDeviatedFromRoute;
}
public RoutingHelper(OsmandApplication context, CommandPlayer player){
this.app = context;
settings = context.getSettings();
@ -125,7 +124,7 @@ public class RoutingHelper {
public synchronized void clearCurrentRoute(LatLon newFinalLocation, List<LatLon> newIntermediatePoints) {
route = new RouteCalculationResult("");
makeUturnWhenPossible = false;
isDeviatedFromRoute = false;
evalWaitInterval = 3000;
app.runInUIThread(new Runnable() {
@Override
@ -210,11 +209,21 @@ public class RoutingHelper {
public Location setCurrentLocation(Location currentLocation, boolean returnUpdatedLocation) {
return setCurrentLocation(currentLocation, returnUpdatedLocation, route);
}
public double getRouteDeviation(){
if (route == null ||
route.getImmutableAllDirections().size() < 2 ||
route.currentRoute == 0){
return 0;
}
List<Location> routeNodes = route.getImmutableAllLocations();
return getOrthogonalDistance(lastFixedLocation, routeNodes.get(route.currentRoute -1), routeNodes.get(route.currentRoute));
}
private Location setCurrentLocation(Location currentLocation, boolean returnUpdatedLocation, RouteCalculationResult previousRoute) {
Location locationProjection = currentLocation;
if (finalLocation == null || currentLocation == null) {
makeUturnWhenPossible = false;
isDeviatedFromRoute = false;
return locationProjection;
}
float posTolerance = POSITION_TOLERANCE;
@ -261,10 +270,10 @@ public class RoutingHelper {
// don't update in route planing mode
announceGpxWaypoints(currentLocation);
boolean inRecalc = calculateRoute || isRouteBeingCalculated();
if (!inRecalc && !uTurnIsNeeded && !wrongMovementDirection) {
if (!inRecalc && !wrongMovementDirection) {
voiceRouter.updateStatus(currentLocation, false);
} else if (uTurnIsNeeded) {
voiceRouter.makeUTStatus();
} else if(isDeviatedFromRoute){
voiceRouter.interruptRouteCommands();
}
}
@ -463,10 +472,10 @@ public class RoutingHelper {
public boolean identifyUTurnIsNeeded(Location currentLocation, float posTolerance) {
if (finalLocation == null || currentLocation == null || !route.isCalculated()) {
this.makeUturnWhenPossible = false;
return makeUturnWhenPossible;
this.isDeviatedFromRoute = false;
return isDeviatedFromRoute;
}
boolean makeUturnWhenPossible = false;
boolean isOffRoute = false;
if (currentLocation.hasBearing()) {
float bearingMotion = currentLocation.getBearing() ;
Location nextRoutePosition = route.getNextRouteLocation();
@ -479,19 +488,19 @@ public class RoutingHelper {
// 60m tolerance to allow for GPS inaccuracy
if (d > posTolerance) {
// require x sec continuous since first detection
if (makeUTwpDetected == 0) {
makeUTwpDetected = System.currentTimeMillis();
} else if ((System.currentTimeMillis() - makeUTwpDetected > 10000)) {
makeUturnWhenPossible = true;
if (deviateFromRouteDetected == 0) {
deviateFromRouteDetected = System.currentTimeMillis();
} else if ((System.currentTimeMillis() - deviateFromRouteDetected > 10000)) {
isOffRoute = true;
//log.info("bearingMotion is opposite to bearingRoute"); //$NON-NLS-1$
}
}
} else {
makeUTwpDetected = 0;
deviateFromRouteDetected = 0;
}
}
this.makeUturnWhenPossible = makeUturnWhenPossible;
return makeUturnWhenPossible;
this.isDeviatedFromRoute = isOffRoute;
return isOffRoute;
}
/**

View file

@ -201,17 +201,6 @@ public class VoiceRouter {
return currentStatus <= statusToCheck;
}
protected void makeUTStatus() {
// Mechanism via STATUS_UTWP_TOLD: Until turn in the right direction, or route is re-calculated in forward direction
if (currentStatus != STATUS_UTWP_TOLD) {
if (playMakeUTwp()) {
currentStatus = STATUS_UTWP_TOLD;
playGoAheadDist = 0;
}
}
}
public void announceOffRoute(double dist) {
long ms = System.currentTimeMillis();
if(waitAnnouncedOffRoute == 0 || ms - lastAnnouncedOffRoute > waitAnnouncedOffRoute) {
@ -682,7 +671,13 @@ public class VoiceRouter {
player.clear();
}
}
public void interruptRouteCommands() {
if (player != null){
player.stop();
}
}
/**
* Command to wait until voice player is initialized
*/

View file

@ -140,16 +140,36 @@ public class TurnPathHelper {
pathForTurn.rQuadTo(0, -(quadShiftY+th), -b * (quadShiftX+th), -(quadShiftY+th));
pathForTurn.rQuadTo(-b * (quadShiftX+th), 0, -b * (quadShiftX+th), (quadShiftY+th));
pathForTurn.rLineTo(0, sm);
pathForTurn.rLineTo(-b * hpartArrowL, 0);
pathForTurn.rLineTo(b * harrowL/2, harrowL/2); // center
pathForTurn.rLineTo(b * harrowL/2, -harrowL/2);
pathForTurn.rLineTo(-b *hpartArrowL, 0);
pathForTurn.rLineTo(0, -sm);
pathForTurn.rQuadTo(0, -quadShiftX, b *quadShiftX, -quadShiftY);
pathForTurn.rQuadTo(b * quadShiftX, 0, b * quadShiftX, quadShiftY);
pathForTurn.rLineTo(0, h);
} else if (TurnType.OFFR.equals(turnType.getValue())){
int h = (int) (ha - hpartArrowL - 16);
pathForTurn.rMoveTo(th, 0); //12 0
//first square
pathForTurn.rLineTo(0, -h / 4); //0 -7
pathForTurn.rLineTo(-th, 0); //-12 0
pathForTurn.rLineTo(0, h / 4); //0 7
pathForTurn.rLineTo(th, 0); //12 0
pathForTurn.rMoveTo(0, -h / 2); //12 0
//second square
pathForTurn.rLineTo(0, -h / 4); //0 -7
pathForTurn.rLineTo(-th, 0); //-12 0
pathForTurn.rLineTo(0, h / 4); //0 7
pathForTurn.rLineTo(th, 0); //12 0
pathForTurn.rMoveTo(0, -h / 2 + 1); //31 0
//arrow
pathForTurn.rLineTo(hpartArrowL, 0); //9 0
pathForTurn.rLineTo(-harrowL / 2, -harrowL / 2); // center -15 -15
pathForTurn.rLineTo(-harrowL / 2, harrowL / 2); // -15 15
pathForTurn.rLineTo(hpartArrowL + th, 0); //9 0
} else if (turnType != null && turnType.isRoundAbout()) {
float t = turnType.getTurnAngle();
if (t >= 170 && t < 220) {

View file

@ -1,6 +1,7 @@
package net.osmand.plus.views.mapwidgets;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.views.MapInfoLayer;
import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
@ -22,6 +23,8 @@ public class NextTurnInfoWidget extends BaseMapWidget {
private float height ;
private static final float miniCoeff = 2.5f;
protected double deviatedPath = 0;
protected Path pathForTurn = new Path();
protected TurnType turnType = null;
@ -34,7 +37,7 @@ public class NextTurnInfoWidget extends BaseMapWidget {
private Paint paintBlack;
private Paint paintRouteDirection;
protected boolean makeUturnWhenPossible;
protected boolean deviatedFromRoute;
protected int turnImminent;
protected boolean horisontalMini;
@ -94,7 +97,10 @@ public class NextTurnInfoWidget extends BaseMapWidget {
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
if (pathForTurn != null) {
if (turnImminent > 0) {
//if user deviates from route that we should draw grey arrow
if (deviatedFromRoute){
paintRouteDirection.setColor(getResources().getColor(R.color.nav_arrow_distant));
} else if (turnImminent > 0) {
paintRouteDirection.setColor(getResources().getColor(R.color.nav_arrow));
} else if (turnImminent == 0) {
paintRouteDirection.setColor(getResources().getColor(R.color.nav_arrow_imminent));
@ -105,15 +111,15 @@ public class NextTurnInfoWidget extends BaseMapWidget {
canvas.translate(0, 3 * scaleCoefficient);
canvas.drawPath(pathForTurn, paintRouteDirection);
canvas.drawPath(pathForTurn, paintBlack);
if (exitOut != null && !horisontalMini && !makeUturnWhenPossible) {
if (exitOut != null && !horisontalMini && !deviatedFromRoute) {
drawShadowText(canvas, exitOut, width / 2 - 7 * scaleCoefficient,
height / 2 + textPaint.getTextSize() / 2 - 3 * scaleCoefficient, textPaint);
}
String text = OsmAndFormatter.getFormattedDistance(nextTurnDirection, getClientContext());
String subtext = null;
if (makeUturnWhenPossible) {
text = getResources().getString(R.string.asap);
if (deviatedFromRoute) {
text = OsmAndFormatter.getFormattedDistance((float) deviatedPath, (OsmandApplication)getContext().getApplicationContext());
}
int ls = text.lastIndexOf(' ');

View file

@ -60,12 +60,13 @@ public class RouteInfoWidgetsFactory {
boolean visible = false;
boolean followingMode = routingHelper.isFollowingMode() || ctx.getLocationProvider().getLocationSimulation().isRouteAnimating();
if (routingHelper != null && routingHelper.isRouteCalculated() && followingMode) {
makeUturnWhenPossible = routingHelper.makeUturnWhenPossible() ;
if (makeUturnWhenPossible) {
deviatedFromRoute = routingHelper.isDeviatedFromRoute() ;
if (deviatedFromRoute) {
visible = true;
turnImminent = 0;
turnType = TurnType.valueOf(TurnType.TU, settings.DRIVING_REGION.get().leftHandDriving);
turnType = TurnType.valueOf(TurnType.OFFR, settings.DRIVING_REGION.get().leftHandDriving);
TurnPathHelper.calcTurnPath(pathForTurn, turnType, pathTransform);
deviatedPath = routingHelper.getRouteDeviation();
invalidate();
} else {
boolean showStraight = false;
@ -147,9 +148,9 @@ public class RouteInfoWidgetsFactory {
boolean visible = false;
boolean followingMode = routingHelper.isFollowingMode() || ctx.getLocationProvider().getLocationSimulation().isRouteAnimating();
if (routingHelper != null && routingHelper.isRouteCalculated() && followingMode) {
boolean uturnWhenPossible = routingHelper.makeUturnWhenPossible() ;
boolean devitedFromRoute = routingHelper.isDeviatedFromRoute() ;
NextDirectionInfo r = routingHelper.getNextRouteDirectionInfo(calc1, true);
if (!uturnWhenPossible) {
if (!devitedFromRoute) {
if (r != null) {
// next turn is very close (show next next with false to speak)
// if (r.imminent >= 0 && r.imminent < 2) {

View file

@ -21,4 +21,6 @@ public interface CommandPlayer {
public String getLanguage();
public boolean supportsStructuredStreetNames();
public void stop();
}

View file

@ -43,7 +43,17 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer implemen
super.clear();
mediaPlayer = null;
}
@Override
public void stop(){
if (filesToPlay != null){
filesToPlay.clear();
}
if (mediaPlayer != null){
mediaPlayer.stop();
}
}
// Called from the calculating route thread.
@Override
public synchronized void playCommands(CommandBuilder builder) {

View file

@ -111,6 +111,13 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
}
}
@Override
public void stop(){
if (mTts != null){
mTts.stop();
}
}
public void sendAlertToPebble(String message) {
final Intent i = new Intent("com.getpebble.action.SEND_NOTIFICATION");
final Map<String, Object> data = new HashMap<String, Object>();