Merge branch 'master' of ssh://github.com/osmandapp/Osmand into Fix_6523
This commit is contained in:
Chumva
commit
4a8bf89556
25 changed files with 219 additions and 29 deletions
|
|
@ -40,6 +40,7 @@ public interface OsmAndCustomizationConstants {
|
|||
String RECORDING_LAYER = SHOW_ITEMS_ID_SCHEME + "recording_layer";
|
||||
String MAPILLARY = SHOW_ITEMS_ID_SCHEME + "mapillary";
|
||||
String OSM_NOTES = SHOW_ITEMS_ID_SCHEME + "osm_notes";
|
||||
String OSM_EDITS = SHOW_ITEMS_ID_SCHEME + "osm_edits";
|
||||
String OVERLAY_MAP = SHOW_ITEMS_ID_SCHEME + "overlay_map";
|
||||
String UNDERLAY_MAP = SHOW_ITEMS_ID_SCHEME + "underlay_map";
|
||||
String CONTOUR_LINES = SHOW_ITEMS_ID_SCHEME + "contour_lines";
|
||||
|
|
|
|||
|
|
@ -457,6 +457,7 @@
|
|||
android:layout_width="@dimen/map_address_height"
|
||||
android:layout_height="@dimen/map_address_height"
|
||||
android:background="@drawable/btn_circle_transparent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:src="@drawable/ic_overflow_menu_white"/>
|
||||
|
||||
<ImageButton
|
||||
|
|
@ -465,6 +466,7 @@
|
|||
android:layout_width="@dimen/map_address_height"
|
||||
android:layout_height="@dimen/map_address_height"
|
||||
android:background="@drawable/btn_circle_transparent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:src="@drawable/ic_action_test_light"/>
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
|
|
|||
|
|
@ -3371,4 +3371,8 @@ Abgedeckte Fläche: %1$s x %2$s</string>
|
|||
\n • Weitere Fehlerlösungen
|
||||
\n
|
||||
\n</string>
|
||||
<string name="apply_preference_to_all_profiles">Sie können diese Änderung auf alle oder nur auf ausgewählte Profile anwenden.</string>
|
||||
<string name="shared_preference">Geteilt</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">Unbefestigte Straßen bevorzugen</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">Unbefestigte Straßen bevorzugen.</string>
|
||||
</resources>
|
||||
|
|
@ -3346,4 +3346,8 @@ Indikas lokon: %1$s x %2$s"</string>
|
|||
\n• riparoj de aliaj eraroj
|
||||
\n
|
||||
\n"</string>
|
||||
<string name="apply_preference_to_all_profiles">Vi povas apliki tiun ĉi ŝanĝon al ĉiuj profiloj aŭ nur al la elektitaj.</string>
|
||||
<string name="shared_preference">Komuna</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">Preferi tervojojn</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">Preferi vojojn sen firma pavimo.</string>
|
||||
</resources>
|
||||
|
|
@ -3365,4 +3365,8 @@ Lon %2$s</string>
|
|||
\n • Otras correcciones de errores
|
||||
\n
|
||||
\n</string>
|
||||
<string name="apply_preference_to_all_profiles">Puedes aplicar este cambio a todos los perfiles o sólo a los marcados.</string>
|
||||
<string name="shared_preference">Compartido</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">Preferir caminos sin pavimentar</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">Prefiere caminos sin pavimentar.</string>
|
||||
</resources>
|
||||
|
|
@ -3366,4 +3366,8 @@ Lon %2$s</string>
|
|||
\n • Otras correcciones de errores
|
||||
\n
|
||||
\n</string>
|
||||
<string name="apply_preference_to_all_profiles">Puedes aplicar este cambio a todos los perfiles o sólo a los marcados.</string>
|
||||
<string name="shared_preference">Compartido</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">Preferir caminos sin pavimentar</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">Prefiere caminos sin pavimentar.</string>
|
||||
</resources>
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
<string name="poi_service_tyres">پنچرگیری</string>
|
||||
<string name="poi_vehicle_inspection">معاینه فنی خودرو</string>
|
||||
<string name="poi_car_wash">کارواش</string>
|
||||
<string name="poi_fuel">پمپ بنزین; جایگاه سوخت; جایگاه سوخت‌گیری; جایگاه</string>
|
||||
<string name="poi_fuel">پمپ بنزین; جایگاه سوخت; جایگاه سوخت‌گیری</string>
|
||||
<string name="poi_electricity_combined_charging">ایستگاه شارژ</string>
|
||||
<string name="poi_vehicle_ramp">سطح شیب دار خودرو</string>
|
||||
<string name="poi_compressed_air">هوای فشرده</string>
|
||||
|
|
@ -665,7 +665,7 @@
|
|||
<string name="poi_aerialway_bicycle">حمل‌ونقل دوچرخه</string>
|
||||
<string name="poi_aerialway_heating">گرمایش</string>
|
||||
<string name="poi_pump">پنجرگیری دوچرخه</string>
|
||||
<string name="poi_observatory_designation">رصدخانه</string>
|
||||
<string name="poi_observatory_designation"></string>
|
||||
<string name="poi_pharmacy_dispensing">داروخانه</string>
|
||||
<string name="poi_star_rating">رتبه‌بندی ستاره‌ای</string>
|
||||
<string name="poi_clock_option">تنظیمات ساعت</string>
|
||||
|
|
@ -754,7 +754,7 @@
|
|||
<string name="poi_emergency">اورژانس</string>
|
||||
<string name="poi_transportation">حمل و نقل</string>
|
||||
<string name="poi_road_obstacle">مانع جاده</string>
|
||||
<string name="poi_filling_station">پمپ بنزین</string>
|
||||
<string name="poi_filling_station">جایگاه سوخت</string>
|
||||
<string name="poi_animal_shelter_type">حیوانات مجاز</string>
|
||||
<string name="poi_personal_transport">حمل و نقل شخصی</string>
|
||||
<string name="poi_public_transport">حمل و نقل عمومی</string>
|
||||
|
|
|
|||
|
|
@ -39,13 +39,13 @@
|
|||
<string name="stop_routing_confirm">آیا ناوبری را قطع می‌کنید؟</string>
|
||||
<string name="clear_dest_confirm">آیا از پاک‌کردن مقصد (و مقصدهای میانی) مطمئن هستید؟</string>
|
||||
<string name="intermediate_points_change_order">تغییر ترتیب</string>
|
||||
<string name="av_def_action_video">ضبط ویدئو</string>
|
||||
<string name="av_def_action_audio">ضبط صدا</string>
|
||||
<string name="av_def_action_video">فیلم‌برداری</string>
|
||||
<string name="av_def_action_audio">صدابرداری</string>
|
||||
<string name="av_video_format_descr">قالب خروجی ویدئو را انتخاب کنید.</string>
|
||||
<string name="av_video_format">قالب خروجی ویدئو</string>
|
||||
<string name="av_settings">تنظیمات صدا/ویدئو</string>
|
||||
<string name="av_use_external_recorder">استفاده از ضبط‌کنندهٔ سیستم</string>
|
||||
<string name="av_use_external_camera_descr">برای عکس‌گرفتن از برنامهٔ خود دستگاه استفاده شود.</string>
|
||||
<string name="av_use_external_camera_descr">برای عکس‌برداری از برنامهٔ سیستم استفاده شود.</string>
|
||||
<string name="av_use_external_camera">از برنامهٔ دوربین استفاده کن</string>
|
||||
<string name="av_settings_descr">تنظیمات صدا و ویدئو را پیکربندی کنید.</string>
|
||||
<string name="recording_error">ضبط ناموفق بود</string>
|
||||
|
|
@ -166,7 +166,7 @@
|
|||
<string name="cancel_route">حذف مسیر</string>
|
||||
<string name="max_speed_none">هیچ‌کدام</string>
|
||||
<string name="dropbox_plugin_name">افزونهٔ دراپ‌باکس</string>
|
||||
<string name="av_use_external_recorder_descr">برای ویدئو از ضبط‌کنندهٔ خود دستگاه استفاده شود.</string>
|
||||
<string name="av_use_external_recorder_descr">برای فیلم‌برداری از ضبط‌کنندهٔ سیستم استفاده شود.</string>
|
||||
<string name="recording_open_external_player">بازکردن پخش‌کنندهٔ خارجی</string>
|
||||
<string name="recording_unavailable">موجود نیست</string>
|
||||
<string name="map_widget_distancemeasurement">اندازه‌گیری مسافت</string>
|
||||
|
|
@ -523,7 +523,7 @@
|
|||
<string name="local_indexes_cat_srtm">منحنی‌های میزان</string>
|
||||
<string name="precise_routing_mode_descr">محاسبهٔ مسیرهایی دقیق و بدون اشکال. البته این حالت محدودیت مسافت دارد و کُند است.</string>
|
||||
<string name="recording_context_menu_show">نشان بده</string>
|
||||
<string name="av_def_action_picture">عکس‌گرفتن</string>
|
||||
<string name="av_def_action_picture">عکس‌برداری</string>
|
||||
<string name="recording_context_menu_precord">یادداشت عکسی</string>
|
||||
<string name="dropbox_plugin_description">با افزونهٔ دراپ‌باکس ردها و یادداشت‌های صوتی/تصویری را با حساب دراپ‌باکس خود همگام کنید.</string>
|
||||
<string name="srtm_paid_version_msg">لطفاً افزونهٔ منحنی‌های میزان را بخرید تا به توسعهٔ بیشتر نرم‌افزار کمک کنید.</string>
|
||||
|
|
@ -578,7 +578,7 @@
|
|||
<string name="settings_preset">پروفایل پیش‌فرض</string>
|
||||
<string name="settings_preset_descr">نمای نقشه و تنظیمات ناوبری برای هر پروفایل جداگانه ذخیره می‌شود. پروفایل پیش‌فرض خود را اینجا تنظیم کنید.</string>
|
||||
<string name="osmand_background_plugin_description">تنظیمات مربوط به فعال‌سازی ردگیری و ناوبری در پس‌زمینه را نشان می‌دهد که با ارسال پیام‌های بیدارباش متناوب به جی‌پی‌اس دستگاه این کار را انجام می‌دهد (با نمایشگر خاموش).</string>
|
||||
<string name="av_def_action_choose">انتخاب برحسب تقاضا</string>
|
||||
<string name="av_def_action_choose">انتخاب هنگام استفاده</string>
|
||||
<string name="audionotes_location_not_defined">مکانی برای یادداشت‌گذاری تعیین نشده.
|
||||
\nمکانی را مشخص و از منوی زمینه اقدام کنید.</string>
|
||||
<string name="rendering_attr_showRoadMaps_description">انتخاب کنید نقشه‌های فقط-جاده چه زمانی نشان داده شود:</string>
|
||||
|
|
@ -586,14 +586,14 @@
|
|||
<string name="ending_point_too_far">نقطهٔ پایانی از نزدیک‌ترین جاده خیلی دور است.</string>
|
||||
<string name="map_widget_vector_attributes">خصوصیات رندر نقشه</string>
|
||||
<string name="av_photo_play_sound_descr">هنگام عکس‌برداری صدای شاتر پخش شود یا خیر.</string>
|
||||
<string name="av_camera_focus">نوع فوکوس دوربین</string>
|
||||
<string name="av_camera_focus_descr">نوع فوکوس داخلی دوربین را انتخاب کنید.</string>
|
||||
<string name="av_camera_focus">شیوهٔ فوکوس دوربین</string>
|
||||
<string name="av_camera_focus_descr">حالت فوکوس داخلی دوربین را انتخاب کنید.</string>
|
||||
<string name="av_camera_focus_auto">خودکار</string>
|
||||
<string name="av_camera_focus_hiperfocal">فراکانونی</string>
|
||||
<string name="av_camera_focus_edof">عمق میدان گسترده (EDOF)</string>
|
||||
<string name="av_camera_focus_infinity">روی بینهایت تنظیم شده</string>
|
||||
<string name="av_camera_focus_infinity">تنظیم روی بینهایت</string>
|
||||
<string name="av_camera_focus_macro">حالت ماکرو (از نزدیک)</string>
|
||||
<string name="av_camera_focus_continuous">دوربین پیوسته فوکوس را تنظیم می‌کند</string>
|
||||
<string name="av_camera_focus_continuous">دوربین فوکوس را پیوسته تنظیم کند</string>
|
||||
<string name="choose_intersected_street">تقاطع را انتخاب کنید</string>
|
||||
<string name="osm_settings">ویرایش نقشهٔ OSM</string>
|
||||
<string name="save_current_track_descr">رد جاری را همین حالا در قالب فایل GPX ذخیره کن.</string>
|
||||
|
|
@ -3405,4 +3405,8 @@
|
|||
\n• اصلاح سایر باگ‌ها
|
||||
\n
|
||||
\n"</string>
|
||||
<string name="apply_preference_to_all_profiles">این تنظیم را می‌توانید بر همهٔ پروفایل‌ها یا فقط بر پروفایل انتخاب‌شده به کار ببندید.</string>
|
||||
<string name="shared_preference">مشترک</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">ترجیح جاده‌های روسازی‌نشده</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">جاده‌های روسازی‌نشده را ترجیح می‌دهم.</string>
|
||||
</resources>
|
||||
|
|
@ -626,8 +626,8 @@
|
|||
<string name="shared_string_help">Aide</string>
|
||||
<string name="accessibility_mode">Mode accessibilité</string>
|
||||
<string name="accessibility_mode_descr">Active les fonctionnalités d\'accessibilité.</string>
|
||||
<string name="shared_string_on">Oui</string>
|
||||
<string name="shared_string_off">Non</string>
|
||||
<string name="shared_string_on">Actif</string>
|
||||
<string name="shared_string_off">Inactif</string>
|
||||
<string name="accessibility_default">Selon les paramètres Android</string>
|
||||
<string name="backToMenu">Retour au menu</string>
|
||||
<string name="zoomOut">Zoom -</string>
|
||||
|
|
@ -3333,4 +3333,8 @@ représentant la zone : %1$s x %2$s</string>
|
|||
\n • Other bug fixes
|
||||
\n
|
||||
\n</string>
|
||||
<string name="apply_preference_to_all_profiles">Vous pouvez appliquer cette modification à tous les profils ou uniquement aux profils sélectionnés.</string>
|
||||
<string name="shared_preference">Partagé</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">Privilégier les routes non pavées</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">Privilégier les routes non pavées.</string>
|
||||
</resources>
|
||||
|
|
@ -3720,4 +3720,5 @@
|
|||
<string name="poi_craft_cabinet_maker">Ebanista</string>
|
||||
<string name="poi_charge">Carga</string>
|
||||
<string name="poi_pet_grooming">Coidado de mascotas</string>
|
||||
<string name="poi_atm_yes">Caixeiro automático: si</string>
|
||||
</resources>
|
||||
|
|
@ -3372,5 +3372,42 @@ Lon %2$s</string>
|
|||
<string name="shared_string_memory_tb_desc">%1$s TB</string>
|
||||
<string name="shared_string_memory_gb_desc">%1$s GB</string>
|
||||
<string name="shared_string_memory_mb_desc">%1$s MB</string>
|
||||
<string name="shared_string_memory_kb_desc">%1$s KB</string>
|
||||
<string name="shared_string_memory_kb_desc">%1$s kB</string>
|
||||
<string name="data_storage_preference_summary">%1$s • %2$s</string>
|
||||
<string name="data_storage_space_description">Libre %1$s GB • Total %2$s GB</string>
|
||||
<string name="track_storage_directory">Cartafol de almacenamento de pistas</string>
|
||||
<string name="track_storage_directory_descrp">As pistas poden almacenarse nun cartafol de gravación, en cartafoles mensuais ou diarios.</string>
|
||||
<string name="store_tracks_in_rec_directory">Almacenar as pistas gravadas no cartafol de gravación</string>
|
||||
<string name="store_tracks_in_daily_directories">Almacenar as pistas gravadas en cartafoles diarios</string>
|
||||
<string name="store_tracks_in_daily_directories_descrp">Almacena as pistas gravadas en subcartafoles por día de gravación (coma 2018-01-01).</string>
|
||||
<string name="shared_string_memory_used_tb_desc">Usado %1$s TB</string>
|
||||
<string name="shared_string_memory_used_gb_desc">Usado %1$s GB</string>
|
||||
<string name="shared_string_memory_used_mb_desc">Usado %1$s GB</string>
|
||||
<string name="shared_string_memory_used_kb_desc">Usado %1$s kB</string>
|
||||
<string name="contour_lines_and_hillshade">Curvas do nivel e Sombras do relevo</string>
|
||||
<string name="routing_attr_prefer_unpaved_name">Preferir estradas sen pavementar</string>
|
||||
<string name="routing_attr_prefer_unpaved_description">Preferir estradas sen pavementar.</string>
|
||||
<string name="update_all_maps">Actualizar todos os mapas</string>
|
||||
<string name="update_all_maps_q">Actualizar todos os mapas (%1$d)\?</string>
|
||||
<string name="release_3_5">• Axustes da aplicación e do perfil actualizados. Cómoda distribución dos axustes por tipo e posibilidade de personalizar cada perfil
|
||||
\n
|
||||
\n • Novo cadro de diálogo de descarga de mapas que suxire un mapa para baixar mentras se procura un
|
||||
\n
|
||||
\n • Arranxos no tema de noite
|
||||
\n
|
||||
\n • Corrixíronse algúns problemas de enrutamento en todo o mundo
|
||||
\n
|
||||
\n • Actualizouse o mapa de base con máis detalles na rede de estradas
|
||||
\n
|
||||
\n • Corrixíronse as zonas inundadas en todo o mundo
|
||||
\n
|
||||
\n • Enrutamento de esquí: perfil de altura e complexidade da ruta engadidos ós detalles da ruta
|
||||
\n
|
||||
\n • Outras correccións de erros
|
||||
\n
|
||||
\n</string>
|
||||
<string name="apply_preference_to_all_profiles">Podes aplicar esta mudanza a todos os perfís ou só ós escollidos.</string>
|
||||
<string name="shared_preference">Compartillado</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">Preferir estradas sen pavementar</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">Preferir estradas sen pavementar.</string>
|
||||
</resources>
|
||||
|
|
@ -3334,4 +3334,25 @@
|
|||
<string name="store_tracks_in_rec_directory">אחסון מסלולים שהוקלטו בתיקיית rec</string>
|
||||
<string name="store_tracks_in_daily_directories">אחסון מסלולים שהוקלטו בתיקיות יומיות</string>
|
||||
<string name="store_tracks_in_daily_directories_descrp">אחסון מסלולים שהוקלטו בתת־תיקיות לפי יום ההקלטה (למשל: 2019-01-01).</string>
|
||||
<string name="release_3_5">• הגדרות הפרופיל של היישומון עודכנו: מעתה ההגדרות מסודרות לפי סוג. ניתן להתאים כל פרופיל בנפרד.
|
||||
\n
|
||||
\n • חלונית הורדת מפה חדשה שמציעה להוריד מפה בזמן עיון
|
||||
\n
|
||||
\n • תיקונים לערכת העיצוב הלילית
|
||||
\n
|
||||
\n • תוקנו בעיות ניווט ברחבי העולם
|
||||
\n
|
||||
\n • בסיס המפה עודכן לשיפור פירוט רשת הכבישים
|
||||
\n
|
||||
\n • שיפור מיפוי האזורים המוצפים ברחבי העולם
|
||||
\n
|
||||
\n • ניווט סקי: נוספו פרופיל גובה ומורכבות מסלול לפרטי המסלול
|
||||
\n
|
||||
\n • תיקוני תקלות נוספים
|
||||
\n
|
||||
\n</string>
|
||||
<string name="apply_preference_to_all_profiles">ניתן להחיל את השינוי הזה לכל הפרופילים או רק לאלו שנבחרו.</string>
|
||||
<string name="shared_preference">משותף</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">להעדיף דרכים לא סלולות</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">להעדיף דרכים לא סלולות.</string>
|
||||
</resources>
|
||||
|
|
@ -3371,4 +3371,13 @@ POIの更新は利用できません</string>
|
|||
<string name="screen_alerts">画面アラート</string>
|
||||
<string name="route_parameters_descr">ルートパラメーターの構成</string>
|
||||
<string name="route_parameters">ルートパラメーター</string>
|
||||
<string name="gpx_join_gaps">ギャップを埋める</string>
|
||||
<string name="app_mode_wagon">ワゴン車</string>
|
||||
<string name="app_mode_pickup_truck">ピックアップトラック</string>
|
||||
<string name="years_5">年</string>
|
||||
<string name="cancel_subscription">サブスクリプションの解除</string>
|
||||
<string name="apply_preference_to_all_profiles">ここでなされた変更は、すべてのプロファイルまたは選択したプロファイルのみにも適用できます。</string>
|
||||
<string name="shared_preference">シェア</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">未舗装道路を優先</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">未舗装道路を優先してルートを検索します。</string>
|
||||
</resources>
|
||||
|
|
@ -296,4 +296,31 @@
|
|||
<string name="rendering_attr_highway_class_track_grade3_name">အဆင့် ၃</string>
|
||||
<string name="rendering_attr_highway_class_track_grade4_name">အဆင့် ၄</string>
|
||||
<string name="rendering_attr_highway_class_track_grade5_name">အဆင့် ၅</string>
|
||||
<string name="osm_live_plan_pricing">အစီအစဉ် & စျေးနှုန်း</string>
|
||||
<string name="osm_live_payment_monthly_title">လစဉ်</string>
|
||||
<string name="osm_live_payment_3_months_title">သုံးလတစ်ကြိမ်</string>
|
||||
<string name="osm_live_payment_annual_title">နှစ်စဉ်</string>
|
||||
<string name="osm_live_payment_month_cost_descr">%1$s / လ</string>
|
||||
<string name="osm_live_payment_current_subscription">လက်ရှိကြေးပေးသွင်းခြင်း</string>
|
||||
<string name="osm_live_payment_renews_monthly">လစဉ်သက်တမ်းတိုး</string>
|
||||
<string name="osm_live_payment_renews_quarterly">သုံးလတစ်ကြိမ်သက်တမ်းတိုး</string>
|
||||
<string name="osm_live_payment_renews_annually">နှစ်စဉ်သက်တမ်းတိုး</string>
|
||||
<string name="osm_live_payment_header">သင့်အတွက်အဆင်ပြေမည့်ငွေပေးချေမှုကာလကိုရွေးချယ်ပါ။</string>
|
||||
<string name="osm_live_payment_contribute_descr">၀င်ငွေ၏တစိတ်တပိုင်းသည် OpenStreetMap ထောက်ပံ့သူများထံသို့သွားသည်။</string>
|
||||
<string name="powered_by_osmand">OsmAnd မှ</string>
|
||||
<string name="swap_start_and_destination">ခရီးအစနဲ့အဆုံးပြောင်း</string>
|
||||
<string name="add_destination_point">ဦး တည်ရာကိုထည့်ပါ</string>
|
||||
<string name="add_intermediate_point">ကြားရပ်နေရာထည့်ပါ</string>
|
||||
<string name="add_start_point">အစနေရာထည့်ပါ</string>
|
||||
<string name="intermediate_waypoint">ကြားရပ်နေရာ</string>
|
||||
<string name="on_foot">ခြေလျင်</string>
|
||||
<string name="route_way">လမ်း</string>
|
||||
<string name="points_of_interests">စိတ်ဝင်စားဖွယ်နေရာများ</string>
|
||||
<string name="waiting_for_route_calculation">လမ်းကြောင်းကိုတွက်ချက်မြည်…</string>
|
||||
<string name="app_mode_public_transport">ပြည်သူပို့ဆောင်ရေး</string>
|
||||
<string name="avoid_roads_descr">ရှောင်သွားလိုသည့်လမ်းကြောင်းကိုမြေပုံပေါ် (သို့) အောက်ပါစာရင်းမှရွေးချယ်ပါ။</string>
|
||||
<string name="show_along_the_route">လမ်းကြောင်းတစ်လျှောက်ပြ</string>
|
||||
<string name="choose_track_file_to_follow">အသုံးပြုချင်သောလမ်းကြောင်းဖိုင်ရွေးပါ</string>
|
||||
<string name="voice_announcements">အသံကြေငြာချက်များ</string>
|
||||
<string name="intermediate_destinations">ကြားရပ်နေရာများ</string>
|
||||
</resources>
|
||||
|
|
@ -3351,4 +3351,8 @@ Pôr do Sol: %2$s</string>
|
|||
\n • Outras correções de bugs
|
||||
\n
|
||||
\n"</string>
|
||||
<string name="apply_preference_to_all_profiles">Você pode aplicar essa alteração a todos os perfis ou apenas aos selecionados.</string>
|
||||
<string name="shared_preference">Compartilhado</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">Preferir estradas não pavimentadas</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">Preferir estradas não pavimentadas.</string>
|
||||
</resources>
|
||||
|
|
@ -2136,9 +2136,7 @@
|
|||
\nDê-nos a sua opinião</string>
|
||||
<string name="commiting_way">Cometendo caminho…</string>
|
||||
<string name="increase_search_radius_to">Aumentar o raio de pesquisa para %1$s</string>
|
||||
<string name="send_search_query_description">Enviaremos a sua consulta de pesquisa: <b>\"%1$s\"</b> e a sua localização.<br/>
|
||||
<br/> Nenhuma informação pessoal é recolhida. Os dados de pesquisa só servem para melhorar o algoritmo de pesquisa.<br/>
|
||||
</string>
|
||||
<string name="send_search_query_description"> string name=\"lat_lon_pattern\">Lat: %1$.5f Lon: %2$.5f</string </string>
|
||||
<string name="send_search_query">Enviar a consulta de pesquisa?</string>
|
||||
<string name="shared_string_world">Mundo</string>
|
||||
<string name="point_deleted">Ponto %1$s eliminado</string>
|
||||
|
|
@ -3362,4 +3360,8 @@
|
|||
\n - Outras correções de bugs
|
||||
\n
|
||||
\n"</string>
|
||||
<string name="apply_preference_to_all_profiles">Pode aplicar essa modificação a todos os perfis ou apenas aos selecionados.</string>
|
||||
<string name="shared_preference">Partilhado</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">Preferir estradas não pavimentadas</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">Preferir estradas não pavimentadas.</string>
|
||||
</resources>
|
||||
|
|
@ -3319,4 +3319,6 @@
|
|||
<string name="routing_attr_prefer_unpaved_name">Предпочитать грунтовые дороги</string>
|
||||
<string name="routing_attr_prefer_unpaved_description">Предпочитать грунтовые дороги.</string>
|
||||
<string name="update_all_maps_q">Вы уверены, что хотите обновить все карты (%1$d)\?</string>
|
||||
<string name="apply_preference_to_all_profiles">Вы можете применить это изменение ко всем профилям или только к выбранным.</string>
|
||||
<string name="shared_preference">Общий</string>
|
||||
</resources>
|
||||
|
|
@ -3354,4 +3354,8 @@
|
|||
\n • 其他臭蟲修復
|
||||
\n
|
||||
\n</string>
|
||||
<string name="apply_preference_to_all_profiles">您可以套用此變更到所有設定或只套用到選定的。</string>
|
||||
<string name="shared_preference">共享</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">偏好未鋪設的路面</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">偏好未鋪設的路面。</string>
|
||||
</resources>
|
||||
|
|
@ -11,6 +11,7 @@
|
|||
Thx - Hardy
|
||||
|
||||
-->
|
||||
<string name="layer_osm_edits">OSM Edits</string>
|
||||
<string name="quick_action_contour_lines_descr">Tapping this action button shows or hides contour lines on the map</string>
|
||||
<string name="quick_action_contour_lines_show">Show contour lines</string>
|
||||
<string name="quick_action_contour_lines_hide">Hide contour lines</string>
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
android:icon="@drawable/ic_action_notification"
|
||||
android:key="do_not_show_startup_messages"
|
||||
android:layout="@layout/preference_switch_with_descr"
|
||||
android:persistent="false"
|
||||
android:summaryOff="@string/shared_string_off"
|
||||
android:summaryOn="@string/shared_string_on"
|
||||
android:title="@string/start_up_message_pref" />
|
||||
|
|
|
|||
|
|
@ -1391,7 +1391,7 @@ public class OsmandSettings {
|
|||
public final OsmandPreference<Integer> SEND_ANONYMOUS_DATA_REQUESTS_COUNT = new IntPreference("send_anonymous_data_requests_count", 0).makeGlobal().cache();
|
||||
public final OsmandPreference<Integer> SEND_ANONYMOUS_DATA_LAST_REQUEST_NS = new IntPreference("send_anonymous_data_last_request_ns", -1).makeGlobal().cache();
|
||||
|
||||
public final OsmandPreference<Boolean> MAP_EMPTY_STATE_ALLOWED = new BooleanPreference("map_empty_state_allowed", true).makeProfile().makeGeneral().cache();
|
||||
public final OsmandPreference<Boolean> MAP_EMPTY_STATE_ALLOWED = new BooleanPreference("map_empty_state_allowed", false).makeProfile().makeGeneral().cache();
|
||||
|
||||
|
||||
public final CommonPreference<Float> TEXT_SCALE = new FloatPreference("text_scale", 1f).makeProfile().cache();
|
||||
|
|
@ -1707,6 +1707,7 @@ public class OsmandSettings {
|
|||
// this value string is synchronized with settings_pref.xml preference name
|
||||
public final OsmandPreference<Boolean> SHOW_OSM_BUGS = new BooleanPreference("show_osm_bugs", false).makeGlobal();
|
||||
|
||||
public final OsmandPreference<Boolean> SHOW_OSM_EDITS = new BooleanPreference("show_osm_edits", true).makeProfile().cache();
|
||||
|
||||
public final CommonPreference<Boolean> SHOW_CLOSED_OSM_BUGS = new BooleanPreference("show_closed_osm_bugs", false).makeGlobal();
|
||||
public final CommonPreference<Integer> SHOW_OSM_BUGS_MIN_ZOOM = new IntPreference("show_osm_bugs_min_zoom", 8).makeGlobal();
|
||||
|
|
@ -3022,9 +3023,12 @@ public class OsmandSettings {
|
|||
return false;
|
||||
}
|
||||
|
||||
;
|
||||
};
|
||||
|
||||
{
|
||||
RENDERER.setModeDefaultValue(ApplicationMode.BOAT, RendererRegistry.NAUTICAL_RENDER);
|
||||
RENDERER.setModeDefaultValue(ApplicationMode.SKI, RendererRegistry.WINTER_SKI_RENDER);
|
||||
}
|
||||
|
||||
Map<String, CommonPreference<String>> customRendersProps = new LinkedHashMap<String, OsmandSettings.CommonPreference<String>>();
|
||||
|
||||
|
|
|
|||
|
|
@ -54,8 +54,16 @@ public class SendAnalyticsBottomSheetDialogFragment extends MenuBottomSheetDialo
|
|||
|
||||
items.add(new SubtitleDividerItem(context));
|
||||
|
||||
sendAnonymousMapDownloadsData = app.getSettings().SEND_ANONYMOUS_MAP_DOWNLOADS_DATA.get();
|
||||
sendAnonymousAppUsageData = app.getSettings().SEND_ANONYMOUS_APP_USAGE_DATA.get();
|
||||
if (app.getSettings().SEND_ANONYMOUS_MAP_DOWNLOADS_DATA.isSet()) {
|
||||
sendAnonymousMapDownloadsData = app.getSettings().SEND_ANONYMOUS_MAP_DOWNLOADS_DATA.get();
|
||||
} else {
|
||||
sendAnonymousMapDownloadsData = true;
|
||||
}
|
||||
if (app.getSettings().SEND_ANONYMOUS_APP_USAGE_DATA.isSet()) {
|
||||
sendAnonymousAppUsageData = app.getSettings().SEND_ANONYMOUS_APP_USAGE_DATA.get();
|
||||
} else {
|
||||
sendAnonymousAppUsageData = true;
|
||||
}
|
||||
final BottomSheetItemWithCompoundButton[] downloadedMapsItem = new BottomSheetItemWithCompoundButton[1];
|
||||
downloadedMapsItem[0] = (BottomSheetItemWithCompoundButton) new BottomSheetItemWithCompoundButton.Builder()
|
||||
.setChecked(sendAnonymousMapDownloadsData)
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_M
|
|||
import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_OSM_NOTE;
|
||||
import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MODIFY_POI;
|
||||
import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_OPEN_OSM_NOTE;
|
||||
import static net.osmand.aidlapi.OsmAndCustomizationConstants.OSM_EDITS;
|
||||
import static net.osmand.aidlapi.OsmAndCustomizationConstants.OSM_NOTES;
|
||||
|
||||
|
||||
|
|
@ -140,8 +141,12 @@ public class OsmEditingPlugin extends OsmandPlugin {
|
|||
if (osmBugsLayer == null) {
|
||||
registerLayers(activity);
|
||||
}
|
||||
if (!mapView.getLayers().contains(osmEditsLayer)) {
|
||||
activity.getMapView().addLayer(osmEditsLayer, 3.5f);
|
||||
if (mapView.getLayers().contains(osmEditsLayer) != settings.SHOW_OSM_EDITS.get()) {
|
||||
if (settings.SHOW_OSM_EDITS.get()) {
|
||||
mapView.addLayer(osmEditsLayer, 3.5f);
|
||||
} else {
|
||||
mapView.removeLayer(osmEditsLayer);
|
||||
}
|
||||
}
|
||||
if (mapView.getLayers().contains(osmBugsLayer) != settings.SHOW_OSM_BUGS.get()) {
|
||||
if (settings.SHOW_OSM_BUGS.get()) {
|
||||
|
|
@ -338,6 +343,28 @@ public class OsmEditingPlugin extends OsmandPlugin {
|
|||
})
|
||||
.setPosition(16)
|
||||
.createItem());
|
||||
|
||||
adapter.addItem(new ContextMenuItem.ItemBuilder()
|
||||
.setId(OSM_EDITS)
|
||||
.setTitleId(R.string.layer_osm_edits, mapActivity)
|
||||
.setSelected(settings.SHOW_OSM_EDITS.get())
|
||||
.setIcon(R.drawable.ic_action_openstreetmap_logo)
|
||||
.setColor(settings.SHOW_OSM_EDITS.get() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)
|
||||
.setListener(new ContextMenuAdapter.OnRowItemClick() {
|
||||
@Override
|
||||
public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
|
||||
if (itemId == R.string.layer_osm_edits) {
|
||||
OsmandSettings.OsmandPreference<Boolean> showOsmEdits = settings.SHOW_OSM_EDITS;
|
||||
showOsmEdits.set(isChecked);
|
||||
adapter.getItem(pos).setColorRes(showOsmEdits.get() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
|
||||
adapter.notifyDataSetChanged();
|
||||
updateLayers(mapActivity.getMapView(), mapActivity);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
})
|
||||
.setPosition(17)
|
||||
.createItem());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package net.osmand.plus.settings;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.pm.ActivityInfo;
|
||||
import android.graphics.drawable.Drawable;
|
||||
|
|
@ -26,6 +27,7 @@ import net.osmand.plus.ApplicationMode;
|
|||
import net.osmand.plus.OsmandSettings;
|
||||
import net.osmand.plus.OsmandSettings.CommonPreference;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.UiUtilities;
|
||||
import net.osmand.plus.base.MapViewTrackingUtilities;
|
||||
import net.osmand.plus.helpers.FontCache;
|
||||
import net.osmand.plus.settings.bottomsheets.ChangeGeneralProfilesPrefBottomSheet;
|
||||
|
|
@ -276,7 +278,8 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
|
|||
}
|
||||
|
||||
private void showDrivingRegionDialog() {
|
||||
final AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
|
||||
Context themedContext = UiUtilities.getThemedContext(getActivity(), isNightMode());
|
||||
AlertDialog.Builder b = new AlertDialog.Builder(themedContext);
|
||||
|
||||
b.setTitle(getString(R.string.driving_region));
|
||||
|
||||
|
|
@ -297,14 +300,13 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
|
|||
|
||||
final int selected = sel;
|
||||
final ArrayAdapter<OsmandSettings.DrivingRegion> singleChoiceAdapter =
|
||||
new ArrayAdapter<OsmandSettings.DrivingRegion>(getActivity(), R.layout.single_choice_description_item, R.id.text1, drs) {
|
||||
new ArrayAdapter<OsmandSettings.DrivingRegion>(themedContext, R.layout.single_choice_description_item, R.id.text1, drs) {
|
||||
@NonNull
|
||||
@Override
|
||||
public View getView(int position, View convertView, @NonNull ViewGroup parent) {
|
||||
View v = convertView;
|
||||
if (v == null) {
|
||||
LayoutInflater inflater = getActivity().getLayoutInflater();
|
||||
v = inflater.inflate(R.layout.single_choice_description_item, parent, false);
|
||||
v = LayoutInflater.from(parent.getContext()).inflate(R.layout.single_choice_description_item, parent, false);
|
||||
}
|
||||
OsmandSettings.DrivingRegion item = getItem(position);
|
||||
AppCompatCheckedTextView title = (AppCompatCheckedTextView) v.findViewById(R.id.text1);
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ public class GlobalSettingsFragment extends BaseSettingsFragment implements Send
|
|||
setupExternalStorageDirPref();
|
||||
|
||||
setupSendAnonymousDataPref();
|
||||
setupShowStartupMessagesPref();
|
||||
setupEnableProxyPref();
|
||||
}
|
||||
|
||||
|
|
@ -66,6 +67,11 @@ public class GlobalSettingsFragment extends BaseSettingsFragment implements Send
|
|||
}
|
||||
}
|
||||
return false;
|
||||
} else if (prefId.equals(settings.DO_NOT_SHOW_STARTUP_MESSAGES.getId())) {
|
||||
if (newValue instanceof Boolean) {
|
||||
boolean enabled = !(Boolean) newValue;
|
||||
return settings.DO_NOT_SHOW_STARTUP_MESSAGES.set(enabled);
|
||||
}
|
||||
}
|
||||
|
||||
return super.onPreferenceChange(preference, newValue);
|
||||
|
|
@ -165,6 +171,13 @@ public class GlobalSettingsFragment extends BaseSettingsFragment implements Send
|
|||
sendAnonymousData.setChecked(enabled);
|
||||
}
|
||||
|
||||
private void setupShowStartupMessagesPref() {
|
||||
boolean enabled = !settings.DO_NOT_SHOW_STARTUP_MESSAGES.get(); // pref ui was inverted
|
||||
|
||||
SwitchPreferenceCompat sendAnonymousData = (SwitchPreferenceCompat) findPreference(settings.DO_NOT_SHOW_STARTUP_MESSAGES.getId());
|
||||
sendAnonymousData.setChecked(enabled);
|
||||
}
|
||||
|
||||
private void setupEnableProxyPref() {
|
||||
SwitchPreferenceEx enableProxy = (SwitchPreferenceEx) findPreference(settings.ENABLE_PROXY.getId());
|
||||
enableProxy.setIcon(getContentIcon(R.drawable.ic_action_proxy));
|
||||
|
|
|
|||
Loading…
Reference in a new issue