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

Merge pull request #10410 from osmandapp/master

Browse source 
update test branch
This commit is contained in:
Hardy 2020-12-16 00:21:34 +01:00 committed by GitHub
commit f1acb29f78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 1615 additions and 851 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_56dp.xml
View file

@ -6,11 +6,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding" android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"> android:paddingStart="@dimen/content_padding"
android:paddingTop="@dimen/context_menu_padding_margin_medium"
android:paddingBottom="@dimen/context_menu_padding_margin_medium">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/icon" android:id="@+id/icon"

16
OsmAnd/res/layout/popup_menu_item.xml
View file

@ -12,13 +12,13 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/content_padding_half" android:layout_marginLeft="@dimen/content_padding_half"
android:layout_marginStart="@dimen/content_padding_half" android:layout_marginStart="@dimen/content_padding_half"
tools:src="@drawable/ic_action_info_dark" tools:src="@drawable/ic_action_info_dark" />
android:tint="?attr/primary_icon_color"/>
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
@ -30,4 +30,14 @@
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
tools:text="Title" /> tools:text="Title" />
<androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/radio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginRight="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding"
android:focusable="false"
android:clickable="false" />
</LinearLayout> </LinearLayout>

2
OsmAnd/res/layout/preference_dropdown_list.xml
View file

@ -33,7 +33,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="60dp" android:minHeight="60dp"
app:labelText="@string/profile_type_base_string" app:labelText="@string/profile_type_osmand_string"
app:primaryColor="@color/active_color_primary_dark" app:primaryColor="@color/active_color_primary_dark"
app:secondaryColor="?android:textColorSecondary"> app:secondaryColor="?android:textColorSecondary">

2
OsmAnd/res/layout/profile_preference_toolbar_big.xml
View file

@ -99,7 +99,7 @@
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" osmand:typeface="@string/font_roboto_regular"
tools:text="@string/profile_type_base_string" /> tools:text="@string/profile_type_osmand_string" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/profile_type" android:id="@+id/profile_type"

43
OsmAnd/res/layout/profile_with_config_btn_layout.xml
View file

@ -9,27 +9,30 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:elevation="2dp"> android:elevation="2dp">
<ImageButton
android:id="@+id/profile"
android:layout_width="@dimen/map_route_buttons_height_land"
android:layout_height="@dimen/map_route_buttons_height_land"
app:srcCompat="@drawable/ic_action_car_dark"
android:background="@color/color_transparent"
android:contentDescription="@string/app_modes_choose"/>
<View <ImageButton
android:id="@+id/divider" android:id="@+id/profile"
android:layout_width="1dp" android:layout_width="@dimen/map_route_buttons_height_land"
android:layout_height="24dp" android:layout_height="@dimen/map_route_buttons_height_land"
android:background="?attr/divider_color" app:srcCompat="@drawable/ic_action_car_dark"
android:layout_gravity="center_vertical"/> android:background="@color/color_transparent"
android:contentDescription="@string/app_modes_choose"/>
<View
android:id="@+id/divider"
android:layout_width="1dp"
android:layout_height="24dp"
android:background="?attr/divider_color"
android:layout_gravity="center_vertical"/>
<ImageButton
android:id="@+id/profile_config"
android:layout_width="@dimen/map_route_buttons_height_land"
android:layout_height="@dimen/map_route_buttons_height_land"
app:srcCompat="@drawable/ic_action_settings"
android:background="@color/color_transparent"
android:contentDescription="@string/configure_profile" />
<ImageButton
android:id="@+id/profile_config"
android:layout_width="@dimen/map_route_buttons_height_land"
android:layout_height="@dimen/map_route_buttons_height_land"
app:srcCompat="@drawable/ic_action_settings"
android:background="@color/color_transparent"
android:contentDescription="@string/configure_profile" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

28
OsmAnd/res/menu/widget_visibility_menu.xml
View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group
android:id="@+id/single_selection_group"
android:orderInCategory="1"
android:checkableBehavior="single"
android:menuCategory="alternative"
android:visible="false">
</group>
<group
android:id="@+id/button_group"
android:orderInCategory="2"
android:checkableBehavior="none"
android:menuCategory="container">
<item
android:id="@+id/action_show"
android:icon="@drawable/ic_action_view"
android:title="@string/shared_string_show"/>
<item
android:id="@+id/action_hide"
android:icon="@drawable/ic_action_hide"
android:title="@string/shared_string_hide"/>
<item
android:id="@+id/action_collapse"
android:icon="@drawable/ic_action_widget_collapse"
android:title="@string/shared_string_collapse"/>
</group>
</menu>

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

@ -3419,7 +3419,7 @@
<string name="monitoring_min_speed_descr_side_effect">اعراض جانبية: سيفقد المسار الخاص بك جميع الأقسام التي لم يتحقق فيها معيار الحد الأدنى للسرعة (على سبيل المثال ، حيث تدفع دراجتك أعلى تل شديد الانحدار). أيضا ، لن تكون هناك معلومات حول فترات الراحة ، مثل الاستراحات. هذا له تأثيرات على أي تحليل أو مرحلة ما بعد المعالجة ، مثل عند محاولة تحديد المدة الإجمالية لرحلتك ، أو وقت الحركة ، أو متوسط سرعتك.</string> <string name="monitoring_min_speed_descr_side_effect">اعراض جانبية: سيفقد المسار الخاص بك جميع الأقسام التي لم يتحقق فيها معيار الحد الأدنى للسرعة (على سبيل المثال ، حيث تدفع دراجتك أعلى تل شديد الانحدار). أيضا ، لن تكون هناك معلومات حول فترات الراحة ، مثل الاستراحات. هذا له تأثيرات على أي تحليل أو مرحلة ما بعد المعالجة ، مثل عند محاولة تحديد المدة الإجمالية لرحلتك ، أو وقت الحركة ، أو متوسط سرعتك.</string>
<string name="tracks_view_descr">المسارات المسجلة الخاصة بك هي في %1$s، أو مجلد أوسماند.</string> <string name="tracks_view_descr">المسارات المسجلة الخاصة بك هي في %1$s، أو مجلد أوسماند.</string>
<string name="multimedia_notes_view_descr">ملاحظات OSM موجودة في%1$s.</string> <string name="multimedia_notes_view_descr">ملاحظات OSM موجودة في%1$s.</string>
<string name="osm_edits_view_descr">يمكنك عرض جميع التعديلات التي لم يتم رفعها بعد أو أخطاء OSM في %1$s. النقاط التي تم رفعها لا تظهر في OsmAnd.</string> <string name="osm_edits_view_descr">عرض كل التعديلات التي لم يتم تحميلها أو أخطاء OSM في %1$s. التغييرات التي تم رفعها فعلا لن تظهر بعد الآن.</string>
<string name="monitoring_min_speed_descr">مرشح قطع سرعة منخفضة لعدم تسجيل نقاط أقل من سرعة معينة. وهذا قد يجعل المسارات المسجلة تبدو أكثر سلاسة عند عرضها على الخريطة.</string> <string name="monitoring_min_speed_descr">مرشح قطع سرعة منخفضة لعدم تسجيل نقاط أقل من سرعة معينة. وهذا قد يجعل المسارات المسجلة تبدو أكثر سلاسة عند عرضها على الخريطة.</string>
<string name="monitoring_min_speed_descr_recommendation">التوصية: حاول استخدام كشف الحركة عبر مرشح الحد الأدنى للإزاحة للتسجيل (B) أولاً ، فقد ينتج عنه نتائج أفضل ، ويستهلك بيانات أقل. إذا استمرت المسارات الخاصة بك مزعجة عند السرعات المنخفضة ، فجرب القيم غير الصفرية هنا. يرجى ملاحظة أن بعض القياسات قد لا تبلغ عن أي قيمة سرعة على الإطلاق (بعض الطرق المستندة إلى الشبكة) ، وفي هذه الحالة لن تسجل أي شيء.</string> <string name="monitoring_min_speed_descr_recommendation">التوصية: حاول استخدام كشف الحركة عبر مرشح الحد الأدنى للإزاحة للتسجيل (B) أولاً ، فقد ينتج عنه نتائج أفضل ، ويستهلك بيانات أقل. إذا استمرت المسارات الخاصة بك مزعجة عند السرعات المنخفضة ، فجرب القيم غير الصفرية هنا. يرجى ملاحظة أن بعض القياسات قد لا تبلغ عن أي قيمة سرعة على الإطلاق (بعض الطرق المستندة إلى الشبكة) ، وفي هذه الحالة لن تسجل أي شيء.</string>
<string name="monitoring_min_speed_descr_remark">ملاحظة: سرعة &gt; 0 الاختيار: معظم شرائح GPS تبلغ عن قيمة السرعة فقط إذا كانت الخوارزمية تحدد الحركة أوالسكون. وبالتالي باستخدام إعدادات&gt; 0 في هذا المرشح يتم كشف عن الحركة من شرائح GPS. ولكن حتى لو لم تتم تصفيتها هنا في وقت التسجيل ، فإننا لا نزال نستخدم هذه الميزة في تحليل GPX لتحديد المسافة المصححة ، أي أن القيمة المعروضة في هذا الحقل هي المسافة المسجلة أثناء الحركة.</string> <string name="monitoring_min_speed_descr_remark">ملاحظة: سرعة &gt; 0 الاختيار: معظم شرائح GPS تبلغ عن قيمة السرعة فقط إذا كانت الخوارزمية تحدد الحركة أوالسكون. وبالتالي باستخدام إعدادات&gt; 0 في هذا المرشح يتم كشف عن الحركة من شرائح GPS. ولكن حتى لو لم تتم تصفيتها هنا في وقت التسجيل ، فإننا لا نزال نستخدم هذه الميزة في تحليل GPX لتحديد المسافة المصححة ، أي أن القيمة المعروضة في هذا الحقل هي المسافة المسجلة أثناء الحركة.</string>
@ -3781,7 +3781,7 @@
<string name="lenght_limit_description">إعطاء معلومات وزن مركبتك ،قد يتم تطبيق بعض القيود على المركبات الثقيلة.</string> <string name="lenght_limit_description">إعطاء معلومات وزن مركبتك ،قد يتم تطبيق بعض القيود على المركبات الثقيلة.</string>
<string name="quick_action_remove_next_destination">حذف نقطة الوجهة التالية</string> <string name="quick_action_remove_next_destination">حذف نقطة الوجهة التالية</string>
<string name="please_provide_point_name_error">يرجى إعطاء اسم للنقطة</string> <string name="please_provide_point_name_error">يرجى إعطاء اسم للنقطة</string>
<string name="quick_action_remove_next_destination_descr">سيتم حذف نقطة الوجهة الحالية على المسار. إذا كانت هي الوجهة، سوف تتوقف الملاحة.</string> <string name="quick_action_remove_next_destination_descr">سيتم حذف نقطة الوجهة الحالية على المسار. إذا كانت هي الوجهة الرئيسية، سوف تتوقف الملاحة.</string>
<string name="search_download_wikipedia_maps">تنزيل بيانات ويكيبيديا</string> <string name="search_download_wikipedia_maps">تنزيل بيانات ويكيبيديا</string>
<string name="plugin_wikipedia_description">الحصول على معلومات حول النقاط المثيرة للاهتمام من ويكيبيديا. إنه دليلك غير المتصل بجيبك - ما عليك سوى تمكين المكون الإضافي ويكبيديا والاستمتاع بمقالات حول الكائنات من حولك.</string> <string name="plugin_wikipedia_description">الحصول على معلومات حول النقاط المثيرة للاهتمام من ويكيبيديا. إنه دليلك غير المتصل بجيبك - ما عليك سوى تمكين المكون الإضافي ويكبيديا والاستمتاع بمقالات حول الكائنات من حولك.</string>
<string name="app_mode_enduro_motorcycle">دراجة نارية</string> <string name="app_mode_enduro_motorcycle">دراجة نارية</string>
@ -3821,7 +3821,7 @@
<string name="route_between_points_warning_desc">بعد ذلك ، ألقط مسارك بأقرب طريق مسموح به باستخدام أحد أوضاع التنقل الخاصة بك لاستخدام هذا الخيار.</string> <string name="route_between_points_warning_desc">بعد ذلك ، ألقط مسارك بأقرب طريق مسموح به باستخدام أحد أوضاع التنقل الخاصة بك لاستخدام هذا الخيار.</string>
<string name="threshold_distance">بداية المسافة</string> <string name="threshold_distance">بداية المسافة</string>
<string name="street_level_imagery">صور للشارع</string> <string name="street_level_imagery">صور للشارع</string>
<string name="plan_route_exit_dialog_descr">هل أنت متأكد أنك تريد إغلاق مسار الخطة دون حفظ؟ سوف تفقد كل التغييرات؟</string> <string name="plan_route_exit_dialog_descr">هل أنت متأكد أنك تريد إغلاق مسار الرحلة دون حفظ؟ سوف تفقد كل التغييرات؟</string>
<string name="in_case_of_reverse_direction">في حالة الاتجاه المعاكس</string> <string name="in_case_of_reverse_direction">في حالة الاتجاه المعاكس</string>
<string name="save_track_to_gpx">تسجيل المسار أثناء الملاحة</string> <string name="save_track_to_gpx">تسجيل المسار أثناء الملاحة</string>
<string name="shared_string_save_as_gpx">حفظ كملف مسار جديد</string> <string name="shared_string_save_as_gpx">حفظ كملف مسار جديد</string>
@ -3855,7 +3855,7 @@
<string name="plan_route_change_route_type_before">تغيير نوع المسار قبل</string> <string name="plan_route_change_route_type_before">تغيير نوع المسار قبل</string>
<string name="plan_route_change_route_type_after">تغيير نوع المسار بعد</string> <string name="plan_route_change_route_type_after">تغيير نوع المسار بعد</string>
<string name="number_of_gpx_files_selected_pattern">%s ملفات مسارات محددة</string> <string name="number_of_gpx_files_selected_pattern">%s ملفات مسارات محددة</string>
<string name="disable_recording_once_app_killed_descrp">سيتم إيقاف تسجيل المسار مؤقتًا عند غلق التطبيق (عبر نافذة التطبيقات المستخدمة مؤخرا). (إشارة تشغيل التطبيق في الخلفية ستختفي من الشريط العلوي.)</string> <string name="disable_recording_once_app_killed_descrp">سيتم إيقاف تسجيل المسار مؤقتًا عند إغلاق التطبيق (عبر نافذة التطبيقات المستخدمة مؤخرا). (إشارة تشغيل التطبيق في الخلفية ستختفي من الشريط العلوي.)</string>
<string name="save_global_track_interval_descr">حدد الفاصل الزمني للادخال الخاص بالتسجيل العام للمسار (مفعل من خلال ودجت \"تسجيل الرحلة\" على الخريطة).</string> <string name="save_global_track_interval_descr">حدد الفاصل الزمني للادخال الخاص بالتسجيل العام للمسار (مفعل من خلال ودجت \"تسجيل الرحلة\" على الخريطة).</string>
<string name="gpx_monitoring_stop">إيقاف تسجيل الرحلة مؤقتًا</string> <string name="gpx_monitoring_stop">إيقاف تسجيل الرحلة مؤقتًا</string>
<string name="gpx_monitoring_start">استئناف تسجيل الرحلة</string> <string name="gpx_monitoring_start">استئناف تسجيل الرحلة</string>
@ -3893,12 +3893,12 @@
<string name="sort_name_ascending">الاسم: أ – ي</string> <string name="sort_name_ascending">الاسم: أ – ي</string>
<string name="start_finish_icons">أيقونات البدء والانتهاء</string> <string name="start_finish_icons">أيقونات البدء والانتهاء</string>
<string name="contour_lines_thanks">شكرا لشرائك \"خطوط الكنتور\"</string> <string name="contour_lines_thanks">شكرا لشرائك \"خطوط الكنتور\"</string>
<string name="osm_live_payment_desc_hw">رسوم الاشتراك ستفرض كل شهر. يمكنك إلغاء اشتراكك متى أردت عبر Google play.</string> <string name="osm_live_payment_desc_hw">يتم احتساب الاشتراك للفترة المحددة. قم بإلغائه في AppGallery في أي وقت تريد.</string>
<string name="osm_live_payment_subscription_management_hw">سيتم تحصيل المبلغ على حساب AppGallery الخاص بك عند تأكيد الشراء. <string name="osm_live_payment_subscription_management_hw">يتم الخصم من حساب AppGallery الخاص بك عند تأكيد الشراء.
\n \n
\nيتم تجديد الاشتراك تلقائيًا ما لم يتم إلغاؤه قبل تاريخ التجديد. سيتم خصم حسابك على فترة التجديد (شهر/ثلاثة أشهر/سنة) فقط في تاريخ التجديد. \nيتم تمديد الاشتراك تلقائيًا ما لم يتم إلغاؤه قبل تاريخ التجديد. سيتم الخصم من الحساب على فترة التجديد (شهر/ ثلاثة أشهر/ سنة) فقط عند تاريخ التجديد.
\n \n
\nيمكنك إدارة وإلغاء الاشتراكات الخاصة بك عن طريق الانتقال إلى إعدادات AppGallery.</string> \nيمكنك إدارة وإلغاء الاشتراكات الخاصة بك في إعدادات AppGallery.</string>
<string name="routing_attr_avoid_footways_description">تجنب الممرات</string> <string name="routing_attr_avoid_footways_description">تجنب الممرات</string>
<string name="routing_attr_avoid_footways_name">تجنب الممرات</string> <string name="routing_attr_avoid_footways_name">تجنب الممرات</string>
<string name="what_is_new">ما الجديد</string> <string name="what_is_new">ما الجديد</string>
@ -3936,7 +3936,7 @@
<string name="mgrs_format_descr">OsmAnd يستخدم MGRS، وهو مشابه لتنسيق UTM NATO .</string> <string name="mgrs_format_descr">OsmAnd يستخدم MGRS، وهو مشابه لتنسيق UTM NATO .</string>
<string name="message_you_need_add_two_points_to_show_graphs">تحتاج إلى إضافة نقطتين على الأقل</string> <string name="message_you_need_add_two_points_to_show_graphs">تحتاج إلى إضافة نقطتين على الأقل</string>
<string name="manage_subscription">إدارة الاشتراك</string> <string name="manage_subscription">إدارة الاشتراك</string>
<string name="subscription_payment_issue_title">هناك مشكلة في اشتراكك. انتقل إلى إعدادات اشتراك Google Play لإصلاح طريقة الدفع الخاصة بك.</string> <string name="subscription_payment_issue_title">اضغط على الزر لإعداد طريقة دفع على Google Play لإصلاح اشتراكك.</string>
<string name="subscription_expired_title">انتهت صلاحية اشتراك OsmAnd Live</string> <string name="subscription_expired_title">انتهت صلاحية اشتراك OsmAnd Live</string>
<string name="subscription_paused_title">تم إيقاف اشتراك OsmAnd Live مؤقتًا</string> <string name="subscription_paused_title">تم إيقاف اشتراك OsmAnd Live مؤقتًا</string>
<string name="subscription_on_hold_title">اشتراك OsmAnd Live معلق</string> <string name="subscription_on_hold_title">اشتراك OsmAnd Live معلق</string>
@ -3996,11 +3996,13 @@
<string name="plan_route_add_new_segment">إضافة شريحة جديدة</string> <string name="plan_route_add_new_segment">إضافة شريحة جديدة</string>
<string name="release_3_9">• خيار مضاف لتصدير واستيراد جميع البيانات بما في ذلك الإعدادات والموارد والأماكن الخاصة بي <string name="release_3_9">• خيار مضاف لتصدير واستيراد جميع البيانات بما في ذلك الإعدادات والموارد والأماكن الخاصة بي
\n \n
\n • مخطط الطريق: الرسوم البيانية للأجزاء مع المسار ، إضافة القدرة على إنشاء وتحرير مسارات مقطع مضاعفة \n • مخطط الطريق: الرسوم البيانية لأجزاء المسار مع الطريق ، إضافة القدرة على إنشاء وتحرير مقاطع مسارات متعددة
\n \n
\n • تمت إضافة طريقة مصادقة آلية لـ OpenStreetMap ، واجهة مستخدم محسنة لمربعات حوار OSM \n • تمت إضافة طريقة مصادقة آلية OAuth ل OpenStreetMap ، وواجهة مستخدم محسنة لمربعات حوار OSM
\n \n
\n • ألوان مخصصة للمفضلة والمسارات نقاط الطريق \n • دعم ألوان مخصصة للمفضلة ونقاط لمسار الطريق
\n \n
\n</string> \n</string>
<string name="profile_type_osmand_string">ملف تعريف أوسماند</string>
<string name="profile_type_user_string">ملف تعريف المستخدم</string>
</resources> </resources>

2
OsmAnd/res/values-b+kab/strings.xml
View file

@ -1340,4 +1340,6 @@
<string name="route_between_points_add_track_desc">Fren afaylu n uḍfar iɣer ara yernu uḥric amaynut.</string> <string name="route_between_points_add_track_desc">Fren afaylu n uḍfar iɣer ara yernu uḥric amaynut.</string>
<string name="plan_route_exit_dialog_descr">Tebɣiḍ s tidet ad tmedleḍ abrid n uɣawas war asekles\? Ad tesruḥeḍ akk ibeddilen.</string> <string name="plan_route_exit_dialog_descr">Tebɣiḍ s tidet ad tmedleḍ abrid n uɣawas war asekles\? Ad tesruḥeḍ akk ibeddilen.</string>
<string name="shared_string_is_saved">Ittwasekles</string> <string name="shared_string_is_saved">Ittwasekles</string>
<string name="profile_type_osmand_string">Amaɣnu OsmAnd</string>
<string name="profile_type_user_string">Amaɣnu n useqdac</string>
</resources> </resources>

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

@ -3885,4 +3885,9 @@
<string name="poi_fuel_lng">LNG</string> <string name="poi_fuel_lng">LNG</string>
<string name="poi_siren">Sirene</string> <string name="poi_siren">Sirene</string>
<string name="poi_nurse">Sygeplejerske</string> <string name="poi_nurse">Sygeplejerske</string>
<string name="poi_water_source_lake">Sø</string>
<string name="poi_water_source_river">Flod</string>
<string name="poi_water_source_water_tank">Vandtank</string>
<string name="poi_vaccination_covid19">Vaccination: COVID19</string>
<string name="poi_health_specialty_vaccination_yes">Vaccination</string>
</resources> </resources>

4
OsmAnd/res/values-da/strings.xml
View file

@ -3869,4 +3869,8 @@
<string name="snowmobile_render_descr">Til kørsel med snescooter med dedikerede veje og spor.</string> <string name="snowmobile_render_descr">Til kørsel med snescooter med dedikerede veje og spor.</string>
<string name="navigate_point_format_mgrs">MGRS</string> <string name="navigate_point_format_mgrs">MGRS</string>
<string name="mgrs_format_descr">OsmAnd bruger MGRS, som svarer til UTM NATO-formatet.</string> <string name="mgrs_format_descr">OsmAnd bruger MGRS, som svarer til UTM NATO-formatet.</string>
<string name="plan_route_join_segments">Forbind segmenter</string>
<string name="plan_route_split_before">Opdel før</string>
<string name="plan_route_split_after">Opdel efter</string>
<string name="plan_route_add_new_segment">Tilføj et nyt segment</string>
</resources> </resources>

2
OsmAnd/res/values-de/phrases.xml
View file

@ -3887,4 +3887,6 @@
<string name="poi_nurse">Krankenpfleger/in</string> <string name="poi_nurse">Krankenpfleger/in</string>
<string name="poi_mobile_money_agent">Mobiler Geldvermittler</string> <string name="poi_mobile_money_agent">Mobiler Geldvermittler</string>
<string name="poi_lifeguard_base">Rettungsschwimmerbasis</string> <string name="poi_lifeguard_base">Rettungsschwimmerbasis</string>
<string name="poi_vaccination_covid19">Impfung: COVID19</string>
<string name="poi_health_specialty_vaccination_yes">Impfung</string>
</resources> </resources>

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

@ -1750,19 +1750,19 @@
<string name="osm_save_offline">Offline speichern</string> <string name="osm_save_offline">Offline speichern</string>
<string name="osm_edit_modified_poi">Geänderter OSM-POI</string> <string name="osm_edit_modified_poi">Geänderter OSM-POI</string>
<string name="osm_edit_deleted_poi">Gelöschter OSM-POI</string> <string name="osm_edit_deleted_poi">Gelöschter OSM-POI</string>
<string name="context_menu_item_open_note">OSM-Notiz erstellen</string> <string name="context_menu_item_open_note">OSM-Hinweis erstellen</string>
<string name="osm_edit_reopened_note">Wiedereröffnete OSM-Notiz</string> <string name="osm_edit_reopened_note">Wiedereröffneter OSM-Hinweis</string>
<string name="osm_edit_commented_note">Kommentierte OSM-Notiz</string> <string name="osm_edit_commented_note">Kommentierter OSM-Hinweis</string>
<string name="osm_edit_created_note">Erstellte OSM-Notiz</string> <string name="osm_edit_created_note">Erstellter OSM-Hinweis</string>
<string name="osn_bug_name">OSM-Notiz</string> <string name="osn_bug_name">OSM-Hinweis</string>
<string name="osn_add_dialog_title">Notiz erstellen</string> <string name="osn_add_dialog_title">Hinweis erstellen</string>
<string name="osn_comment_dialog_title">Kommentar hinzufügen</string> <string name="osn_comment_dialog_title">Kommentar hinzufügen</string>
<string name="osn_reopen_dialog_title">Notiz wieder öffnen</string> <string name="osn_reopen_dialog_title">Hinweis wieder öffnen</string>
<string name="osn_close_dialog_title">Notiz schließen</string> <string name="osn_close_dialog_title">Hinweis schließen</string>
<string name="osn_add_dialog_success">Notiz erstellt</string> <string name="osn_add_dialog_success">Hinweis erstellt</string>
<string name="osn_add_dialog_error">Notiz konnte nicht erstellt werden.</string> <string name="osn_add_dialog_error">Hinweis konnte nicht erstellt werden.</string>
<string name="osn_close_dialog_success">Notiz geschlossen</string> <string name="osn_close_dialog_success">Hinweis geschlossen</string>
<string name="osn_close_dialog_error">Notiz konnte nicht geschlossen werden.</string> <string name="osn_close_dialog_error">Hinweis konnte nicht geschlossen werden.</string>
<string name="context_menu_item_delete_waypoint">GPX-Wegpunkt löschen?</string> <string name="context_menu_item_delete_waypoint">GPX-Wegpunkt löschen?</string>
<string name="context_menu_item_edit_waypoint">GPX-Wegpunkt bearbeiten</string> <string name="context_menu_item_edit_waypoint">GPX-Wegpunkt bearbeiten</string>
<string name="lang_fy">Westfriesisch</string> <string name="lang_fy">Westfriesisch</string>
@ -1888,8 +1888,8 @@
\n Es werden vorübergehend {3} MB und dauerhaft {1} MB benötigt. (Von {2} MB.)</string> \n Es werden vorübergehend {3} MB und dauerhaft {1} MB benötigt. (Von {2} MB.)</string>
<string name="select_map_marker">Kartenmarkierung auswählen</string> <string name="select_map_marker">Kartenmarkierung auswählen</string>
<string name="map_markers_other">Andere Markierungen</string> <string name="map_markers_other">Andere Markierungen</string>
<string name="upload_osm_note_description">Laden Sie Ihre OSM-Notiz anonym oder über Ihr OpenStreetMap.org-Profil hoch.</string> <string name="upload_osm_note_description">Laden Sie Ihren OSM-Hinweis anonym oder über Ihr OpenStreetMap.org-Profil hoch.</string>
<string name="upload_osm_note">OSM-Notiz hochladen</string> <string name="upload_osm_note">OSM-Hinweis hochladen</string>
<string name="upload_anonymously">Anonym hochladen</string> <string name="upload_anonymously">Anonym hochladen</string>
<string name="show_transparency_seekbar">Transparenz-Schieber anzeigen</string> <string name="show_transparency_seekbar">Transparenz-Schieber anzeigen</string>
<string name="recalculate_route">Route neu berechnen</string> <string name="recalculate_route">Route neu berechnen</string>
@ -2103,8 +2103,8 @@
<string name="quick_action_map_style_switch">Kartendarstellung geändert zu „%s“.</string> <string name="quick_action_map_style_switch">Kartendarstellung geändert zu „%s“.</string>
<string name="quick_action_take_audio_note">Neue Audio-Notiz</string> <string name="quick_action_take_audio_note">Neue Audio-Notiz</string>
<string name="quick_action_take_video_note">Neue Video-Notiz</string> <string name="quick_action_take_video_note">Neue Video-Notiz</string>
<string name="quick_action_take_photo_note">Neue Fotonotiz</string> <string name="quick_action_take_photo_note">Neue Foto-Notiz</string>
<string name="quick_action_add_osm_bug">OSM-Notiz hinzufügen</string> <string name="quick_action_add_osm_bug">OSM-Hinweis hinzufügen</string>
<string name="quick_action_navigation_voice">Sprachausgabe ein/aus</string> <string name="quick_action_navigation_voice">Sprachausgabe ein/aus</string>
<string name="quick_action_navigation_voice_off">Sprachausgabe aktivieren</string> <string name="quick_action_navigation_voice_off">Sprachausgabe aktivieren</string>
<string name="quick_action_navigation_voice_on">Sprachausgabe stummschalten</string> <string name="quick_action_navigation_voice_on">Sprachausgabe stummschalten</string>
@ -2154,7 +2154,7 @@
<string name="quick_action_gpx_category_descr">Wählen Sie eine beliebige Kategorie.</string> <string name="quick_action_gpx_category_descr">Wählen Sie eine beliebige Kategorie.</string>
<string name="configure_screen_quick_action">Schnellaktion</string> <string name="configure_screen_quick_action">Schnellaktion</string>
<string name="quick_action_add_gpx_descr">Eine Schaltfläche, um einen GPX-Wegpunkt in der Bildschirmmitte einzufügen.</string> <string name="quick_action_add_gpx_descr">Eine Schaltfläche, um einen GPX-Wegpunkt in der Bildschirmmitte einzufügen.</string>
<string name="quick_action_add_osm_bug_descr">Eine Schaltfläche, um eine OSM-Notiz in der Bildschirmmitte einzufügen.</string> <string name="quick_action_add_osm_bug_descr">Eine Schaltfläche, um einen OSM-Hinweis in der Bildschirmmitte einzufügen.</string>
<string name="quick_action_add_poi_descr">Eine Schaltfläche, um einen POI in der Bildschirmmitte einzufügen.</string> <string name="quick_action_add_poi_descr">Eine Schaltfläche, um einen POI in der Bildschirmmitte einzufügen.</string>
<string name="quick_action_navigation_voice_descr">Umschalter, um die Sprachansagen während der Navigation ein- oder auszuschalten.</string> <string name="quick_action_navigation_voice_descr">Umschalter, um die Sprachansagen während der Navigation ein- oder auszuschalten.</string>
<string name="quick_action_add_parking_descr">Eine Schaltfläche, um eine Parkposition in der Bildschirmmitte einzufügen.</string> <string name="quick_action_add_parking_descr">Eine Schaltfläche, um eine Parkposition in der Bildschirmmitte einzufügen.</string>
@ -2537,9 +2537,9 @@
<string name="map_orientation_change_in_accordance_with_speed">Kartenausrichtungsgrenzwert</string> <string name="map_orientation_change_in_accordance_with_speed">Kartenausrichtungsgrenzwert</string>
<string name="map_orientation_change_in_accordance_with_speed_descr">Auswählen, bei welcher Geschwindigkeit die Kartenausrichtung von \'Nach Bewegungsrichtung\' auf \'Nach Kompass\' umschaltet.</string> <string name="map_orientation_change_in_accordance_with_speed_descr">Auswählen, bei welcher Geschwindigkeit die Kartenausrichtung von \'Nach Bewegungsrichtung\' auf \'Nach Kompass\' umschaltet.</string>
<string name="marker_moved_to_history">Kartenmarkierung in den Verlauf verschoben</string> <string name="marker_moved_to_history">Kartenmarkierung in den Verlauf verschoben</string>
<string name="osn_modify_dialog_error">Notiz konnte nicht geändert werden.</string> <string name="osn_modify_dialog_error">Hinweis konnte nicht geändert werden.</string>
<string name="osn_modify_dialog_title">Notiz ändern</string> <string name="osn_modify_dialog_title">Hinweis ändern</string>
<string name="context_menu_item_modify_note">OSM-Notiz ändern</string> <string name="context_menu_item_modify_note">OSM-Hinweis ändern</string>
<string name="make_round_trip_descr">Kopie des Startpunkts als Ziel hinzufügen.</string> <string name="make_round_trip_descr">Kopie des Startpunkts als Ziel hinzufügen.</string>
<string name="make_round_trip">Rundreise erstellen</string> <string name="make_round_trip">Rundreise erstellen</string>
<string name="my_location">Meine Position</string> <string name="my_location">Meine Position</string>
@ -3808,7 +3808,7 @@
<string name="app_mode_motor_scooter">Motorroller</string> <string name="app_mode_motor_scooter">Motorroller</string>
<string name="app_mode_wheelchair">Rollstuhl</string> <string name="app_mode_wheelchair">Rollstuhl</string>
<string name="app_mode_go_cart">Go-Kart</string> <string name="app_mode_go_cart">Go-Kart</string>
<string name="osm_edit_closed_note">Geschlossene OSM-Notiz</string> <string name="osm_edit_closed_note">Geschlossener OSM-Hinweis</string>
<string name="app_mode_wheelchair_forward">Rollstuhl vorwärts</string> <string name="app_mode_wheelchair_forward">Rollstuhl vorwärts</string>
<string name="set_working_days_to_continue">Zum Fortfahren bitte Arbeitstage auswählen</string> <string name="set_working_days_to_continue">Zum Fortfahren bitte Arbeitstage auswählen</string>
<string name="route_between_points">Route zwischen Punkten</string> <string name="route_between_points">Route zwischen Punkten</string>
@ -3973,8 +3973,8 @@
<string name="gpx_upload_identifiable_visibility_descr">\"Identifizierbar\" bedeutet, dass der Track in Ihren GPS-Tracks und in öffentlichen GPS-Track Verzeichnissen angezeigt wird, d.h. andere Benutzer können den Track herunterladen und mit Ihrem Benutzernamen verknüpfen. Öffentliche, mit Zeitstempel versehene Trackpunkt-Daten von der GPS API, die über die Trackpunkt API bereitgestellt werden, verweisen auf Ihre ursprüngliche Trackseite.</string> <string name="gpx_upload_identifiable_visibility_descr">\"Identifizierbar\" bedeutet, dass der Track in Ihren GPS-Tracks und in öffentlichen GPS-Track Verzeichnissen angezeigt wird, d.h. andere Benutzer können den Track herunterladen und mit Ihrem Benutzernamen verknüpfen. Öffentliche, mit Zeitstempel versehene Trackpunkt-Daten von der GPS API, die über die Trackpunkt API bereitgestellt werden, verweisen auf Ihre ursprüngliche Trackseite.</string>
<string name="gpx_upload_private_visibility_descr">\"Privat\" bedeutet, dass der Track nicht in öffentlichen Verzeichnissen auftaucht, aber seine Trackpunkte in nicht chronologischer Reihenfolge über die öffentliche GPS API ohne Zeitstempel verfügbar sind.</string> <string name="gpx_upload_private_visibility_descr">\"Privat\" bedeutet, dass der Track nicht in öffentlichen Verzeichnissen auftaucht, aber seine Trackpunkte in nicht chronologischer Reihenfolge über die öffentliche GPS API ohne Zeitstempel verfügbar sind.</string>
<string name="gpx_upload_trackable_visibility_descr">\"Verfolgbar\" bedeutet, dass die Spur nicht in öffentlichen Auflistungen auftaucht, aber verarbeitete Trackpunkte mit Zeitstempeln davon (die nicht direkt mit Ihnen in Verbindung gebracht werden können) durch Downloads von der öffentlichen GPS API.</string> <string name="gpx_upload_trackable_visibility_descr">\"Verfolgbar\" bedeutet, dass die Spur nicht in öffentlichen Auflistungen auftaucht, aber verarbeitete Trackpunkte mit Zeitstempeln davon (die nicht direkt mit Ihnen in Verbindung gebracht werden können) durch Downloads von der öffentlichen GPS API.</string>
<string name="osm_edit_close_note">OSM Notiz schließen</string> <string name="osm_edit_close_note">OSM-Hinweis schließen</string>
<string name="osm_edit_comment_note">OSM Notiz kommentieren</string> <string name="osm_edit_comment_note">OSM-Hinweis kommentieren</string>
<string name="osm_login_descr">Sie können sich mit der sicheren OAuth-Methode anmelden oder Ihren Benutzernamen und Ihr Passwort verwenden.</string> <string name="osm_login_descr">Sie können sich mit der sicheren OAuth-Methode anmelden oder Ihren Benutzernamen und Ihr Passwort verwenden.</string>
<string name="shared_string_add_photo">Foto hinzufügen</string> <string name="shared_string_add_photo">Foto hinzufügen</string>
<string name="register_on_openplacereviews">Registrieren bei <string name="register_on_openplacereviews">Registrieren bei

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

@ -2852,7 +2852,7 @@
<string name="poi_power_supply">Energifonto</string> <string name="poi_power_supply">Energifonto</string>
<string name="poi_medical_system">Medicina sistemo</string> <string name="poi_medical_system">Medicina sistemo</string>
<string name="poi_home_visit">Vizitoj en hejmo</string> <string name="poi_home_visit">Vizitoj en hejmo</string>
<string name="poi_cuisine_pizza">pico</string> <string name="poi_cuisine_pizza">picoj</string>
<string name="poi_cuisine_burger">burgeroj</string> <string name="poi_cuisine_burger">burgeroj</string>
<string name="poi_cuisine_coffee">kaftrinkaĵoj</string> <string name="poi_cuisine_coffee">kaftrinkaĵoj</string>
<string name="poi_cuisine_sandwich">sandviĉoj</string> <string name="poi_cuisine_sandwich">sandviĉoj</string>
@ -2942,82 +2942,82 @@
<string name="poi_cuisine_burrito">burrito (meksika vianda manĝaĵo)</string> <string name="poi_cuisine_burrito">burrito (meksika vianda manĝaĵo)</string>
<string name="poi_cuisine_teriyaki">terijakio (sojmielita viando)</string> <string name="poi_cuisine_teriyaki">terijakio (sojmielita viando)</string>
<string name="poi_cuisine_regional">regiona</string> <string name="poi_cuisine_regional">regiona</string>
<string name="poi_cuisine_italian">Itala</string> <string name="poi_cuisine_italian">itala</string>
<string name="poi_cuisine_chinese">Ĉina</string> <string name="poi_cuisine_chinese">ĉina</string>
<string name="poi_cuisine_mexican">Meksika</string> <string name="poi_cuisine_mexican">meksika</string>
<string name="poi_cuisine_japanese">Japana</string> <string name="poi_cuisine_japanese">japana</string>
<string name="poi_cuisine_german">Germana</string> <string name="poi_cuisine_german">germana</string>
<string name="poi_cuisine_indian">Barata</string> <string name="poi_cuisine_indian">hinda</string>
<string name="poi_cuisine_american">Amerika</string> <string name="poi_cuisine_american">usona</string>
<string name="poi_cuisine_asian">Azia</string> <string name="poi_cuisine_asian">azia</string>
<string name="poi_cuisine_french">Franca</string> <string name="poi_cuisine_french">franca</string>
<string name="poi_cuisine_greek">Greka</string> <string name="poi_cuisine_greek">greka</string>
<string name="poi_cuisine_thai">Taja</string> <string name="poi_cuisine_thai">taja</string>
<string name="poi_cuisine_international">tutmonda</string> <string name="poi_cuisine_international">tutmonda</string>
<string name="poi_cuisine_turkish">Turka</string> <string name="poi_cuisine_turkish">turka</string>
<string name="poi_cuisine_spanish">Hispana</string> <string name="poi_cuisine_spanish">hispana</string>
<string name="poi_cuisine_vietnamese">Vjetnama</string> <string name="poi_cuisine_vietnamese">vjetnama</string>
<string name="poi_cuisine_korean">Korea</string> <string name="poi_cuisine_korean">korea</string>
<string name="poi_cuisine_mediterranean">Mediteranea</string> <string name="poi_cuisine_mediterranean">mediteranea</string>
<string name="poi_cuisine_bavarian">Bavara</string> <string name="poi_cuisine_bavarian">bavara</string>
<string name="poi_cuisine_lebanese">Libana</string> <string name="poi_cuisine_lebanese">libana</string>
<string name="poi_cuisine_russian">Rusa</string> <string name="poi_cuisine_russian">rusa</string>
<string name="poi_cuisine_filipino">Filipina</string> <string name="poi_cuisine_filipino">filipina</string>
<string name="poi_cuisine_portuguese">Portugala</string> <string name="poi_cuisine_portuguese">portugala</string>
<string name="poi_cuisine_georgian">Kartvela</string> <string name="poi_cuisine_georgian">kartvela</string>
<string name="poi_cuisine_polish">Pola</string> <string name="poi_cuisine_polish">pola</string>
<string name="poi_cuisine_brazilian">Brazila</string> <string name="poi_cuisine_brazilian">brazila</string>
<string name="poi_cuisine_arab">Araba</string> <string name="poi_cuisine_arab">araba</string>
<string name="poi_cuisine_danish">Dana</string> <string name="poi_cuisine_danish">dana</string>
<string name="poi_cuisine_indonesian">Indonezia</string> <string name="poi_cuisine_indonesian">indonezia</string>
<string name="poi_cuisine_african">Afrika</string> <string name="poi_cuisine_african">afrika</string>
<string name="poi_cuisine_caribbean">Kariba</string> <string name="poi_cuisine_caribbean">kariba</string>
<string name="poi_cuisine_argentinian">Argentina</string> <string name="poi_cuisine_argentinian">argentina</string>
<string name="poi_cuisine_balkan">balkana</string> <string name="poi_cuisine_balkan">balkana</string>
<string name="poi_cuisine_peruvian">Perua</string> <string name="poi_cuisine_peruvian">perua</string>
<string name="poi_cuisine_croatian">Kroata</string> <string name="poi_cuisine_croatian">kroata</string>
<string name="poi_cuisine_bolivian">Bolivia</string> <string name="poi_cuisine_bolivian">bolivia</string>
<string name="poi_cuisine_malagasy">Malagasa</string> <string name="poi_cuisine_malagasy">malagasa</string>
<string name="poi_cuisine_persian">Persa</string> <string name="poi_cuisine_persian">persa</string>
<string name="poi_cuisine_moroccan">Maroka</string> <string name="poi_cuisine_moroccan">maroka</string>
<string name="poi_cuisine_austrian">Aŭstra</string> <string name="poi_cuisine_austrian">aŭstra</string>
<string name="poi_cuisine_malaysian">Malajzia</string> <string name="poi_cuisine_malaysian">malajzia</string>
<string name="poi_cuisine_irish">Irlanda</string> <string name="poi_cuisine_irish">irlanda</string>
<string name="poi_cuisine_ethiopian">Etiopa</string> <string name="poi_cuisine_ethiopian">etiopa</string>
<string name="poi_cuisine_hungarian">Hungara</string> <string name="poi_cuisine_hungarian">hungara</string>
<string name="poi_cuisine_lao">Laŭa</string> <string name="poi_cuisine_lao">laŭa</string>
<string name="poi_cuisine_european">Eŭropa</string> <string name="poi_cuisine_european">eŭropa</string>
<string name="poi_cuisine_uzbek">Uzbeka</string> <string name="poi_cuisine_uzbek">uzbeka</string>
<string name="poi_cuisine_czech">Ĉeĥa</string> <string name="poi_cuisine_czech">ĉeĥa</string>
<string name="poi_cuisine_cuban">Kuba</string> <string name="poi_cuisine_cuban">kuba</string>
<string name="poi_cuisine_british">Brita</string> <string name="poi_cuisine_british">brita</string>
<string name="poi_cuisine_latin_american">Latinamerika</string> <string name="poi_cuisine_latin_american">latinamerika</string>
<string name="poi_cuisine_nepalese">Nepala</string> <string name="poi_cuisine_nepalese">nepala</string>
<string name="poi_cuisine_mongolian">Mongola</string> <string name="poi_cuisine_mongolian">mongola</string>
<string name="poi_cuisine_middle_eastern">Proksim-orienta</string> <string name="poi_cuisine_middle_eastern">Proksim-orienta</string>
<string name="poi_cuisine_ukrainian">Ukrajna</string> <string name="poi_cuisine_ukrainian">ukrajna</string>
<string name="poi_cuisine_afghan">Afgana</string> <string name="poi_cuisine_afghan">afgana</string>
<string name="poi_cuisine_belgian">Belga</string> <string name="poi_cuisine_belgian">belga</string>
<string name="poi_cuisine_basque">Eŭska</string> <string name="poi_cuisine_basque">eŭska</string>
<string name="poi_cuisine_swiss">Svisa</string> <string name="poi_cuisine_swiss">svisa</string>
<string name="poi_cuisine_cantonese">Kantona</string> <string name="poi_cuisine_cantonese">kantona</string>
<string name="poi_cuisine_swedish">Sveda</string> <string name="poi_cuisine_swedish">sveda</string>
<string name="poi_cuisine_jamaican">Jamajka</string> <string name="poi_cuisine_jamaican">jamajka</string>
<string name="poi_cuisine_armenian">Armena</string> <string name="poi_cuisine_armenian">armena</string>
<string name="poi_cuisine_hawaiian">Havaja</string> <string name="poi_cuisine_hawaiian">havaja</string>
<string name="poi_cuisine_english">Angla</string> <string name="poi_cuisine_english">angla</string>
<string name="poi_cuisine_pakistani">Pakistana</string> <string name="poi_cuisine_pakistani">pakistana</string>
<string name="poi_cuisine_taiwanese">Tajvana</string> <string name="poi_cuisine_taiwanese">tajvana</string>
<string name="poi_cuisine_tex_mex">Teksas-meksika</string> <string name="poi_cuisine_tex_mex">teksas-meksika</string>
<string name="poi_cuisine_dutch">Nederlanda</string> <string name="poi_cuisine_dutch">nederlanda</string>
<string name="poi_cuisine_syrian">Siria</string> <string name="poi_cuisine_syrian">siria</string>
<string name="poi_cuisine_australian">Aŭstralia</string> <string name="poi_cuisine_australian">aŭstralia</string>
<string name="poi_cuisine_cajun">Kaĵuna</string> <string name="poi_cuisine_cajun">kaĵuna</string>
<string name="poi_cuisine_egyptian">Egipta</string> <string name="poi_cuisine_egyptian">egipta</string>
<string name="poi_cuisine_senegalese">Senegala</string> <string name="poi_cuisine_senegalese">senegala</string>
<string name="poi_cuisine_jewish">Juda</string> <string name="poi_cuisine_jewish">juda</string>
<string name="poi_cuisine_bulgarian">Bulgara</string> <string name="poi_cuisine_bulgarian">bulgara</string>
<string name="poi_cuisine_tibetan">Tibeta</string> <string name="poi_cuisine_tibetan">tibeta</string>
<string name="poi_payment_transport_type">Pagmaniero (transporto)</string> <string name="poi_payment_transport_type">Pagmaniero (transporto)</string>
<string name="poi_social_facility_type">Socia servejo</string> <string name="poi_social_facility_type">Socia servejo</string>
<string name="poi_social_facility_for">Alcela grupo</string> <string name="poi_social_facility_for">Alcela grupo</string>
@ -3877,4 +3877,14 @@
<string name="poi_nurse">Flegist(in)o</string> <string name="poi_nurse">Flegist(in)o</string>
<string name="poi_mobile_money_agent">Agentejo de poŝtelefonaj pagoj</string> <string name="poi_mobile_money_agent">Agentejo de poŝtelefonaj pagoj</string>
<string name="poi_lifeguard_base">Bazo de akvaj savistoj</string> <string name="poi_lifeguard_base">Bazo de akvaj savistoj</string>
<string name="poi_vaccination_covid19">vakcinado: KOVIM-19</string>
<string name="poi_health_specialty_vaccination_yes">vakcinado</string>
<string name="poi_water_source_lake">lago</string>
<string name="poi_water_source_river">rivero</string>
<string name="poi_water_source_well">puto</string>
<string name="poi_water_source_powered_pump">pumpo elektra</string>
<string name="poi_water_source_water_tank">cisterno</string>
<string name="poi_water_source_tap">krano</string>
<string name="poi_water_source_water_works">akvokondukilo</string>
<string name="poi_water_source_tube_well">puto tuba (abisena)</string>
</resources> </resources>

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

@ -1853,7 +1853,7 @@
<string name="navigation_intent_invalid">Erara formo: %s</string> <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="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">Inteligenta rekalkulado de kurso</string>
<string name="use_fast_recalculation_desc">Rekalkuli nur komencan parton de kurso. Uzebla por longaj kursoj.</string> <string name="use_fast_recalculation_desc">Rekalkuli nur komencan parton de kurso, utila por longaj kursoj.</string>
<string name="rate_this_app">Taksi tiun ĉi aplikaĵon</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="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> <string name="rate_this_app_long">Bonvolu taksi OsmAnd ĉe Google Play</string>
@ -3426,7 +3426,7 @@
<string name="login_and_pass">Uzantnomo kaj pasvorto</string> <string name="login_and_pass">Uzantnomo kaj pasvorto</string>
<string name="plugin_global_prefs_info">Tiuj ĉi agordoj pri kromprogramoj aplikos al ĉiuj profiloj</string> <string name="plugin_global_prefs_info">Tiuj ĉi agordoj pri kromprogramoj aplikos al ĉiuj profiloj</string>
<string name="osm_editing">OSM‑redaktilo</string> <string name="osm_editing">OSM‑redaktilo</string>
<string name="osm_edits_view_descr">Vi povas vidigi ĉiujn viajn jam nepublikigitajn redaktojn aŭ rimarkojn ĉe %1$s. Punktoj alŝutitaj al OSM ne estos videblaj en OsmAnd.</string> <string name="osm_edits_view_descr">Ĉiuj viaj jam nepublikigitaj redaktoj aŭ rimarkoj OSM estos videblaj ĉe %1$s. Punktoj alŝutitaj al OSM ne estos videblaj en OsmAnd.</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">Emblemo montrata dum navigi aŭ moviĝi.</string> <string name="select_nav_icon_descr">Emblemo montrata dum navigi aŭ moviĝi.</string>
<string name="select_map_icon_descr">Montri emblemon dum restado.</string> <string name="select_map_icon_descr">Montri emblemon dum restado.</string>
@ -3833,7 +3833,7 @@
<string name="navigation_profile">Profilo de navigo</string> <string name="navigation_profile">Profilo de navigo</string>
<string name="route_between_points_add_track_desc">Elektu dosieron de spuro al kiu nova segmento estos aldonita.</string> <string name="route_between_points_add_track_desc">Elektu dosieron de spuro al kiu nova segmento estos aldonita.</string>
<string name="street_level_imagery">Strat-nivela fotaro</string> <string name="street_level_imagery">Strat-nivela fotaro</string>
<string name="plan_route_exit_dialog_descr">Ĉu vi certe volas forĵeti ĉiujn ŝanĝojn en la planita kurso per fermi ĝin\?</string> <string name="plan_route_exit_dialog_descr">Ĉu vi certe volas forĵeti ĉiujn ŝanĝojn en la planita kurso\?</string>
<string name="in_case_of_reverse_direction">Kiam en inversa direkto</string> <string name="in_case_of_reverse_direction">Kiam en inversa direkto</string>
<string name="save_track_to_gpx">Aŭtomate registri spuron dum navigi</string> <string name="save_track_to_gpx">Aŭtomate registri spuron dum navigi</string>
<string name="shared_string_save_as_gpx">Konservi kiel novan dosieron de spuro</string> <string name="shared_string_save_as_gpx">Konservi kiel novan dosieron de spuro</string>
@ -3895,7 +3895,7 @@
<string name="simplified_track_description">Nur la linio de kurso estos konservita, la navigadpunktoj estos forigitaj.</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="shared_string_file_name">Dosiernomo</string>
<string name="number_of_gpx_files_selected_pattern">%s 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="disable_recording_once_app_killed_descrp">Paŭzigi registri spuron je halto de la aplikaĵo (per la menuo de lastaj aplikaĵoj). (La 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_stop">Paŭzigi registri spuron</string>
<string name="gpx_monitoring_start">Daŭrigi registri spuron</string> <string name="gpx_monitoring_start">Daŭrigi registri spuron</string>
<string name="system_default_theme">Sistema</string> <string name="system_default_theme">Sistema</string>
@ -3911,7 +3911,7 @@
\n Vi povas administri kaj rezigni viajn abonojn per la agordoj de AppGallery.</string> \n Vi povas administri kaj rezigni viajn abonojn per la agordoj de AppGallery.</string>
<string name="start_finish_icons">Emblemoj de komenco kaj fino</string> <string name="start_finish_icons">Emblemoj de komenco kaj fino</string>
<string name="contour_lines_thanks">Dankon al vi por aĉeti la kromprogramon “nivelkurboj”</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="osm_live_payment_desc_hw">La abonpago estas 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_description">Eviti irejojn</string>
<string name="routing_attr_avoid_footways_name">Sen trotuaroj</string> <string name="routing_attr_avoid_footways_name">Sen trotuaroj</string>
<string name="development">Programado</string> <string name="development">Programado</string>
@ -3929,9 +3929,9 @@
<string name="file_already_imported">Dosiero jam estas enportita al OsmAnd</string> <string name="file_already_imported">Dosiero jam estas enportita al OsmAnd</string>
<string name="use_two_phase_routing">Uzi 2-fazan A* algoritmon de navigo</string> <string name="use_two_phase_routing">Uzi 2-fazan A* algoritmon de navigo</string>
<string name="shared_string_graph">Diagramo</string> <string name="shared_string_graph">Diagramo</string>
<string name="message_need_calculate_route_before_show_graph">Datumoj de %1$s estas disponeblaj nur por vojoj, vi devas kalkuli la kurson uzante “kalkuli kurson inter punktoj” por akiri ĝin.</string> <string name="message_need_calculate_route_before_show_graph">Datumoj de %1$s estas disponeblaj nur por vojoj, kalkulu la kurson uzante “kalkuli kurson inter punktoj” por montri diagramon.</string>
<string name="message_graph_will_be_available_after_recalculation">Atendado ĝis la kurso estos rekalkulita. <string name="message_graph_will_be_available_after_recalculation">Bonvolu atendi.
\nDiagramo estos videbla post rekalkulado.</string> \nDiagramo estos videbla post rekalkuli kurson.</string>
<string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string> <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
<string name="app_mode_gap">Manko</string> <string name="app_mode_gap">Manko</string>
<string name="shared_string_local_maps">Lokaj mapoj</string> <string name="shared_string_local_maps">Lokaj mapoj</string>
@ -3948,7 +3948,7 @@
<string name="mgrs_format_descr">OsmAnd uzas MGRS, kiu estas simila al la formo UTM NATO.</string> <string name="mgrs_format_descr">OsmAnd uzas MGRS, kiu estas simila al la formo UTM NATO.</string>
<string name="message_you_need_add_two_points_to_show_graphs">Aldonu almenaŭ du punktojn</string> <string name="message_you_need_add_two_points_to_show_graphs">Aldonu almenaŭ du punktojn</string>
<string name="manage_subscription">Administri abonon</string> <string name="manage_subscription">Administri abonon</string>
<string name="subscription_payment_issue_title">Okazis problemo pri via abono. Premu la butonon por iri al agordoj pri abonoj ĉe Google Play por korekti vian pagmanieron.</string> <string name="subscription_payment_issue_title">Frapetu la butonon por agordi pagmanieron ĉe Google Play por korekti vian abonon.</string>
<string name="subscription_expired_title">Abono OsmAnd Live senvalidiĝis</string> <string name="subscription_expired_title">Abono OsmAnd Live senvalidiĝis</string>
<string name="subscription_paused_title">Abono OsmAnd Live estas paŭziigita</string> <string name="subscription_paused_title">Abono OsmAnd Live estas paŭziigita</string>
<string name="subscription_on_hold_title">Abono OsmAnd Live estas ĉesigita</string> <string name="subscription_on_hold_title">Abono OsmAnd Live estas ĉesigita</string>
@ -3983,7 +3983,7 @@
<string name="add_photos_descr">OsmAnd montras fotojn el diversaj fontoj: <string name="add_photos_descr">OsmAnd montras fotojn el diversaj fontoj:
\nOpenPlaceReviews – fotoj de interesejoj; \nOpenPlaceReviews – fotoj de interesejoj;
\nMapillary – strat‑nivela fotaro; \nMapillary – strat‑nivela fotaro;
\ninterreto, Vikimedio – fotoj de interesejoj difinitaj en OpenStreetMap-datumoj.</string> \ninterreto, Vikimedio – fotoj de interesejoj difinitaj en OSM-datumoj.</string>
<string name="shared_string_resources">Rimedoj</string> <string name="shared_string_resources">Rimedoj</string>
<string name="approximate_file_size">Proksimuma dosiergrando</string> <string name="approximate_file_size">Proksimuma dosiergrando</string>
<string name="select_data_to_export">Elektu datumojn por elporti al dosiero.</string> <string name="select_data_to_export">Elektu datumojn por elporti al dosiero.</string>
@ -4015,4 +4015,6 @@
\n • propraj koloroj por ŝatataj ejoj kaj navigadpunktoj de spuro \n • propraj koloroj por ŝatataj ejoj kaj navigadpunktoj de spuro
\n \n
\n</string> \n</string>
<string name="profile_type_osmand_string">OsmAnd‑profilo</string>
<string name="profile_type_user_string">Profilo de uzanto</string>
</resources> </resources>

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

@ -3248,7 +3248,7 @@
<string name="poi_water_supply_pump">Bomba</string> <string name="poi_water_supply_pump">Bomba</string>
<string name="poi_water_supply_borehole">Perforación</string> <string name="poi_water_supply_borehole">Perforación</string>
<string name="poi_water_supply_water_trucking">Camión de agua</string> <string name="poi_water_supply_water_trucking">Camión de agua</string>
<string name="poi_water_supply_water_tank">Tanque de agua</string> <string name="poi_water_supply_water_tank">Depósito de agua</string>
<string name="poi_water_supply_bottled_water">Botella de agua</string> <string name="poi_water_supply_bottled_water">Botella de agua</string>
<string name="poi_water_place_access_community">Comunidad</string> <string name="poi_water_place_access_community">Comunidad</string>
<string name="poi_water_place_access_family">Familia</string> <string name="poi_water_place_access_family">Familia</string>
@ -3891,4 +3891,14 @@
<string name="poi_nurse">Enfermera</string> <string name="poi_nurse">Enfermera</string>
<string name="poi_mobile_money_agent">Agente de dinero móvil</string> <string name="poi_mobile_money_agent">Agente de dinero móvil</string>
<string name="poi_lifeguard_base">Base de salvavidas</string> <string name="poi_lifeguard_base">Base de salvavidas</string>
<string name="poi_vaccination_covid19">Vacunación: COVID19</string>
<string name="poi_health_specialty_vaccination_yes">Vacunación</string>
<string name="poi_water_source_lake">Lago</string>
<string name="poi_water_source_river">Río</string>
<string name="poi_water_source_well">Pozo</string>
<string name="poi_water_source_powered_pump">Bomba accionada</string>
<string name="poi_water_source_water_tank">Depósito de agua</string>
<string name="poi_water_source_tap">Canilla</string>
<string name="poi_water_source_water_works">Planta potabilizadora</string>
<string name="poi_water_source_tube_well">Pozo entubado</string>
</resources> </resources>

34
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_name">Límite de altura</string>
<string name="routing_attr_height_description">Indica la altura permitida del vehículo en rutas.</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">Recálculo inteligente de 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="use_fast_recalculation_desc">Recalcula sólo la parte inicial de la ruta, útil para viajes largos.</string>
<string name="shared_string_logoff">Cerrar sesión</string> <string name="shared_string_logoff">Cerrar sesión</string>
<string name="rendering_value_disabled_name">Desactivado</string> <string name="rendering_value_disabled_name">Desactivado</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Color por red de afiliación</string> <string name="rendering_value_walkingRoutesScopeOSMC_name">Color por red de afiliación</string>
@ -1952,7 +1952,7 @@
<string name="access_autoannounce_period_descr">Lapso de tiempo mínimo entre avisos.</string> <string name="access_autoannounce_period_descr">Lapso de tiempo mínimo entre avisos.</string>
<string name="map_widget_bearing">Rumbo relativo</string> <string name="map_widget_bearing">Rumbo relativo</string>
<string name="map_widget_magnetic_bearing">Rumbo magnético</string> <string name="map_widget_magnetic_bearing">Rumbo magnético</string>
<string name="access_no_destination">Destino indefinido</string> <string name="access_no_destination">Complemento de accesibilidad: Destino indefinido</string>
<string name="use_osm_live_routing_description">Activa la navegación para cambios en vivo de OsmAnd.</string> <string name="use_osm_live_routing_description">Activa la navegación para cambios en vivo de OsmAnd.</string>
<string name="use_osm_live_routing">Navegación con OsmAnd Live</string> <string name="use_osm_live_routing">Navegación con OsmAnd Live</string>
<string name="follow_us">Síguenos</string> <string name="follow_us">Síguenos</string>
@ -2396,7 +2396,7 @@
<string name="srtm_menu_download_descr">Descarga el mapa de «Curvas de nivel» para usarlas en esta región.</string> <string name="srtm_menu_download_descr">Descarga el mapa de «Curvas de nivel» para usarlas en esta región.</string>
<string name="shared_string_plugin">Complemento</string> <string name="shared_string_plugin">Complemento</string>
<string name="srtm_purchase_header">Compra e instala el complemento «Curvas de nivel» para mostrar áreas verticales graduadas.</string> <string name="srtm_purchase_header">Compra e instala el complemento «Curvas de nivel» para mostrar áreas verticales graduadas.</string>
<string name="hillshade_menu_download_descr">Descarga el mapa «Superposición de sombreado» para mostrar el sombreado vertical.</string> <string name="hillshade_menu_download_descr">Descarga la capa superpuesta del mapa «Sombreado» para mostrar el sombreado vertical.</string>
<string name="hillshade_purchase_header">Instala el complemento «Curvas de nivel» para mostrar las áreas verticales graduadas.</string> <string name="hillshade_purchase_header">Instala el complemento «Curvas de nivel» para mostrar las áreas verticales graduadas.</string>
<string name="hide_from_zoom_level">Ocultar desde el nivel de zoom</string> <string name="hide_from_zoom_level">Ocultar desde el nivel de zoom</string>
<string name="quick_action_showhide_osmbugs_title">Mostrar u ocultar notas de OSM</string> <string name="quick_action_showhide_osmbugs_title">Mostrar u ocultar notas de OSM</string>
@ -3432,7 +3432,7 @@
<string name="login_and_pass">Nombre de usuario y contraseña</string> <string name="login_and_pass">Nombre de usuario y contraseña</string>
<string name="plugin_global_prefs_info">Los ajustes de este complemento son globales y se aplican a todos los perfiles</string> <string name="plugin_global_prefs_info">Los ajustes de este complemento son globales y se aplican a todos los perfiles</string>
<string name="osm_editing">Edición de OSM</string> <string name="osm_editing">Edición de OSM</string>
<string name="osm_edits_view_descr">Puedes ver todas tus ediciones aún no subidas o errores de OSM en «%1$s». Los puntos subidos no se muestran en OsmAnd.</string> <string name="osm_edits_view_descr">Vea todas las ediciones aún no subidas o errores de OSM en «%1$s». Los cambios ya cargados no se mostrarán más.</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">El icono se muestra mientras se navega o se mueve.</string> <string name="select_nav_icon_descr">El icono se muestra mientras se navega o se mueve.</string>
<string name="select_map_icon_descr">El icono se muestra en reposo.</string> <string name="select_map_icon_descr">El icono se muestra en reposo.</string>
@ -3799,9 +3799,9 @@
<string name="lenght_limit_description">Proporciona la longitud del vehículo, se pueden aplicar algunas restricciones de rutas para vehículos largos.</string> <string name="lenght_limit_description">Proporciona la longitud del vehículo, se pueden aplicar algunas restricciones de rutas para vehículos largos.</string>
<string name="quick_action_remove_next_destination">Borrar el punto de destino más cercano</string> <string name="quick_action_remove_next_destination">Borrar el punto de destino más cercano</string>
<string name="please_provide_point_name_error">Proporciona un nombre para el punto</string> <string name="please_provide_point_name_error">Proporciona un nombre para el punto</string>
<string name="quick_action_remove_next_destination_descr">El punto de destino actual de la ruta será borrado. Si será el destino, la navegación se detendrá.</string> <string name="quick_action_remove_next_destination_descr">Quita el siguiente destino de la ruta. Si es el destino final, la navegación se detendrá.</string>
<string name="search_download_wikipedia_maps">Descargar datos de Wikipedia</string> <string name="search_download_wikipedia_maps">Descargar datos de Wikipedia</string>
<string name="plugin_wikipedia_description">Obtén información sobre los puntos de interés de Wikipedia. Es tu guía de bolsillo sin conexión - sólo activa el complemento de Wikipedia y disfruta los artículos sobre los objetos de alrededor.</string> <string name="plugin_wikipedia_description">Obtén información sobre los puntos de interés de Wikipedia, una guía de bolsillo sin conexión que incluye artículos sobre objetos y destinos.</string>
<string name="app_mode_enduro_motorcycle">Motocicleta de enduro</string> <string name="app_mode_enduro_motorcycle">Motocicleta de enduro</string>
<string name="app_mode_motor_scooter">Motoneta (motor)</string> <string name="app_mode_motor_scooter">Motoneta (motor)</string>
<string name="app_mode_wheelchair">Silla de ruedas</string> <string name="app_mode_wheelchair">Silla de ruedas</string>
@ -3839,7 +3839,7 @@
<string name="navigation_profile">Perfil de navegación</string> <string name="navigation_profile">Perfil de navegación</string>
<string name="route_between_points_add_track_desc">Elige un archivo de traza al que se añadirá un nuevo segmento.</string> <string name="route_between_points_add_track_desc">Elige un archivo de traza al que se añadirá un nuevo segmento.</string>
<string name="street_level_imagery">Imágenes a nivel de calle</string> <string name="street_level_imagery">Imágenes a nivel de calle</string>
<string name="plan_route_exit_dialog_descr">¿Cerrar el plan de ruta sin guardar\?, se descartarán todos los cambios.</string> <string name="plan_route_exit_dialog_descr">¿Descartar todos los cambios en la ruta planificada\?</string>
<string name="in_case_of_reverse_direction">En caso de dirección inversa</string> <string name="in_case_of_reverse_direction">En caso de dirección inversa</string>
<string name="save_track_to_gpx">Grabar la traza automáticamente al navegar</string> <string name="save_track_to_gpx">Grabar la traza automáticamente al navegar</string>
<string name="shared_string_gpx_files">Trazas</string> <string name="shared_string_gpx_files">Trazas</string>
@ -3911,12 +3911,12 @@
<string name="sort_name_ascending">Nombre: A – Z</string> <string name="sort_name_ascending">Nombre: A – Z</string>
<string name="start_finish_icons">Iconos de inicio y fin</string> <string name="start_finish_icons">Iconos de inicio y fin</string>
<string name="contour_lines_thanks">Gracias por comprar las «Curvas de nivel»</string> <string name="contour_lines_thanks">Gracias por comprar las «Curvas de nivel»</string>
<string name="osm_live_payment_desc_hw">La suscripción se cobra por el período elegido. Puedes cancelarlo en cualquier momento en AppGallery.</string> <string name="osm_live_payment_desc_hw">La suscripción se cobra por el período elegido. Puedes cancelarlo en AppGallery en cualquier momento.</string>
<string name="osm_live_payment_subscription_management_hw">El pago será cargado a la cuenta de AppGallery al confirmar la compra. <string name="osm_live_payment_subscription_management_hw">El pago será cargado a la cuenta de AppGallery al confirmar la compra.
\n \n
\nLa suscripción se renueva automáticamente a menos que se cancele antes de la fecha de renovación. La cuenta será cargada por el período de renovación (mes/trimestre/año) sólo en la fecha de renovación. \nLa suscripción se renueva automáticamente a menos que se cancele antes de la fecha de renovación. La cuenta será cargada por el período de renovación (mes/trimestre/año) sólo en la fecha de renovación.
\n \n
\nPuedes administrar y cancelar las suscripciones accediendo a los ajustes de AppGallery.</string> \nPuedes administrar y cancelar las suscripciones en 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_description">Evita pasar por las veredas o aceras</string>
<string name="routing_attr_avoid_footways_name">Evitar veredas/aceras</string> <string name="routing_attr_avoid_footways_name">Evitar veredas/aceras</string>
<string name="development">Desarrollo</string> <string name="development">Desarrollo</string>
@ -3935,9 +3935,9 @@
<string name="file_already_imported">El archivo ya fue importado en OsmAnd</string> <string name="file_already_imported">El archivo ya fue importado en OsmAnd</string>
<string name="use_two_phase_routing">Usar el algoritmo de navegación A* bifásica</string> <string name="use_two_phase_routing">Usar el algoritmo de navegación A* bifásica</string>
<string name="shared_string_graph">Gráfico</string> <string name="shared_string_graph">Gráfico</string>
<string name="message_need_calculate_route_before_show_graph">Hay %1$s datos disponibles sólo en los caminos, debes calcular una ruta usando «Ruta entre puntos» para obtenerla.</string> <string name="message_need_calculate_route_before_show_graph">Hay %1$s datos disponibles sólo en los caminos, calcular una ruta usando «Ruta entre puntos» para ver los gráficos.</string>
<string name="message_graph_will_be_available_after_recalculation">Espera el recálculo de la ruta. <string name="message_graph_will_be_available_after_recalculation">Ten paciencia.
\nEl gráfico estará disponible después del recálculo.</string> \nEl gráfico estará disponible al recalcular la ruta.</string>
<string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string> <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
<string name="shared_string_local_maps">Mapas locales</string> <string name="shared_string_local_maps">Mapas locales</string>
<string name="icon_group_amenity">Comodidad</string> <string name="icon_group_amenity">Comodidad</string>
@ -3951,7 +3951,7 @@
<string name="navigate_point_mgrs">MGRS</string> <string name="navigate_point_mgrs">MGRS</string>
<string name="navigate_point_format_mgrs">MGRS</string> <string name="navigate_point_format_mgrs">MGRS</string>
<string name="mgrs_format_descr">OsmAnd usa MGRS, similar al formato UTM de la OTAN.</string> <string name="mgrs_format_descr">OsmAnd usa MGRS, similar al formato UTM de la OTAN.</string>
<string name="message_you_need_add_two_points_to_show_graphs">Debes añadir al menos dos puntos</string> <string name="message_you_need_add_two_points_to_show_graphs">Añadir al menos dos puntos</string>
<string name="manage_subscription">Gestionar suscripción</string> <string name="manage_subscription">Gestionar suscripción</string>
<string name="subscription_payment_issue_title">Hay un problema con la suscripción. Pulsa el botón para ir a los ajustes de la suscripción de Google Play y corregir el método de pago.</string> <string name="subscription_payment_issue_title">Hay un problema con la suscripción. Pulsa el botón para ir a los ajustes de la suscripción de Google Play y corregir el método de pago.</string>
<string name="subscription_expired_title">La suscripción a OsmAnd Live ha caducado</string> <string name="subscription_expired_title">La suscripción a OsmAnd Live ha caducado</string>
@ -3996,7 +3996,7 @@
<string name="add_photos_descr">OsmAnd muestra fotos de varios repositorios: <string name="add_photos_descr">OsmAnd muestra fotos de varios repositorios:
\nOpenPlaceReviews (fotos de PDI); \nOpenPlaceReviews (fotos de PDI);
\nMapillary (imágenes a nivel de calle); \nMapillary (imágenes a nivel de calle);
\nWeb / Wikimedia (fotos de PDI incluidas en los datos de OpenStreetMap).</string> \nWeb / Wikimedia (fotos de PDI según datos de OpenStreetMap).</string>
<string name="app_mode_gap">Separador</string> <string name="app_mode_gap">Separador</string>
<string name="select_groups_for_import">Marca los grupos que serán importados.</string> <string name="select_groups_for_import">Marca los grupos que serán importados.</string>
<string name="select_items_for_import">Marca los elementos que serán importados.</string> <string name="select_items_for_import">Marca los elementos que serán importados.</string>
@ -4006,7 +4006,7 @@
<string name="select_picture">Elegir imagen</string> <string name="select_picture">Elegir imagen</string>
<string name="lang_de_casual">Alemán (casual)</string> <string name="lang_de_casual">Alemán (casual)</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string> <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="elevation_data">Puedes usar los datos de elevación para considerar el ascenso o descenso de su viaje</string> <string name="elevation_data">Puedes usar los datos de elevación para tener en cuenta el ascenso y descenso del viaje</string>
<string name="app_mode_light_aircraft">Avión ligero</string> <string name="app_mode_light_aircraft">Avión ligero</string>
<string name="plan_route_join_segments">Unir segmentos</string> <string name="plan_route_join_segments">Unir segmentos</string>
<string name="plan_route_split_before">Dividir antes</string> <string name="plan_route_split_before">Dividir antes</string>
@ -4014,11 +4014,13 @@
<string name="plan_route_add_new_segment">Añadir nuevo segmento</string> <string name="plan_route_add_new_segment">Añadir nuevo segmento</string>
<string name="release_3_9">• Se ha añadido la opción de exportar e importar todos los datos, incluyendo los ajustes, los recursos y «Mis sitios» <string name="release_3_9">• Se ha añadido la opción de exportar e importar todos los datos, incluyendo los ajustes, los recursos y «Mis sitios»
\n \n
\n • Planificar ruta: se añadieron gráficos para los segmentos con la ruta y capacidad de crear o editar trazas de segmentos múltiples \n • Planificar ruta: se añadieron gráficos para los segmentos de trazas con la ruta y capacidad de crear o editar trazas de segmentos múltiples
\n \n
\n • Se ha añadido el método de autenticación OAuth para OpenStreetMap y se ha mejorado la interfaz de usuario de los diálogos de OSM \n • Se ha añadido el método de autenticación OAuth para OpenStreetMap y se ha mejorado la interfaz de usuario de los diálogos de OSM
\n \n
\n • Se añadieron colores personalizados para los favoritos y los puntos de referencia de la traza \n • Se añadieron colores personalizados para los favoritos y los puntos de referencia de la traza
\n \n
\n</string> \n</string>
<string name="profile_type_osmand_string">Perfil de OsmAnd</string>
<string name="profile_type_user_string">Perfil de usuario</string>
</resources> </resources>

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

@ -3891,4 +3891,6 @@
<string name="poi_siren">Sirena</string> <string name="poi_siren">Sirena</string>
<string name="poi_nurse">Enfermera</string> <string name="poi_nurse">Enfermera</string>
<string name="poi_mobile_money_agent">Agente de dinero móvil</string> <string name="poi_mobile_money_agent">Agente de dinero móvil</string>
<string name="poi_vaccination_covid19">Vacunación: COVID19</string>
<string name="poi_health_specialty_vaccination_yes">Vacunación</string>
</resources> </resources>

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

@ -1541,7 +1541,7 @@
<string name="routing_attr_height_name">Límite de altura</string> <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="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">Recálculo inteligente de 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="use_fast_recalculation_desc">Recalcula sólo la parte inicial de la ruta, útil para viajes largos.</string>
<string name="shared_string_logoff">Cerrar sesión</string> <string name="shared_string_logoff">Cerrar sesión</string>
<string name="rendering_value_disabled_name">Desactivado</string> <string name="rendering_value_disabled_name">Desactivado</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Color por red de afiliación</string> <string name="rendering_value_walkingRoutesScopeOSMC_name">Color por red de afiliación</string>
@ -3935,9 +3935,9 @@
<string name="navigate_point_mgrs">MGRS</string> <string name="navigate_point_mgrs">MGRS</string>
<string name="navigate_point_format_mgrs">MGRS</string> <string name="navigate_point_format_mgrs">MGRS</string>
<string name="mgrs_format_descr">OsmAnd usa MGRS, similar al formato UTM de la OTAN.</string> <string name="mgrs_format_descr">OsmAnd usa MGRS, similar al formato UTM de la OTAN.</string>
<string name="message_need_calculate_route_before_show_graph">Hay %1$s datos disponibles sólo en los caminos, debes calcular una ruta usando «Ruta entre puntos» para obtenerla.</string> <string name="message_need_calculate_route_before_show_graph">Hay %1$s datos disponibles sólo en los caminos, calcular una ruta usando «Ruta entre puntos» para ver los gráficos.</string>
<string name="message_graph_will_be_available_after_recalculation">Espera el recálculo de la ruta. <string name="message_graph_will_be_available_after_recalculation">Ten paciencia
\nEl gráfico estará disponible después del recálculo.</string> \nEl gráfico estará disponible al recalcular la ruta.</string>
<string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string> <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
<string name="icon_group_travel">Viaje</string> <string name="icon_group_travel">Viaje</string>
<string name="icon_group_transport">Transporte</string> <string name="icon_group_transport">Transporte</string>
@ -3959,7 +3959,7 @@
<string name="open_street_map_login_mode">Debes iniciar sesión para subir los cambios nuevos o modificados. <string name="open_street_map_login_mode">Debes iniciar sesión para subir los cambios nuevos o modificados.
\n \n
\nPuedes ingresar usando el método seguro de OAuth o con nombre de usuario y contraseña.</string> \nPuedes ingresar usando el método seguro de OAuth o con nombre de usuario y contraseña.</string>
<string name="message_you_need_add_two_points_to_show_graphs">Debes añadir al menos dos puntos</string> <string name="message_you_need_add_two_points_to_show_graphs">Añadir al menos dos puntos</string>
<string name="markers_history">Historial de marcadores</string> <string name="markers_history">Historial de marcadores</string>
<string name="manage_subscription">Gestionar suscripción</string> <string name="manage_subscription">Gestionar suscripción</string>
<string name="login_open_street_map_org">Ingresar en OpenStreetMap.org</string> <string name="login_open_street_map_org">Ingresar en OpenStreetMap.org</string>
@ -3993,7 +3993,7 @@
<string name="add_photos_descr">OsmAnd muestra fotos de varios repositorios: <string name="add_photos_descr">OsmAnd muestra fotos de varios repositorios:
\nOpenPlaceReviews (fotos de PDI); \nOpenPlaceReviews (fotos de PDI);
\nMapillary (imágenes a nivel de calle); \nMapillary (imágenes a nivel de calle);
\nWeb / Wikimedia (fotos de PDI incluidas en los datos de OpenStreetMap).</string> \nWeb / Wikimedia (fotos de PDI según datos de OpenStreetMap).</string>
<string name="use_dev_url_descr">Cambia a la versión para desarrolladores «dev.openstreetmap.org» en lugar de openstreetmap.org para probar la carga de PDI, notas de OSM y archivos GPX.</string> <string name="use_dev_url_descr">Cambia a la versión para desarrolladores «dev.openstreetmap.org» en lugar de openstreetmap.org para probar la carga de PDI, notas de OSM y archivos GPX.</string>
<string name="use_dev_url">Usar dev.openstreetmap.org</string> <string name="use_dev_url">Usar dev.openstreetmap.org</string>
<string name="select_picture">Elegir imagen</string> <string name="select_picture">Elegir imagen</string>
@ -4003,7 +4003,7 @@
<string name="app_mode_gap">Separador</string> <string name="app_mode_gap">Separador</string>
<string name="release_3_9">• Se ha añadido la opción de exportar e importar todos los datos, incluyendo los ajustes, los recursos y «Mis sitios» <string name="release_3_9">• Se ha añadido la opción de exportar e importar todos los datos, incluyendo los ajustes, los recursos y «Mis sitios»
\n \n
\n • Planificar ruta: se añadieron gráficos para los segmentos con la ruta y capacidad de crear o editar trazas de segmentos múltiples \n • Planificar ruta: se añadieron gráficos para los segmentos de trazas con la ruta y capacidad de crear o editar trazas de segmentos múltiples
\n \n
\n • Se ha añadido el método de autenticación OAuth para OpenStreetMap y se ha mejorado la interfaz de usuario de los diálogos de OSM \n • Se ha añadido el método de autenticación OAuth para OpenStreetMap y se ha mejorado la interfaz de usuario de los diálogos de OSM
\n \n
@ -4016,6 +4016,6 @@
<string name="plan_route_add_new_segment">Añadir nuevo segmento</string> <string name="plan_route_add_new_segment">Añadir nuevo segmento</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string> <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="lang_de_casual">Alemán (casual)</string> <string name="lang_de_casual">Alemán (casual)</string>
<string name="elevation_data">Puedes usar los datos de elevación para considerar el ascenso o descenso del viaje</string> <string name="elevation_data">Puedes usar los datos de elevación para tener en cuenta el ascenso y descenso del viaje</string>
<string name="app_mode_light_aircraft">Avión ligero</string> <string name="app_mode_light_aircraft">Avión ligero</string>
</resources> </resources>

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

@ -3941,13 +3941,13 @@
<string name="select_data_to_export">Seleccione los datos para exportar al fichero.</string> <string name="select_data_to_export">Seleccione los datos para exportar al fichero.</string>
<string name="file_size_needed_for_import">Necesario para importar</string> <string name="file_size_needed_for_import">Necesario para importar</string>
<string name="export_not_enough_space">No hay espacio suficiente</string> <string name="export_not_enough_space">No hay espacio suficiente</string>
<string name="release_3_9">"• Se ha añadido la opción de exportar e importar todos los datos, incluyendo los ajustes, los recursos y «Mis sitios» <string name="release_3_9">• Se ha añadido la opción de exportar e importar todos los datos, incluyendo los ajustes, los recursos y «Mis sitios»
\n \n
\n • Planificar ruta: se añadieron gráficos para los segmentos de traza con la ruta y capacidad de crear o editar segmentos de traza múltiples \n • Planificar ruta: se añadieron gráficos para los segmentos de trazas con la ruta y capacidad de crear o editar trazas de segmentos múltiples
\n \n
\n • Se ha añadido el método de autenticación OAuth para OpenStreetMap y se ha mejorado la interfaz de usuario de los diálogos de OSM \n • Se ha añadido el método de autenticación OAuth para OpenStreetMap y se ha mejorado la interfaz de usuario de los diálogos de OSM
\n \n
\n • Se añadieron colores personalizados para los favoritos y los puntos de referencia de la traza \n • Se añadieron colores personalizados para los favoritos y los puntos de referencia de la traza
\n \n
\n"</string> \n</string>
</resources> </resources>

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

@ -4000,4 +4000,12 @@ Area honi dagokio: %1$s x %2$s</string>
<string name="osm_edit_comment_note">Egin iruzkina OSM oharrean</string> <string name="osm_edit_comment_note">Egin iruzkina OSM oharrean</string>
<string name="select_picture">Hautatu argazkia</string> <string name="select_picture">Hautatu argazkia</string>
<string name="use_dev_url">Erabili dev.openstreetmap.org</string> <string name="use_dev_url">Erabili dev.openstreetmap.org</string>
<string name="select_groups_for_import">Hautatu inportatuko diren taldeak.</string>
<string name="select_items_for_import">Hautatu inportatuko diren elementuak.</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="app_mode_light_aircraft">Hegazkin arina</string>
<string name="plan_route_join_segments">Elkartu segmentuak</string>
<string name="plan_route_split_before">Zatitu aurretik</string>
<string name="plan_route_split_after">Zatitu ondoren</string>
<string name="plan_route_add_new_segment">Gehitu segmentu berria</string>
</resources> </resources>

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

@ -3885,4 +3885,14 @@
<string name="poi_diplomatic_services_immigrant_visas_filter">Visas pour immigrants</string> <string name="poi_diplomatic_services_immigrant_visas_filter">Visas pour immigrants</string>
<string name="poi_diplomatic_services_non_immigrant_visas_filter">Visas pour non-immigrants</string> <string name="poi_diplomatic_services_non_immigrant_visas_filter">Visas pour non-immigrants</string>
<string name="poi_diplomatic_liaison">Liaison diplomatique</string> <string name="poi_diplomatic_liaison">Liaison diplomatique</string>
<string name="poi_water_source_lake">Lac</string>
<string name="poi_water_source_tube_well">Puits tubulaire</string>
<string name="poi_water_source_river">Rivière</string>
<string name="poi_water_source_well">Puits</string>
<string name="poi_water_source_powered_pump">Pompe à eau</string>
<string name="poi_water_source_water_works">Ouvrages hydrauliques</string>
<string name="poi_water_source_water_tank">Réservoir d\'eau</string>
<string name="poi_water_source_tap">Robinet</string>
<string name="poi_vaccination_covid19">Vaccination : covid19</string>
<string name="poi_health_specialty_vaccination_yes">Vaccination</string>
</resources> </resources>

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

@ -1934,7 +1934,7 @@
<string name="access_smart_autoannounce_descr">Annoncer uniquement lorsque la direction de la destination est modifiée.</string> <string name="access_smart_autoannounce_descr">Annoncer uniquement lorsque la direction de la destination est modifiée.</string>
<string name="access_autoannounce_period">Fréquence des annonces</string> <string name="access_autoannounce_period">Fréquence des annonces</string>
<string name="access_autoannounce_period_descr">Durée minimum entre deux annonces.</string> <string name="access_autoannounce_period_descr">Durée minimum entre deux annonces.</string>
<string name="access_no_destination">Aucune destination définie</string> <string name="access_no_destination">Greffon d\'accessibilité : Aucune destination n\'est définie</string>
<string name="map_widget_magnetic_bearing">Cap magnétique</string> <string name="map_widget_magnetic_bearing">Cap magnétique</string>
<string name="map_widget_bearing">Cap relatif</string> <string name="map_widget_bearing">Cap relatif</string>
<string name="access_disable_offroute_recalc">Ne pas recalculer l\'itinéraire après l\'avoir quitté</string> <string name="access_disable_offroute_recalc">Ne pas recalculer l\'itinéraire après l\'avoir quitté</string>
@ -3408,7 +3408,7 @@
<string name="login_and_pass">Nom d\'utilisateur et mot de passe</string> <string name="login_and_pass">Nom d\'utilisateur et mot de passe</string>
<string name="plugin_global_prefs_info">Les paramètres de ce greffon sont globaux et s\'appliquent à tous les profils</string> <string name="plugin_global_prefs_info">Les paramètres de ce greffon sont globaux et s\'appliquent à tous les profils</string>
<string name="osm_editing">Édition OSM</string> <string name="osm_editing">Édition OSM</string>
<string name="osm_edits_view_descr">Vous pouvez consulter vos modifications et vos bugs OSM non envoyés dans %1$s. Les points téléversés ne sont plus affichés dans OsmAnd.</string> <string name="osm_edits_view_descr">Consultez vos modifications et vos bugs OSM non encore envoyés dans %1$s. Les modifications téléversées ne seront plus affichées dans OsmAnd.</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">Icône affiché pendant la navigation ou en déplacement.</string> <string name="select_nav_icon_descr">Icône affiché pendant la navigation ou en déplacement.</string>
<string name="select_map_icon_descr">Icône affiché à l\'arrêt.</string> <string name="select_map_icon_descr">Icône affiché à l\'arrêt.</string>
@ -3770,7 +3770,7 @@
<string name="app_mode_inline_skates">Patins à roulettes en ligne</string> <string name="app_mode_inline_skates">Patins à roulettes en ligne</string>
<string name="use_volume_buttons_as_zoom">Zoomer avec les boutons de volume</string> <string name="use_volume_buttons_as_zoom">Zoomer avec les boutons de volume</string>
<string name="use_volume_buttons_as_zoom_descr">Contrôler le niveau de zoom de la carte avec les boutons de réglage du volume sonore.</string> <string name="use_volume_buttons_as_zoom_descr">Contrôler le niveau de zoom de la carte avec les boutons de réglage du volume sonore.</string>
<string name="quick_action_remove_next_destination_descr">Le prochain point sur la route va être supprimé. S\'il s\'agit de la destination finale, la navigation s\'arrêtera.</string> <string name="quick_action_remove_next_destination_descr">Supprime la prochaine étape de votre route. S\'il s\'agit de la destination finale, la navigation s\'arrêtera.</string>
<string name="lenght_limit_description">Indiquez la longueur de votre véhicule, certaines restrictions d\'itinéraire peuvent s\'appliquer aux véhicules longs.</string> <string name="lenght_limit_description">Indiquez la longueur de votre véhicule, certaines restrictions d\'itinéraire peuvent s\'appliquer aux véhicules longs.</string>
<string name="quick_action_remove_next_destination">Supprimer le prochain point</string> <string name="quick_action_remove_next_destination">Supprimer le prochain point</string>
<string name="please_provide_point_name_error">Merci de renseigner un nom pour le point</string> <string name="please_provide_point_name_error">Merci de renseigner un nom pour le point</string>
@ -3940,7 +3940,7 @@
<string name="markers_history">Historique des marqueurs</string> <string name="markers_history">Historique des marqueurs</string>
<string name="send_files_to_openstreetmap">Envoyer un fichier GPX vers OpenStreetMap</string> <string name="send_files_to_openstreetmap">Envoyer un fichier GPX vers OpenStreetMap</string>
<string name="enter_text_separated">Saisissez les étiquettes séparées par des virgules.</string> <string name="enter_text_separated">Saisissez les étiquettes séparées par des virgules.</string>
<string name="subscription_payment_issue_title">Il y a un problème avec votre abonnement. Tapez sur le bouton pour accéder aux paramètres de l\'abonnement Google Play et corriger votre mode de paiement.</string> <string name="subscription_payment_issue_title">Appuyez sur le bouton pour configurer un mode de paiement sur Google Play pour résoudre le problème de votre abonnement.</string>
<string name="osm_edit_comment_note">Commenter la note OSM</string> <string name="osm_edit_comment_note">Commenter la note OSM</string>
<string name="osm_edit_close_note">Fermer la note OSM</string> <string name="osm_edit_close_note">Fermer la note OSM</string>
<string name="shared_string_add_photo">Ajouter une photo</string> <string name="shared_string_add_photo">Ajouter une photo</string>

2
OsmAnd/res/values-hu/phrases.xml
View file

@ -3876,4 +3876,6 @@
<string name="poi_siren">Sziréna</string> <string name="poi_siren">Sziréna</string>
<string name="poi_mobile_money_agent">Mobilpénzfizetési iroda</string> <string name="poi_mobile_money_agent">Mobilpénzfizetési iroda</string>
<string name="poi_lifeguard_base">Vízimentő-támaszpont</string> <string name="poi_lifeguard_base">Vízimentő-támaszpont</string>
<string name="poi_vaccination_covid19">Oltóközpont: Covid19</string>
<string name="poi_health_specialty_vaccination_yes">Oltóközpont</string>
</resources> </resources>

26
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_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="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">Intelligens útvonal újraszámítás</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="use_fast_recalculation_desc">Csak az útvonal kezdeti részét számítja újra; hosszú utaknál hasznos.</string>
<string name="shared_string_logoff">Naplózás ki</string> <string name="shared_string_logoff">Naplózás ki</string>
<string name="rendering_value_disabled_name">Letiltva</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> <string name="rendering_value_walkingRoutesScopeOSMC_name">Színezés hálózathoz tartozás szerint</string>
@ -3923,9 +3923,9 @@
<string name="ltr_or_rtl_combine_via_dash">%1$s - %2$s</string> <string name="ltr_or_rtl_combine_via_dash">%1$s - %2$s</string>
<string name="snowmobile_render_descr">Motorosszánutakhoz kifejezetten motoros szán számára kijelölt utakon.</string> <string name="snowmobile_render_descr">Motorosszánutakhoz kifejezetten motoros szán számára kijelölt utakon.</string>
<string name="shared_string_graph">Grafikon</string> <string name="shared_string_graph">Grafikon</string>
<string name="message_need_calculate_route_before_show_graph">%1$s adatok csak az utakról állnak rendelkezésre. Használja az „Útvonal tervezése pontok között” funkciót.</string> <string name="message_need_calculate_route_before_show_graph">%1$s adatok csak utakról állnak rendelkezésre. Az ábrák megtekintéséhez az „Útvonal tervezése pontok között” funkcióval számítsa ki az útvonalat.</string>
<string name="message_graph_will_be_available_after_recalculation">Várja meg az útvonal újraszámítását. <string name="message_graph_will_be_available_after_recalculation">Kérjük, várjon.
\nAz ábra az újraszámítás után lesz látható.</string> \nAz ábra azútvonal újraszámítása után lesz látható.</string>
<string name="shared_string_local_maps">Helyi térképek</string> <string name="shared_string_local_maps">Helyi térképek</string>
<string name="icon_group_amenity">Hasznos és fontos létesítmény</string> <string name="icon_group_amenity">Hasznos és fontos létesítmény</string>
<string name="icon_group_special">Különleges</string> <string name="icon_group_special">Különleges</string>
@ -3938,7 +3938,7 @@
<string name="navigate_point_mgrs">MGRS</string> <string name="navigate_point_mgrs">MGRS</string>
<string name="navigate_point_format_mgrs">MGRS</string> <string name="navigate_point_format_mgrs">MGRS</string>
<string name="mgrs_format_descr">Az OsmAnd a NATO által is használt MGRS (Military Grid Reference System) koordinátákat alkamazza, amely hasonlít az UTM-formátumhoz.</string> <string name="mgrs_format_descr">Az OsmAnd a NATO által is használt MGRS (Military Grid Reference System) koordinátákat alkamazza, amely hasonlít az UTM-formátumhoz.</string>
<string name="message_you_need_add_two_points_to_show_graphs">Legalább két pontot kell hozzáadnia</string> <string name="message_you_need_add_two_points_to_show_graphs">Legalább két pontot adjon hozzá</string>
<string name="manage_subscription">Előfizetés kezelése</string> <string name="manage_subscription">Előfizetés kezelése</string>
<string name="gpx_upload_trackable_visibility_descr">A követhető azt jelenti, hogy a nyomvonal egyetlen nyilvános listában sem jelenik meg, de a belőle származó, időbélyeggel ellátott, feldolgozott nyomvonalpontok (amelyek közvetlenül nem kapcsolhatók Önhöz) igen, mégpedig a nyilvános GPS API-ról történő letöltések révén.</string> <string name="gpx_upload_trackable_visibility_descr">A követhető azt jelenti, hogy a nyomvonal egyetlen nyilvános listában sem jelenik meg, de a belőle származó, időbélyeggel ellátott, feldolgozott nyomvonalpontok (amelyek közvetlenül nem kapcsolhatók Önhöz) igen, mégpedig a nyilvános GPS API-ról történő letöltések révén.</string>
<string name="gpx_upload_identifiable_visibility_descr">Az azonosítható azt jelenti, hogy a nyomvonal nyilvánosan megjelenik az Ön GPS-nyomvonalai között és a GPS-nyomvonalak nyilvános listáin, vagyis más felhasználók letölthetik a nyers nyomvonalat, és társíthatják azt a felhasználónévvel. A nyomvonalpont-API-n keresztül kiszolgált GPS API-ból származó nyilvános időbélyegzővel ellátott nyomvonalpont-adatok hivatkoznak az Ön eredeti nyomvonaloldalára.</string> <string name="gpx_upload_identifiable_visibility_descr">Az azonosítható azt jelenti, hogy a nyomvonal nyilvánosan megjelenik az Ön GPS-nyomvonalai között és a GPS-nyomvonalak nyilvános listáin, vagyis más felhasználók letölthetik a nyers nyomvonalat, és társíthatják azt a felhasználónévvel. A nyomvonalpont-API-n keresztül kiszolgált GPS API-ból származó nyilvános időbélyegzővel ellátott nyomvonalpont-adatok hivatkoznak az Ön eredeti nyomvonaloldalára.</string>
@ -3950,7 +3950,7 @@
<string name="subscription_on_hold_title">Az OsmAnd-előfizetés fel van függesztve</string> <string name="subscription_on_hold_title">Az OsmAnd-előfizetés fel van függesztve</string>
<string name="subscription_paused_title">Az OsmAnd Live-előfizetés szünetel</string> <string name="subscription_paused_title">Az OsmAnd Live-előfizetés szünetel</string>
<string name="subscription_expired_title">Az OsmAnd Live-előfizetés lejárt</string> <string name="subscription_expired_title">Az OsmAnd Live-előfizetés lejárt</string>
<string name="subscription_payment_issue_title">Probléma van az előfizetésével. A fizetési mód kijavítása érdekében kattintson a gombra a Google Play előfizetési beállításaihoz történő ugráshoz.</string> <string name="subscription_payment_issue_title">Probléma van az előfizetésével. A fizetési mód kijavítása érdekében koppintson a gombra a Google Play előfizetési beállításaihoz történő ugráshoz.</string>
<string name="user_login">Bejelentkezés</string> <string name="user_login">Bejelentkezés</string>
<string name="login_account">Fiók</string> <string name="login_account">Fiók</string>
<string name="use_login_password">Bejelentkezés felhasználónévvel és jelszóval</string> <string name="use_login_password">Bejelentkezés felhasználónévvel és jelszóval</string>
@ -3966,7 +3966,7 @@
<string name="shared_string_add_photo">Fénykép hozzáadása</string> <string name="shared_string_add_photo">Fénykép hozzáadása</string>
<string name="register_on_openplacereviews">Regisztráció az <string name="register_on_openplacereviews">Regisztráció az
\nOpenPlaceReviews.org oldalon</string> \nOpenPlaceReviews.org oldalon</string>
<string name="register_on_openplacereviews_desc">A fényképeket a OpenPlaceReviews.org nyíltadat-projekt biztosítja. Saját fényképei feltöltéséhez be kell jelentkeznie a weboldalon.</string> <string name="register_on_openplacereviews_desc">A fényképeket a OpenPlaceReviews.org nyíltadat-projekt biztosítja. Saját fényképei feltöltéséhez be kell jelentkeznie a weboldalukon.</string>
<string name="register_opr_create_new_account">Új fiók létrehozása</string> <string name="register_opr_create_new_account">Új fiók létrehozása</string>
<string name="register_opr_have_account">Már van fiókom</string> <string name="register_opr_have_account">Már van fiókom</string>
<string name="app_mode_motorboat">Motorcsónak</string> <string name="app_mode_motorboat">Motorcsónak</string>
@ -3978,7 +3978,7 @@
<string name="add_photos_descr">Az OsmAnd több forrásból jelenít meg fényképeket: <string name="add_photos_descr">Az OsmAnd több forrásból jelenít meg fényképeket:
\nOpenPlaceReviews – POI-fotók; \nOpenPlaceReviews – POI-fotók;
\nMapillary – utcaszintű képek; \nMapillary – utcaszintű képek;
\nWeb / Wikimedia – az OpenStreetMap-adatokban meghatározott POI-fotók.</string> \nWeb / Wikimedia – POI-fotók az OpenStreetMap-adatoknak megfelelően.</string>
<string name="approximate_file_size">Hozzávetőleges fájlméret</string> <string name="approximate_file_size">Hozzávetőleges fájlméret</string>
<string name="select_data_to_export">Jelölje ki a fájlba exportálandó adatokat.</string> <string name="select_data_to_export">Jelölje ki a fájlba exportálandó adatokat.</string>
<string name="file_size_needed_for_import">Szükséges az importáláshoz</string> <string name="file_size_needed_for_import">Szükséges az importáláshoz</string>
@ -3992,19 +3992,19 @@
<string name="select_picture">Kép kijelölése</string> <string name="select_picture">Kép kijelölése</string>
<string name="lang_de_casual">német (tegeződő)</string> <string name="lang_de_casual">német (tegeződő)</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string> <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="elevation_data">A magassági adatokat az utazás során előforduló emelkedés/lejtés megfontolásához használhatja</string> <string name="elevation_data">A magassági adatok felhasználásával figyelembe veheti az utazás során az emelkedést / lejtést</string>
<string name="app_mode_light_aircraft">Könnyű légi jármű</string> <string name="app_mode_light_aircraft">Könnyű légi jármű</string>
<string name="plan_route_split_before">Elvágás előtte</string> <string name="plan_route_split_before">Elvágás előtte</string>
<string name="plan_route_split_after">Elvágás utána</string> <string name="plan_route_split_after">Elvágás utána</string>
<string name="plan_route_join_segments">Szakaszok egyesítése</string> <string name="plan_route_join_segments">Szakaszok egyesítése</string>
<string name="plan_route_add_new_segment">Új szakasz hozzáadása</string> <string name="plan_route_add_new_segment">Új szakasz hozzáadása</string>
<string name="release_3_9">"• Lehetőség az összes adat – többek között beállítások, erőforrások és helyek – exportálására és importálására <string name="release_3_9">"• Lehetőség az összes adat exportálására és importálására, beleértve a beállításokat, erőforrásokat és a saját helyeket is
\n \n
\n • Útvonaltervezés: grafikonok az útvonalat tartalmazó szegmensekhez, útszakasznyomvonalak létrehozása és szerkesztése \n • Útvonaltervezés: grafikonok a nyomvonalszakaszokhoz útvonallal, valamint lehetőség több nyomvonalszakasz létrehozására és szerkesztésére
\n \n
\n • OAuth hitelesítési módszer az OpenStreetMap-hez, javított felhasználói felület az OSM-párbeszédpanelekhez \n • OAuth hitelesítési módszer az OpenStreetMap-hez, az OSM párbeszédpanelek felhasználói felületének javítása
\n \n
\n • Egyéni színek a kedvencekhez és az útvonalak útpontjaihoz \n • Egyéni színek támogatása a kedvenceknél és a nyomvonalak útpontjainál
\n \n
\n"</string> \n"</string>
</resources> </resources>

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

@ -4012,4 +4012,6 @@
\n • Supporto alla personalizzazione dei colori per i preferiti e i punti intermedi delle tracce \n • Supporto alla personalizzazione dei colori per i preferiti e i punti intermedi delle tracce
\n \n
\n"</string> \n"</string>
<string name="plan_route_join_segments">Unisci segmenti</string>
<string name="plan_route_split_before">Spezza</string>
</resources> </resources>

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

@ -1339,7 +1339,7 @@
<string name="group_will_be_removed_after_restart">הקבוצה תוסר לאחר ההפעלה הבאה של היישומון.</string> <string name="group_will_be_removed_after_restart">הקבוצה תוסר לאחר ההפעלה הבאה של היישומון.</string>
<string name="show_guide_line">הצגת קווי כיוון</string> <string name="show_guide_line">הצגת קווי כיוון</string>
<string name="use_osm_live_routing">ניווט חי של OsmAnd</string> <string name="use_osm_live_routing">ניווט חי של OsmAnd</string>
<string name="access_no_destination">לא הוגדר יעד</string> <string name="access_no_destination">תוסף נגישות: לא הוגדר יעד</string>
<string name="shared_string_widgets">וידג׳טים</string> <string name="shared_string_widgets">וידג׳טים</string>
<string name="add_points_to_map_markers_q">להוסיף את כל הנקודות כסמני מפה?</string> <string name="add_points_to_map_markers_q">להוסיף את כל הנקודות כסמני מפה?</string>
<string name="shared_string_add_to_map_markers">הוספת לסמני מפה</string> <string name="shared_string_add_to_map_markers">הוספת לסמני מפה</string>
@ -1728,7 +1728,7 @@
<string name="show_on_map_after_saving">הצגה על המפה לאחר השמירה</string> <string name="show_on_map_after_saving">הצגה על המפה לאחר השמירה</string>
<string name="measurement_tool_action_bar">עיון במפה והוספת נקודות</string> <string name="measurement_tool_action_bar">עיון במפה והוספת נקודות</string>
<string name="measurement_tool">מדידת מרחק</string> <string name="measurement_tool">מדידת מרחק</string>
<string name="hillshade_menu_download_descr">יש להוריד את מפת ‚שכבת ההצללות’ כדי להציג הצללה אנכית.</string> <string name="hillshade_menu_download_descr">יש להוריד את מפת שכבת ‚הצללות’ כדי להציג הצללה אנכית.</string>
<string name="hillshade_purchase_header">יש להתקין את התוסף ‚קווי מתאר’ (Contour lines) כדי להציג אזורים מדורגים אנכית.</string> <string name="hillshade_purchase_header">יש להתקין את התוסף ‚קווי מתאר’ (Contour lines) כדי להציג אזורים מדורגים אנכית.</string>
<string name="hide_from_zoom_level">הסתרה החל מרמת תקריב</string> <string name="hide_from_zoom_level">הסתרה החל מרמת תקריב</string>
<string name="srtm_menu_download_descr">נא להוריד את מפת ‚קווי המתאר’ של האזור הזה.</string> <string name="srtm_menu_download_descr">נא להוריד את מפת ‚קווי המתאר’ של האזור הזה.</string>
@ -3840,7 +3840,7 @@
<string name="route_between_points_desc">נא לבחור כיצד לחבר את הנקודות, בקו ישר, או לחבר מסלול ביניהן כפי שצוין להלן.</string> <string name="route_between_points_desc">נא לבחור כיצד לחבר את הנקודות, בקו ישר, או לחבר מסלול ביניהן כפי שצוין להלן.</string>
<string name="route_between_points_warning_desc">בשלב הבא עליך להצמיד את הדרך המורשית הקרובה ביותר לאחד מפרופילי הניווט שלך כדי להשתמש באפשרות הזו.</string> <string name="route_between_points_warning_desc">בשלב הבא עליך להצמיד את הדרך המורשית הקרובה ביותר לאחד מפרופילי הניווט שלך כדי להשתמש באפשרות הזו.</string>
<string name="street_level_imagery">תמונות ברמת רחוב</string> <string name="street_level_imagery">תמונות ברמת רחוב</string>
<string name="plan_route_exit_dialog_descr">להתעלם מהשינויים במסלול המתוכנן על ידי סגירתו\?</string> <string name="plan_route_exit_dialog_descr">להתעלם מכל השינויים במסלול המתוכנן על ידי סגירתו\?</string>
<string name="in_case_of_reverse_direction">במקרה של כיוון הפוך</string> <string name="in_case_of_reverse_direction">במקרה של כיוון הפוך</string>
<string name="shared_string_save_as_gpx">שמירה כקובץ מסלול חדש</string> <string name="shared_string_save_as_gpx">שמירה כקובץ מסלול חדש</string>
<string name="add_segment_to_the_track">הוספה לקובץ מסלול</string> <string name="add_segment_to_the_track">הוספה לקובץ מסלול</string>
@ -3934,10 +3934,10 @@
<string name="file_already_imported">הקובץ כבר ייובא אל OsmAnd</string> <string name="file_already_imported">הקובץ כבר ייובא אל OsmAnd</string>
<string name="use_two_phase_routing">להשתמש באלגוריתם חישוב מסלול דו־שלבי A*‎</string> <string name="use_two_phase_routing">להשתמש באלגוריתם חישוב מסלול דו־שלבי A*‎</string>
<string name="snowmobile_render_descr">לנהיגה ברכבי שלג עם דרכים ומסלולים יעודיים.</string> <string name="snowmobile_render_descr">לנהיגה ברכבי שלג עם דרכים ומסלולים יעודיים.</string>
<string name="message_need_calculate_route_before_show_graph">הנתונים של %1$s זמינים בדרכים בלבד, עליך לחשב מסלול באמצעות „מסלול בין נקודות” כדי לקבל אותם.</string> <string name="message_need_calculate_route_before_show_graph">הנתונים של %1$s זמינים על דרכים בלבד, ניתן לחשב מסלול באמצעות „מסלול בין נקודות” כדי לראות תרשימים.</string>
<string name="shared_string_graph">תרשים</string> <string name="shared_string_graph">תרשים</string>
<string name="message_graph_will_be_available_after_recalculation">"נא להמתין. <string name="message_graph_will_be_available_after_recalculation">נא להמתין.
\nהתרשים יהיה זמין לאחר חישוב מחדש."</string> \nהתרשים יהיה זמין לאחר חישוב מחדש.</string>
<string name="ltr_or_rtl_combine_via_dash">%1$s ‏— %2$s</string> <string name="ltr_or_rtl_combine_via_dash">%1$s ‏— %2$s</string>
<string name="shared_string_local_maps">מפות מקומיות</string> <string name="shared_string_local_maps">מפות מקומיות</string>
<string name="icon_group_amenity">שירות לציבור</string> <string name="icon_group_amenity">שירות לציבור</string>
@ -3964,7 +3964,7 @@
<string name="open_street_map_login_mode">עליך להיכנס כדי להעלות שינויים חדשים או כאלו שנערכו. <string name="open_street_map_login_mode">עליך להיכנס כדי להעלות שינויים חדשים או כאלו שנערכו.
\n \n
\nניתן להיכנס בשיטת OAuth המאובטחת או באמצעות שם הכניסה והססמה שלך.</string> \nניתן להיכנס בשיטת OAuth המאובטחת או באמצעות שם הכניסה והססמה שלך.</string>
<string name="subscription_payment_issue_title">יש בעיה עם המינוי שלך. יש לגעת כפתור כדי לגשת להגדרות המינוי של Google Play ולתקן את שיטת התשלום שלך.</string> <string name="subscription_payment_issue_title">יש לגעת בכפתור כדי להגדיר שיטת תשלום ב־Google Play ולתקן את המינוי שלך.</string>
<string name="subscription_on_hold_title">המינוי ל־OsmAnd Live מוחזק</string> <string name="subscription_on_hold_title">המינוי ל־OsmAnd Live מוחזק</string>
<string name="markers_history">היסטוריית סמנים</string> <string name="markers_history">היסטוריית סמנים</string>
<string name="send_files_to_openstreetmap">שליחת קובץ GPX ל־OpenStreetMap</string> <string name="send_files_to_openstreetmap">שליחת קובץ GPX ל־OpenStreetMap</string>

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

@ -271,7 +271,7 @@
<string name="install_more">Installer flere…</string> <string name="install_more">Installer flere…</string>
<string name="search_osm_offline">Søk etter geografisk posisjon</string> <string name="search_osm_offline">Søk etter geografisk posisjon</string>
<string name="system_locale">System</string> <string name="system_locale">System</string>
<string name="preferred_locale_descr">Velg visningsspråk (trer i kraft når OsmAnd startes på nytt).</string> <string name="preferred_locale_descr">Visningsspråk (brukes etter at OsmAnd er startet på nytt).</string>
<string name="preferred_locale">Visningsspråk</string> <string name="preferred_locale">Visningsspråk</string>
<string name="shared_string_next">Neste</string> <string name="shared_string_next">Neste</string>
<string name="shared_string_previous">Forrige</string> <string name="shared_string_previous">Forrige</string>
@ -308,7 +308,7 @@
<string name="km">km</string> <string name="km">km</string>
<string name="km_h">km/t</string> <string name="km_h">km/t</string>
<string name="m">m</string> <string name="m">m</string>
<string name="old_map_index_is_not_supported">Foreldet kartdataformat \'\'{0}\'\' støttes ikke</string> <string name="old_map_index_is_not_supported">Foreldet kartdataformat \'\'{0}\'\', ikke støttet</string>
<string name="poi_filter_closest_poi">Nærmeste interessepunkter</string> <string name="poi_filter_closest_poi">Nærmeste interessepunkter</string>
<string name="poi_filter_custom_filter">Egendefinert filter</string> <string name="poi_filter_custom_filter">Egendefinert filter</string>
<string name="specified_dir_doesnt_exist">Kunne ikke finne angitt mappe.</string> <string name="specified_dir_doesnt_exist">Kunne ikke finne angitt mappe.</string>
@ -772,7 +772,7 @@
<string name="voice_stream_notification">Varslingslyd</string> <string name="voice_stream_notification">Varslingslyd</string>
<string name="voice_stream_music">Media-/navigasjonslyd</string> <string name="voice_stream_music">Media-/navigasjonslyd</string>
<string name="level_to_switch_vector_raster_descr">Bruk rasterkart for alt utover dette nivået.</string> <string name="level_to_switch_vector_raster_descr">Bruk rasterkart for alt utover dette nivået.</string>
<string name="level_to_switch_vector_raster">Minste vektorielle forstørrelsesnivå</string> <string name="level_to_switch_vector_raster">Minste vektor-zoomnivå</string>
<string name="incomplete_locale">ufullstendig</string> <string name="incomplete_locale">ufullstendig</string>
<string name="voice_is_not_available_title">Velg en taleveiledningspakke</string> <string name="voice_is_not_available_title">Velg en taleveiledningspakke</string>
<string name="select_max_zoom_preload_area">Maksimal forstørrelse å forhåndslaste</string> <string name="select_max_zoom_preload_area">Maksimal forstørrelse å forhåndslaste</string>
@ -979,7 +979,7 @@
<string name="show_pedestrian_warnings">Fotgjengeroverganger</string> <string name="show_pedestrian_warnings">Fotgjengeroverganger</string>
<string name="rendering_value_americanRoadAtlas_name">Amerikansk veiatlas</string> <string name="rendering_value_americanRoadAtlas_name">Amerikansk veiatlas</string>
<string name="av_camera_focus_hiperfocal">Hyperfokal fokus</string> <string name="av_camera_focus_hiperfocal">Hyperfokal fokus</string>
<string name="lock_screen_request_explanation">%1$s trenger denne tillatelsen til å slå av skjermen (Strømsparingsfunksjon).</string> <string name="lock_screen_request_explanation">%1$s trenger denne tillatelsen til å slå av skjermen for strømsparingsfunksjonen.</string>
<string name="shared_string_show_all">Vis alle</string> <string name="shared_string_show_all">Vis alle</string>
<string name="speak_pedestrian">Fotgjengeroverganger</string> <string name="speak_pedestrian">Fotgjengeroverganger</string>
<string name="rendering_attr_streetLighting_name">Gatebelysning</string> <string name="rendering_attr_streetLighting_name">Gatebelysning</string>
@ -1381,7 +1381,7 @@
<string name="shared_string_status">Status</string> <string name="shared_string_status">Status</string>
<string name="shared_string_save_changes">Lagre endringer</string> <string name="shared_string_save_changes">Lagre endringer</string>
<string name="shared_string_email_address">E-postadresse</string> <string name="shared_string_email_address">E-postadresse</string>
<string name="data_is_not_available">Data er ikke tilgjengelig</string> <string name="data_is_not_available">Data ikke tilgjengelig</string>
<string name="shared_string_read_more">Les mer</string> <string name="shared_string_read_more">Les mer</string>
<string name="switch_start_finish">Bytt om på startpunkt og reisemål</string> <string name="switch_start_finish">Bytt om på startpunkt og reisemål</string>
<string name="shared_string_topbar">Topplinje</string> <string name="shared_string_topbar">Topplinje</string>
@ -1409,7 +1409,7 @@
<string name="no_address_found">Ingen adresse funnet</string> <string name="no_address_found">Ingen adresse funnet</string>
<string name="shared_string_near">Nær</string> <string name="shared_string_near">Nær</string>
<string name="looking_up_address">Ser etter adresse</string> <string name="looking_up_address">Ser etter adresse</string>
<string name="cancel_route">Forkast rute</string> <string name="cancel_route">Vil du forkaste ruten\?</string>
<string name="file_name_containes_illegal_char">Ulovlig tegn i filnavn</string> <string name="file_name_containes_illegal_char">Ulovlig tegn i filnavn</string>
<string name="rendering_value_thin_name">Tynn</string> <string name="rendering_value_thin_name">Tynn</string>
<string name="rendering_value_medium_name">Middels</string> <string name="rendering_value_medium_name">Middels</string>
@ -1480,7 +1480,7 @@
<string name="map_mode">Kartmodus</string> <string name="map_mode">Kartmodus</string>
<string name="follow_us">Følg oss</string> <string name="follow_us">Følg oss</string>
<string name="use_osm_live_routing">OsmAnd Live-navigering</string> <string name="use_osm_live_routing">OsmAnd Live-navigering</string>
<string name="access_no_destination">Reisemål er ikke angitt</string> <string name="access_no_destination">Tilgjengelighetstillegg: Ingen reisemål angitt</string>
<string name="access_shared_string_navigate_up">Naviger opp</string> <string name="access_shared_string_navigate_up">Naviger opp</string>
<string name="open_street_map_login_and_pass">OSM-brukernavn og passord</string> <string name="open_street_map_login_and_pass">OSM-brukernavn og passord</string>
<string name="osm_live_subscription">OsmAnd Live-abonnement</string> <string name="osm_live_subscription">OsmAnd Live-abonnement</string>
@ -1506,9 +1506,9 @@
<string name="storage_permission_restart_is_required">Programmet har nå lov til å skrive til ekstern lagring, men programomstart kreves.</string> <string name="storage_permission_restart_is_required">Programmet har nå lov til å skrive til ekstern lagring, men programomstart kreves.</string>
<string name="shared_string_undo_all">Angre alle</string> <string name="shared_string_undo_all">Angre alle</string>
<string name="rec_split_storage_size">Lagringsstørrelse</string> <string name="rec_split_storage_size">Lagringsstørrelse</string>
<string name="no_location_permission">Innvilg tilgang til posisjon.</string> <string name="no_location_permission">Gi tilgang til posisjonsdata.</string>
<string name="no_camera_permission">Innvilg kameratilgang.</string> <string name="no_camera_permission">Gi kameratilgang.</string>
<string name="no_microphone_permission">Innvilgt mikrofontilgang.</string> <string name="no_microphone_permission">Gi mikrofontilgang.</string>
<string name="shared_string_hide">Skjul</string> <string name="shared_string_hide">Skjul</string>
<string name="av_video_quality_low">Laveste kvalitet</string> <string name="av_video_quality_low">Laveste kvalitet</string>
<string name="av_video_quality_high">Høyeste kvalitet</string> <string name="av_video_quality_high">Høyeste kvalitet</string>
@ -1720,7 +1720,7 @@
<string name="access_autoannounce_period_descr">Minste tidsintervall mellom annonseringer.</string> <string name="access_autoannounce_period_descr">Minste tidsintervall mellom annonseringer.</string>
<string name="osm_user_stat">Redigeringer %1$s, rang %2$s, redigeringer totalt %3$s</string> <string name="osm_user_stat">Redigeringer %1$s, rang %2$s, redigeringer totalt %3$s</string>
<string name="osm_editors_ranking">Rangering av OSM-bidragsytere</string> <string name="osm_editors_ranking">Rangering av OSM-bidragsytere</string>
<string name="osm_live_email_desc">Behøves for å gi deg info om dine bidrag.</string> <string name="osm_live_email_desc">Behøves for å oppdatere deg om dine bidrag.</string>
<string name="osm_live_support_region">Støttet region</string> <string name="osm_live_support_region">Støttet region</string>
<string name="osm_live_thanks">Takk for at du støtter OsmAnd! <string name="osm_live_thanks">Takk for at du støtter OsmAnd!
\nFor å aktivere alle nye funksjoner må du starte OsmAnd på nytt.</string> \nFor å aktivere alle nye funksjoner må du starte OsmAnd på nytt.</string>
@ -1769,7 +1769,7 @@
<string name="track_segments">Sporsegmenter</string> <string name="track_segments">Sporsegmenter</string>
<string name="track_points">Sporpunkter</string> <string name="track_points">Sporpunkter</string>
<string name="share_note">Del notat</string> <string name="share_note">Del notat</string>
<string name="notes">Notater</string> <string name="notes">Lyd/video-notater</string>
<string name="nautical_maps_missing">For å vise sjøkart, må det spesielle frakoblede kartet lastes ned.</string> <string name="nautical_maps_missing">For å vise sjøkart, må det spesielle frakoblede kartet lastes ned.</string>
<string name="navigation_over_track">Starte navigering langs spor\?</string> <string name="navigation_over_track">Starte navigering langs spor\?</string>
<string name="avoid_roads_msg">Utløs en alternativ rute ved å velge veier å unngå</string> <string name="avoid_roads_msg">Utløs en alternativ rute ved å velge veier å unngå</string>
@ -1988,7 +1988,7 @@
<string name="quick_action_navigation_voice_off">Slå på tale</string> <string name="quick_action_navigation_voice_off">Slå på tale</string>
<string name="quick_action_navigation_voice_on">Slå av tale</string> <string name="quick_action_navigation_voice_on">Slå av tale</string>
<string name="sorted_by_distance">Sortert etter avstand</string> <string name="sorted_by_distance">Sortert etter avstand</string>
<string name="search_favorites">Søk blandt favoritter</string> <string name="search_favorites">Søk i favoritter</string>
<string name="configure_screen_quick_action">Hurtighandling</string> <string name="configure_screen_quick_action">Hurtighandling</string>
<string name="quick_action_new_action">Legg til handling</string> <string name="quick_action_new_action">Legg til handling</string>
<string name="dialog_add_action_title">Legg til handling</string> <string name="dialog_add_action_title">Legg til handling</string>
@ -1998,9 +1998,9 @@
<string name="nothing_found">Ingenting funnet</string> <string name="nothing_found">Ingenting funnet</string>
<string name="nothing_found_descr">Endre søket eller øk radiusen.</string> <string name="nothing_found_descr">Endre søket eller øk radiusen.</string>
<string name="analyze_on_map">Analyser på kartet</string> <string name="analyze_on_map">Analyser på kartet</string>
<string name="shared_string_slope">Helning</string> <string name="shared_string_slope">Bakkehelning</string>
<string name="route_altitude">Rutehøydeprofil</string> <string name="route_altitude">Rutehøydeprofil</string>
<string name="altitude_descent">Fall</string> <string name="altitude_descent">Nedstigning</string>
<string name="altitude_ascent">Stigning</string> <string name="altitude_ascent">Stigning</string>
<string name="altitude_range">Høydeintervall</string> <string name="altitude_range">Høydeintervall</string>
<string name="average_altitude">Gjennomsnittshøyde</string> <string name="average_altitude">Gjennomsnittshøyde</string>
@ -2058,7 +2058,7 @@
<string name="store_tracks_in_monthly_directories_descrp">Lagre spor som er tatt opp, i undermapper per opptaksmåned (f.eks. 2018-01).</string> <string name="store_tracks_in_monthly_directories_descrp">Lagre spor som er tatt opp, i undermapper per opptaksmåned (f.eks. 2018-01).</string>
<string name="mapillary_menu_descr_tile_cache">Last kartfliser på nytt for å se oppdaterte data.</string> <string name="mapillary_menu_descr_tile_cache">Last kartfliser på nytt for å se oppdaterte data.</string>
<string name="mapillary_menu_title_tile_cache">Kartflis-hurtigbuffer</string> <string name="mapillary_menu_title_tile_cache">Kartflis-hurtigbuffer</string>
<string name="mapillary_menu_descr_dates">Kun vis tillagte bilder</string> <string name="mapillary_menu_descr_dates">Vis bare bilder som er lagt til</string>
<string name="line">Linje</string> <string name="line">Linje</string>
<string name="save_as_route_point">Lagre som rutepunkter</string> <string name="save_as_route_point">Lagre som rutepunkter</string>
<string name="save_as_line">Lagre som linje</string> <string name="save_as_line">Lagre som linje</string>
@ -2078,7 +2078,7 @@
<string name="add_route_points">Legg til rutepunkter</string> <string name="add_route_points">Legg til rutepunkter</string>
<string name="add_line">Legg til linje</string> <string name="add_line">Legg til linje</string>
<string name="do_not_use_animations">Ingen animasjoner</string> <string name="do_not_use_animations">Ingen animasjoner</string>
<string name="do_not_use_animations_descr">Slår av animasjoner i programmet.</string> <string name="do_not_use_animations_descr">Slår av kartanimasjoner.</string>
<string name="keep_showing_on_map">Fortsett å vise på kartet</string> <string name="keep_showing_on_map">Fortsett å vise på kartet</string>
<string name="exit_without_saving">Avslutte uten å lagre\?</string> <string name="exit_without_saving">Avslutte uten å lagre\?</string>
<string name="mapillary_menu_descr_username">Vis bare bilder lagt til av</string> <string name="mapillary_menu_descr_username">Vis bare bilder lagt til av</string>
@ -2089,7 +2089,7 @@
<string name="online_photos">Nettbaserte bilder</string> <string name="online_photos">Nettbaserte bilder</string>
<string name="shared_string_add_photos">Legg til bilder</string> <string name="shared_string_add_photos">Legg til bilder</string>
<string name="no_photos_descr">Ingen bilder her.</string> <string name="no_photos_descr">Ingen bilder her.</string>
<string name="mapillary_action_descr">Del ditt gatenivå-åsyn via Mapillary.</string> <string name="mapillary_action_descr">Del dine bilder på gatenivå via Mapillary.</string>
<string name="mapillary_widget">Mapillary-miniprogram</string> <string name="mapillary_widget">Mapillary-miniprogram</string>
<string name="mapillary_widget_descr">Gir mulighet for raske bidrag til Mapillary.</string> <string name="mapillary_widget_descr">Gir mulighet for raske bidrag til Mapillary.</string>
<string name="mapillary_descr">Nettbaserte bilder på gatenivå for alle. Oppdag steder, samarbeid, fang inn verden.</string> <string name="mapillary_descr">Nettbaserte bilder på gatenivå for alle. Oppdag steder, samarbeid, fang inn verden.</string>
@ -2121,8 +2121,8 @@
<string name="use_system_keyboard">Bruk systemets tastatur</string> <string name="use_system_keyboard">Bruk systemets tastatur</string>
<string name="fast_coordinates_input_descr">Velg format for koordinatinntasting. Du kan alltid endre det ved å trykke \'Alternativer\'.</string> <string name="fast_coordinates_input_descr">Velg format for koordinatinntasting. Du kan alltid endre det ved å trykke \'Alternativer\'.</string>
<string name="fast_coordinates_input">Rask koordinatinntasting</string> <string name="fast_coordinates_input">Rask koordinatinntasting</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Ingen isete veier eller vadesteder</string> <string name="routing_attr_avoid_ice_roads_fords_name">Ingen veier på is eller vadesteder</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Unngår isete veier og vadesteder.</string> <string name="routing_attr_avoid_ice_roads_fords_description">Unngår veier på is og vadesteder.</string>
<string name="use_location">Bruk posisjon</string> <string name="use_location">Bruk posisjon</string>
<string name="add_location_as_first_point_descr">Legg til din posisjon som startpunkt for å planlegge den perfekte ruten.</string> <string name="add_location_as_first_point_descr">Legg til din posisjon som startpunkt for å planlegge den perfekte ruten.</string>
<string name="my_location">Min posisjon</string> <string name="my_location">Min posisjon</string>
@ -2156,7 +2156,7 @@
\n- Synkronisere grupper og enheter med tjeneren; \n- Synkronisere grupper og enheter med tjeneren;
\n- Behandle grupper og enheter i et personlig dashbord på nettstedet.</string> \n- Behandle grupper og enheter i et personlig dashbord på nettstedet.</string>
<string name="simulate_initial_startup">Simuler første programstart</string> <string name="simulate_initial_startup">Simuler første programstart</string>
<string name="audionotes_plugin_description">Lag audio/foto/video-notater på en tur, enten ved bruk av en knapp på kartet eller posisjon-kontekstmeny.</string> <string name="audionotes_plugin_description">Lag lyd/foto/video-notater på en tur, enten ved bruk av en knapp på kartet eller posisjon-lokalmeny.</string>
<string name="average">Gjennomsnitt</string> <string name="average">Gjennomsnitt</string>
<string name="of">%1$d av %2$d</string> <string name="of">%1$d av %2$d</string>
<string name="ascent_descent">Stigning/nedstigning</string> <string name="ascent_descent">Stigning/nedstigning</string>
@ -2166,7 +2166,7 @@
<string name="layer_osm_bugs">OSM-notater (på nett)</string> <string name="layer_osm_bugs">OSM-notater (på nett)</string>
<string name="move_to_history">Flytt til historikk</string> <string name="move_to_history">Flytt til historikk</string>
<string name="group_will_be_removed_after_restart">Gruppen vil være borte neste gang du starter programmet.</string> <string name="group_will_be_removed_after_restart">Gruppen vil være borte neste gang du starter programmet.</string>
<string name="show_guide_line">Vis hjelpelinjer</string> <string name="show_guide_line">Vis retningslinjer</string>
<string name="show_arrows_on_the_map">Vis piler på kartet</string> <string name="show_arrows_on_the_map">Vis piler på kartet</string>
<string name="show_passed">Vis passerte</string> <string name="show_passed">Vis passerte</string>
<string name="hide_passed">Skjul passerte</string> <string name="hide_passed">Skjul passerte</string>
@ -2272,7 +2272,7 @@
<string name="quick_action_fav_name_descr">La stå tomt for å bruke adressen eller stedsnavnet.</string> <string name="quick_action_fav_name_descr">La stå tomt for å bruke adressen eller stedsnavnet.</string>
<string name="quick_action_bug_descr">Denne meldingen inkluderes i kommentarfeltet.</string> <string name="quick_action_bug_descr">Denne meldingen inkluderes i kommentarfeltet.</string>
<string name="mappilary_no_internet_desc">Bilder fra Mapillary er kun tilgjengelig når tilkoblet internett.</string> <string name="mappilary_no_internet_desc">Bilder fra Mapillary er kun tilgjengelig når tilkoblet internett.</string>
<string name="hillshade_menu_download_descr">Last ned kart for \'Relieffskyggeoverlegg\' for å vise vertikal skyggelegging.</string> <string name="hillshade_menu_download_descr">Last ned overleggskartet for \'Relieffskygge\' for å vise vertikal skyggelegging.</string>
<string name="hillshade_purchase_header">Installer programtillegget \'Koter\' for å vise graderte vertikale områder.</string> <string name="hillshade_purchase_header">Installer programtillegget \'Koter\' for å vise graderte vertikale områder.</string>
<string name="enter_new_name">Oppfør nytt navn</string> <string name="enter_new_name">Oppfør nytt navn</string>
<string name="shared_string_back">Tilbake</string> <string name="shared_string_back">Tilbake</string>
@ -2290,7 +2290,7 @@
<string name="import_as_gpx">Importer som GPX-fil</string> <string name="import_as_gpx">Importer som GPX-fil</string>
<string name="import_as_favorites">Importer som favoritt</string> <string name="import_as_favorites">Importer som favoritt</string>
<string name="import_file">Importer fil</string> <string name="import_file">Importer fil</string>
<string name="marker_show_distance_descr">Velg hvordan avstand og retning til kartmarkører på kartskjermen angis:</string> <string name="marker_show_distance_descr">Velg hvordan du skal indikere avstand og retning til kartmarkører på kartet:</string>
<string name="import_gpx_file_description">kan importeres som favoritt eller en GPX-fil.</string> <string name="import_gpx_file_description">kan importeres som favoritt eller en GPX-fil.</string>
<string name="tap_on_map_to_hide_interface">Fullskjermmodus</string> <string name="tap_on_map_to_hide_interface">Fullskjermmodus</string>
<string name="appearance_on_the_map">Utseende på kartet</string> <string name="appearance_on_the_map">Utseende på kartet</string>
@ -2301,7 +2301,7 @@
<string name="favourites_group">Favoritterkategori</string> <string name="favourites_group">Favoritterkategori</string>
<string name="empty_state_markers_active">Opprett kartmarkører!</string> <string name="empty_state_markers_active">Opprett kartmarkører!</string>
<string name="empty_state_markers_active_desc">Lang- eller korttrykk \'Steder\', deretter trykk markørflaggknappen.</string> <string name="empty_state_markers_active_desc">Lang- eller korttrykk \'Steder\', deretter trykk markørflaggknappen.</string>
<string name="empty_state_markers_history_desc">Markører markert som passert vises på denne skjermen.</string> <string name="empty_state_markers_history_desc">Markører merket som passerte vises på denne skjermen.</string>
<string name="digits_quantity">Antall desimaler</string> <string name="digits_quantity">Antall desimaler</string>
<string name="shared_string_right">Høyre</string> <string name="shared_string_right">Høyre</string>
<string name="shared_string_left">Venstre</string> <string name="shared_string_left">Venstre</string>
@ -2314,11 +2314,11 @@
<string name="empty_state_osm_edits">Opprett eller endre OSM-objekter</string> <string name="empty_state_osm_edits">Opprett eller endre OSM-objekter</string>
<string name="shared_string_added">Lagt til</string> <string name="shared_string_added">Lagt til</string>
<string name="marker_activated">Markøren %s er aktivert.</string> <string name="marker_activated">Markøren %s er aktivert.</string>
<string name="one_tap_active_descr">Trykk en markør på kartet for å flytte den til toppen av de aktive markørene uten å åpne kontekstmenyen.</string> <string name="one_tap_active_descr">Trykk en markør på kartet for å flytte den til toppen av de aktive markørene uten å åpne lokalmenyen.</string>
<string name="one_tap_active">«Ett-trykk» aktiv</string> <string name="one_tap_active">«Ett-trykk» aktiv</string>
<string name="empty_state_av_notes">Ta notater!</string> <string name="empty_state_av_notes">Ta notater!</string>
<string name="empty_state_av_notes_desc">Legg til lyd-, video- eller bildenotat til hvert punkt på kartet, ved bruk av modul eller kontekstmeny.</string> <string name="empty_state_av_notes_desc">Legg til lyd-, video- eller bildenotater til et hvilket som helst punkt på kartet ved bruk av modul eller lokalmeny.</string>
<string name="notes_by_date">Notater etter dato</string> <string name="notes_by_date">Lyd/video-notater etter dato</string>
<string name="by_date">Etter dato</string> <string name="by_date">Etter dato</string>
<string name="by_type">Etter type</string> <string name="by_type">Etter type</string>
<string name="shared_string_more_without_dots">Mer</string> <string name="shared_string_more_without_dots">Mer</string>
@ -2329,12 +2329,12 @@
<string name="context_menu_item_modify_note">Endre OSM-notat</string> <string name="context_menu_item_modify_note">Endre OSM-notat</string>
<string name="rendering_value_darkyellow_name">Mørkegul</string> <string name="rendering_value_darkyellow_name">Mørkegul</string>
<string name="rendering_value_translucent_pink_name">Gjennomskinnelig rosa</string> <string name="rendering_value_translucent_pink_name">Gjennomskinnelig rosa</string>
<string name="modify_the_search_query">Endre søket ditt.</string> <string name="modify_the_search_query">Endre søket.</string>
<string name="looking_for_tracks_with_waypoints">Ser etter spor med rutepunkter</string> <string name="looking_for_tracks_with_waypoints">Ser etter spor med rutepunkter</string>
<string name="shared_string_gpx_waypoints">Spor-rutepunkter</string> <string name="shared_string_gpx_waypoints">Spor-rutepunkter</string>
<string name="add_group_descr">Importer grupper fra favoritter eller GPX-rutepunkter.</string> <string name="add_group_descr">Importer grupper fra favoritter eller GPX-rutepunkter.</string>
<string name="empty_state_markers_groups_desc">Importer favorittgrupper eller rutepunkter som markører.</string> <string name="empty_state_markers_groups_desc">Importer favorittgrupper eller rutepunkter som markører.</string>
<string name="show_guide_line_descr">Vis retningsbestemte linjer fra din posisjon til de aktive markørplasseringene.</string> <string name="show_guide_line_descr">Vis retningslinje fra din posisjon til de aktive markørplasseringene.</string>
<string name="show_arrows_descr">Vis én eller to piler som indikerer retningen til de aktive markørene.</string> <string name="show_arrows_descr">Vis én eller to piler som indikerer retningen til de aktive markørene.</string>
<string name="distance_indication_descr">Velg hvordan avstanden til aktive markører skal vises.</string> <string name="distance_indication_descr">Velg hvordan avstanden til aktive markører skal vises.</string>
<string name="active_markers_descr">Velg antall retningsindikatorer.</string> <string name="active_markers_descr">Velg antall retningsindikatorer.</string>
@ -2366,7 +2366,7 @@
<string name="build_installed">Byggversion {0} ble installert ({1}).</string> <string name="build_installed">Byggversion {0} ble installert ({1}).</string>
<string name="poi_context_menu_call">Vis interessepunktstelefon</string> <string name="poi_context_menu_call">Vis interessepunktstelefon</string>
<string name="use_high_res_maps_descr">Ikke strekk (og gjør uskarpe) kartfliser på høyoppløselige skjermer.</string> <string name="use_high_res_maps_descr">Ikke strekk (og gjør uskarpe) kartfliser på høyoppløselige skjermer.</string>
<string name="gpx_files_not_found">Finner ingen GPX-filer i spormappen</string> <string name="gpx_files_not_found">Ingen GPX-filer funnet i spormappen</string>
<string name="poi_namefinder_query_empty">Skriv for å finne interessepunkt</string> <string name="poi_namefinder_query_empty">Skriv for å finne interessepunkt</string>
<string name="background_service_wait_int_descr">Setter høyeste tillatte ventetid for hver bakgrunns-posisjonsbestemmelse.</string> <string name="background_service_wait_int_descr">Setter høyeste tillatte ventetid for hver bakgrunns-posisjonsbestemmelse.</string>
<string name="background_service_wait_int">Maksimal ventetid for posisjonsbestemmelse</string> <string name="background_service_wait_int">Maksimal ventetid for posisjonsbestemmelse</string>
@ -2437,7 +2437,7 @@
<string name="audionotes_location_not_defined">Trykk \'Bruk posisjon…\' for å legge til et notat til stedet.</string> <string name="audionotes_location_not_defined">Trykk \'Bruk posisjon…\' for å legge til et notat til stedet.</string>
<string name="add_waypoint_dialog_title">Legg til rutepunkt i innspilt GPX-spor</string> <string name="add_waypoint_dialog_title">Legg til rutepunkt i innspilt GPX-spor</string>
<string name="voice_is_not_available_msg">Taleveiledning er ikke tilgjengelig, gå til \'Innstillinger\' → \'Navigeringsinnstillinger\' , velg profilen → \'Taleveiledning\' og velg eller last ned en talemeldingspakke.</string> <string name="voice_is_not_available_msg">Taleveiledning er ikke tilgjengelig, gå til \'Innstillinger\' → \'Navigeringsinnstillinger\' , velg profilen → \'Taleveiledning\' og velg eller last ned en talemeldingspakke.</string>
<string name="use_fast_recalculation_desc">Beregner på nytt bare den første delen av ruten. Kan brukes for lange turer.</string> <string name="use_fast_recalculation_desc">Beregner på nytt bare den første delen av ruten, nyttig for lange turer.</string>
<string name="nautical_renderer">Maritimt</string> <string name="nautical_renderer">Maritimt</string>
<string name="day_off_label">stengt (fridag)</string> <string name="day_off_label">stengt (fridag)</string>
<string name="copy_location_name">Kopier sted/interessepunkt-navn</string> <string name="copy_location_name">Kopier sted/interessepunkt-navn</string>
@ -2521,7 +2521,7 @@
\n</string> \n</string>
<string name="rendering_attr_noPolygons_description">Gjør alle landarealelementer på kartet gjennomsiktige.</string> <string name="rendering_attr_noPolygons_description">Gjør alle landarealelementer på kartet gjennomsiktige.</string>
<string name="foot">ft</string> <string name="foot">ft</string>
<string name="nothing_found_in_radius">Ingenting funnet innen radiusen:</string> <string name="nothing_found_in_radius">Kunne ikke finne noe:</string>
<string name="select_waypoints_category_description">Legg til alle sporets rutepunkter, eller velg separate kategorier.</string> <string name="select_waypoints_category_description">Legg til alle sporets rutepunkter, eller velg separate kategorier.</string>
<string name="rendering_attr_whiteWaterSports_name">Elvesport</string> <string name="rendering_attr_whiteWaterSports_name">Elvesport</string>
<string name="poi_error_info_not_loaded">Info om knutepunktet ble ikke lastet inn</string> <string name="poi_error_info_not_loaded">Info om knutepunktet ble ikke lastet inn</string>
@ -2721,7 +2721,7 @@
\n</string> \n</string>
<string name="osmand_plus_extended_description_part3">Kartvisning <string name="osmand_plus_extended_description_part3">Kartvisning
\n • Vis din posisjon og retning \n • Vis din posisjon og retning
\n • Eventuelt orienter kartet etter kompass eller bevegelsesretning \n • Orienter kartet etter eget valg i henhold til kompass eller bevegelsesretning
\n • Lagre dine viktigste steder som favoritter \n • Lagre dine viktigste steder som favoritter
\n • Vis interessepunkter rundt deg \n • Vis interessepunkter rundt deg
\n • Vis spesialiserte nettbaserte kartfliser, satellittvisning (fra Bing), forskjellige overlegg som GPX-spor til tur/navigering og ytterligere lag med tilpassbar gjennomsiktighet \n • Vis spesialiserte nettbaserte kartfliser, satellittvisning (fra Bing), forskjellige overlegg som GPX-spor til tur/navigering og ytterligere lag med tilpassbar gjennomsiktighet
@ -3086,9 +3086,9 @@
<string name="application_profiles_descr">Velg profilene du vil ha synlig i programmet.</string> <string name="application_profiles_descr">Velg profilene du vil ha synlig i programmet.</string>
<string name="application_profiles">Programprofiler</string> <string name="application_profiles">Programprofiler</string>
<string name="zoom_by_wunderlinq">Bruk WunderLINQ for styring</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_downhill_name">Alpin skisport</string>
<string name="routing_attr_piste_type_sled_name">Kjelke</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_piste_type_sled_description">Bakker for kjelkebruk.</string>
<string name="routing_attr_allow_advanced_name">Tillat avanserte ruter</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_expert_name">Tillat ekspertruter</string>
<string name="routing_attr_allow_skating_only_name">Tillat løyper kun for skøyting</string> <string name="routing_attr_allow_skating_only_name">Tillat løyper kun for skøyting</string>
@ -3109,7 +3109,7 @@
<string name="base_profile_descr_public_transport">Alle typer offentlig transport</string> <string name="base_profile_descr_public_transport">Alle typer offentlig transport</string>
<string name="zoom_by_wunderlinq_descr">Endre kartforstørrelse ved å rulle hjulet opp og ned. Escape tar deg tilbake til WunderLINQ-programmet.</string> <string name="zoom_by_wunderlinq_descr">Endre kartforstørrelse ved å rulle hjulet opp og ned. Escape tar deg tilbake til WunderLINQ-programmet.</string>
<string name="quick_action_need_to_add_item_to_list">Legg til minst ett element i listen i hurtighandlingsinnstillingene</string> <string name="quick_action_need_to_add_item_to_list">Legg til minst ett element i listen i hurtighandlingsinnstillingene</string>
<string name="routing_attr_piste_type_downhill_description">Bakker for alpint eller utfor og tilgang til skiheiser.</string> <string name="routing_attr_piste_type_downhill_description">Bakker for alpin skisport og tilgang til skiheiser.</string>
<string name="routing_attr_piste_type_nordic_name">Langrenn</string> <string name="routing_attr_piste_type_nordic_name">Langrenn</string>
<string name="routing_attr_piste_type_nordic_description">Løyper for langrenn.</string> <string name="routing_attr_piste_type_nordic_description">Løyper for langrenn.</string>
<string name="routing_attr_piste_type_skitour_name">Skigåing</string> <string name="routing_attr_piste_type_skitour_name">Skigåing</string>
@ -3321,12 +3321,12 @@
<string name="sett_parrot_ext_input">Parrot</string> <string name="sett_parrot_ext_input">Parrot</string>
<string name="turn_on_profile_desc">Skru på minst én programprofil for å bruke denne innstillingen.</string> <string name="turn_on_profile_desc">Skru på minst én programprofil for å bruke denne innstillingen.</string>
<string name="rendering_attr_winter_road_name">Vintervei</string> <string name="rendering_attr_winter_road_name">Vintervei</string>
<string name="rendering_attr_tracktype_grade1_name">Fast (asfaltert)</string> <string name="rendering_attr_tracktype_grade1_name">Hard (fast dekke)</string>
<string name="rendering_attr_tracktype_grade2_name">Fast (uasfaltert)</string> <string name="rendering_attr_tracktype_grade2_name">Hard (uten fast dekke)</string>
<string name="rendering_attr_tracktype_grade3_name">For det meste fast</string> <string name="rendering_attr_tracktype_grade3_name">For det meste hard</string>
<string name="rendering_attr_tracktype_grade4_name">For det meste mykt</string> <string name="rendering_attr_tracktype_grade4_name">For det meste myk</string>
<string name="rendering_attr_tracktype_grade5_name">Mykt</string> <string name="rendering_attr_tracktype_grade5_name">Myk</string>
<string name="routeInfo_tracktype_name">Flatefasthet</string> <string name="routeInfo_tracktype_name">Overflatefasthet</string>
<string name="shared_string_open_track">Åpne spor</string> <string name="shared_string_open_track">Åpne spor</string>
<string name="shared_string_track_is_saved">Sporet %s ble lagret</string> <string name="shared_string_track_is_saved">Sporet %s ble lagret</string>
<string name="gpx_join_gaps">Fjern mellomrom</string> <string name="gpx_join_gaps">Fjern mellomrom</string>
@ -3367,8 +3367,8 @@
<string name="rendering_attr_piste_type_connection_name">Forbindelse</string> <string name="rendering_attr_piste_type_connection_name">Forbindelse</string>
<string name="rendering_attr_piste_type_skitour_name">Skitur</string> <string name="rendering_attr_piste_type_skitour_name">Skitur</string>
<string name="rendering_attr_piste_type_downhill_name">Alpint</string> <string name="rendering_attr_piste_type_downhill_name">Alpint</string>
<string name="rendering_attr_piste_difficulty_novice_name">Begynner</string> <string name="rendering_attr_piste_difficulty_novice_name">Nybegynner</string>
<string name="rendering_attr_piste_difficulty_easy_name">Enkelt</string> <string name="rendering_attr_piste_difficulty_easy_name">Enkel</string>
<string name="rendering_attr_piste_difficulty_intermediate_name">Middels</string> <string name="rendering_attr_piste_difficulty_intermediate_name">Middels</string>
<string name="rendering_attr_piste_difficulty_advanced_name">Avansert</string> <string name="rendering_attr_piste_difficulty_advanced_name">Avansert</string>
<string name="rendering_attr_piste_difficulty_expert_name">Ekspert</string> <string name="rendering_attr_piste_difficulty_expert_name">Ekspert</string>
@ -3439,7 +3439,7 @@
<string name="login_and_pass">Brukernavn og passord</string> <string name="login_and_pass">Brukernavn og passord</string>
<string name="plugin_global_prefs_info">Disse programtillegg-innstillingene er globale og gjelder for alle profiler</string> <string name="plugin_global_prefs_info">Disse programtillegg-innstillingene er globale og gjelder for alle profiler</string>
<string name="osm_editing">OSM-redigering</string> <string name="osm_editing">OSM-redigering</string>
<string name="osm_edits_view_descr">Du kan vise alle dine uopplastede redigeringer eller OSM-feil i %1$s. Opplastede punkter viser ikke i OsmAnd.</string> <string name="osm_edits_view_descr">Vis alle redigeringene dine som ikke er lastet opp ennå eller OSM-feil i %1$s. Endringer som allerede er lastet opp vises ikke lenger.</string>
<string name="select_nav_icon_descr">Ikon vist under navigering eller bevegelse.</string> <string name="select_nav_icon_descr">Ikon vist under navigering eller bevegelse.</string>
<string name="select_map_icon_descr">Ikon vist i hviletilstand.</string> <string name="select_map_icon_descr">Ikon vist i hviletilstand.</string>
<string name="multimedia_use_system_camera">Bruk systemprogram</string> <string name="multimedia_use_system_camera">Bruk systemprogram</string>
@ -3499,7 +3499,7 @@
<string name="items_added">Elementer lagt til</string> <string name="items_added">Elementer lagt til</string>
<string name="restore_all_profile_settings">Gjenopprett alle profilinnstillinger\?</string> <string name="restore_all_profile_settings">Gjenopprett alle profilinnstillinger\?</string>
<string name="quick_action_terrain_descr">En knapp for å vise eller skjule terrenglag på kartet.</string> <string name="quick_action_terrain_descr">En knapp for å vise eller skjule terrenglag på kartet.</string>
<string name="context_menu_actions">Handlinger i bindeleddsmeny</string> <string name="context_menu_actions">Handlinger i lokalmeny</string>
<string name="shared_string_hidden">Skjult</string> <string name="shared_string_hidden">Skjult</string>
<string name="main_actions_descr">Har kun fire knapper.</string> <string name="main_actions_descr">Har kun fire knapper.</string>
<string name="main_actions">Hovedhandlinger</string> <string name="main_actions">Hovedhandlinger</string>
@ -3524,7 +3524,7 @@
<string name="download_unsupported_action">Ustøttet handling %1$s</string> <string name="download_unsupported_action">Ustøttet handling %1$s</string>
<string name="extra_maps_menu_group">Ekstra kart</string> <string name="extra_maps_menu_group">Ekstra kart</string>
<string name="shared_string_divider">Skillelinje</string> <string name="shared_string_divider">Skillelinje</string>
<string name="some_articles_may_not_available_in_lang">Det kan hende noen Wikipedia-artikler ikke finnes på norsk.</string> <string name="some_articles_may_not_available_in_lang">Noen Wikipedia-artikler er kanskje ikke tilgjengelige på ditt språk.</string>
<string name="custom_color">Egendefinert farge</string> <string name="custom_color">Egendefinert farge</string>
<string name="search_poi_types">Søk etter interessepunkttyper</string> <string name="search_poi_types">Søk etter interessepunkttyper</string>
<string name="quick_action_item">Hurtighandling</string> <string name="quick_action_item">Hurtighandling</string>
@ -3547,7 +3547,7 @@
<string name="live_monitoring_tracking_interval">Sporingsintervall</string> <string name="live_monitoring_tracking_interval">Sporingsintervall</string>
<string name="live_monitoring_time_buffer">Tidsmellomlager</string> <string name="live_monitoring_time_buffer">Tidsmellomlager</string>
<string name="multimedia_photo_play_sound">Kameralukker-lyd</string> <string name="multimedia_photo_play_sound">Kameralukker-lyd</string>
<string name="shared_string_resume">Fortsett</string> <string name="shared_string_resume">Gjenoppta</string>
<string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string> <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
<string name="lang_zhyue">Standard kantonesisk</string> <string name="lang_zhyue">Standard kantonesisk</string>
<string name="lang_zhminnan">Sørlig min</string> <string name="lang_zhminnan">Sørlig min</string>
@ -3581,9 +3581,9 @@
<string name="import_complete_description">All data fra %1$s er importert, du kan bruke knappene nedenfor for å åpne den delen du trenger for å håndtere den.</string> <string name="import_complete_description">All data fra %1$s er importert, du kan bruke knappene nedenfor for å åpne den delen du trenger for å håndtere den.</string>
<string name="restore_all_profile_settings_descr">Alle profilinnstillinger blir gjenopprettet til deres opprinnelige tilstand etter opprettelse/import av denne profilen.</string> <string name="restore_all_profile_settings_descr">Alle profilinnstillinger blir gjenopprettet til deres opprinnelige tilstand etter opprettelse/import av denne profilen.</string>
<string name="clear_recorded_data_warning">Er du sikker på at du vil tømme lagret data\?</string> <string name="clear_recorded_data_warning">Er du sikker på at du vil tømme lagret data\?</string>
<string name="recalculate_route_in_deviation">Anvis ny rute ved avvik</string> <string name="recalculate_route_in_deviation">Beregn rute på nytt ved avvik</string>
<string name="download_slope_maps">Løyper</string> <string name="download_slope_maps">Bakkehelninger</string>
<string name="ui_customization_short_descr">Skuffeelementer, bindeleddsmeny</string> <string name="ui_customization_short_descr">Skuffeelementer, lokalmeny</string>
<string name="ui_customization">Grensesnittstilpasning</string> <string name="ui_customization">Grensesnittstilpasning</string>
<string name="shared_string_drawer">Skuff</string> <string name="shared_string_drawer">Skuff</string>
<string name="tracker_item">OsmAnd-sporer</string> <string name="tracker_item">OsmAnd-sporer</string>
@ -3593,8 +3593,8 @@
<string name="replace_all_desc">Nåværende elementer vil erstattes med elementer fra filen</string> <string name="replace_all_desc">Nåværende elementer vil erstattes med elementer fra filen</string>
<string name="recalc_angle_dialog_title">Minimumsvinkel mellom min plassering og rute</string> <string name="recalc_angle_dialog_title">Minimumsvinkel mellom min plassering og rute</string>
<string name="import_rendering_file">Importer opptegningsfil</string> <string name="import_rendering_file">Importer opptegningsfil</string>
<string name="slope_description">Løyper bruker farger for å visualisere bratthet.</string> <string name="slope_description">Bakkehelningskart bruker farger for å visualisere terrengbratthet.</string>
<string name="slope_download_description">Ytterligere kart trengs for å vise løyper på kartet.</string> <string name="slope_download_description">Ekstra kart er nødvendige for å vise bakkehelninger på kartet.</string>
<string name="subscription_osmandlive_item">Abonnement - OsmAnd Live</string> <string name="subscription_osmandlive_item">Abonnement - OsmAnd Live</string>
<string name="reset_deafult_order">Gjenopprett forvalgt elementrekkefølge</string> <string name="reset_deafult_order">Gjenopprett forvalgt elementrekkefølge</string>
<string name="profiles_for_action_not_found">Fant ingen slike profiler.</string> <string name="profiles_for_action_not_found">Fant ingen slike profiler.</string>
@ -3605,29 +3605,29 @@
<string name="no_recalculation_setting">Ingen ny beregning</string> <string name="no_recalculation_setting">Ingen ny beregning</string>
<string name="please_provide_profile_name_message">Angi et navn for profilen</string> <string name="please_provide_profile_name_message">Angi et navn for profilen</string>
<string name="select_data_to_import">Velg data å importere.</string> <string name="select_data_to_import">Velg data å importere.</string>
<string name="slope_read_more">Du kan lese mer om løyper i %1$s.</string> <string name="slope_read_more">Du kan lese mer om helninger på %1$s.</string>
<string name="reorder_or_hide_from">Omarranger eller skjul elementer fra %1$s.</string> <string name="reorder_or_hide_from">Omarranger eller skjul elementer fra %1$s.</string>
<string name="divider_descr">Elementer under dette punktet er atskilt med en skillelinje.</string> <string name="divider_descr">Elementer under dette punktet er atskilt med en skillelinje.</string>
<string name="reset_items_descr">Skjuling av innstillinger tilbakestiller dem til opprinnelig tilstand.</string> <string name="reset_items_descr">Skjuling av innstillinger tilbakestiller dem til opprinnelig tilstand.</string>
<string name="app_mode_ski_touring">Skigåing</string> <string name="app_mode_ski_touring">Skigåing</string>
<string name="unsupported_type_error">Ustøttet type</string> <string name="unsupported_type_error">Ustøttet type</string>
<string name="select_distance_route_will_recalc">Velg hvor mye avviksdistanse som skal utløse omruting.</string> <string name="select_distance_route_will_recalc">Velg avstanden som skal til for å beregne ruten på nytt.</string>
<string name="export_profile_dialog_description">Du kan velge ytterligere data å eksportere sammen med profilen.</string> <string name="export_profile_dialog_description">Du kan velge ytterligere data å eksportere sammen med profilen.</string>
<string name="import_profile_dialog_description">Importer profil inneholder ytterligere data. Klikk «Import» for å importere kun profildata, eller velg ytterligere data.</string> <string name="import_profile_dialog_description">Importer profil inneholder ytterligere data. Klikk «Import» for å importere kun profildata, eller velg ytterligere data.</string>
<string name="plugin_prefs_reset_successful">Alle programtilleggsinnstillinger tilbakestilt til standard.</string> <string name="plugin_prefs_reset_successful">Alle programtilleggsinnstillinger tilbakestilt til standard.</string>
<string name="add_new_custom_category_button_promo">Du kan legge til en ny egendefinert kategori ved å velge én eller flere kategorier.</string> <string name="add_new_custom_category_button_promo">Du kan legge til en ny egendefinert kategori ved å velge én eller flere kategorier.</string>
<string name="create_custom_categories_list_promo">Endre listens sorteringsrekkefølge, skjul unødvendige kategorier. Du kan importere eller eksportere alle endringer med profiler.</string> <string name="create_custom_categories_list_promo">Endre listens sorteringsrekkefølge, skjul unødvendige kategorier. Du kan importere eller eksportere alle endringer med profiler.</string>
<string name="rearrange_categories">Omorganiser kategorier</string> <string name="rearrange_categories">Omorganiser kategorier</string>
<string name="route_recalculation_dist_descr">Ruten vil bli kalkulert igjen hvis distansen til ruten er lengre enn angitt parameter</string> <string name="route_recalculation_dist_descr">Ruten blir beregnet på nytt hvis avstanden til ruten er lengre enn angitt parameter</string>
<string name="plugin_disabled_descr">Dette programtillegget er et eget program, du vil måtte fjerne det for seg hvis du ikke lenger vil bruke det. <string name="plugin_disabled_descr">Dette programtillegget er et eget program, du vil måtte fjerne det for seg hvis du ikke lenger vil bruke det.
\n \n
\nDette programtillegget vil forbli på enheten etter fjerning av OsmAnd.</string> \nDette programtillegget vil forbli på enheten etter fjerning av OsmAnd.</string>
<string name="keep_both_desc">Importerte elementer vil bli lagt til med fortegnelse</string> <string name="keep_both_desc">Importerte elementer vil bli lagt til med fortegnelse</string>
<string name="ui_customization_description">Tilpass mengden elementer i \"Skuff\", \"Sett opp kart\", og \"Bindeleddsmeny\". <string name="ui_customization_description">Tilpass antallet elementer i \"Skuff\", \"Kartinnstilling\" og \"Lokalmeny\".
\n \n
\nSkru av ubrukte programtillegg for å skjule alle deres styringskontroller. %1$s.</string> \nSlå av ubrukte programtillegg for å skjule alle deres styringskontroller. %1$s.</string>
<string name="hidden_items_descr">Disse elementene er skjult fra menyen, men de representerte valgene eller programtilleggene vil fortsette å virke.</string> <string name="hidden_items_descr">Disse elementene er skjult fra menyen, men de representerte valgene eller programtilleggene vil fortsette å virke.</string>
<string name="select_wikipedia_article_langs">Velg språkene Wikipedia-artikler skal vises på i kartet. Du kan bytte mellom alle tilgjengelige språk mens du leser artikkelen.</string> <string name="select_wikipedia_article_langs">Velg språkene for Wikipedia-artikler på kartet. Bytt til hvilket som helst tilgjengelig språk mens du leser artikkelen.</string>
<string name="legend_item_description">Veiledning til kartets symbolbruk.</string> <string name="legend_item_description">Veiledning til kartets symbolbruk.</string>
<string name="shared_string_routing">Ruteplanlegging</string> <string name="shared_string_routing">Ruteplanlegging</string>
<string name="route_recalculation_dist_title">Minsteavstand for å beregne rute på nytt</string> <string name="route_recalculation_dist_title">Minsteavstand for å beregne rute på nytt</string>
@ -3695,7 +3695,7 @@
<string name="shared_string_custom">Egendefinert</string> <string name="shared_string_custom">Egendefinert</string>
<string name="gpx_direction_arrows">Retningspiler</string> <string name="gpx_direction_arrows">Retningspiler</string>
<string name="shared_string_tones">tonn</string> <string name="shared_string_tones">tonn</string>
<string name="route_between_points">Rut mellom punkter</string> <string name="route_between_points">Rute mellom punkter</string>
<string name="app_mode_enduro_motorcycle">Enduro-motorsykkel</string> <string name="app_mode_enduro_motorcycle">Enduro-motorsykkel</string>
<string name="screen_control">Skjermkontroll</string> <string name="screen_control">Skjermkontroll</string>
<string name="system_screen_timeout">Bruk systemets skjermtidsavbrudd</string> <string name="system_screen_timeout">Bruk systemets skjermtidsavbrudd</string>
@ -3778,17 +3778,17 @@
<string name="use_system_screen_timeout_promo">Avskrudd som forvalg: Skjermen vil ikke slås av så lenge OsmAnd kjører i forgrunnen. <string name="use_system_screen_timeout_promo">Avskrudd som forvalg: Skjermen vil ikke slås av så lenge OsmAnd kjører i forgrunnen.
\n \n
\nHvis påskrudd vil OsmAnd bruke systemets innstilling for skjermtidsavbrudd.</string> \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="terrain_empty_state_text">Slå på for å vise relieffskygge- eller bakkehelningskart. Du kan lese mer om disse karttypene på vårt nettsted.</string>
<string name="reset_to_default_category_button_promo">«Tilbakestill til forvalg» gjenoppretter sorteringsrekkefølgen til installasjonsforvalg.</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="hillshade_description">Relieffskyggekart bruker mørke skygger for å vise bakkehelninger, 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="recalculate_route_distance_promo">Ruten blir beregnet på nytt hvis avstanden fra ruten til nåværende posisjon er større enn valgt verdi.</string>
<string name="osm_live_payment_subscription_management">Betaling vil bli belastet din Google Play-konto ved bekreftelse av kjøp. <string name="osm_live_payment_subscription_management">Betaling vil bli belastet din Google Play-konto ved bekreftelse av kjøp.
\n \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 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
\n Du kan håndtere og avbryte dine abonnementer ved å gå til dine Google Play-innstillinger.</string> \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="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">Still inn minimum og maksimum zoomnivå for å vise eller laste det nettbaserte kartet.</string>
<string name="map_source_zoom_levels_descr">Har innvirkning på om skjermen skal brukes som kart eller overlag/underlag. <string name="map_source_zoom_levels_descr">Har innvirkning på om skjermen skal brukes som kart eller overlag/underlag.
\n \n
\n%1$s: Kartet er begrenset til valgt forstørrelsesrekkevidde. \n%1$s: Kartet er begrenset til valgt forstørrelsesrekkevidde.
@ -3803,13 +3803,13 @@
\n \n
\nVelg %2$s. Alle data som har med fotobokser å gjøre: varsler, meldinger og interessepunkter blir slettet til OsmAnd er fullstendig installert på nytt.</string> \nVelg %2$s. Alle data som har med fotobokser å gjøre: varsler, meldinger og interessepunkter blir slettet til OsmAnd er fullstendig installert på nytt.</string>
<string name="clear_tiles_warning">Å utføre disse endringene vil tømme hurtiglagret data for denne fliskilden.</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="plugin_wikipedia_description">Få info om interessepunkter fra Wikipedia, en nettfrakoblet lommeguide med artikler om steder og reisemål.</string>
<string name="track_coloring_solid">Utfylt</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. <string name="osm_live_payment_subscription_management_hw">Betalingen blir belastet din AppGallery-konto ved bekreftelse på kjøp.
\n \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. \nAbonnementet forlenges automatisk med mindre det avbrytes før fornyelsesdatoen. Din konto blir belastet for fornyelsesperioden (måned/tre måneder/år) kun på fornyelsesdatoen.
\n \n
\nDu kan håndtere og avbryte ditt abonnement ved å gå gjennom dine programgalleri-innstillinger.</string> \nDu kan håndtere og avbryte dine abonnementer i dine AppGallery-innstillinger.</string>
<string name="gpx_parse_error">OsmAnd-GPX er feilformatert, kontakt brukerstøtte for videre etterforskning.</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="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="lenght_limit_description">Angi lengden på ditt kjøretøy, noen rutebegrensninger kan gjelde for lange kjøretøy.</string>
@ -3825,7 +3825,7 @@
<string name="context_menu_item_add_waypoint">Legg til spor-rutepunkt</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="quick_action_add_gpx">Legg til spor-rutepunkt</string>
<string name="complex_routing_descr">To-fase-ruting for bilnavigering.</string> <string name="complex_routing_descr">To-fase-ruting for bilnavigering.</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="osm_live_payment_desc_hw">Abonnementet belastes for den valgte perioden. Avbryt det når som helst i AppGallery.</string>
<string name="attach_to_the_roads">Følg veier</string> <string name="attach_to_the_roads">Følg veier</string>
<string name="monitoring_min_distance">Minimumsforskyvning</string> <string name="monitoring_min_distance">Minimumsforskyvning</string>
<string name="radius_ruler_item">Radiuspasser</string> <string name="radius_ruler_item">Radiuspasser</string>
@ -3840,7 +3840,7 @@
<string name="screen_timeout_descr">Hvis «%1$s» er på, vil aktivitetstiden avhenge av den.</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_description">Angi kjøretøylengde som tillates på rutene.</string>
<string name="routing_attr_length_name">Lengdebegrensning</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="plan_route_exit_dialog_descr">Er du sikker på at du vil forkaste alle endringer i den planlagte ruten\?</string>
<string name="navigate_to_track_descr">Naviger fra min posisjon til sporet</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">Innebygd utvikling for offentlig transport</string>
<string name="use_native_pt_desc">Bytt til Java (sikker) ruteberegning for offentlig transport</string> <string name="use_native_pt_desc">Bytt til Java (sikker) ruteberegning for offentlig transport</string>
@ -3848,7 +3848,7 @@
<string name="use_complex_routing">Kompleks ruting</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_name">Unngå gangveier</string>
<string name="routing_attr_avoid_footways_description">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="recalc_angle_dialog_descr">Ekstra rett segment mellom min posisjon og beregnet rute blir vist til ruten er beregnet på nytt</string>
<string name="checking_for_duplicate_description">OsmAnd sjekker %1$s for duplikater med eksisterende elementer i programmet. <string name="checking_for_duplicate_description">OsmAnd sjekker %1$s for duplikater med eksisterende elementer i programmet.
\n \n
\nDet kan ta noe tid.</string> \nDet kan ta noe tid.</string>
@ -3862,18 +3862,18 @@
<string name="development">Utvikling</string> <string name="development">Utvikling</string>
<string name="use_live_public_transport">OsmAnd-sanntidsdata</string> <string name="use_live_public_transport">OsmAnd-sanntidsdata</string>
<string name="use_live_routing">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="perform_oauth_authorization_description">Logg inn med OAuth for å bruke osmedit-funksjoner</string>
<string name="clear_osm_token">Fjern OpenStreetmap-OAuth-symbol</string> <string name="clear_osm_token">Fjern OpenStreetmap-OAuth-symbol</string>
<string name="perform_oauth_authorization">Logg inn via OAuth</string> <string name="perform_oauth_authorization">Logg inn via OAuth</string>
<string name="what_is_new">Hva er nytt</string> <string name="what_is_new">Hva er nytt</string>
<string name="osm_edit_logout_success">Utlogget</string> <string name="osm_edit_logout_success">Utlogget</string>
<string name="use_two_phase_routing">Bruk 2-stegs A*-rutingsalgoritme</string> <string name="use_two_phase_routing">Bruk 2-stegs A*-rutingsalgoritme</string>
<string name="file_already_imported">Filen er allerede importert i OsmAnd</string> <string name="file_already_imported">Filen er allerede importert i OsmAnd</string>
<string name="message_graph_will_be_available_after_recalculation">Vent på omberegning av ruten. <string name="message_graph_will_be_available_after_recalculation">Vent.
\nGraf vil være tilgjengelig etter omberegning.</string> \nGraf vil være tilgjengelig etter omberegning av ruten.</string>
<string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string> <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
<string name="shared_string_graph">Graf</string> <string name="shared_string_graph">Graf</string>
<string name="message_need_calculate_route_before_show_graph">%1$s-data er tilgjengelig kun på veiene, du må beregne en rute med “Rut mellom punkter”.</string> <string name="message_need_calculate_route_before_show_graph">%1$s-data er tilgjengelig kun på veiene, beregn en rute med “Rute mellom punkter” for å se grafer.</string>
<string name="shared_string_gpx_route">Spor rute</string> <string name="shared_string_gpx_route">Spor rute</string>
<string name="icon_group_special">Spesiell</string> <string name="icon_group_special">Spesiell</string>
<string name="mgrs_format_descr">OsmAnd bruker MGRS, som ligner UTM NATO-format</string> <string name="mgrs_format_descr">OsmAnd bruker MGRS, som ligner UTM NATO-format</string>
@ -3887,7 +3887,7 @@
<string name="icon_group_sport">Sport</string> <string name="icon_group_sport">Sport</string>
<string name="icon_group_emergency">Nødsfall</string> <string name="icon_group_emergency">Nødsfall</string>
<string name="icon_group_travel">Reise</string> <string name="icon_group_travel">Reise</string>
<string name="message_you_need_add_two_points_to_show_graphs">Du må legge til minst to punkter.</string> <string name="message_you_need_add_two_points_to_show_graphs">Legg til minst to punkter</string>
<string name="gpx_upload_trackable_visibility_descr">\"Sporbar\" betyr at sporet ikke vil vises i offentlige lister, men bearbeidede sporpunkter med tidsstempel (som ikke direkte kan knyttes til deg) vil være tilgjengelig gjennom nedlastinger fra det offentlige GPS-API-et.</string> <string name="gpx_upload_trackable_visibility_descr">\"Sporbar\" betyr at sporet ikke vil vises i offentlige lister, men bearbeidede sporpunkter med tidsstempel (som ikke direkte kan knyttes til deg) vil være tilgjengelig gjennom nedlastinger fra det offentlige GPS-API-et.</string>
<string name="sign_in_with_open_street_map">Logg inn med OpenStreetMap</string> <string name="sign_in_with_open_street_map">Logg inn med OpenStreetMap</string>
<string name="use_login_password">Bruk innlogging og passord</string> <string name="use_login_password">Bruk innlogging og passord</string>
@ -3895,12 +3895,12 @@
<string name="send_files_to_openstreetmap">Send GPX-fil til OpenStreetMap</string> <string name="send_files_to_openstreetmap">Send GPX-fil til OpenStreetMap</string>
<string name="icon_group_amenity">Fasilitet</string> <string name="icon_group_amenity">Fasilitet</string>
<string name="markers_history">Markørhistorikk</string> <string name="markers_history">Markørhistorikk</string>
<string name="disable_recording_once_app_killed_descrp">Pauser spor-logging når programmet drepes (via nylige programmer). (OsmAnd-bakgrunnsindikatoren forsvinner fra Android-merknadsfeltet.)</string> <string name="disable_recording_once_app_killed_descrp">Sporlogging vil settes i pausemodus når appen blir avsluttet (via nylige apper). (OsmAnd-bakgrunnsindikasjonen forsvinner fra Android-varslingslinjen.)</string>
<string name="monitoring_control_start">START</string> <string name="monitoring_control_start">START</string>
<string name="osm_edit_close_note">Lukk OSM-notat</string> <string name="osm_edit_close_note">Lukk OSM-notat</string>
<string name="osm_edit_comment_note">Kommenter OSM-notat</string> <string name="osm_edit_comment_note">Kommenter OSM-notat</string>
<string name="enter_text_separated">Skriv inn etiketter inndelt med komma.</string> <string name="enter_text_separated">Skriv inn etiketter inndelt med komma.</string>
<string name="subscription_payment_issue_title">Det har oppstått et problem med abonnementet ditt. Klikk på knappen for å gå til Google Play-abonnementsinnstillingene for å fikse din betalingsmetode.</string> <string name="subscription_payment_issue_title">Trykk på knappen for å sette opp en betalingsmåte på Google Play for å fikse ditt abonnement.</string>
<string name="subscription_expired_title">OsmAnd-Live-abonnement utløpt</string> <string name="subscription_expired_title">OsmAnd-Live-abonnement utløpt</string>
<string name="subscription_paused_title">OsmAnd-Live-abonnement har blitt satt på vent</string> <string name="subscription_paused_title">OsmAnd-Live-abonnement har blitt satt på vent</string>
<string name="subscription_on_hold_title">OsmAnd-Live-abonnement på vent</string> <string name="subscription_on_hold_title">OsmAnd-Live-abonnement på vent</string>
@ -3927,8 +3927,16 @@
<string name="add_photos_descr">OsmAnd viser bilder fra flere kilder: <string name="add_photos_descr">OsmAnd viser bilder fra flere kilder:
\nOpenPlaceReviews - interessepunktbilder; \nOpenPlaceReviews - interessepunktbilder;
\nMapillary - bilder på gatenivå; \nMapillary - bilder på gatenivå;
\nWeb / Wikimedia - interessepunktbilder spesifisert i OpenStreetMap-data.</string> \nWeb / Wikimedia - interessepunktbilder i henhold til OpenStreetMap-data.</string>
<string name="elevation_data">Du kan bruke høydedata for å ta i betraktning stigning/nedstigning på turen din</string> <string name="elevation_data">Du kan bruke høydedata for å ta hensyn til stigning/nedstigning på turen din</string>
<string name="app_mode_light_aircraft">Småfly</string> <string name="app_mode_light_aircraft">Småfly</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string> <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="lang_de_casual">Tysk (uformell)</string>
<string name="plan_route_join_segments">Slå sammen segmenter</string>
<string name="plan_route_split_before">Del før</string>
<string name="plan_route_split_after">Del etter</string>
<string name="plan_route_add_new_segment">Legg til et nytt segment</string>
<string name="login_open_street_map_org">Logg inn på OpenStreetMap.org</string>
<string name="profile_type_osmand_string">OsmAnd-profil</string>
<string name="profile_type_user_string">Brukerprofil</string>
</resources> </resources>

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

@ -1541,7 +1541,7 @@
<string name="routing_attr_height_name">Ograniczenie wysokości</string> <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="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">Inteligentne przeliczanie trasy</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="use_fast_recalculation_desc">Przelicza tylko początkową część trasy, która jest przydatna podczas długich podróży.</string>
<string name="shared_string_logoff">Wyloguj się</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_walkingRoutesOSMC_name">Linia w kolorze oznakowania OSMC</string>
<string name="rendering_value_disabled_name">Wyłączenie</string> <string name="rendering_value_disabled_name">Wyłączenie</string>
@ -3938,8 +3938,8 @@
<string name="use_two_phase_routing">Użyj 2-fazowego algorytmu routingu A *</string> <string name="use_two_phase_routing">Użyj 2-fazowego algorytmu routingu A *</string>
<string name="shared_string_graph">Wykres</string> <string name="shared_string_graph">Wykres</string>
<string name="message_need_calculate_route_before_show_graph">%1$s dane dostępne tylko na drogach, aby je uzyskać, musisz obliczyć trasę za pomocą opcji „Trasa między punktami”.</string> <string name="message_need_calculate_route_before_show_graph">%1$s dane dostępne tylko na drogach, aby je uzyskać, musisz obliczyć trasę za pomocą opcji „Trasa między punktami”.</string>
<string name="message_graph_will_be_available_after_recalculation">Poczekaj na ponowne obliczenie trasy. <string name="message_graph_will_be_available_after_recalculation">Proszę czekać.
\nWykres będzie dostępny po ponownym obliczeniu.</string> \nWykres będzie dostępny po ponownym obliczeniu trasy.</string>
<string name="shared_string_local_maps">Mapy lokalne</string> <string name="shared_string_local_maps">Mapy lokalne</string>
<string name="app_mode_gap">Przerwa</string> <string name="app_mode_gap">Przerwa</string>
<string name="icon_group_amenity">Udogodnienie</string> <string name="icon_group_amenity">Udogodnienie</string>
@ -3955,8 +3955,8 @@
<string name="subscription_expired_title">Subskrypcja OsmAnd Live wygasła</string> <string name="subscription_expired_title">Subskrypcja OsmAnd Live wygasła</string>
<string name="subscription_paused_title">Subskrypcja OsmAnd Live została wstrzymana</string> <string name="subscription_paused_title">Subskrypcja OsmAnd Live została wstrzymana</string>
<string name="snowmobile_render_descr">Do jazdy skuterem śnieżnym z wyznaczonymi drogami i torami.</string> <string name="snowmobile_render_descr">Do jazdy skuterem śnieżnym z wyznaczonymi drogami i torami.</string>
<string name="message_you_need_add_two_points_to_show_graphs">Musisz dodać co najmniej dwa punkty</string> <string name="message_you_need_add_two_points_to_show_graphs">Dodaj co najmniej dwa punkty</string>
<string name="subscription_payment_issue_title">Wystąpił problem z Twoją subskrypcją. Kliknij przycisk, aby przejść do ustawień subskrypcji Google Play i naprawić metodę płatności.</string> <string name="subscription_payment_issue_title">Wystąpił problem z Twoją subskrypcją. Naciśnij przycisk, aby przejść do ustawień subskrypcji Google Play i naprawić metodę płatności.</string>
<string name="subscription_on_hold_title">Subskrypcja OsmAnd Live jest wstrzymana</string> <string name="subscription_on_hold_title">Subskrypcja OsmAnd Live jest wstrzymana</string>
<string name="user_login">Login</string> <string name="user_login">Login</string>
<string name="login_open_street_map">Zaloguj się do OpenStreetMap</string> <string name="login_open_street_map">Zaloguj się do OpenStreetMap</string>
@ -3986,7 +3986,7 @@
<string name="add_photos_descr">OsmAnd pokazuje zdjęcia z kilku źródeł: <string name="add_photos_descr">OsmAnd pokazuje zdjęcia z kilku źródeł:
\nOpenPlaceReviews - zdjęcia punktów użyteczności; \nOpenPlaceReviews - zdjęcia punktów użyteczności;
\nMapillary - zdjęcia z poziomu ulicy; \nMapillary - zdjęcia z poziomu ulicy;
\nWeb / Wikimedia - zdjęcia określonych punktów użyteczności w danych OpenStreetMap.</string> \nWeb / Wikimedia - zdjęcia punktów POI zgodnie z danymi OpenStreetMap.</string>
<string name="shared_string_resources">Zasoby</string> <string name="shared_string_resources">Zasoby</string>
<string name="approximate_file_size">Przybliżony rozmiar pliku</string> <string name="approximate_file_size">Przybliżony rozmiar pliku</string>
<string name="select_data_to_export">Wybierz dane do wyeksportowania do pliku.</string> <string name="select_data_to_export">Wybierz dane do wyeksportowania do pliku.</string>
@ -4007,4 +4007,18 @@
<string name="lang_de_casual">Niemiecki (styl potoczny)</string> <string name="lang_de_casual">Niemiecki (styl potoczny)</string>
<string name="gpx_upload_public_visibility_descr">\"Publiczny\" oznacza, że ślad jest pokazywany publicznie w śladach GPS i na publicznych listach śladów GPS oraz na publicznej liście śladów z surowymi znacznikami czasowymi. Dane obsługiwane przez API nie odnoszą się do strony śladów. Znaczniki czasu punktów śladowych nie są dostępne za pośrednictwem publicznego API GPS, a punkty śladowe nie są uporządkowane chronologicznie.</string> <string name="gpx_upload_public_visibility_descr">\"Publiczny\" oznacza, że ślad jest pokazywany publicznie w śladach GPS i na publicznych listach śladów GPS oraz na publicznej liście śladów z surowymi znacznikami czasowymi. Dane obsługiwane przez API nie odnoszą się do strony śladów. Znaczniki czasu punktów śladowych nie są dostępne za pośrednictwem publicznego API GPS, a punkty śladowe nie są uporządkowane chronologicznie.</string>
<string name="app_mode_light_aircraft">Lekki samolot</string> <string name="app_mode_light_aircraft">Lekki samolot</string>
<string name="elevation_data">Możesz użyć danych wysokości, aby uwzględnić wzniesienie / zejście podczas podróży</string>
<string name="plan_route_join_segments">Połącz segmenty</string>
<string name="plan_route_split_before">Podziel przed</string>
<string name="plan_route_split_after">Podziel po</string>
<string name="plan_route_add_new_segment">Dodaj nowy segment</string>
<string name="release_3_9">• Dodano opcję eksportowania i importowania wszystkich danych, w tym ustawień, zasobów, miejsc
\n
\n• Planowanie trasy: wykresy dla segmentów toru z trasą oraz dodano możliwość tworzenia i edycji wielu segmentów toru
\n
\n• Dodano metodę uwierzytelniania OAuth dla OpenStreetMap, ulepszony interfejs użytkownika okien dialogowych OSM
\n
\n• Obsługa niestandardowych kolorów dla ulubionych i śledzenia punktów trasy
\n
\n</string>
</resources> </resources>

10
OsmAnd/res/values-pt-rBR/phrases.xml
View file

@ -3884,4 +3884,14 @@
<string name="poi_nurse">Enfermaria</string> <string name="poi_nurse">Enfermaria</string>
<string name="poi_mobile_money_agent">Agente de dinheiro móvel</string> <string name="poi_mobile_money_agent">Agente de dinheiro móvel</string>
<string name="poi_lifeguard_base">Base do salva-vidas</string> <string name="poi_lifeguard_base">Base do salva-vidas</string>
<string name="poi_vaccination_covid19">Vacinação: COVID19</string>
<string name="poi_health_specialty_vaccination_yes">Vacinação</string>
<string name="poi_water_source_lake">Lago</string>
<string name="poi_water_source_river">Rio</string>
<string name="poi_water_source_well">Poço de água</string>
<string name="poi_water_source_powered_pump">Bomba motorizada</string>
<string name="poi_water_source_water_tank">Tanque de água</string>
<string name="poi_water_source_tap">Toque</string>
<string name="poi_water_source_water_works">Estação de tratamento de água</string>
<string name="poi_water_source_tube_well">Bem embalado</string>
</resources> </resources>

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

@ -1874,7 +1874,7 @@
<string name="move_marker_bottom_sheet_title">Mova o mapa para reposicionar o marcador</string> <string name="move_marker_bottom_sheet_title">Mova o mapa para reposicionar o marcador</string>
<!-- string name="lat_lon_pattern">Lat: %1$.5f Lon: %2$.5f</string --> <!-- string name="lat_lon_pattern">Lat: %1$.5f Lon: %2$.5f</string -->
<string name="use_osm_live_routing">Navegação OsmAnd Live</string> <string name="use_osm_live_routing">Navegação OsmAnd Live</string>
<string name="access_no_destination">Destino não definido</string> <string name="access_no_destination">Plug-in de acessibilidade: sem destino definido</string>
<string name="access_disable_offroute_recalc_descr">Desabilitar recálculo de rota depois de ter saído de rota.</string> <string name="access_disable_offroute_recalc_descr">Desabilitar recálculo de rota depois de ter saído de rota.</string>
<string name="access_disable_wrong_direction_recalc_descr">Desabilitar recálculo de rota se só estiver se movendo na direção oposta.</string> <string name="access_disable_wrong_direction_recalc_descr">Desabilitar recálculo de rota se só estiver se movendo na direção oposta.</string>
<string name="follow_us">Siga-nos</string> <string name="follow_us">Siga-nos</string>
@ -2062,7 +2062,7 @@
<string name="quick_action_showhide_osmbugs_descr">Botão para mostrar ou ocultar notas do OSM no mapa.</string> <string name="quick_action_showhide_osmbugs_descr">Botão para mostrar ou ocultar notas do OSM no mapa.</string>
<string name="sorted_by_distance">Classificado por distância</string> <string name="sorted_by_distance">Classificado por distância</string>
<string name="search_favorites">Pesquisar Favoritos</string> <string name="search_favorites">Pesquisar Favoritos</string>
<string name="hillshade_menu_download_descr">Baixe o mapa \'Hillshade Overlay\' para mostrar o sombreamento vertical.</string> <string name="hillshade_menu_download_descr">Baixe o mapa de sombreado para mostrar o sombreamento vertical.</string>
<string name="hillshade_purchase_header">Instale o plugin \'Curvas de nível\' para mostrar declividades.</string> <string name="hillshade_purchase_header">Instale o plugin \'Curvas de nível\' para mostrar declividades.</string>
<string name="hide_from_zoom_level">Ocultar a partir do nível de zoom</string> <string name="hide_from_zoom_level">Ocultar a partir do nível de zoom</string>
<string name="srtm_menu_download_descr">Baixe o mapa \'Curvas de nível\' para usar nesta região.</string> <string name="srtm_menu_download_descr">Baixe o mapa \'Curvas de nível\' para usar nesta região.</string>
@ -3423,7 +3423,7 @@
<string name="login_and_pass">Usuário e senha</string> <string name="login_and_pass">Usuário e senha</string>
<string name="plugin_global_prefs_info">Essas configurações de plug-in são globais e se aplicam a todos os perfis</string> <string name="plugin_global_prefs_info">Essas configurações de plug-in são globais e se aplicam a todos os perfis</string>
<string name="osm_editing">Edição OSM</string> <string name="osm_editing">Edição OSM</string>
<string name="osm_edits_view_descr">Você pode ver todas as suas edições ainda não carregadas ou erros de OSM em %1$s. Os pontos carregados não aparecem no OsmAnd.</string> <string name="osm_edits_view_descr">Veja todas as suas edições ainda não carregadas ou erros de OSM em %1$s. As alterações já enviadas não aparecerão mais.</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">Ícone mostrado ao navegar ou mover.</string> <string name="select_nav_icon_descr">Ícone mostrado ao navegar ou mover.</string>
<string name="select_map_icon_descr">Ícone mostrado em repouso.</string> <string name="select_map_icon_descr">Ícone mostrado em repouso.</string>
@ -3787,9 +3787,9 @@
<string name="lenght_limit_description">Forneça o comprimento do seu veículo. Algumas restrições de rotas podem ser aplicadas a veículos longos.</string> <string name="lenght_limit_description">Forneça o comprimento do seu veículo. Algumas restrições de rotas podem ser aplicadas a veículos longos.</string>
<string name="quick_action_remove_next_destination">Apagar o ponto de destino mais próximo</string> <string name="quick_action_remove_next_destination">Apagar o ponto de destino mais próximo</string>
<string name="please_provide_point_name_error">Forneça um nome para o ponto</string> <string name="please_provide_point_name_error">Forneça um nome para o ponto</string>
<string name="quick_action_remove_next_destination_descr">O ponto de destino atual na rota será excluído. Se for o destino, a navegação será interrompida.</string> <string name="quick_action_remove_next_destination_descr">Exclui o próximo destino da sua rota. Se esse for o destino final, a navegação será interrompida.</string>
<string name="search_download_wikipedia_maps">Baixar mapas da Wikipédia</string> <string name="search_download_wikipedia_maps">Baixar mapas da Wikipédia</string>
<string name="plugin_wikipedia_description">Obtenha informações sobre pontos de interesse na Wikipédia. É o seu guia offline de bolso - basta ativar o plug-in da Wikipédia e desfrutar dos artigos sobre os objetos ao seu redor.</string> <string name="plugin_wikipedia_description">Obtenha informações sobre pontos de interesse na Wikipédia, um guia off-line de bolso com artigos sobre lugares e destinos.</string>
<string name="app_mode_enduro_motorcycle">Motocicleta enduro</string> <string name="app_mode_enduro_motorcycle">Motocicleta enduro</string>
<string name="app_mode_motor_scooter">Motoneta</string> <string name="app_mode_motor_scooter">Motoneta</string>
<string name="app_mode_wheelchair">Cadeira de rodas</string> <string name="app_mode_wheelchair">Cadeira de rodas</string>
@ -3829,7 +3829,7 @@
<string name="navigation_profile">Perfil de navegação</string> <string name="navigation_profile">Perfil de navegação</string>
<string name="route_between_points_add_track_desc">Selecione um arquivo de trilha para o qual um novo segmento será adicionado.</string> <string name="route_between_points_add_track_desc">Selecione um arquivo de trilha para o qual um novo segmento será adicionado.</string>
<string name="street_level_imagery">Imagens de rua</string> <string name="street_level_imagery">Imagens de rua</string>
<string name="plan_route_exit_dialog_descr">Tem certeza de que deseja descartar todas as alterações no percurso planejado, fechando-o\?</string> <string name="plan_route_exit_dialog_descr">Tem certeza de que deseja descartar todas as alterações no percurso planejado\?</string>
<string name="in_case_of_reverse_direction">Em caso de direção reversa</string> <string name="in_case_of_reverse_direction">Em caso de direção reversa</string>
<string name="shared_string_save_as_gpx">Salvar como novo arquivo de trilha</string> <string name="shared_string_save_as_gpx">Salvar como novo arquivo de trilha</string>
<string name="shared_string_gpx_files">Trilhas</string> <string name="shared_string_gpx_files">Trilhas</string>
@ -3866,7 +3866,7 @@
<string name="simplified_track_description">Apenas a linha da rota será salva, os waypoints serão excluídos.</string> <string name="simplified_track_description">Apenas a linha da rota será salva, os waypoints serão excluídos.</string>
<string name="shared_string_file_name">Nome do arquivo</string> <string name="shared_string_file_name">Nome do arquivo</string>
<string name="number_of_gpx_files_selected_pattern">%s arquivos de trilha selecionados</string> <string name="number_of_gpx_files_selected_pattern">%s arquivos de trilha selecionados</string>
<string name="disable_recording_once_app_killed_descrp">Pausará o registro de rastreamento quando o aplicativo for encerrado (por meio de aplicativos recentes). (A indicação de uso em segundo plano do OsmAnd desaparece da barra de notificação do Android.)</string> <string name="disable_recording_once_app_killed_descrp">O registro de trilhas fará uma pausa quando o aplicativo for encerrado (por meio de aplicativos recentes). (A indicação de segundo plano do OsmAnd desaparece da barra de notificação do Android.)</string>
<string name="save_global_track_interval_descr">Especifique o intervalo de registro para a gravação geral da trilha (ligado por meio do widget de \'gravação de viagem\' no mapa).</string> <string name="save_global_track_interval_descr">Especifique o intervalo de registro para a gravação geral da trilha (ligado por meio do widget de \'gravação de viagem\' no mapa).</string>
<string name="gpx_monitoring_stop">Pausar gravação de viagem</string> <string name="gpx_monitoring_stop">Pausar gravação de viagem</string>
<string name="gpx_monitoring_start">Retomar a gravação da viagem</string> <string name="gpx_monitoring_start">Retomar a gravação da viagem</string>
@ -3901,12 +3901,12 @@
<string name="sort_name_ascending">Nome: A – Z</string> <string name="sort_name_ascending">Nome: A – Z</string>
<string name="start_finish_icons">Ícones de início e término</string> <string name="start_finish_icons">Ícones de início e término</string>
<string name="contour_lines_thanks">Obrigado por adquirir \'curvas de nível\'</string> <string name="contour_lines_thanks">Obrigado por adquirir \'curvas de nível\'</string>
<string name="osm_live_payment_desc_hw">Assinatura cobrada por período selecionado. Cancele no AppGallery a qualquer momento.</string> <string name="osm_live_payment_desc_hw">A assinatura é cobrada de acordo com o período selecionado. Cancele em seu AppGallery a qualquer momento.</string>
<string name="osm_live_payment_subscription_management_hw">O pagamento será cobrado em sua conta AppGallery na confirmação da compra. <string name="osm_live_payment_subscription_management_hw">Sua conta AppGallery é cobrada após a confirmação da compra.
\n \n
\nA assinatura é renovada automaticamente, a menos que seja cancelada antes da data de renovação. Sua conta será cobrada pelo período de renovação (mês/três meses/ano) apenas na data de renovação. \nA assinatura se prolonga automaticamente, a menos que seja cancelada antes da data de renovação. Sua conta será cobrada pelo período de renovação (mês/três meses/ano) apenas na data de renovação.
\n \n
\nVocê pode gerenciar e cancelar suas assinaturas acessando as configurações do AppGallery.</string> \nVocê pode gerenciar e cancelar suas assinaturas nas configurações do AppGallery.</string>
<string name="routing_attr_avoid_footways_description">Evite passarelas</string> <string name="routing_attr_avoid_footways_description">Evite passarelas</string>
<string name="routing_attr_avoid_footways_name">Evite passarelas</string> <string name="routing_attr_avoid_footways_name">Evite passarelas</string>
<string name="development">Desenvolvimento</string> <string name="development">Desenvolvimento</string>
@ -3943,7 +3943,7 @@
<string name="mgrs_format_descr">OsmAnd usa MGRS, que é semelhante ao formato UTM NATO.</string> <string name="mgrs_format_descr">OsmAnd usa MGRS, que é semelhante ao formato UTM NATO.</string>
<string name="message_you_need_add_two_points_to_show_graphs">Adicione pelo menos dois pontos</string> <string name="message_you_need_add_two_points_to_show_graphs">Adicione pelo menos dois pontos</string>
<string name="manage_subscription">Gerenciar assinatura</string> <string name="manage_subscription">Gerenciar assinatura</string>
<string name="subscription_payment_issue_title">Há um problema com sua assinatura. Toque no botão para ir para as configurações de assinatura do Google Play para corrigir sua forma de pagamento.</string> <string name="subscription_payment_issue_title">Toque no botão para configurar um método de pagamento no Google Play para corrigir sua assinatura.</string>
<string name="subscription_expired_title">A assinatura do OsmAnd Live expirou</string> <string name="subscription_expired_title">A assinatura do OsmAnd Live expirou</string>
<string name="subscription_paused_title">A assinatura do OsmAnd Live foi pausada</string> <string name="subscription_paused_title">A assinatura do OsmAnd Live foi pausada</string>
<string name="subscription_on_hold_title">A assinatura do OsmAnd Live está em espera</string> <string name="subscription_on_hold_title">A assinatura do OsmAnd Live está em espera</string>
@ -4011,4 +4011,6 @@
<string name="plan_route_split_before">Dividir antes</string> <string name="plan_route_split_before">Dividir antes</string>
<string name="plan_route_split_after">Dividir depois</string> <string name="plan_route_split_after">Dividir depois</string>
<string name="plan_route_add_new_segment">Adicionar novo segmento</string> <string name="plan_route_add_new_segment">Adicionar novo segmento</string>
<string name="profile_type_osmand_string">Perfil do OsmAnd</string>
<string name="profile_type_user_string">Perfil de usuário</string>
</resources> </resources>

2
OsmAnd/res/values-pt/phrases.xml
View file

@ -3869,4 +3869,6 @@
<string name="poi_nurse">Enfermeira</string> <string name="poi_nurse">Enfermeira</string>
<string name="poi_mobile_money_agent">Agente de dinheiro móvel</string> <string name="poi_mobile_money_agent">Agente de dinheiro móvel</string>
<string name="poi_lifeguard_base">Base de salva-vidas</string> <string name="poi_lifeguard_base">Base de salva-vidas</string>
<string name="poi_vaccination_covid19">Vacinação: COVID19</string>
<string name="poi_health_specialty_vaccination_yes">Vacinação</string>
</resources> </resources>

22
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="av_camera_pic_size_descr">Definir o tamanho da imagem da câmara</string>
<string name="get_plugin">Obter</string> <string name="get_plugin">Obter</string>
<string name="use_fast_recalculation">Recálculo de rota inteligente</string> <string name="use_fast_recalculation">Recálculo de rota inteligente</string>
<string name="use_fast_recalculation_desc">Recalcula apenas a parte inicial da rota. Pode ser usado para viagens longas.</string> <string name="use_fast_recalculation_desc">Recalcula apenas a parte inicial da rota, útil para viagens longas.</string>
<string name="do_you_like_osmand">Está a gostar do OsmAnd\?</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="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> <string name="rate_this_app">Avalie esta aplicação</string>
@ -3923,7 +3923,7 @@
<string name="use_complex_routing">Roteamento complexo</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="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">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="use_native_pt_desc">Mudar para o Cálculo de rotas de transporte público Java (seguro)</string>
<string name="perform_oauth_authorization_description">Entre com o OAuth para usar os recursos do osmedit</string> <string name="perform_oauth_authorization_description">Entre com o OAuth para usar os recursos do osmedit</string>
<string name="perform_oauth_authorization">Fazer login via OAuth</string> <string name="perform_oauth_authorization">Fazer login via OAuth</string>
<string name="clear_osm_token">Limpar token do OpenStreetMap OAuth</string> <string name="clear_osm_token">Limpar token do OpenStreetMap OAuth</string>
@ -3932,9 +3932,9 @@
<string name="use_two_phase_routing">Usar algoritmo de roteamento de 2 fases A*</string> <string name="use_two_phase_routing">Usar algoritmo de roteamento de 2 fases A*</string>
<string name="snowmobile_render_descr">Para a condução de motos de neve com estradas e pistas dedicadas.</string> <string name="snowmobile_render_descr">Para a condução de motos de neve com estradas e pistas dedicadas.</string>
<string name="shared_string_graph">Gráfico</string> <string name="shared_string_graph">Gráfico</string>
<string name="message_need_calculate_route_before_show_graph">%1$s dados disponíveis apenas nas estradas, precisa calcular uma rota a usar \"Rota entre pontos\" para obtê-la.</string> <string name="message_need_calculate_route_before_show_graph">Dados de %1$s disponíveis apenas em estradas, calcule uma rota a usar \"Rota entre pontos\" para ver os gráficos.</string>
<string name="message_graph_will_be_available_after_recalculation">Espere pelo recalculo da rota. <string name="message_graph_will_be_available_after_recalculation">Por favor, espere.
\nO gráfico estará disponível após o recalculo.</string> \nO gráfico estará disponível após o recalculo da rota.</string>
<string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string> <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
<string name="app_mode_gap">Lacuna</string> <string name="app_mode_gap">Lacuna</string>
<string name="navigate_point_mgrs">MGRS</string> <string name="navigate_point_mgrs">MGRS</string>
@ -3949,9 +3949,9 @@
<string name="icon_group_sport">Desporto</string> <string name="icon_group_sport">Desporto</string>
<string name="icon_group_emergency">Emergência</string> <string name="icon_group_emergency">Emergência</string>
<string name="icon_group_travel">Viagem</string> <string name="icon_group_travel">Viagem</string>
<string name="message_you_need_add_two_points_to_show_graphs">Precisa de adicionar pelo menos dois pontos</string> <string name="message_you_need_add_two_points_to_show_graphs">Adicione pelo menos dois pontos</string>
<string name="manage_subscription">Gerir a assinatura</string> <string name="manage_subscription">Gerir a assinatura</string>
<string name="subscription_payment_issue_title">Há um problema com a sua assinatura. Clique no botão para ir às definições de assinatura do Google Play para corrigir o seu método de pagamento.</string> <string name="subscription_payment_issue_title">Há um problema com a sua assinatura. Toque no botão para ir às definições de assinatura do Google Play para corrigir o seu método de pagamento.</string>
<string name="subscription_expired_title">A assinatura do OsmAnd Live expirou</string> <string name="subscription_expired_title">A assinatura do OsmAnd Live expirou</string>
<string name="subscription_paused_title">A assinatura do OsmAnd Live foi pausada</string> <string name="subscription_paused_title">A assinatura do OsmAnd Live foi pausada</string>
<string name="subscription_on_hold_title">A assinatura do OsmAnd Live está em espera</string> <string name="subscription_on_hold_title">A assinatura do OsmAnd Live está em espera</string>
@ -3969,7 +3969,7 @@
<string name="enter_text_separated">Insira etiquetas separadas por vírgula.</string> <string name="enter_text_separated">Insira etiquetas separadas por vírgula.</string>
<string name="gpx_upload_public_visibility_descr">\"Público\" significa que o rastreamento é mostrado publicamente em Seus traços de GPS e em listas públicas de rastreamento de GPS, e na lista pública de rastreamento com carimbos de data e hora na forma bruta. Os dados servidos através da API não fazem referência à sua página de rastreamento. Os marcadores de ponto de rastreamento não estão disponíveis através da API de GPS pública, e os pontos de rastreamento não estão ordenados cronologicamente.</string> <string name="gpx_upload_public_visibility_descr">\"Público\" significa que o rastreamento é mostrado publicamente em Seus traços de GPS e em listas públicas de rastreamento de GPS, e na lista pública de rastreamento com carimbos de data e hora na forma bruta. Os dados servidos através da API não fazem referência à sua página de rastreamento. Os marcadores de ponto de rastreamento não estão disponíveis através da API de GPS pública, e os pontos de rastreamento não estão ordenados cronologicamente.</string>
<string name="gpx_upload_private_visibility_descr">\"Privado\" significa que o rastreamento não aparece em nenhuma listagem pública, mas os pontos de rastreamento dela em ordem não cronológica estão disponíveis através da API pública do GPS sem carimbos de tempo.</string> <string name="gpx_upload_private_visibility_descr">\"Privado\" significa que o rastreamento não aparece em nenhuma listagem pública, mas os pontos de rastreamento dela em ordem não cronológica estão disponíveis através da API pública do GPS sem carimbos de tempo.</string>
<string name="gpx_upload_identifiable_visibility_descr">\"Identificável\" significa que o rastreamento será mostrado publicamente em Seus traços de GPS e em listas públicas de rastreamento de GPS, ou seja, outros utilizadoes serão capazes de descarregar o rastreamento bruto e associá-lo ao seu nome de utilizador. Os dados públicos de pontos de rastreamento marcados com a hora da API do GPS servidos através da API de pontos de rastreamento farão referência à sua página de rastreamento original.</string> <string name="gpx_upload_identifiable_visibility_descr">\"Identificável\" significa que o rastreamento será mostrado publicamente nos seus traços de GPS e nas listas públicas de rastreamento de GPS, ou seja, outros utilizadoes serão capazes de descarregar o rastreamento bruto e associá-lo ao seu nome de utilizador. Os dados públicos de pontos de rastreamento marcados com a hora da API do GPS servidos através da API de pontos de rastreamento farão referência à sua página de rastreamento original.</string>
<string name="gpx_upload_trackable_visibility_descr">\"Rastreável\" significa que o rastreamento não aparece em nenhuma listagem pública, mas pontos de rastreamento processados com carimbos de tempo a partir dele (que não podem ser associados diretamente a si) fazem através de descarregadas da API pública do GPS.</string> <string name="gpx_upload_trackable_visibility_descr">\"Rastreável\" significa que o rastreamento não aparece em nenhuma listagem pública, mas pontos de rastreamento processados com carimbos de tempo a partir dele (que não podem ser associados diretamente a si) fazem através de descarregadas da API pública do GPS.</string>
<string name="osm_edit_close_note">Fechar nota do OSM</string> <string name="osm_edit_close_note">Fechar nota do OSM</string>
<string name="osm_edit_comment_note">Comentário de nota do OSM</string> <string name="osm_edit_comment_note">Comentário de nota do OSM</string>
@ -3994,7 +3994,7 @@
<string name="add_photos_descr">OsmAnd mostra fotos de várias fontes: <string name="add_photos_descr">OsmAnd mostra fotos de várias fontes:
\nOpenPlaceReviews - fotos de POI; \nOpenPlaceReviews - fotos de POI;
\nMapillary - imagens ao nível da rua; \nMapillary - imagens ao nível da rua;
\nWeb / Wikimedia - fotos de POI especificadas nos dados do OpenStreetMap.</string> \nWeb / Wikimedia - fotos de POI como nos dados do OpenStreetMap.</string>
<string name="select_groups_for_import">Seleccionar os grupos que serão importados.</string> <string name="select_groups_for_import">Seleccionar os grupos que serão importados.</string>
<string name="select_items_for_import">Seleccionar os objectos que serão importados.</string> <string name="select_items_for_import">Seleccionar os objectos que serão importados.</string>
<string name="use_dev_url">Utilizar dev.openstreetmap.org</string> <string name="use_dev_url">Utilizar dev.openstreetmap.org</string>
@ -4003,12 +4003,12 @@
<string name="use_dev_url_descr">Mude para usar dev.openstreetmap.org ao invés de openstreetmap.org para testar enviar uma OSM Nota / POI / GPX.</string> <string name="use_dev_url_descr">Mude para usar dev.openstreetmap.org ao invés de openstreetmap.org para testar enviar uma OSM Nota / POI / GPX.</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string> <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="lang_de_casual">Alemão (casual)</string> <string name="lang_de_casual">Alemão (casual)</string>
<string name="elevation_data">Pode usar os dados de elevação para considerar a ascensão / descida na sua viagem</string> <string name="elevation_data">Pode usar dados de elevação para representar a subida / descida da sua viagem</string>
<string name="app_mode_light_aircraft">Aeronaves ligeiras</string> <string name="app_mode_light_aircraft">Aeronaves ligeiras</string>
<string name="plan_route_join_segments">Unir segmentos</string> <string name="plan_route_join_segments">Unir segmentos</string>
<string name="plan_route_split_before">Dividir antes</string> <string name="plan_route_split_before">Dividir antes</string>
<string name="plan_route_split_after">Dividir após</string> <string name="plan_route_split_after">Dividir após</string>
<string name="plan_route_add_new_segment">Adicionar novo segmento</string> <string name="plan_route_add_new_segment">Adicionar um novo segmento</string>
<string name="release_3_9">• Opção de exportar e importar todos os dados adicionada, que inclui configurações, recursos, meus lugares <string name="release_3_9">• Opção de exportar e importar todos os dados adicionada, que inclui configurações, recursos, meus lugares
\n \n
\n• Planear rota: gráficos para segmentos com a rota, adicionado a capacidade de criar e editar trilhos de segmentos múltiplos \n• Planear rota: gráficos para segmentos com a rota, adicionado a capacidade de criar e editar trilhos de segmentos múltiplos

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

@ -53,9 +53,27 @@
OsmAnd (OSM Automated Navigation Directions) OsmAnd este o aplicatie open source cu acces la o gamă variată de date de la OpenStreetMap (OSM). Harta în format vectorial sau raster se poate stoca în memoria telefonului (pe card) pentru uz offline. OsmAnd poate calcula ruta atât offline căt și online și oferă ghidare vocală. Câteva dintre funcții: - Poate funcționa offline - se pot stoca hărți vectoriale sau raster într-un director la alegere - Sunt disponibile hărți vectoriale în format compact - Se pot descărca harți ale țării sau regiunii direct din aplicație - Se pot folosi diverse straturi ale hărților precum rute si trasee GPX, POI, favorite, linii de contur, stații ale transportului public, hărți suplimentare cu grad de transparență selectabil - Căutare offline de adrese și POI - Rutare offline pe distanțe scurte (experimental) - Mod de deplasare cu mașina, bicicleta sau pieton opțional cu: * comutare automată zi/noapte * zoom dependent de viteză * aliniere hartă funcție de busolă și de direcția de deplasare * orientare pe benzile de circulație, afișare viteză, voce înregistrată sau TTS Restrângerile variantei gratuite al aplicației OsmAnd: - Numărul de hărți descărcate este limitat - Nu se pot accesa offline lista de POI de la Wikipedia OsmAnd este o aplicație în dezvoltare iar progresul său se bazează pe contribuții financiare pentru implementarea de noi funcționalități. Vă rugăm să aveți în vedere achiziționarea aplicației OsmAnd+, finanțarea unor anume funcționalități sau să faceți o donație la osmand.net. OsmAnd (OSM Automated Navigation Directions) OsmAnd este o aplicatie open source cu acces la o gamă variată de date de la OpenStreetMap (OSM). Harta în format vectorial sau raster se poate stoca în memoria telefonului (pe card) pentru uz offline. OsmAnd poate calcula ruta atât offline căt și online și oferă ghidare vocală. Câteva dintre funcții: - Poate funcționa offline - se pot stoca hărți vectoriale sau raster într-un director la alegere - Sunt disponibile hărți vectoriale în format compact - Se pot descărca harți ale țării sau regiunii direct din aplicație - Se pot folosi diverse straturi ale hărților precum rute si trasee GPX, POI, favorite, linii de contur, stații ale transportului public, hărți suplimentare cu grad de transparență selectabil - Căutare offline de adrese și POI - Rutare offline pe distanțe scurte (experimental) - Mod de deplasare cu mașina, bicicleta sau pieton opțional cu: * comutare automată zi/noapte * zoom dependent de viteză * aliniere hartă funcție de busolă și de direcția de deplasare * orientare pe benzile de circulație, afișare viteză, voce înregistrată sau TTS Restrângerile variantei gratuite al aplicației OsmAnd: - Numărul de hărți descărcate este limitat - Nu se pot accesa offline lista de POI de la Wikipedia OsmAnd este o aplicație în dezvoltare iar progresul său se bazează pe contribuții financiare pentru implementarea de noi funcționalități. Vă rugăm să aveți în vedere achiziționarea aplicației OsmAnd+, finanțarea unor anume funcționalități sau să faceți o donație la osmand.net.
</string> </string>
<string name="osmand_plus_short_description_80_chars">OsmAnd+ este o aplicație open source pentru navigare cu hărți offline și online</string> <string name="osmand_plus_short_description_80_chars">OsmAnd+ este o aplicație open source pentru navigare cu hărți offline și online</string>
<string name="osmand_plus_long_description_1000_chars"> <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions)
OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ este o aplicație open source cu acces la o gamă variată de date de la OpenStreetMap (OSM). Harta în format vectorial sau raster se poate stoca în memoria telefonului (pe card) pentru uz offline. OsmAnd poate calcula ruta atât offline cât și online și oferă ghidare vocală. OsmAnd+ este versiunea comercială, prin achiziționarea ei susțineți proiectul, finanțați dezvoltarea de noi funcționalități și primiți cele mai recente versiuni. Câteva dintre funcții: - Poate funcționa offline - se pot stoca hărți vectoriale sau raster într-un director la alegere - Sunt disponibile hărți vectoriale în format compact - Se pot descărca hărți ale țării sau regiunii direct din aplicație - Se pot folosi diverse straturi ale hărților precum rute si trasee GPX, POI, favorite, linii de contur, stații ale transportului public, hărți suplimentare cu grad de transparență selectabil - Căutare offline de adrese și POI - Rutare offline pe distanțe scurte (experimental) - Mod de deplasare cu mașina, bicicleta sau pieton opțional cu: * comutare automată zi/noapte * zoom dependent de viteză * aliniere hartă funcție de busolă și de direcția de deplasare * orientare pe benzile de circulație, afișare viteză, voce înregistrată sau Text To Speech \n
</string> \nOsmAnd+ este o aplicație open source cu acces la o gamă variată de date de la OpenStreetMap (OSM). Harta în format vectorial sau raster se poate stoca în memoria telefonului (pe card) pentru uz offline. OsmAnd poate calcula ruta atât offline cât și online și oferă ghidare vocală.
\n
\nOsmAnd+ este versiunea comercială, prin achiziționarea ei susțineți proiectul, finanțați dezvoltarea de noi funcționalități și primiți cele mai recente versiuni.
\n
\nCâteva dintre funcții:
\n - poate funcționa offline
\n - se pot stoca hărți vectoriale sau raster într-un director la alegere
\n - sunt disponibile hărți vectoriale în format compact
\n - se pot descărca hărți ale țării sau regiunii direct din aplicație
\n - se pot folosi diverse straturi ale hărților precum rute si trasee GPX, POI, favorite, linii de contur, stații ale transportului public, hărți suplimentare cu grad de transparență selectabil
\n
\n - căutare offline de adrese și POI
\n - rutare offline pe distanțe scurte (experimental)
\n - mod de deplasare cu mașina, bicicleta sau pieton opțional cu:
\n - comutare automată zi/noapte
\n - zoom dependent de viteză
\n - aliniere hartă funcție de busolă și de direcția de deplasare
\n - orientare pe benzile de circulație, afișare viteză, voce înregistrată sau Text To Speech
\n</string>
<string name="filterpoi_activity">Creează filtru POI</string> <string name="filterpoi_activity">Creează filtru POI</string>
<string name="recalculate_route_to_your_location">Mod de transport:</string> <string name="recalculate_route_to_your_location">Mod de transport:</string>
<string name="select_navigation_mode">Mod transport:</string> <string name="select_navigation_mode">Mod transport:</string>
@ -304,7 +322,8 @@
<string name="osmand_service">Mod standby</string> <string name="osmand_service">Mod standby</string>
<string name="osmand_service_descr">Folosit pentru ca OsmAnd să poată funcționa când telefonul este în standby</string> <string name="osmand_service_descr">Folosit pentru ca OsmAnd să poată funcționa când telefonul este în standby</string>
<string name="download_files_not_enough_space">Nu există spațiu suficient pentru descărcarea a %1$s MB (liber: %2$s).</string> <string name="download_files_not_enough_space">Nu există spațiu suficient pentru descărcarea a %1$s MB (liber: %2$s).</string>
<string name="download_files_question_space">Descarc {0} fișiere\? Necesită {1} MB permanent. (În prezent sunt {2} MB disponibili.)</string> <string name="download_files_question_space">"Descarc {0} fișiere\?
\n Necesită {1} MB (din {2} MB disponibili)."</string>
<string name="use_transparent_map_theme">Temă transparentă</string> <string name="use_transparent_map_theme">Temă transparentă</string>
<string name="native_library_not_supported">Librăria nativă nu este suportată de acest dispozitiv.</string> <string name="native_library_not_supported">Librăria nativă nu este suportată de acest dispozitiv.</string>
<string name="init_native_library">Se inițializează librăria nativă…</string> <string name="init_native_library">Se inițializează librăria nativă…</string>
@ -762,8 +781,8 @@
<string name="navigate_point_latitude">Latitudine</string> <string name="navigate_point_latitude">Latitudine</string>
<string name="navigate_point_longitude">Longitudine</string> <string name="navigate_point_longitude">Longitudine</string>
<string name="navigate_point_format_D">DDD.DD</string> <string name="navigate_point_format_D">DDD.DD</string>
<string name="navigate_point_format_DM">DDD MM.MM</string> <string name="navigate_point_format_DM">DDD MM.MMM</string>
<string name="navigate_point_format_DMS">DDD MM SS.SS</string> <string name="navigate_point_format_DMS">DDD MM SS.S</string>
<string name="shared_string_show_on_map">Arată pe hartă</string> <string name="shared_string_show_on_map">Arată pe hartă</string>
<string name="search_address_top_text">Selecție adresa</string> <string name="search_address_top_text">Selecție adresa</string>
<string name="search_address_region">Regiune</string> <string name="search_address_region">Regiune</string>
@ -1515,9 +1534,11 @@
<string name="map_markers_other">Alți marcatori</string> <string name="map_markers_other">Alți marcatori</string>
<string name="upload_anonymously">Încarcă anonim</string> <string name="upload_anonymously">Încarcă anonim</string>
<string name="show_transparency_seekbar">Afișați bara de căutare transparentă</string> <string name="show_transparency_seekbar">Afișați bara de căutare transparentă</string>
<string name="download_files_error_not_enough_space">Spațiu insuficient! E nevoie de {3} MB temporar și {1} MB permanent. În prezent, sunt doar {2} MB disponibili.</string> <string name="download_files_error_not_enough_space">"Spațiu insuficient!
\n E nevoie de {3} MB temporar și {1} MB permanent.
\n În prezent, sunt doar {2} MB disponibili."</string>
<string name="download_files_question_space_with_temp">Descarc {0} fișier(e)\? Necesită {3} MB temporar și {1} MB permanent. (În prezent sunt {2} MB disponibili.)</string> <string name="download_files_question_space_with_temp">Descarc {0} fișier(e)\? Necesită {3} MB temporar și {1} MB permanent. (În prezent sunt {2} MB disponibili.)</string>
<string name="upload_osm_note_description">Nu puteți încărca anonim notele d-voastră OSM dacă folosiți profilul d-voastră OpenStreetMap.org</string> <string name="upload_osm_note_description">Încărcați anonim notele d-voastră OSM sau prin folosirea profilului d-voastră OpenStreetMap.org.</string>
<string name="upload_osm_note">Încărcați note OSM</string> <string name="upload_osm_note">Încărcați note OSM</string>
<string name="shared_string_toolbar">Bara de instrumente</string> <string name="shared_string_toolbar">Bara de instrumente</string>
<string name="shared_string_widgets">Widget-uri (dispozitive mici)</string> <string name="shared_string_widgets">Widget-uri (dispozitive mici)</string>
@ -1792,7 +1813,7 @@
<string name="sorted_by_distance">Sortat după distanță</string> <string name="sorted_by_distance">Sortat după distanță</string>
<string name="search_favorites">Caută Favorite</string> <string name="search_favorites">Caută Favorite</string>
<string name="hillshade_menu_download_descr">Pentru a vedea relieful pe hartă, descărcați harta cu relieful 3D pentru această regiune.</string> <string name="hillshade_menu_download_descr">Pentru a vedea relieful pe hartă, descărcați harta cu relieful 3D pentru această regiune.</string>
<string name="hillshade_purchase_header">Pentru a vedea relieful pe hartă, trebuie să cumparați si să instalați extensia \'Contour Lines\'</string> <string name="hillshade_purchase_header">Pentru a vedea relieful pe hartă, trebuie să instalați extensia \'Contour Lines\'.</string>
<string name="hide_from_zoom_level">Ascunde de la nivelul de zoom</string> <string name="hide_from_zoom_level">Ascunde de la nivelul de zoom</string>
<string name="shared_string_plugin">Extensie</string> <string name="shared_string_plugin">Extensie</string>
<string name="srtm_color_scheme">Schemă culori</string> <string name="srtm_color_scheme">Schemă culori</string>
@ -2362,7 +2383,7 @@
<string name="apply_preference_to_all_profiles">Poţi aplica aceasta modificare pe toate profilele sau doar pe cel selectat.</string> <string name="apply_preference_to_all_profiles">Poţi aplica aceasta modificare pe toate profilele sau doar pe cel selectat.</string>
<string name="shared_preference">Partajat</string> <string name="shared_preference">Partajat</string>
<string name="routing_attr_driving_style_prefer_unpaved_name">Prefer drumurile nepavate</string> <string name="routing_attr_driving_style_prefer_unpaved_name">Prefer drumurile nepavate</string>
<string name="routing_attr_driving_style_prefer_unpaved_description">Prefer drumurile nepavate</string> <string name="routing_attr_driving_style_prefer_unpaved_description">Prefer drumurile nepavate.</string>
<string name="layer_osm_edits">Editare OSM</string> <string name="layer_osm_edits">Editare OSM</string>
<string name="quick_action_contour_lines_descr">Comută pentru a afișa sau ascunde liniile de contur pe hartă.</string> <string name="quick_action_contour_lines_descr">Comută pentru a afișa sau ascunde liniile de contur pe hartă.</string>
<string name="quick_action_contour_lines_show">Afişează conturul liniilor</string> <string name="quick_action_contour_lines_show">Afişează conturul liniilor</string>
@ -2411,7 +2432,7 @@
<string name="paste_Osmand_data_folder_path">Lipește calea către dosar cu datele OsmAnd</string> <string name="paste_Osmand_data_folder_path">Lipește calea către dosar cu datele OsmAnd</string>
<string name="change_osmand_data_folder_question">Schimbați dosarul de date ale OsmAnd\?</string> <string name="change_osmand_data_folder_question">Schimbați dosarul de date ale OsmAnd\?</string>
<string name="move_maps_to_new_destination">Mută la noua destinație</string> <string name="move_maps_to_new_destination">Mută la noua destinație</string>
<string name="internal_app_storage_description">Stocare internă, ascunsă de utilizator și alte aplicații, accesibilă exclusiv pentru OsmAnd</string> <string name="internal_app_storage_description">Stocare internă pentru OsmAnd (ascunsă de utilizator și alte aplicații).</string>
<string name="change_data_storage_folder">Schimbați folderul de stocare</string> <string name="change_data_storage_folder">Schimbați folderul de stocare</string>
<string name="rendering_attr_piste_type_snow_park_name">Parc</string> <string name="rendering_attr_piste_type_snow_park_name">Parc</string>
<string name="rendering_attr_piste_type_sleigh_name">Sanie</string> <string name="rendering_attr_piste_type_sleigh_name">Sanie</string>
@ -2658,7 +2679,7 @@
<string name="nautical_render_descr">Pentru navigare nautică.Caracteristici de geamanduri, faruri, râuri, benzi și mărci de mare, porturi, servicii de marinari, și contururi de adâncime.</string> <string name="nautical_render_descr">Pentru navigare nautică.Caracteristici de geamanduri, faruri, râuri, benzi și mărci de mare, porturi, servicii de marinari, și contururi de adâncime.</string>
<string name="ski_map_render_descr">Pentru schi. Dispune de pârtii, teleschiuri, piste de fond, etc.</string> <string name="ski_map_render_descr">Pentru schi. Dispune de pârtii, teleschiuri, piste de fond, etc.</string>
<string name="light_rs_render_descr">Stil de conducere simplu. Mod de noapte ,cu linii de contur, drumuri cu contrast portocaliu, obiecte intunecate in harta secundară.</string> <string name="light_rs_render_descr">Stil de conducere simplu. Mod de noapte ,cu linii de contur, drumuri cu contrast portocaliu, obiecte intunecate in harta secundară.</string>
<string name="topo_render_descr">Pentru drumeții, drumeții și ciclism natural. Citit în aer liber. Drumuri contrastante și obiecte naturale, diferite tipuri de traseu, opțiuni avansate de linie de contur, detalii suplimentare. Reglarea integrității suprafeței distinge calitatea drumului. Fără mod de noapte.</string> <string name="topo_render_descr">Pentru drumeții, drumeții montane și ciclism natural. Citit în aer liber. Drumuri contrastante și obiecte naturale, diferite tipuri de traseu, opțiuni avansate de linie de contur, detalii suplimentare. Reglarea integrității suprafeței distinge calitatea drumului. Fără mod de noapte.</string>
<string name="mapnik_render_descr">Vechiul stil \"Mapnik\".Culori similare cu \"Mapnik\".</string> <string name="mapnik_render_descr">Vechiul stil \"Mapnik\".Culori similare cu \"Mapnik\".</string>
<string name="touring_view_render_descr">Stil turistic cu contrast ridicat și detalii maxime. Include toate opțiunile stilului implicit OsmAnd, afișând în același timp cât mai multe detalii posibile, în special drumuri, căi și alte modalități de călătorie. Distincția clară \"atlas turistic\" între tipurile de drum. Potrivit pentru zi, noapte și în aer liber.</string> <string name="touring_view_render_descr">Stil turistic cu contrast ridicat și detalii maxime. Include toate opțiunile stilului implicit OsmAnd, afișând în același timp cât mai multe detalii posibile, în special drumuri, căi și alte modalități de călătorie. Distincția clară \"atlas turistic\" între tipurile de drum. Potrivit pentru zi, noapte și în aer liber.</string>
<string name="off_road_render_descr">Pentru conducere off-road bazată pe stilul „Topo” și pentru utilizarea cu imagini de satelit verzi, ca strat subaltern. Grosimea drumului principal redus, grosimea crescută a pistelor, cărărilor, bicicletelor și altor rute.</string> <string name="off_road_render_descr">Pentru conducere off-road bazată pe stilul „Topo” și pentru utilizarea cu imagini de satelit verzi, ca strat subaltern. Grosimea drumului principal redus, grosimea crescută a pistelor, cărărilor, bicicletelor și altor rute.</string>
@ -2732,7 +2753,7 @@
<string name="route_recalculation">Recalculare rută</string> <string name="route_recalculation">Recalculare rută</string>
<string name="accessibility_announce">Anunț</string> <string name="accessibility_announce">Anunț</string>
<string name="login_and_pass">Utilizator și parolă</string> <string name="login_and_pass">Utilizator și parolă</string>
<string name="plugin_global_prefs_info">Aceste setări se aplicp la toate profilurile.</string> <string name="plugin_global_prefs_info">Aceste setări se aplică la toate profilurile</string>
<string name="osm_editing">Editare OSM</string> <string name="osm_editing">Editare OSM</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
<string name="permission_is_required">E nevoie de permisiune pentru a utiliza această opțiune.</string> <string name="permission_is_required">E nevoie de permisiune pentru a utiliza această opțiune.</string>

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

@ -3869,4 +3869,16 @@
<string name="poi_embassy_interests_section">Раздел интересов</string> <string name="poi_embassy_interests_section">Раздел интересов</string>
<string name="poi_consulate_filter">Консульство</string> <string name="poi_consulate_filter">Консульство</string>
<string name="poi_siren">Сирена</string> <string name="poi_siren">Сирена</string>
<string name="poi_vaccination_covid19">Вакцинация: COVID19</string>
<string name="poi_health_specialty_vaccination_yes">Вакцинация</string>
<string name="poi_lifeguard_base">База спасателей</string>
<string name="poi_nurse">Медсестра</string>
<string name="poi_water_source_lake">Озеро</string>
<string name="poi_water_source_river">Река</string>
<string name="poi_water_source_well">Колодец</string>
<string name="poi_water_source_powered_pump">Приводной насос</string>
<string name="poi_water_source_water_tank">Резервуар для воды</string>
<string name="poi_water_source_tap">Нажмите</string>
<string name="poi_water_source_water_works">Водозабор</string>
<string name="poi_water_source_tube_well">Трубчатый колодец</string>
</resources> </resources>

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

@ -1255,7 +1255,7 @@
<string name="distance_measurement_finish_editing">Закончить редактирование</string> <string name="distance_measurement_finish_editing">Закончить редактирование</string>
<string name="distance_measurement_clear_route">Очистить все точки</string> <string name="distance_measurement_clear_route">Очистить все точки</string>
<string name="install_paid">Полная версия</string> <string name="install_paid">Полная версия</string>
<string name="cancel_route">Отменить маршрут</string> <string name="cancel_route">Отменить маршрут\?</string>
<string name="clear_destination">Очистить пункт назначения</string> <string name="clear_destination">Очистить пункт назначения</string>
<string name="search_street_in_neighborhood_cities">Искать улицу в ближайших населённых пунктах</string> <string name="search_street_in_neighborhood_cities">Искать улицу в ближайших населённых пунктах</string>
<string name="intermediate_items_sort_by_distance">Расположить в оптимальном порядке</string> <string name="intermediate_items_sort_by_distance">Расположить в оптимальном порядке</string>
@ -2680,7 +2680,7 @@
<string name="choose_file_type">Выберите тип файла</string> <string name="choose_file_type">Выберите тип файла</string>
<string name="osm_edits_export_desc">Экспортировать в виде POI, заметок OSM или обоих вариантов.</string> <string name="osm_edits_export_desc">Экспортировать в виде POI, заметок OSM или обоих вариантов.</string>
<string name="all_data">Все данные</string> <string name="all_data">Все данные</string>
<string name="osm_notes">OSM-заметки</string> <string name="osm_notes">Заметки OSM</string>
<string name="tunnel_warning">Впереди туннель</string> <string name="tunnel_warning">Впереди туннель</string>
<string name="show_tunnels">Туннели</string> <string name="show_tunnels">Туннели</string>
<string name="make_as_start_point">Сделать пунктом отправления</string> <string name="make_as_start_point">Сделать пунктом отправления</string>
@ -3994,4 +3994,9 @@
<string name="app_mode_kayak">Каяк</string> <string name="app_mode_kayak">Каяк</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string> <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="lang_de_casual">Немецкий (повседневный)</string> <string name="lang_de_casual">Немецкий (повседневный)</string>
<string name="app_mode_light_aircraft">Легкий самолет</string>
<string name="plan_route_add_new_segment">Добавить новый сегмент</string>
<string name="plan_route_join_segments">Объединить сегменты</string>
<string name="plan_route_split_before">Разделить до</string>
<string name="plan_route_split_after">Разделить после</string>
</resources> </resources>

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

@ -3880,4 +3880,14 @@
<string name="poi_nurse">Infermieri</string> <string name="poi_nurse">Infermieri</string>
<string name="poi_mobile_money_agent">Agente de denaru mòbile</string> <string name="poi_mobile_money_agent">Agente de denaru mòbile</string>
<string name="poi_lifeguard_base">Base de sos bagninos</string> <string name="poi_lifeguard_base">Base de sos bagninos</string>
<string name="poi_vaccination_covid19">Vatzinamentu: COVID19</string>
<string name="poi_health_specialty_vaccination_yes">Vatzinamentu</string>
<string name="poi_water_source_lake">Lagu</string>
<string name="poi_water_source_river">Riu</string>
<string name="poi_water_source_well">Putzu</string>
<string name="poi_water_source_powered_pump">Pompa alimentada</string>
<string name="poi_water_source_water_tank">Depòsitu de abba</string>
<string name="poi_water_source_tap">Isceta</string>
<string name="poi_water_source_water_works">Òperas idràulicas</string>
<string name="poi_water_source_tube_well">Putzu a tubu</string>
</resources> </resources>

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

@ -1540,7 +1540,7 @@
<string name="routing_attr_height_description">Dislinda s’artària de su veìculu permìtida pro sos caminos.</string> <string name="routing_attr_height_description">Dislinda s’artària de su veìculu permìtida pro sos caminos.</string>
<string name="routing_attr_avoid_borders_description">Non faghet rugrare sas fronteras intre sos istados</string> <string name="routing_attr_avoid_borders_description">Non faghet rugrare sas fronteras intre sos istados</string>
<string name="use_fast_recalculation">Recàrculu intelligente de s’àndala</string> <string name="use_fast_recalculation">Recàrculu intelligente de s’àndala</string>
<string name="use_fast_recalculation_desc">Torra a carculare petzi su cantu initziale de s’àndala. Podet èssere impreadu pro biàgios longos.</string> <string name="use_fast_recalculation_desc">Torra a carculare petzi su cantu initziale de s’àndala. Podet èssere ùtile pro biàgios longos.</string>
<string name="rendering_value_disabled_name">Disabilitadu</string> <string name="rendering_value_disabled_name">Disabilitadu</string>
<string name="shared_string_logoff">Essi</string> <string name="shared_string_logoff">Essi</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Coloratzione a segunda de sa casta (afiliatzione) de àndala</string> <string name="rendering_value_walkingRoutesScopeOSMC_name">Coloratzione a segunda de sa casta (afiliatzione) de àndala</string>
@ -1944,7 +1944,7 @@
<string name="follow_us">Sighi·nos</string> <string name="follow_us">Sighi·nos</string>
<string name="use_osm_live_routing_description">Allughe sa navigatzione OsmAnd Live cun sas mòdìficas in tempus reale.</string> <string name="use_osm_live_routing_description">Allughe sa navigatzione OsmAnd Live cun sas mòdìficas in tempus reale.</string>
<string name="use_osm_live_routing">Navigatzione OsmAnd Live</string> <string name="use_osm_live_routing">Navigatzione OsmAnd Live</string>
<string name="access_no_destination">Destinatzione non definida</string> <string name="access_no_destination">Estensione pro s\'atzessibilidade: Destinatzione non definida</string>
<string name="map_widget_magnetic_bearing">Bùssola magnètica</string> <string name="map_widget_magnetic_bearing">Bùssola magnètica</string>
<string name="map_widget_bearing">Bùssola relativa</string> <string name="map_widget_bearing">Bùssola relativa</string>
<string name="access_disable_offroute_recalc">Non torres a carculare s\'àndala si ses essidu dae su caminu</string> <string name="access_disable_offroute_recalc">Non torres a carculare s\'àndala si ses essidu dae su caminu</string>
@ -3431,7 +3431,7 @@
<string name="login_and_pass">Nùmene impreadore e crae</string> <string name="login_and_pass">Nùmene impreadore e crae</string>
<string name="plugin_global_prefs_info">Custas impostatziones de s\'estensione sunt globales, e s\'àplicant a totu sos profilos</string> <string name="plugin_global_prefs_info">Custas impostatziones de s\'estensione sunt globales, e s\'àplicant a totu sos profilos</string>
<string name="osm_editing">Modìfica de OSM</string> <string name="osm_editing">Modìfica de OSM</string>
<string name="osm_edits_view_descr">Podes pompiare totu sas modìficas o sas sinnalatziones de errores de OSM tuos galu non carrigados in %1$s. Sos puntos carrigados no ant a èssere ammustrados in OsmAnd.</string> <string name="osm_edits_view_descr">Pòmpia totu sas modìficas o sas sinnalatziones de errores de OSM tuos galu non carrigados in %1$s. Sas modìficas giai carrigadas no ant a èssere prus ammustradas.</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">Icona ammustrada durante sa navigatzione o su movimentu ebbia.</string> <string name="select_nav_icon_descr">Icona ammustrada durante sa navigatzione o su movimentu ebbia.</string>
<string name="select_map_icon_descr">Icona ammustrada in pàusa.</string> <string name="select_map_icon_descr">Icona ammustrada in pàusa.</string>
@ -3794,9 +3794,9 @@
<string name="lenght_limit_description">Inserta sa longària de su veìculu tuo. Bi diant pòdere èssere unas cantas restritziones de sas àndalas pro sos veìculos longos.</string> <string name="lenght_limit_description">Inserta sa longària de su veìculu tuo. Bi diant pòdere èssere unas cantas restritziones de sas àndalas pro sos veìculos longos.</string>
<string name="quick_action_remove_next_destination">Iscantzella su puntu de destinatzione prus a curtzu</string> <string name="quick_action_remove_next_destination">Iscantzella su puntu de destinatzione prus a curtzu</string>
<string name="please_provide_point_name_error">Fruni unu nùmene pro su puntu</string> <string name="please_provide_point_name_error">Fruni unu nùmene pro su puntu</string>
<string name="quick_action_remove_next_destination_descr">Su puntu de destinatzione atuale in s\'àndala at a èssere iscantzelladu. Si at a èssere sa destinatzione, sa navigatzione s\'at a firmare.</string> <string name="quick_action_remove_next_destination_descr">Iscantzellat su puntu de destinatzione imbeniente in s\'àndala tua. Si est sa destinatzione, sa navigatzione s\'at a firmare.</string>
<string name="search_download_wikipedia_maps">Iscàrriga sas mapas de Wikipedia</string> <string name="search_download_wikipedia_maps">Iscàrriga sas mapas de Wikipedia</string>
<string name="plugin_wikipedia_description">Otene informatziones a pitzu de puntos de interesse dae Wikipedia. Est sa ghia non in lìnia tua de mantènnere in butzaca - allughe s\'estensione Wikipedia e ispassia·ti cun sos artìculos a pitzu de sos ogetos a fùrriu de tie.</string> <string name="plugin_wikipedia_description">Otene informatziones a pitzu de puntos de interesse dae Wikipedia, una ghia non in lìnia de mantènnere in butzaca cun artìculos in subra de logos e destinatziones.</string>
<string name="app_mode_enduro_motorcycle">Moto enduro</string> <string name="app_mode_enduro_motorcycle">Moto enduro</string>
<string name="app_mode_motor_scooter">Motorinu</string> <string name="app_mode_motor_scooter">Motorinu</string>
<string name="app_mode_wheelchair_forward">Cadira a rodas cara a in antis</string> <string name="app_mode_wheelchair_forward">Cadira a rodas cara a in antis</string>
@ -3834,7 +3834,7 @@
<string name="navigation_profile">Profilu de navigatzione</string> <string name="navigation_profile">Profilu de navigatzione</string>
<string name="route_between_points_add_track_desc">Ischerta unu documentu de rasta in ue annànghere su segmentu nou.</string> <string name="route_between_points_add_track_desc">Ischerta unu documentu de rasta in ue annànghere su segmentu nou.</string>
<string name="street_level_imagery">Fotografias a livellu de sas carreras</string> <string name="street_level_imagery">Fotografias a livellu de sas carreras</string>
<string name="plan_route_exit_dialog_descr">Ses seguru de chèrrere serrare sa pianificatzione de s\'àndala e pèrdere totu sas modìficas\?</string> <string name="plan_route_exit_dialog_descr">Ses seguru de chèrrere iscartare totu sas modìficas in s\'àndala pranificada\?</string>
<string name="in_case_of_reverse_direction">In casu de diretzione furriada</string> <string name="in_case_of_reverse_direction">In casu de diretzione furriada</string>
<string name="layer_gpx_layer">Rastas</string> <string name="layer_gpx_layer">Rastas</string>
<string name="save_track_to_gpx_globally">Càrriga sa rasta in unu documentu GPX</string> <string name="save_track_to_gpx_globally">Càrriga sa rasta in unu documentu GPX</string>
@ -3847,7 +3847,7 @@
<string name="context_menu_item_add_waypoint">Annanghe unu puntu de coladòrgiu a sa rasta</string> <string name="context_menu_item_add_waypoint">Annanghe unu puntu de coladòrgiu a sa rasta</string>
<string name="quick_action_add_gpx">Annanghe unu puntu de coladòrgiu a sa rasta</string> <string name="quick_action_add_gpx">Annanghe unu puntu de coladòrgiu a sa rasta</string>
<string name="map_widget_monitoring">Registratzione de su biàgiu</string> <string name="map_widget_monitoring">Registratzione de su biàgiu</string>
<string name="disable_recording_once_app_killed_descrp">At a pònnere in pàusa sa registratzione de sa rasta cando OsmAnd at a èssere istudadu (pro mèdiu de sas aplicatziones reghentes). (S\'indicatore de sa modalidade OsmAnd de isfundu at a iscumpàrrere dae sa barra de notìfica de Android.)</string> <string name="disable_recording_once_app_killed_descrp">Sa registratzione de sa rasta s\'at a pònnere in pàusa cando OsmAnd at a èssere istudadu (pro mèdiu de sas aplicatziones reghentes). (S\'indicatore de sa modalidade OsmAnd de isfundu at a iscumpàrrere dae sa barra de notìfica de Android.)</string>
<string name="gpx_monitoring_stop">Pone in pàusa sa registratzione de su biàgiu</string> <string name="gpx_monitoring_stop">Pone in pàusa sa registratzione de su biàgiu</string>
<string name="gpx_monitoring_start">Sighi cun sa registratzione de su biàgiu</string> <string name="gpx_monitoring_start">Sighi cun sa registratzione de su biàgiu</string>
<string name="marker_save_as_track">Sarva comente documentu de rasta</string> <string name="marker_save_as_track">Sarva comente documentu de rasta</string>
@ -3905,12 +3905,12 @@
<string name="sort_name_ascending">Nùmene: A – Z</string> <string name="sort_name_ascending">Nùmene: A – Z</string>
<string name="start_finish_icons">Iconas de incumintzu e fine</string> <string name="start_finish_icons">Iconas de incumintzu e fine</string>
<string name="contour_lines_thanks">Gràtzias pro àere comporadu \'Curvas de livellu\'</string> <string name="contour_lines_thanks">Gràtzias pro àere comporadu \'Curvas de livellu\'</string>
<string name="osm_live_payment_desc_hw">Costu periòdicu de s\'abbonamentu. Lu podes anullare in AppGallery cando boles.</string> <string name="osm_live_payment_desc_hw">S\'abbonamentu si pagat pro su perìodu ischertadu. Annulla·lu in AppGallery cando boles.</string>
<string name="osm_live_payment_subscription_management_hw">Su pagamentu at a èssere addebitadu a su contu tuo de AppGallery cando sa còmpora at a èssere cunfirmada. <string name="osm_live_payment_subscription_management_hw">Su pagamentu at a èssere addebitadu a su contu tuo de AppGallery cando sa còmpora at a èssere cunfirmada.
\n \n
\nS\'abbonamentu si rinnovat a sa sola automaticamente, francu chi siat istadu annulladu in antis de sa die de su rinnovu. Su contu tuo at a bènnere addebitadu pro su perìodu de rinnovu (mese/tres meses/annu) in sa die de rinnovu ebbia. \nS\'abbonamentu si rinnovat a sa sola automaticamente, francu chi siat istadu annulladu in antis de sa die de su rinnovu. Su contu tuo at a bènnere addebitadu pro su perìodu de rinnovu (mese/tres meses/annu) in sa die de rinnovu ebbia.
\n \n
\nPodes amministrare e annullare sos abbonamentos tuos intrende in sas impostatziones de AppGallery tuas.</string> \nPodes amministrare e annullare sos abbonamentos tuos in sas impostatziones de AppGallery tuas.</string>
<string name="routing_attr_avoid_footways_description">Èvita sos martzapiedis</string> <string name="routing_attr_avoid_footways_description">Èvita sos martzapiedis</string>
<string name="routing_attr_avoid_footways_name">Èvita sos martzapiedis</string> <string name="routing_attr_avoid_footways_name">Èvita sos martzapiedis</string>
<string name="what_is_new">Ite b\'at de nou</string> <string name="what_is_new">Ite b\'at de nou</string>
@ -3927,10 +3927,10 @@
<string name="file_already_imported">Su documentu est giai importadu in OsmAnd</string> <string name="file_already_imported">Su documentu est giai importadu in OsmAnd</string>
<string name="use_two_phase_routing">Imprea un\'algoritmu de càrculu de s\'àndala A* a duas fases</string> <string name="use_two_phase_routing">Imprea un\'algoritmu de càrculu de s\'àndala A* a duas fases</string>
<string name="snowmobile_render_descr">Pro sa ghia de motoislitas cun caminos e rastas dedicados.</string> <string name="snowmobile_render_descr">Pro sa ghia de motoislitas cun caminos e rastas dedicados.</string>
<string name="message_need_calculate_route_before_show_graph">Datos %1$s a disponimentu in sos caminos ebbia. Depes carculare un\'àndala impreende \"Àndala intre puntos\" pro los otènnere.</string> <string name="message_need_calculate_route_before_show_graph">Datos %1$s a disponimentu in sos caminos ebbia. Depes carculare un\'àndala impreende \"Àndala intre puntos\" pro bìdere sos gràficos.</string>
<string name="shared_string_graph">Gràficu</string> <string name="shared_string_graph">Gràficu</string>
<string name="message_graph_will_be_available_after_recalculation">Iseta su càrculu nou de s\'àndala. <string name="message_graph_will_be_available_after_recalculation">Pro praghere iseta.
\nSu gràficu at a èssere a disponimentu a pustis de su càrculu.</string> \nSu gràficu at a èssere a disponimentu a pustis de su càrculu nou de s\'àndala.</string>
<string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string> <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
<string name="icon_group_emergency">Apretu/Emergèntzia</string> <string name="icon_group_emergency">Apretu/Emergèntzia</string>
<string name="icon_group_special">Ispetziales</string> <string name="icon_group_special">Ispetziales</string>
@ -3944,7 +3944,7 @@
<string name="mgrs_format_descr">OsmAnd impreat su MGRS, chi assimìgiat a su formadu UTM NATO.</string> <string name="mgrs_format_descr">OsmAnd impreat su MGRS, chi assimìgiat a su formadu UTM NATO.</string>
<string name="shared_string_local_maps">Mapas locales</string> <string name="shared_string_local_maps">Mapas locales</string>
<string name="icon_group_amenity">Servìtziu</string> <string name="icon_group_amenity">Servìtziu</string>
<string name="message_you_need_add_two_points_to_show_graphs">Depes annànghere a su mancu duos puntos</string> <string name="message_you_need_add_two_points_to_show_graphs">Annanghe a su mancu duos puntos</string>
<string name="login_open_street_map">Intra in OpenStreetMap</string> <string name="login_open_street_map">Intra in OpenStreetMap</string>
<string name="login_open_street_map_org">Intra in OpenStreetMap.org</string> <string name="login_open_street_map_org">Intra in OpenStreetMap.org</string>
<string name="sign_in_with_open_street_map">Intra cun OpenStreetMap</string> <string name="sign_in_with_open_street_map">Intra cun OpenStreetMap</string>
@ -3955,7 +3955,7 @@
<string name="login_account">Contu</string> <string name="login_account">Contu</string>
<string name="user_login">Identificadore</string> <string name="user_login">Identificadore</string>
<string name="manage_subscription">Amministra s\'abbonamentu</string> <string name="manage_subscription">Amministra s\'abbonamentu</string>
<string name="subscription_payment_issue_title">B\'at unu problema cun s\'abbonamentu tuo. Incarca su butone pro andare a sas impostatziones de sos abbonamentos de Google Play pro acontzare sa manera de pagamentu tua.</string> <string name="subscription_payment_issue_title">Incarca su butone pro andare a sas impostatziones de sos abbonamentos de Google Play pro acontzare sa manera de pagamentu tua.</string>
<string name="subscription_expired_title">S\'abbonamentu de OsmAnd Live est iscadidu</string> <string name="subscription_expired_title">S\'abbonamentu de OsmAnd Live est iscadidu</string>
<string name="subscription_paused_title">S\'abbonamentu de OsmAnd Live est istadu postu in pàusa</string> <string name="subscription_paused_title">S\'abbonamentu de OsmAnd Live est istadu postu in pàusa</string>
<string name="subscription_on_hold_title">S\'abbonamentu de OsmAnd Live est in isetu</string> <string name="subscription_on_hold_title">S\'abbonamentu de OsmAnd Live est in isetu</string>
@ -3972,7 +3972,7 @@
<string name="shared_string_add_photo">Annanghe una fotografia</string> <string name="shared_string_add_photo">Annanghe una fotografia</string>
<string name="register_on_openplacereviews">Registra·ti in <string name="register_on_openplacereviews">Registra·ti in
\nOpenPlaceReviews.org</string> \nOpenPlaceReviews.org</string>
<string name="register_on_openplacereviews_desc">Sas fotografias benint frunidas dae su progetu a datos abertos OpenPlaceReviews.org. Pro carrigare sas fotografias tuas ti depes registrare a su situ.</string> <string name="register_on_openplacereviews_desc">Sas fotografias benint frunidas dae su progetu a datos abertos OpenPlaceReviews.org. Pro carrigare sas fotografias tuas ti depes registrare a su situ issoro.</string>
<string name="register_opr_create_new_account">Crea unu contu nou</string> <string name="register_opr_create_new_account">Crea unu contu nou</string>
<string name="register_opr_have_account">Tèngio giai unu contu</string> <string name="register_opr_have_account">Tèngio giai unu contu</string>
<string name="shared_string_search_history">Cronologia de chirca</string> <string name="shared_string_search_history">Cronologia de chirca</string>
@ -3983,7 +3983,7 @@
<string name="add_photos_descr">OsmAnd ammustrat fotografias dae fontes medas: <string name="add_photos_descr">OsmAnd ammustrat fotografias dae fontes medas:
\nOpenPlaceReviews - fotografias de sos PDI; \nOpenPlaceReviews - fotografias de sos PDI;
\nMapillary - immàgines a livellu de su caminu; \nMapillary - immàgines a livellu de su caminu;
\nWeb / Wikimedia - fotografias de sos PDI dillindadas in sos datos de OpenStreetMap.</string> \nWeb / Wikimedia - fotografias de sos PDI ligadas a sos datos de OpenStreetMap.</string>
<string name="shared_string_resources">Risursas</string> <string name="shared_string_resources">Risursas</string>
<string name="approximate_file_size">Mannària aprossimativa de su documentu</string> <string name="approximate_file_size">Mannària aprossimativa de su documentu</string>
<string name="select_data_to_export">Ischerta sos datos de esportare in su documentu.</string> <string name="select_data_to_export">Ischerta sos datos de esportare in su documentu.</string>
@ -4006,11 +4006,11 @@
<string name="plan_route_add_new_segment">Annanghe unu segmentu nou</string> <string name="plan_route_add_new_segment">Annanghe unu segmentu nou</string>
<string name="release_3_9">• Annanghidura de un\'optzione pro esportare e importare totu sos datos incluende sas impostatziones, sas risursas, e sos \"logos meos\" <string name="release_3_9">• Annanghidura de un\'optzione pro esportare e importare totu sos datos incluende sas impostatziones, sas risursas, e sos \"logos meos\"
\n \n
\n • Pranificatzione de s\'àndala: gràficos pro segmentos cun s\'àndala e annanghidura de s\'abilidade de creare e modificare segmentos de rastas mùltiplos \n • Pranificatzione de s\'àndala: gràficos pro segmentos de sa rasta cun s\'àndala e annanghidura de s\'abilidade de creare e modificare segmentos de rastas mùltiplos
\n \n
\n • Annanghidura de su mètodu de autenticatzione OAuth pro OpenStreetMap, IU de sas ventaneddas de diàlogu de OSM megiorada \n • Annanghidura de su mètodu de autenticatzione OAuth pro OpenStreetMap, IU de sas ventaneddas de diàlogu de OSM megiorada
\n \n
\n • Colores personalizados pro sos preferidos e sos puntos de coladòrgiu de sas rastas \n • Suportu pro colores personalizados pro sos preferidos e sos puntos de coladòrgiu de sas rastas
\n \n
\n</string> \n</string>
</resources> </resources>

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

@ -1933,7 +1933,7 @@
<string name="poi_pump">Pumpa</string> <string name="poi_pump">Pumpa</string>
<string name="poi_telescope_type">Typ</string> <string name="poi_telescope_type">Typ</string>
<string name="poi_animal_training_type">Typ</string> <string name="poi_animal_training_type">Typ</string>
<string name="poi_diplomatic_filter">Typ</string> <string name="poi_diplomatic_filter">Diplomatická inštitúcia</string>
<string name="poi_city_capital">Hlavné mesto</string> <string name="poi_city_capital">Hlavné mesto</string>
<string name="poi_pharmacy_dispensing">Výdaj na predpis</string> <string name="poi_pharmacy_dispensing">Výdaj na predpis</string>
<string name="poi_healthcare_alternative_types">Špecializácia</string> <string name="poi_healthcare_alternative_types">Špecializácia</string>
@ -3664,4 +3664,64 @@
<string name="poi_health_specialty_obstetrics_postnatal_no">Zdravotná špecializácia: pôrodníctvo (postnatálne): nie</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_palsa_bog">Rašelinisko</string>
<string name="poi_wetland_fen">Slatina</string> <string name="poi_wetland_fen">Slatina</string>
<string name="poi_liaison_subnational">Podnárodná úroveň</string>
<string name="poi_liaison_representative_office">Reprezentačná kancelária</string>
<string name="poi_liaison_liaison_office">Kancelária</string>
<string name="poi_consulate_honorary_consul">Honorárny konzul</string>
<string name="poi_consulate_consulate_general">Generálny konzulát</string>
<string name="poi_consulate_consular_office">Kancelária konzula</string>
<string name="poi_consulate_consular_agency">Konzulárne zastupiteľstvo</string>
<string name="poi_consulate_yes">Vedená konzulom</string>
<string name="poi_embassy_residence">Rezidencia</string>
<string name="poi_embassy_nunciature">Nunciatúra</string>
<string name="poi_embassy_mission">Misia</string>
<string name="poi_embassy_interests_section">Záujmová sekcia</string>
<string name="poi_embassy_high_commission">Vysoký komisár</string>
<string name="poi_embassy_delegation">Delegácia</string>
<string name="poi_embassy_branch_embassy">Pobočka</string>
<string name="poi_embassy_yes">Vedená veľvyslancom</string>
<string name="poi_diplomatic_services_citizen_services_no">Nie</string>
<string name="poi_diplomatic_services_citizen_services_yes">Áno</string>
<string name="poi_diplomatic_services_immigrant_visas_no">Nie</string>
<string name="poi_diplomatic_services_immigrant_visas_yes">Áno</string>
<string name="poi_diplomatic_services_non_immigrant_visas_no">Nie</string>
<string name="poi_diplomatic_services_non_immigrant_visas_yes">Áno</string>
<string name="poi_diplomatic_liaison">Neveľvyslanecký prostredník</string>
<string name="poi_diplomatic_embassy">Veľvyslanectvo</string>
<string name="poi_liaison_filter">Neveľvyslanecký prostredník</string>
<string name="poi_consulate_filter">Konzulát</string>
<string name="poi_embassy_filter">Veľvyslanectvo</string>
<string name="poi_diplomatic_services_citizen_services_filter">Služby občanom</string>
<string name="poi_diplomatic_services_immigrant_visas_filter">Imigračné víza</string>
<string name="poi_diplomatic_services_non_immigrant_visas_filter">Neimigračné víza</string>
<string name="poi_internet_access_fee_customers">Prístup na internet: zákazníci</string>
<string name="poi_cash_withdrawal_girocard">Girocard</string>
<string name="poi_cash_withdrawal_migros_bank">Banka Migros</string>
<string name="poi_cash_withdrawal_postfinance_card">Karty Postfinance</string>
<string name="poi_rescue_box">Skrinka záchranného materiálu</string>
<string name="poi_climbing_adventure">Lezecký park</string>
<string name="poi_socket_schuko_output_low">Nízky</string>
<string name="poi_socket_schuko_output_medium">Stredný</string>
<string name="poi_socket_schuko_output_high">Vysoký</string>
<string name="poi_socket_cee_blue_output_low">Nízky</string>
<string name="poi_socket_cee_blue_output_medium">Stredný</string>
<string name="poi_socket_cee_blue_output_high">Vysoký</string>
<string name="poi_socket_type3_output_low">Nízky</string>
<string name="poi_socket_type3_output_medium">Stredný</string>
<string name="poi_socket_type3_output_high">Vysoký</string>
<string name="poi_socket_type2_combo_output_low">Nízky</string>
<string name="poi_socket_type2_combo_output_medium">Stredný</string>
<string name="poi_socket_type2_combo_output_high">Vysoký</string>
<string name="poi_socket_type2_output_low">Nízky</string>
<string name="poi_socket_type2_output_medium">Stredný</string>
<string name="poi_socket_type2_output_high">Vysoký</string>
<string name="poi_socket_chademo_output_low">Nízky</string>
<string name="poi_socket_chademo_output_medium">Stredný</string>
<string name="poi_socket_chademo_output_high">Vysoký</string>
<string name="poi_valley_balka">Balka (ploché údolie v Rusku so suchým tokom)</string>
<string name="poi_office_podologist">Ordinácia podológa</string>
<string name="poi_health_specialty_palliative_medicine_yes">Paliatívna medicína</string>
<string name="poi_health_specialty_depth_psychology_yes">Hlbinná psychológia</string>
<string name="poi_health_specialty_chiropractic_yes">Chiropraxia</string>
<string name="poi_health_specialty_obstetrics_postnatal_yes">Pôrodníctvo (postnatálne)</string>
</resources> </resources>

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

@ -1947,7 +1947,7 @@
<string name="access_smart_autoannounce_descr">Oznamovať len ak sa smer k cieľu zmení.</string> <string name="access_smart_autoannounce_descr">Oznamovať len ak sa smer k cieľu zmení.</string>
<string name="access_autoannounce_period">Interval šikovného oznamovania</string> <string name="access_autoannounce_period">Interval šikovného oznamovania</string>
<string name="access_autoannounce_period_descr">Minimálny čas medzi oznamami.</string> <string name="access_autoannounce_period_descr">Minimálny čas medzi oznamami.</string>
<string name="access_no_destination">Cieľ nie je určený</string> <string name="access_no_destination">Modul uľahčenia prístupu: Cieľ nie je určený</string>
<string name="map_widget_magnetic_bearing">Magnetické smerovanie</string> <string name="map_widget_magnetic_bearing">Magnetické smerovanie</string>
<string name="use_osm_live_routing_description">Povoliť navigácii použiť zmeny z OsmAnd Live.</string> <string name="use_osm_live_routing_description">Povoliť navigácii použiť zmeny z OsmAnd Live.</string>
<string name="use_osm_live_routing">Navigácia OsmAnd Live</string> <string name="use_osm_live_routing">Navigácia OsmAnd Live</string>
@ -2389,7 +2389,7 @@
<string name="display_zoom_level">Priblíženie zobrazenia: %1$s</string> <string name="display_zoom_level">Priblíženie zobrazenia: %1$s</string>
<string name="route_is_too_long_v2">Pre veľké vzdialenosti: Ak sa nenájde výsledok do 10 minút, vložte prosím tranzitné ciele.</string> <string name="route_is_too_long_v2">Pre veľké vzdialenosti: Ak sa nenájde výsledok do 10 minút, vložte prosím tranzitné ciele.</string>
<string name="save_poi_too_many_uppercase">Názov obsahuje príliš veľa veľkých písmen. Pokračovať?</string> <string name="save_poi_too_many_uppercase">Názov obsahuje príliš veľa veľkých písmen. Pokračovať?</string>
<string name="hillshade_menu_download_descr">Pre zobrazenie tieňovaných svahov si stiahnite prekrývaciu mapu tieňovaných svahov (Hillshade).</string> <string name="hillshade_menu_download_descr">Pre zobrazenie tieňovaných svahov si stiahnite prekrývaciu mapu \"tieňovaných svahov\" (Hillshade).</string>
<string name="hillshade_purchase_header">Pre zobrazenie výškových stupňov si musíte nainštalovať zásuvný modul \"Vrstevnice\".</string> <string name="hillshade_purchase_header">Pre zobrazenie výškových stupňov si musíte nainštalovať zásuvný modul \"Vrstevnice\".</string>
<string name="hide_from_zoom_level">Skryť od úrovne priblíženia</string> <string name="hide_from_zoom_level">Skryť od úrovne priblíženia</string>
<string name="shared_string_plugin">Zásuvný modul</string> <string name="shared_string_plugin">Zásuvný modul</string>
@ -2755,7 +2755,7 @@
<string name="wikivoyage_offline">Wikivoyage offline</string> <string name="wikivoyage_offline">Wikivoyage offline</string>
<string name="unlimited_downloads">Neobmedzené sťahovania</string> <string name="unlimited_downloads">Neobmedzené sťahovania</string>
<string name="wikipedia_offline">Wikipédia offline</string> <string name="wikipedia_offline">Wikipédia offline</string>
<string name="contour_lines_hillshade_maps">Vrstevnice &amp; Tieňované svahy</string> <string name="contour_lines_hillshade_maps">Vrstevnice &amp; tieňované svahy</string>
<string name="unlock_all_features">Odomknite všetky funkcie OsmAnd</string> <string name="unlock_all_features">Odomknite všetky funkcie OsmAnd</string>
<string name="download_wikipedia_description">Stiahnite články Wikipédie pre %1$s pre ich čítanie offline.</string> <string name="download_wikipedia_description">Stiahnite články Wikipédie pre %1$s pre ich čítanie offline.</string>
<string name="download_wikipedia_label">Stiahnuť údaje Wikipédie</string> <string name="download_wikipedia_label">Stiahnuť údaje Wikipédie</string>
@ -3427,7 +3427,7 @@
<string name="login_and_pass">Prihlasovacie meno a heslo</string> <string name="login_and_pass">Prihlasovacie meno a heslo</string>
<string name="plugin_global_prefs_info">Tieto nastavenia sú globálne a platia pre všetky profily</string> <string name="plugin_global_prefs_info">Tieto nastavenia sú globálne a platia pre všetky profily</string>
<string name="osm_editing">OSM upravovanie</string> <string name="osm_editing">OSM upravovanie</string>
<string name="osm_edits_view_descr">Môžete zobraziť vaše ešte neodoslané zmeny alebo chyby v OSM cez %1$s. Odoslané body sa už v OsmAnd nezobrazujú.</string> <string name="osm_edits_view_descr">Zobrazte vaše ešte neodoslané zmeny alebo chyby v OSM cez %1$s. Odoslané zmeny sa už v OsmAnd nezobrazujú.</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">Ikona zobrazená pri navigácii alebo pohybe.</string> <string name="select_nav_icon_descr">Ikona zobrazená pri navigácii alebo pohybe.</string>
<string name="select_map_icon_descr">Ikona zobrazená v pokoji.</string> <string name="select_map_icon_descr">Ikona zobrazená v pokoji.</string>
@ -3794,9 +3794,9 @@
<string name="lenght_limit_description">Zadajte dĺžku vášho vozidla, pretože na trase môžu byť obmedzenia pre dlhé vozidlá.</string> <string name="lenght_limit_description">Zadajte dĺžku vášho vozidla, pretože na trase môžu byť obmedzenia pre dlhé vozidlá.</string>
<string name="quick_action_remove_next_destination">Vymazať najbližší cieľový bod</string> <string name="quick_action_remove_next_destination">Vymazať najbližší cieľový bod</string>
<string name="please_provide_point_name_error">Prosím zadajte názov pre bod</string> <string name="please_provide_point_name_error">Prosím zadajte názov pre bod</string>
<string name="quick_action_remove_next_destination_descr">Aktuálny cieľový bod na trase bude vymazaný. Ak je to posledný cieľ, navigácia sa zastaví.</string> <string name="quick_action_remove_next_destination_descr">Vymaže nasledujúci cieľ vašej trasy. Ak je to posledný cieľ, navigácia sa zastaví.</string>
<string name="search_download_wikipedia_maps">Stiahnuť mapy Wikipédia</string> <string name="search_download_wikipedia_maps">Stiahnuť mapy Wikipédia</string>
<string name="plugin_wikipedia_description">Získajte informácie o bodoch záujmu z Wikipédie. Je to váš vreckový sprievodca - zapnite modul Wikipédia a užívajte si články o objektoch okolo vás.</string> <string name="plugin_wikipedia_description">Získajte informácie o bodoch záujmu z Wikipédie, vreckového sprievodcu obsahujúceho články o miestach a cieľoch.</string>
<string name="app_mode_enduro_motorcycle">Enduro motorka</string> <string name="app_mode_enduro_motorcycle">Enduro motorka</string>
<string name="app_mode_motor_scooter">Skúter</string> <string name="app_mode_motor_scooter">Skúter</string>
<string name="app_mode_wheelchair">Invalidný vozík</string> <string name="app_mode_wheelchair">Invalidný vozík</string>
@ -3834,7 +3834,7 @@
<string name="navigation_profile">Navigačný profil</string> <string name="navigation_profile">Navigačný profil</string>
<string name="route_between_points_add_track_desc">Zvoľte súbor stopy, pre ktorú bude pridaný nový úsek.</string> <string name="route_between_points_add_track_desc">Zvoľte súbor stopy, pre ktorú bude pridaný nový úsek.</string>
<string name="street_level_imagery">Snímky z úrovne ulice</string> <string name="street_level_imagery">Snímky z úrovne ulice</string>
<string name="plan_route_exit_dialog_descr">Naozaj chcete zahodiť všetky zmeny v plánovanej trasy jej zatvorením\?</string> <string name="plan_route_exit_dialog_descr">Naozaj chcete zahodiť všetky zmeny v plánovanej trase\?</string>
<string name="in_case_of_reverse_direction">V prípade opačného smeru</string> <string name="in_case_of_reverse_direction">V prípade opačného smeru</string>
<string name="shared_string_gpx_route">Trasa zo stopy</string> <string name="shared_string_gpx_route">Trasa zo stopy</string>
<string name="context_menu_item_add_waypoint">Pridať prechodný bod stopy</string> <string name="context_menu_item_add_waypoint">Pridať prechodný bod stopy</string>
@ -3879,7 +3879,7 @@
<string name="all_previous_segments_will_be_recalc">Všetky predchádzajúce úseky budú prepočítané pomocou zvoleného profilu.</string> <string name="all_previous_segments_will_be_recalc">Všetky predchádzajúce úseky budú prepočítané pomocou zvoleného profilu.</string>
<string name="open_saved_track">Otvoriť uloženú stopu</string> <string name="open_saved_track">Otvoriť uloženú stopu</string>
<string name="shared_string_is_saved">je uložený</string> <string name="shared_string_is_saved">je uložený</string>
<string name="disable_recording_once_app_killed_descrp">Zastaví záznam stopy, keď je aplikácia ukončená (cez nedávne aplikácie). (Ikona režimu na pozadí zmizne z notifikačnej oblasti Androidu.)</string> <string name="disable_recording_once_app_killed_descrp">Záznam stopy bude pozastavený, keď je aplikácia ukončená (cez nedávne aplikácie). (Ikona režimu na pozadí zmizne z notifikačnej oblasti Androidu.)</string>
<string name="number_of_gpx_files_selected_pattern">%s vybraných súborov stôp</string> <string name="number_of_gpx_files_selected_pattern">%s vybraných súborov stôp</string>
<string name="save_global_track_interval_descr">Zadaj interval pre všeobecné zaznamenávanie výletu (zapínané cez tlačidlo Záznamu výletu na mape).</string> <string name="save_global_track_interval_descr">Zadaj interval pre všeobecné zaznamenávanie výletu (zapínané cez tlačidlo Záznamu výletu na mape).</string>
<string name="gpx_monitoring_stop">Pozastaviť nahrávanie výletu</string> <string name="gpx_monitoring_stop">Pozastaviť nahrávanie výletu</string>
@ -3909,7 +3909,7 @@
<string name="osm_live_payment_desc_hw">Predplatné bude spoplatnené v zvolenom intervale. Predplatné zrušte kedykoľvek na AppGallery.</string> <string name="osm_live_payment_desc_hw">Predplatné bude spoplatnené v zvolenom intervale. Predplatné zrušte kedykoľvek na AppGallery.</string>
<string name="osm_live_payment_subscription_management_hw">Platba bude stiahnutá z vášho účtu AppGallery po potvrdení nákupu. <string name="osm_live_payment_subscription_management_hw">Platba bude stiahnutá z vášho účtu AppGallery po potvrdení nákupu.
\n \n
\nPredplatné sa automaticky obnovuje, ak nie je zrušené pred dátumom jeho obnovenia. Ďalšia platba za obdobie predplatného (mesiac/štvrťrok/rok) bude stiahnutá v deň obnovenia. \nPredplatné sa automaticky predlžuje, pokiaľ ho nezrušíte pred dátumom jeho obnovenia. Ďalšia platba za obdobie predplatného (mesiac/štvrťrok/rok) bude stiahnutá v deň obnovenia.
\n \n
\n Vaše predplatné môžete spravovať a zrušiť v nastaveniach AppGallery.</string> \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_description">Vyhnúť sa chodníkom pre chodcov</string>
@ -3949,7 +3949,7 @@
<string name="mgrs_format_descr">OsmAnd používa MGSR, ktorý je podobný ako formát UTM NATO.</string> <string name="mgrs_format_descr">OsmAnd používa MGSR, ktorý je podobný ako formát UTM NATO.</string>
<string name="message_you_need_add_two_points_to_show_graphs">Musíte pridať aspoň dva body</string> <string name="message_you_need_add_two_points_to_show_graphs">Musíte pridať aspoň dva body</string>
<string name="manage_subscription">Spravovať predplatné</string> <string name="manage_subscription">Spravovať predplatné</string>
<string name="subscription_payment_issue_title">S vašim predplatným je problém. Stlačte tlačidlo pre prechod do nastavení predplatného v Google Play a opravte váš spôsob platby.</string> <string name="subscription_payment_issue_title">Pre opravu vášho predplatného stlačte tlačidlo pre nastavenie spôsobu platby v Google Play.</string>
<string name="subscription_expired_title">Predplatné OsmAnd Live skončilo</string> <string name="subscription_expired_title">Predplatné OsmAnd Live skončilo</string>
<string name="subscription_paused_title">Predplatné OsmAnd Live je pozastavené</string> <string name="subscription_paused_title">Predplatné OsmAnd Live je pozastavené</string>
<string name="subscription_on_hold_title">Predplatné OsmAnd Live je zablokované</string> <string name="subscription_on_hold_title">Predplatné OsmAnd Live je zablokované</string>

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

@ -1920,7 +1920,7 @@
<string name="shared_string_topbar">Üst menü</string> <string name="shared_string_topbar">Üst menü</string>
<string name="recalculate_route">Güzergahı yeniden hesapla</string> <string name="recalculate_route">Güzergahı yeniden hesapla</string>
<string name="report">Rapor</string> <string name="report">Rapor</string>
<string name="access_no_destination">Hedef ayarlanmadı</string> <string name="access_no_destination">Erişilebilirlik eklentisi: Hedef belirlenmedi</string>
<string name="access_disable_offroute_recalc">Rota terkedildiğinde yeniden hesaplanmasın</string> <string name="access_disable_offroute_recalc">Rota terkedildiğinde yeniden hesaplanmasın</string>
<string name="access_disable_offroute_recalc_descr">Rotadan çıkıldıktan sonra rota yeniden hesaplanmaz.</string> <string name="access_disable_offroute_recalc_descr">Rotadan çıkıldıktan sonra rota yeniden hesaplanmaz.</string>
<string name="access_disable_wrong_direction_recalc">Aksi yönde iken rota yeniden-hesaplanmasın</string> <string name="access_disable_wrong_direction_recalc">Aksi yönde iken rota yeniden-hesaplanmasın</string>
@ -1997,7 +1997,7 @@
<string name="nothing_found">Hiçbir şey bulunamadı</string> <string name="nothing_found">Hiçbir şey bulunamadı</string>
<string name="nothing_found_descr">Arama sorgusunu değiştir veya yarıçapını arttır.</string> <string name="nothing_found_descr">Arama sorgusunu değiştir veya yarıçapını arttır.</string>
<string name="search_favorites">Sık Kullanılanlarda ara</string> <string name="search_favorites">Sık Kullanılanlarda ara</string>
<string name="hillshade_menu_download_descr">Dikey gölgelendirmeyi göstermek için \'Hillshade Overlay\' haritasını indirin.</string> <string name="hillshade_menu_download_descr">Dikey gölgelendirmeyi göstermek için \'Tepe gölgesi\' üst katman haritasını indirin.</string>
<string name="hillshade_purchase_header">Kademeli dikey alanları göstermek için \'Eş yükselti eğrileri\' eklentisini yükleyin.</string> <string name="hillshade_purchase_header">Kademeli dikey alanları göstermek için \'Eş yükselti eğrileri\' eklentisini yükleyin.</string>
<string name="hide_from_zoom_level">Yakınlaştırma seviyesinden başlayarak gizle</string> <string name="hide_from_zoom_level">Yakınlaştırma seviyesinden başlayarak gizle</string>
<string name="srtm_menu_download_descr">Bu bölgede kullanmak için \'Eş yükselti eğrisi\' haritasını indirin.</string> <string name="srtm_menu_download_descr">Bu bölgede kullanmak için \'Eş yükselti eğrisi\' haritasını indirin.</string>
@ -2849,7 +2849,7 @@
<string name="start_editing_card_description">Wikivoyage üzerindeki herhangi bir makaleyi düzenleyebilirsiniz. Bilgi, deneyim, yetenek ve dikkatinizi paylaşın.</string> <string name="start_editing_card_description">Wikivoyage üzerindeki herhangi bir makaleyi düzenleyebilirsiniz. Bilgi, deneyim, yetenek ve dikkatinizi paylaşın.</string>
<string name="start_editing">Düzenlemeye başla</string> <string name="start_editing">Düzenlemeye başla</string>
<string name="welcome_to_open_beta">Açık betaya hoş geldiniz</string> <string name="welcome_to_open_beta">Açık betaya hoş geldiniz</string>
<string name="contour_lines_hillshade_maps">Eş yükselti eğrileri ve Tepe gölgeleri haritaları</string> <string name="contour_lines_hillshade_maps">Eş yükselti eğrileri ve tepe gölgeleri haritaları</string>
<string name="paid_app">Ücretli uygulama</string> <string name="paid_app">Ücretli uygulama</string>
<string name="paid_plugin">Ücretli eklenti</string> <string name="paid_plugin">Ücretli eklenti</string>
<string name="popular_destinations">Popüler yerler</string> <string name="popular_destinations">Popüler yerler</string>
@ -3384,7 +3384,7 @@
<string name="login_and_pass">Kullanıcı adı ve parola</string> <string name="login_and_pass">Kullanıcı adı ve parola</string>
<string name="plugin_global_prefs_info">Bu eklenti ayarları geneldir ve tüm profiller için geçerlidir</string> <string name="plugin_global_prefs_info">Bu eklenti ayarları geneldir ve tüm profiller için geçerlidir</string>
<string name="osm_editing">OSM düzenleme</string> <string name="osm_editing">OSM düzenleme</string>
<string name="osm_edits_view_descr">Henüz karşıya yüklenmemiş tüm düzenlemelerinizi veya OSM hatalarınızı %1$s\'de görüntüleyebilirsiniz. Karşıya yüklenen noktalar OsmAnd\'da gösterilmez.</string> <string name="osm_edits_view_descr">Henüz karşıya yüklenmemiş tüm düzenlemelerinizi veya OSM hatalarınızı %1$s\'de görüntüleyin. Zaten yüklenen değişiklikler artık gösterilmeyecek.</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">Navigasyon sırasında veya harekete halindeyken gösterilen simge.</string> <string name="select_nav_icon_descr">Navigasyon sırasında veya harekete halindeyken gösterilen simge.</string>
<string name="select_map_icon_descr">Dinlenme anında gösterilen simge.</string> <string name="select_map_icon_descr">Dinlenme anında gösterilen simge.</string>
@ -3745,14 +3745,14 @@
<string name="app_mode_inline_skates">Paten</string> <string name="app_mode_inline_skates">Paten</string>
<string name="routing_attr_length_description">Rotalarda izin verilecek araç uzunluğunu belirtin.</string> <string name="routing_attr_length_description">Rotalarda izin verilecek araç uzunluğunu belirtin.</string>
<string name="routing_attr_length_name">Uzunluk sınırı</string> <string name="routing_attr_length_name">Uzunluk sınırı</string>
<string name="quick_action_remove_next_destination_descr">Güzergahdaki geçerli hedef noktası silinecektir. Eğer bu varış noktası olacaksa, navigasyon duracaktır.</string> <string name="quick_action_remove_next_destination_descr">Güzergahınızdaki bir sonraki hedefi siler. Bu son hedefse, navigasyon duracaktır.</string>
<string name="please_provide_point_name_error">Lütfen nokta için bir ad belirtin</string> <string name="please_provide_point_name_error">Lütfen nokta için bir ad belirtin</string>
<string name="lenght_limit_description">Aracınızın uzunluğunu belirtin, uzun araçlar için bazı güzergah kısıtlamaları geçerli olabilir.</string> <string name="lenght_limit_description">Aracınızın uzunluğunu belirtin, uzun araçlar için bazı güzergah kısıtlamaları geçerli olabilir.</string>
<string name="quick_action_remove_next_destination">En yakın varış noktasını sil</string> <string name="quick_action_remove_next_destination">En yakın varış noktasını sil</string>
<string name="use_volume_buttons_as_zoom_descr">Harita yakınlaştırma seviyesini cihaz ses seviyesi düğmelerini kullanarak denetleyin.</string> <string name="use_volume_buttons_as_zoom_descr">Harita yakınlaştırma seviyesini cihaz ses seviyesi düğmelerini kullanarak denetleyin.</string>
<string name="use_volume_buttons_as_zoom">Yakınlaştırma için ses seviyesi düğmeleri</string> <string name="use_volume_buttons_as_zoom">Yakınlaştırma için ses seviyesi düğmeleri</string>
<string name="search_download_wikipedia_maps">Wikipedia haritalarını indir</string> <string name="search_download_wikipedia_maps">Wikipedia haritalarını indir</string>
<string name="plugin_wikipedia_description">Wikipedia\'dan ilgi çekici yerler hakkında bilgi alın. Bu sizin çevrim dışı cep rehberinizdir - sadece Wikipedia eklentisini etkinleştirin ve etrafınızdaki nesneler hakkında makalelerin tadını çıkarın.</string> <string name="plugin_wikipedia_description">Yerler ve varış noktaları hakkında makaleler içeren çevrim dışı cep kılavuzu Wikipedia\'dan ilgi çekici noktalar hakkında bilgi alın.</string>
<string name="app_mode_enduro_motorcycle">Enduro motosiklet</string> <string name="app_mode_enduro_motorcycle">Enduro motosiklet</string>
<string name="app_mode_motor_scooter">Küçük motosiklet</string> <string name="app_mode_motor_scooter">Küçük motosiklet</string>
<string name="app_mode_wheelchair">Tekerlekli sandalye</string> <string name="app_mode_wheelchair">Tekerlekli sandalye</string>
@ -3781,8 +3781,8 @@
<string name="route_between_points_warning_desc">Ardından, bu seçeneği kullanmak için navigasyon profillerinizden biriyle izlenen yolunuzu izin verilen en yakın yola tutturun.</string> <string name="route_between_points_warning_desc">Ardından, bu seçeneği kullanmak için navigasyon profillerinizden biriyle izlenen yolunuzu izin verilen en yakın yola tutturun.</string>
<string name="save_as_new_track">Yeni bir izleme olarak kaydet</string> <string name="save_as_new_track">Yeni bir izleme olarak kaydet</string>
<string name="reverse_route">Ters güzergah</string> <string name="reverse_route">Ters güzergah</string>
<string name="route_between_points_whole_track_button_desc">Tüm yol, seçilen profil kullanılarak yeniden hesaplanacaktır.</string> <string name="route_between_points_whole_track_button_desc">Tüm yol, seçilen profil kullanılarak yeniden hesaplanacak.</string>
<string name="route_between_points_next_segment_button_desc">Sadece sonraki bölüm, seçilen profil kullanılarak yeniden hesaplanacaktır.</string> <string name="route_between_points_next_segment_button_desc">Yalnızca sonraki bölüm, seçilen profil kullanılarak yeniden hesaplanacak.</string>
<string name="route_between_points_desc">Düz bir çizgi ile noktaların nasıl birleştirileceğini veya aşağıda belirtildiği gibi aralarında nasıl güzergah hesaplanacağını seçin.</string> <string name="route_between_points_desc">Düz bir çizgi ile noktaların nasıl birleştirileceğini veya aşağıda belirtildiği gibi aralarında nasıl güzergah hesaplanacağını seçin.</string>
<string name="whole_track">Tüm yol</string> <string name="whole_track">Tüm yol</string>
<string name="next_segment">Sonraki bölüm</string> <string name="next_segment">Sonraki bölüm</string>
@ -3790,7 +3790,7 @@
<string name="navigation_profile">Navigasyon profili</string> <string name="navigation_profile">Navigasyon profili</string>
<string name="route_between_points_add_track_desc">Kendisine yeni bir bölümün ekleneceği bir yol dosyası seçin.</string> <string name="route_between_points_add_track_desc">Kendisine yeni bir bölümün ekleneceği bir yol dosyası seçin.</string>
<string name="street_level_imagery">Sokak seviyesi görüntüleri</string> <string name="street_level_imagery">Sokak seviyesi görüntüleri</string>
<string name="plan_route_exit_dialog_descr">Planlanan güzergahtaki tüm değişiklikleri kapatarak atmak istediğinizden emin misiniz\?</string> <string name="plan_route_exit_dialog_descr">Planlanan güzergahtaki tüm değişiklikleri atmak istediğinizden emin misiniz\?</string>
<string name="in_case_of_reverse_direction">Ters yön durumunda</string> <string name="in_case_of_reverse_direction">Ters yön durumunda</string>
<string name="monitoring_control_start">REC</string> <string name="monitoring_control_start">REC</string>
<string name="open_saved_track">Kaydedilen yolu aç</string> <string name="open_saved_track">Kaydedilen yolu aç</string>
@ -3810,7 +3810,7 @@
<string name="map_widget_monitoring">Seyahat kaydetme</string> <string name="map_widget_monitoring">Seyahat kaydetme</string>
<string name="marker_save_as_track">Yol dosyası olarak kaydet</string> <string name="marker_save_as_track">Yol dosyası olarak kaydet</string>
<string name="number_of_gpx_files_selected_pattern">%s yol dosyası seçildi</string> <string name="number_of_gpx_files_selected_pattern">%s yol dosyası seçildi</string>
<string name="disable_recording_once_app_killed_descrp">(Son uygulamalar aracılığıyla) uygulama kapatıldığında yol kaydını duraklatacaktır. (OsmAnd arka plan göstergesi Android bildirim çubuğundan kaybolur.)</string> <string name="disable_recording_once_app_killed_descrp">Yol kaydı, uygulama (son uygulamalar aracılığıyla) kapatıldığında duraklatılacaktır. (OsmAnd arka plan göstergesi Android bildirim çubuğundan kaybolur.)</string>
<string name="save_global_track_interval_descr">Genel yol kaydı için kayıt aralığını belirtin (haritadaki \'Seyahat kaydetme\' widget\'ı aracılığıyla açıldı).</string> <string name="save_global_track_interval_descr">Genel yol kaydı için kayıt aralığını belirtin (haritadaki \'Seyahat kaydetme\' widget\'ı aracılığıyla açıldı).</string>
<string name="gpx_monitoring_stop">Seyahat kaydetmeyi duraklat</string> <string name="gpx_monitoring_stop">Seyahat kaydetmeyi duraklat</string>
<string name="gpx_monitoring_start">Seyahat kaydetmeyi devam ettir</string> <string name="gpx_monitoring_start">Seyahat kaydetmeyi devam ettir</string>
@ -3818,15 +3818,15 @@
<string name="delete_address">Adres sil</string> <string name="delete_address">Adres sil</string>
<string name="add_address">Adres ekle</string> <string name="add_address">Adres ekle</string>
<string name="access_hint_enter_address">Adres girin</string> <string name="access_hint_enter_address">Adres girin</string>
<string name="simplified_track_description">Sadece güzergah hattı kaydedilecek, ara noktalar silinecektir.</string> <string name="simplified_track_description">Yalnızca güzergah hattı kaydedilecek, ara noktalar silinecek.</string>
<string name="shared_string_file_name">Dosya adı</string> <string name="shared_string_file_name">Dosya adı</string>
<string name="system_default_theme">Sistem öntanımlı değeri</string> <string name="system_default_theme">Sistem öntanımlı değeri</string>
<string name="all_next_segments">Sonraki tüm bölümler</string> <string name="all_next_segments">Sonraki tüm bölümler</string>
<string name="previous_segment">Önceki bölüm</string> <string name="previous_segment">Önceki bölüm</string>
<string name="all_previous_segments">Önceki tüm bölümler</string> <string name="all_previous_segments">Önceki tüm bölümler</string>
<string name="only_selected_segment_recalc">Sadece seçili bölüm, seçilen profil kullanılarak yeniden hesaplanacaktır.</string> <string name="only_selected_segment_recalc">Yalnızca seçilen bölüm, seçilen profil kullanılarak yeniden hesaplanacak.</string>
<string name="all_next_segments_will_be_recalc">Sonraki tüm bölümler, seçilen profil kullanılarak yeniden hesaplanacaktır.</string> <string name="all_next_segments_will_be_recalc">Sonraki tüm bölümler, seçilen profil kullanılarak yeniden hesaplanacak.</string>
<string name="all_previous_segments_will_be_recalc">Önceki tüm bölümler, seçilen profil kullanılarak yeniden hesaplanacaktır.</string> <string name="all_previous_segments_will_be_recalc">Önceki tüm bölümler, seçilen profil kullanılarak yeniden hesaplanacak.</string>
<string name="shared_string_gpx_route">Yol güzergahı</string> <string name="shared_string_gpx_route">Yol güzergahı</string>
<string name="follow_track">Yolu takip et</string> <string name="follow_track">Yolu takip et</string>
<string name="follow_track_descr">Takip edilecek yol dosyasını seçin</string> <string name="follow_track_descr">Takip edilecek yol dosyasını seçin</string>
@ -3862,11 +3862,11 @@
<string name="start_finish_icons">Başlangıç ve bitiş simgeleri</string> <string name="start_finish_icons">Başlangıç ve bitiş simgeleri</string>
<string name="contour_lines_thanks">\'Eş yükselti eğrileri\'ni satın aldığınız için teşekkürler</string> <string name="contour_lines_thanks">\'Eş yükselti eğrileri\'ni satın aldığınız için teşekkürler</string>
<string name="osm_live_payment_desc_hw">Abonelik seçilen dönem başına ücretlendirilir. İstediğiniz zaman AppGallery\'den iptal edin.</string> <string name="osm_live_payment_desc_hw">Abonelik seçilen dönem başına ücretlendirilir. İstediğiniz zaman AppGallery\'den iptal edin.</string>
<string name="osm_live_payment_subscription_management_hw">Ödeme, satın alma onaylandığında AppGallery hesabınızdan alınacaktır. <string name="osm_live_payment_subscription_management_hw">Satın alma onayının ardından AppGallery hesabınızdan ücret alınır.
\n \n
\nYenileme tarihinden önce iptal edilmedikçe abonelik otomatik olarak yenilenir. Hesabınızdan yenileme süresi (ay/üç ay/yıl) için yalnızca yenileme tarihinde ücret alınacaktır. \nYenileme tarihinden önce iptal edilmediği sürece abonelik otomatik olarak uzatılır. Hesabınızdan yenileme süresi (ay/üç ay/yıl) için yalnızca yenileme tarihinde ücret alınacaktır.
\n \n
\n AppGallery ayarlarınıza giderek aboneliklerinizi yönetebilir ve iptal edebilirsiniz.</string> \n AppGallery ayarlarınızda 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_description">Yaya yollarından kaçın</string>
<string name="routing_attr_avoid_footways_name">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="development">Geliştirme</string>
@ -3912,7 +3912,7 @@
<string name="user_login">Giriş bilgisi</string> <string name="user_login">Giriş bilgisi</string>
<string name="login_account">Hesap</string> <string name="login_account">Hesap</string>
<string name="manage_subscription">Aboneliği yönet</string> <string name="manage_subscription">Aboneliği yönet</string>
<string name="subscription_payment_issue_title">Aboneliğinizle ilgili bir sorun var. Ödeme yönteminizi düzeltmek üzere Google Play abonelik ayarlarına gitmek için düğmeye dokunun.</string> <string name="subscription_payment_issue_title">Aboneliğinizi düzeltmek üzere Google Play\'de bir ödeme yöntemi ayarlamak için düğmeye dokunun.</string>
<string name="subscription_expired_title">OsmAnd Live aboneliğinin süresi doldu</string> <string name="subscription_expired_title">OsmAnd Live aboneliğinin süresi doldu</string>
<string name="subscription_paused_title">OsmAnd Live aboneliği duraklatıldı</string> <string name="subscription_paused_title">OsmAnd Live aboneliği duraklatıldı</string>
<string name="subscription_on_hold_title">OsmAnd Live aboneliği beklemede</string> <string name="subscription_on_hold_title">OsmAnd Live aboneliği beklemede</string>
@ -3971,4 +3971,6 @@
\n • Sık kullanılanlar ve yol ara noktaları için özel renk desteği \n • Sık kullanılanlar ve yol ara noktaları için özel renk desteği
\n \n
\n</string> \n</string>
<string name="profile_type_osmand_string">OsmAnd profili</string>
<string name="profile_type_user_string">Kullanıcı profili</string>
</resources> </resources>

10
OsmAnd/res/values-uk/phrases.xml
View file

@ -3872,4 +3872,14 @@
<string name="poi_nurse">Медсестра</string> <string name="poi_nurse">Медсестра</string>
<string name="poi_mobile_money_agent">Мобільний грошовий агент</string> <string name="poi_mobile_money_agent">Мобільний грошовий агент</string>
<string name="poi_lifeguard_base">Рятувальна станція</string> <string name="poi_lifeguard_base">Рятувальна станція</string>
<string name="poi_vaccination_covid19">Щеплення: COVID19</string>
<string name="poi_health_specialty_vaccination_yes">Щеплення</string>
<string name="poi_water_source_powered_pump">Привідний насос</string>
<string name="poi_water_source_well">Криниця</string>
<string name="poi_water_source_tube_well">Трубна свердловина</string>
<string name="poi_water_source_tap">Торкніться</string>
<string name="poi_water_source_water_works">Водозабір</string>
<string name="poi_water_source_water_tank">Резервуар для води</string>
<string name="poi_water_source_lake">Озеро</string>
<string name="poi_water_source_river">Річка</string>
</resources> </resources>

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

@ -1897,7 +1897,7 @@
<string name="report">Звіт</string> <string name="report">Звіт</string>
<string name="use_osm_live_routing_description">Увімкнути навігацію з урахуванням автооновлень OsmAnd Live.</string> <string name="use_osm_live_routing_description">Увімкнути навігацію з урахуванням автооновлень OsmAnd Live.</string>
<string name="use_osm_live_routing">Навігація OsmAnd Live</string> <string name="use_osm_live_routing">Навігація OsmAnd Live</string>
<string name="access_no_destination">Пункт призначення не заданий</string> <string name="access_no_destination">Втулок доступності: призначення не встановлено</string>
<string name="map_widget_magnetic_bearing">Магнітний пеленг</string> <string name="map_widget_magnetic_bearing">Магнітний пеленг</string>
<string name="map_widget_bearing">Курсовий кут</string> <string name="map_widget_bearing">Курсовий кут</string>
<string name="access_disable_offroute_recalc">Не перераховувати маршрут при сході з нього</string> <string name="access_disable_offroute_recalc">Не перераховувати маршрут при сході з нього</string>
@ -2230,7 +2230,7 @@
<string name="quick_action_showhide_osmbugs_descr">Натискання на кнопку дії покаже чи приховає OSM-нотатки на мапі.</string> <string name="quick_action_showhide_osmbugs_descr">Натискання на кнопку дії покаже чи приховає OSM-нотатки на мапі.</string>
<string name="sorted_by_distance">Відсортоване за відстанню</string> <string name="sorted_by_distance">Відсортоване за відстанню</string>
<string name="search_favorites">Пошук у закладках</string> <string name="search_favorites">Пошук у закладках</string>
<string name="hillshade_menu_download_descr">Для того, щоб відобразити затінення рельєфу, потрібно завантажити спеціальну мапу для цієї області.</string> <string name="hillshade_menu_download_descr">Завантажте шар мапи «Пагорби», щоб показати вертикальне затінення.</string>
<string name="hillshade_purchase_header">Щоб побачити рельєф місцевості на мапі, вам потрібно придбати та встановити втулок \'Горизонталі\' (\'Contour Lines\').</string> <string name="hillshade_purchase_header">Щоб побачити рельєф місцевості на мапі, вам потрібно придбати та встановити втулок \'Горизонталі\' (\'Contour Lines\').</string>
<string name="hide_from_zoom_level">Приховати від рівня масштабування</string> <string name="hide_from_zoom_level">Приховати від рівня масштабування</string>
<string name="srtm_menu_download_descr">Завантажте мапу \'Горизонталі\' (\'Contour Line\') для використання у цій області.</string> <string name="srtm_menu_download_descr">Завантажте мапу \'Горизонталі\' (\'Contour Line\') для використання у цій області.</string>
@ -2750,7 +2750,7 @@
<string name="wikivoyage_offline">Вікімандри в автономному режимі</string> <string name="wikivoyage_offline">Вікімандри в автономному режимі</string>
<string name="unlimited_downloads">Необмежені завантаження</string> <string name="unlimited_downloads">Необмежені завантаження</string>
<string name="wikipedia_offline">Вікіпедія в автономному режимі</string> <string name="wikipedia_offline">Вікіпедія в автономному режимі</string>
<string name="contour_lines_hillshade_maps">Горизонталі і Мапи рельєфу місцевості</string> <string name="contour_lines_hillshade_maps">Горизонталі і мапи рельєфу місцевості</string>
<string name="unlock_all_features">Розблокувати усі можливості OsmAnd</string> <string name="unlock_all_features">Розблокувати усі можливості OsmAnd</string>
<string name="purchase_dialog_title">Оберіть план</string> <string name="purchase_dialog_title">Оберіть план</string>
<string name="purchase_dialog_travel_description">Придбайте одне з наведеного нижче, щоб отримати функціональність автономного туристичного путівника:</string> <string name="purchase_dialog_travel_description">Придбайте одне з наведеного нижче, щоб отримати функціональність автономного туристичного путівника:</string>
@ -3427,7 +3427,7 @@
<string name="login_and_pass">Ім\'я користувача і пароль</string> <string name="login_and_pass">Ім\'я користувача і пароль</string>
<string name="plugin_global_prefs_info">Ці налаштування втулка стосуються всіх профілів</string> <string name="plugin_global_prefs_info">Ці налаштування втулка стосуються всіх профілів</string>
<string name="osm_editing">OSM-правлення</string> <string name="osm_editing">OSM-правлення</string>
<string name="osm_edits_view_descr">Ви можете переглянути всі ще не вивантажені зміни або вади OSM у %1$s. Вивантажені точки не показано в OsmAnd.</string> <string name="osm_edits_view_descr">Перегляньте всі свої ще не завантажені зміни чи помилки OSM у %1$s. Вже завантажені зміни більше не показуватимуться.</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">Значок відображається під час навігації чи переміщення.</string> <string name="select_nav_icon_descr">Значок відображається під час навігації чи переміщення.</string>
<string name="select_map_icon_descr">Значок показано в спокої.</string> <string name="select_map_icon_descr">Значок показано в спокої.</string>
@ -3791,9 +3791,9 @@
<string name="lenght_limit_description">Вкажіть довжину вашого автомобіля, для довгих транспортних засобів можуть застосовуватися деякі обмеження на маршрутах.</string> <string name="lenght_limit_description">Вкажіть довжину вашого автомобіля, для довгих транспортних засобів можуть застосовуватися деякі обмеження на маршрутах.</string>
<string name="quick_action_remove_next_destination">Видалити найближчу точку призначення</string> <string name="quick_action_remove_next_destination">Видалити найближчу точку призначення</string>
<string name="please_provide_point_name_error">Вкажіть назву пункту</string> <string name="please_provide_point_name_error">Вкажіть назву пункту</string>
<string name="quick_action_remove_next_destination_descr">Поточну точку призначення на маршруті буде видалено. Якщо це буде місце призначення, навігація припиниться.</string> <string name="quick_action_remove_next_destination_descr">Видаляє наступний пункт призначення з маршруту. Якщо це кінцевий пункт призначення, навігація зупиниться.</string>
<string name="search_download_wikipedia_maps">Завантажити мапи Вікіпедії</string> <string name="search_download_wikipedia_maps">Завантажити мапи Вікіпедії</string>
<string name="plugin_wikipedia_description">Отримайте відомості про визначні місця у Вікіпедії. Це ваш автономний кишеньковий посібник - просто ввімкніть втулок \"Вікіпедія\" і насолоджуйтеся статтями про об\'єкти довкола вас.</string> <string name="plugin_wikipedia_description">Отримайте відомості про визначні місця з Вікіпедії, кишенькового автономного путівника, що містить статті про місця та пункти призначення.</string>
<string name="app_mode_motor_scooter">Моторолер</string> <string name="app_mode_motor_scooter">Моторолер</string>
<string name="app_mode_enduro_motorcycle">Спортивний мотоцикл</string> <string name="app_mode_enduro_motorcycle">Спортивний мотоцикл</string>
<string name="app_mode_wheelchair">Інвалідне крісло</string> <string name="app_mode_wheelchair">Інвалідне крісло</string>
@ -3831,7 +3831,7 @@
<string name="route_between_points_next_segment_button_desc">Лише наступний сегмент буде перераховано за допомогою обраного профілю.</string> <string name="route_between_points_next_segment_button_desc">Лише наступний сегмент буде перераховано за допомогою обраного профілю.</string>
<string name="route_between_points_desc">Виберіть спосіб з\'єднання точок: прямою лінією чи обчислити маршрут між ними за, як зазначено далі.</string> <string name="route_between_points_desc">Виберіть спосіб з\'єднання точок: прямою лінією чи обчислити маршрут між ними за, як зазначено далі.</string>
<string name="street_level_imagery">Зображення вулиць</string> <string name="street_level_imagery">Зображення вулиць</string>
<string name="plan_route_exit_dialog_descr">Ви дійсно бажаєте відхилити всі зміни у запланованому маршруті, закривши його\?</string> <string name="plan_route_exit_dialog_descr">Ви дійсно бажаєте відхилити всі зміни у запланованому маршруті\?</string>
<string name="in_case_of_reverse_direction">Для зворотного напрямку</string> <string name="in_case_of_reverse_direction">Для зворотного напрямку</string>
<string name="shared_string_save_as_gpx">Зберегти як новий файл треку</string> <string name="shared_string_save_as_gpx">Зберегти як новий файл треку</string>
<string name="add_segment_to_the_track">Додати у файл треку</string> <string name="add_segment_to_the_track">Додати у файл треку</string>
@ -3903,12 +3903,12 @@
<string name="start_finish_icons">Піктограми початку та завершення</string> <string name="start_finish_icons">Піктограми початку та завершення</string>
<string name="contour_lines_thanks">Дякуємо за придбання «Горизонталей»</string> <string name="contour_lines_thanks">Дякуємо за придбання «Горизонталей»</string>
<string name="what_is_new">Що нового</string> <string name="what_is_new">Що нового</string>
<string name="osm_live_payment_desc_hw">Передплата стягується за вибраний період. Скасуйте її в AppGallery у будь-який час.</string> <string name="osm_live_payment_desc_hw">Передплата стягується раз на вибраний період. Скасуйте її в AppGallery у будь-який час.</string>
<string name="osm_live_payment_subscription_management_hw">Оплату буде стягнено з вашого рахунку AppGallery за підтвердження покупки. <string name="osm_live_payment_subscription_management_hw">З вашого рахунку AppGallery буде стягнено плату за підтвердження покупки.
\n \n
\nПередплата автоматично поновлюється, якщо її скасувати до дати поновлення. З вашого рахунку буде стягнено плату за період поновлення (місяць/три місяці/рік) лише на дату поновлення. \nПередплата автоматично поновлюється, якщо її не скасувати до дати поновлення. З вашого рахунку буде стягнено плату за період поновлення (місяць/три місяці/рік) лише на дату поновлення.
\n \n
\nВи можете керувати та скасовувати передплати, переходячи до налаштувань AppGallery.</string> \nВи можете керувати та скасовувати передплати у налаштуваннях AppGallery.</string>
<string name="use_live_routing">OsmAnd дані в реальному часі</string> <string name="use_live_routing">OsmAnd дані в реальному часі</string>
<string name="use_complex_routing">Комплексна маршрутизація</string> <string name="use_complex_routing">Комплексна маршрутизація</string>
<string name="complex_routing_descr">Двофазна маршрутизація для автомобільної навігації.</string> <string name="complex_routing_descr">Двофазна маршрутизація для автомобільної навігації.</string>
@ -3945,7 +3945,7 @@
<string name="mgrs_format_descr">OsmAnd використовує MGRS, який подібний формату UTM NATO.</string> <string name="mgrs_format_descr">OsmAnd використовує MGRS, який подібний формату UTM NATO.</string>
<string name="message_you_need_add_two_points_to_show_graphs">Додайте принаймні дві точки</string> <string name="message_you_need_add_two_points_to_show_graphs">Додайте принаймні дві точки</string>
<string name="manage_subscription">Керувати передплатою</string> <string name="manage_subscription">Керувати передплатою</string>
<string name="subscription_payment_issue_title">Виникла проблема з передплатою. Торкнітся кнопки, щоб перейти до налаштувань передплати у Google Play, щоб виправити спосіб оплати.</string> <string name="subscription_payment_issue_title">Торкніться кнопки, щоб налаштувати спосіб оплати в Google Play для виправлення передплати.</string>
<string name="subscription_expired_title">Термін дії передплати OsmAnd Live закінчився</string> <string name="subscription_expired_title">Термін дії передплати OsmAnd Live закінчився</string>
<string name="subscription_paused_title">Передплату OsmAnd Live зупинено</string> <string name="subscription_paused_title">Передплату OsmAnd Live зупинено</string>
<string name="subscription_on_hold_title">Передплата OsmAnd Live на утриманні</string> <string name="subscription_on_hold_title">Передплата OsmAnd Live на утриманні</string>

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

@ -3883,4 +3883,14 @@
<string name="poi_nurse">護理師</string> <string name="poi_nurse">護理師</string>
<string name="poi_mobile_money_agent">行動貨幣代理商</string> <string name="poi_mobile_money_agent">行動貨幣代理商</string>
<string name="poi_lifeguard_base">救生員基地</string> <string name="poi_lifeguard_base">救生員基地</string>
<string name="poi_vaccination_covid19">預防接種：COVID-19</string>
<string name="poi_health_specialty_vaccination_yes">預防接種</string>
<string name="poi_water_source_lake">湖</string>
<string name="poi_water_source_river">河流</string>
<string name="poi_water_source_well">井</string>
<string name="poi_water_source_powered_pump">動力幫浦</string>
<string name="poi_water_source_water_tank">水箱</string>
<string name="poi_water_source_tap">點擊</string>
<string name="poi_water_source_water_works">自來水廠</string>
<string name="poi_water_source_tube_well">管井</string>
</resources> </resources>

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

@ -1945,7 +1945,7 @@
<string name="access_autoannounce_period_descr">在通告之間的最短時間間隔。</string> <string name="access_autoannounce_period_descr">在通告之間的最短時間間隔。</string>
<string name="map_widget_bearing">相對方位</string> <string name="map_widget_bearing">相對方位</string>
<string name="map_widget_magnetic_bearing">磁力方位</string> <string name="map_widget_magnetic_bearing">磁力方位</string>
<string name="access_no_destination">目的地未設定</string> <string name="access_no_destination">無障礙外掛程式：未設定目的地</string>
<string name="use_osm_live_routing_description">為 OsmAnd Live 變更啟用導航。</string> <string name="use_osm_live_routing_description">為 OsmAnd Live 變更啟用導航。</string>
<string name="use_osm_live_routing">OsmAnd Live 導航</string> <string name="use_osm_live_routing">OsmAnd Live 導航</string>
<string name="follow_us">追蹤我們</string> <string name="follow_us">追蹤我們</string>
@ -2388,7 +2388,7 @@
<string name="srtm_menu_download_descr">下載「等高線」地圖以在此區域使用。</string> <string name="srtm_menu_download_descr">下載「等高線」地圖以在此區域使用。</string>
<string name="shared_string_plugin">外掛元件</string> <string name="shared_string_plugin">外掛元件</string>
<string name="srtm_purchase_header">購買並安裝「等高線」外掛程式以顯示垂直漸層區域。</string> <string name="srtm_purchase_header">購買並安裝「等高線」外掛程式以顯示垂直漸層區域。</string>
<string name="hillshade_menu_download_descr">下載「地形陰影覆蓋層」地圖以顯示垂直陰影。</string> <string name="hillshade_menu_download_descr">下載「地形陰影」覆蓋層地圖以顯示垂直陰影。</string>
<string name="hillshade_purchase_header">安裝「等高線」外掛程式以顯示漸層垂直區域。</string> <string name="hillshade_purchase_header">安裝「等高線」外掛程式以顯示漸層垂直區域。</string>
<string name="hide_from_zoom_level">自此縮放等級開始隱藏</string> <string name="hide_from_zoom_level">自此縮放等級開始隱藏</string>
<string name="sorted_by_distance">按距離排序</string> <string name="sorted_by_distance">按距離排序</string>
@ -3429,7 +3429,7 @@
<string name="search_offline_geo_error">無法解析地理含義「%s」。</string> <string name="search_offline_geo_error">無法解析地理含義「%s」。</string>
<string name="tracks_view_descr">您已紀錄的軌跡位於 %1$s，或是 OsmAnd 資料夾。</string> <string name="tracks_view_descr">您已紀錄的軌跡位於 %1$s，或是 OsmAnd 資料夾。</string>
<string name="multimedia_notes_view_descr">您的 OSM 註記位於 %1$s。</string> <string name="multimedia_notes_view_descr">您的 OSM 註記位於 %1$s。</string>
<string name="osm_edits_view_descr">您可以在 %1$s 中檢視您所有尚未上傳的編輯或 OSM 臭蟲。已上傳的點不會在 OsmAnd 中顯示。</string> <string name="osm_edits_view_descr">在 %1$s 中檢視您所有尚未上傳的編輯或 OSM 臭蟲。已上傳的更改將不會再顯示。</string>
<string name="permission_is_required">使用此選項需要權限。</string> <string name="permission_is_required">使用此選項需要權限。</string>
<string name="monitoring_min_speed_descr">這是一個低速過濾器，不記錄低於特定速度的點。在地圖上查看時，這可能會使記錄的軌跡看起來更平滑。</string> <string name="monitoring_min_speed_descr">這是一個低速過濾器，不記錄低於特定速度的點。在地圖上查看時，這可能會使記錄的軌跡看起來更平滑。</string>
<string name="monitoring_min_speed_descr_side_effect">副作用：您的軌跡將會遺失所有未達到最低速度標準的部份（例如，您將自行車推上陡峭的山坡）。此外，也將沒有其餘的資訊，如休息等。這會影響任何分析或後處理，例如試圖確定行程的總長度，運動時間或平均速度時。</string> <string name="monitoring_min_speed_descr_side_effect">副作用：您的軌跡將會遺失所有未達到最低速度標準的部份（例如，您將自行車推上陡峭的山坡）。此外，也將沒有其餘的資訊，如休息等。這會影響任何分析或後處理，例如試圖確定行程的總長度，運動時間或平均速度時。</string>
@ -3789,9 +3789,9 @@
<string name="lenght_limit_description">提供您的車輛長度，某些路徑限制可能適用於較長的車輛。</string> <string name="lenght_limit_description">提供您的車輛長度，某些路徑限制可能適用於較長的車輛。</string>
<string name="quick_action_remove_next_destination">刪除最近的目的地點</string> <string name="quick_action_remove_next_destination">刪除最近的目的地點</string>
<string name="please_provide_point_name_error">請提供點的名稱</string> <string name="please_provide_point_name_error">請提供點的名稱</string>
<string name="quick_action_remove_next_destination_descr">目前路徑上的目的地點將會被刪除。如果其將為目的地，導航就會停止。</string> <string name="quick_action_remove_next_destination_descr">刪除您路線上的下一個目的地。如果其為您最後的目的地，導航將會中止。</string>
<string name="search_download_wikipedia_maps">下載維基百科地圖</string> <string name="search_download_wikipedia_maps">下載維基百科地圖</string>
<string name="plugin_wikipedia_description">從維基百科取得關於興趣點的資訊。這是您的離線口袋指南 ── 只要開啟維基百科外掛程式並享受有關於您周圍景點的文章。</string> <string name="plugin_wikipedia_description">從維基百科取得關於興趣點的資訊，這是一份袖珍離線指南，其中包含了地點與目的地的文章。</string>
<string name="app_mode_enduro_motorcycle">耐力賽摩托車</string> <string name="app_mode_enduro_motorcycle">耐力賽摩托車</string>
<string name="app_mode_motor_scooter">小型摩托車</string> <string name="app_mode_motor_scooter">小型摩托車</string>
<string name="app_mode_wheelchair">輪椅</string> <string name="app_mode_wheelchair">輪椅</string>
@ -3944,7 +3944,7 @@
<string name="mgrs_format_descr">OsmAnd 使用 MGRS，其類似於 UTM NATO 格式。</string> <string name="mgrs_format_descr">OsmAnd 使用 MGRS，其類似於 UTM NATO 格式。</string>
<string name="message_you_need_add_two_points_to_show_graphs">新增至少兩個點</string> <string name="message_you_need_add_two_points_to_show_graphs">新增至少兩個點</string>
<string name="manage_subscription">管理訂閱</string> <string name="manage_subscription">管理訂閱</string>
<string name="subscription_payment_issue_title">您的訂閱似乎有點問題。點擊按鈕以跳到 Google Play 訂閱設定以修復您的付款方式。</string> <string name="subscription_payment_issue_title">點擊按鈕可在 Google Play 上設定付款方式來修復您的訂閱。</string>
<string name="subscription_expired_title">OsmAnd Live 訂閱已過期</string> <string name="subscription_expired_title">OsmAnd Live 訂閱已過期</string>
<string name="subscription_paused_title">OsmAnd Live 訂閱已暫停</string> <string name="subscription_paused_title">OsmAnd Live 訂閱已暫停</string>
<string name="subscription_on_hold_title">OsmAnd Live 訂閱已暫停</string> <string name="subscription_on_hold_title">OsmAnd Live 訂閱已暫停</string>
@ -4011,4 +4011,6 @@
\n • 支援自訂最愛與軌跡航點的顏色 \n • 支援自訂最愛與軌跡航點的顏色
\n \n
\n</string> \n</string>
<string name="profile_type_osmand_string">OsmAnd 設定檔</string>
<string name="profile_type_user_string">使用者設定檔</string>
</resources> </resources>

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

@ -17,6 +17,8 @@
• Added OAuth authentication method for OpenStreetMap, improved UI of OSM dialogs\n\n • Added OAuth authentication method for OpenStreetMap, improved UI of OSM dialogs\n\n
• Support custom colors for favorites and track waypoints\n\n • Support custom colors for favorites and track waypoints\n\n
</string> </string>
<string name="profile_type_user_string">User profile</string>
<string name="profile_type_osmand_string">OsmAnd profile</string>
<string name="plan_route_add_new_segment">Add a new segment</string> <string name="plan_route_add_new_segment">Add a new segment</string>
<string name="plan_route_split_after">Split after</string> <string name="plan_route_split_after">Split after</string>
<string name="plan_route_split_before">Split before</string> <string name="plan_route_split_before">Split before</string>
@ -60,14 +62,14 @@
<string name="subscription_on_hold_title">OsmAnd Live subscription is on hold</string> <string name="subscription_on_hold_title">OsmAnd Live subscription is on hold</string>
<string name="subscription_paused_title">OsmAnd Live subscription has been paused</string> <string name="subscription_paused_title">OsmAnd Live subscription has been paused</string>
<string name="subscription_expired_title">OsmAnd Live subscription has been expired</string> <string name="subscription_expired_title">OsmAnd Live subscription has been expired</string>
<string name="subscription_payment_issue_title">There is a problem with your subscription. Tap the button to go to the Google Play subscription settings to fix your payment method.</string> <string name="subscription_payment_issue_title">Tap the button to set up a payment method on Google Play to fix your subscription.</string>
<string name="manage_subscription">Manage subscription</string> <string name="manage_subscription">Manage subscription</string>
<string name="user_login">Login</string> <string name="user_login">Login</string>
<string name="user_password">Password</string> <string name="user_password">Password</string>
<string name="login_account">Account</string> <string name="login_account">Account</string>
<string name="use_login_password">Use login and password</string> <string name="use_login_password">Use login and password</string>
<string name="open_street_map_login_mode">You need to login to upload new or modified changes. \n\nYou can log in using the safe OAuth method or use your login and password.</string> <string name="open_street_map_login_mode">You need to login to upload new or modified changes. \n\nYou can log in using the safe OAuth method or use your login and password.</string>
<string name="osm_edits_view_descr">You can view all your not yet uploaded edits or OSM bugs in %1$s. Uploaded points don’t show in OsmAnd.</string> <string name="osm_edits_view_descr">View all your not yet uploaded edits or OSM bugs in %1$s. Already uploaded changes will not show up any more.</string>
<string name="sign_in_with_open_street_map">Sign in with OpenStreetMap</string> <string name="sign_in_with_open_street_map">Sign in with OpenStreetMap</string>
<string name="login_open_street_map_org">Login to OpenStreetMap.org</string> <string name="login_open_street_map_org">Login to OpenStreetMap.org</string>
<string name="login_open_street_map">Login to OpenStreetMap</string> <string name="login_open_street_map">Login to OpenStreetMap</string>
@ -102,8 +104,8 @@
<string name="development">Development</string> <string name="development">Development</string>
<string name="routing_attr_avoid_footways_name">Avoid footways</string> <string name="routing_attr_avoid_footways_name">Avoid footways</string>
<string name="routing_attr_avoid_footways_description">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">Your AppGallery account is charged upon purchase confirmation.\n\nThe subscription prolongates automatically unless canceled before the renewal date. Your account will be charged for the renewal period (month/three months/year) only on the renewal date.\n\nYou can manage and cancel your subscriptions in 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="osm_live_payment_desc_hw">The subscription is charged per the period selected. Cancel it in your AppGallery at any time.</string>
<string name="contour_lines_thanks">Thank you for purchasing \'Contour lines\'</string> <string name="contour_lines_thanks">Thank you for purchasing \'Contour lines\'</string>
<string name="start_finish_icons">Start and finish icons</string> <string name="start_finish_icons">Start and finish icons</string>
<string name="sort_name_ascending">Name: A – Z</string> <string name="sort_name_ascending">Name: A – Z</string>
@ -132,7 +134,7 @@
<string name="gpx_monitoring_start">Resume trip recording</string> <string name="gpx_monitoring_start">Resume trip recording</string>
<string name="gpx_monitoring_stop">Pause trip recording</string> <string name="gpx_monitoring_stop">Pause trip recording</string>
<string name="save_global_track_interval_descr">Specify the logging interval for the general track recording (turned on via the \'Trip recording\' widget on the map).</string> <string name="save_global_track_interval_descr">Specify the logging interval for the general track recording (turned on via the \'Trip recording\' widget on the map).</string>
<string name="disable_recording_once_app_killed_descrp">Will pause track logging when the app is killed (via recent apps). (OsmAnd background indication disappears from the Android notification bar.)</string> <string name="disable_recording_once_app_killed_descrp">Track logging will pause when the app is killed (via recent apps). (The OsmAnd background indication disappears from the Android notification bar.)</string>
<string name="monitoring_control_start">REC</string> <string name="monitoring_control_start">REC</string>
<string name="number_of_gpx_files_selected_pattern">%s track files selected</string> <string name="number_of_gpx_files_selected_pattern">%s track files selected</string>
<string name="shared_string_file_name">Filename</string> <string name="shared_string_file_name">Filename</string>
@ -168,7 +170,7 @@
<string name="add_segment_to_the_track">Add to a track file</string> <string name="add_segment_to_the_track">Add to a track file</string>
<string name="shared_string_save_as_gpx">Save as new track file</string> <string name="shared_string_save_as_gpx">Save as new track file</string>
<string name="in_case_of_reverse_direction">In case of reverse direction</string> <string name="in_case_of_reverse_direction">In case of reverse direction</string>
<string name="plan_route_exit_dialog_descr">Are you sure you want discard all changes in the planned route by closing it?</string> <string name="plan_route_exit_dialog_descr">Are you sure you want to discard all changes in the planned route?</string>
<string name="street_level_imagery">Street-level imagery</string> <string name="street_level_imagery">Street-level imagery</string>
<string name="route_between_points_add_track_desc">Select a track file to add the new segment to.</string> <string name="route_between_points_add_track_desc">Select a track file to add the new segment to.</string>
<string name="navigation_profile">Navigation profile</string> <string name="navigation_profile">Navigation profile</string>
@ -206,9 +208,9 @@
<string name="app_mode_motor_scooter">Motor scooter</string> <string name="app_mode_motor_scooter">Motor scooter</string>
<string name="app_mode_enduro_motorcycle">Enduro motorcycle</string> <string name="app_mode_enduro_motorcycle">Enduro motorcycle</string>
<string name="add_hidden_group_info">The added point will not be visible on the map, since the selected group is hidden, you can find it in \"%s\".</string> <string name="add_hidden_group_info">The added point will not be visible on the map, since the selected group is hidden, you can find it in \"%s\".</string>
<string name="plugin_wikipedia_description">Get info about points of interest from Wikipedia. It is your pocket offline guide - just turn on the Wikipedia plugin and enjoy articles about objects around you.</string> <string name="plugin_wikipedia_description">Get info about points of interest from Wikipedia, a pocket offline guide featuring articles about places and destinations.</string>
<string name="search_download_wikipedia_maps">Download Wikipedia maps</string> <string name="search_download_wikipedia_maps">Download Wikipedia maps</string>
<string name="quick_action_remove_next_destination_descr">The current destination point on the route will be deleted. If it will be the Destination, navigation will stop.</string> <string name="quick_action_remove_next_destination_descr">Deletes the next destination on your route. If that is the final destination, the navigation will stop.</string>
<string name="please_provide_point_name_error">Please provide a name for the point</string> <string name="please_provide_point_name_error">Please provide a name for the point</string>
<string name="use_volume_buttons_as_zoom">Volume buttons as zoom</string> <string name="use_volume_buttons_as_zoom">Volume buttons as zoom</string>
<string name="use_volume_buttons_as_zoom_descr">Control the map-zoom level using the volume buttons on the device.</string> <string name="use_volume_buttons_as_zoom_descr">Control the map-zoom level using the volume buttons on the device.</string>
@ -427,7 +429,7 @@
<string name="shared_string_transparency">Transparency</string> <string name="shared_string_transparency">Transparency</string>
<string name="slope_read_more">You can read more about Slopes in %1$s.</string> <string name="slope_read_more">You can read more about Slopes in %1$s.</string>
<string name="slope_download_description">Additional maps are needed to view Slopes on the map.</string> <string name="slope_download_description">Additional maps are needed to view Slopes on the map.</string>
<string name="hillshade_download_description">Additional maps are needed to view Hillshade on the map.</string> <string name="hillshade_download_description">Additional maps are needed to view hillshade on the map.</string>
<string name="terrain_slider_description">Set the minimum and maximum zoom levels at which the layer will be displayed.</string> <string name="terrain_slider_description">Set the minimum and maximum zoom levels at which the layer will be displayed.</string>
<string name="slope_description">Slope uses colors to visualize terrain steepness.</string> <string name="slope_description">Slope uses colors to visualize terrain steepness.</string>
<string name="hillshade_description">Hillshade map using dark shades to show slopes, peaks and lowlands.</string> <string name="hillshade_description">Hillshade map using dark shades to show slopes, peaks and lowlands.</string>
@ -1138,7 +1140,7 @@
<string name="wikivoyage_offline">Wikivoyage offline</string> <string name="wikivoyage_offline">Wikivoyage offline</string>
<string name="unlimited_downloads">Unlimited downloads</string> <string name="unlimited_downloads">Unlimited downloads</string>
<string name="wikipedia_offline">Wikipedia offline</string> <string name="wikipedia_offline">Wikipedia offline</string>
<string name="contour_lines_hillshade_maps">Contour lines &amp; Hillshade maps</string> <string name="contour_lines_hillshade_maps">Contour lines &amp; hillshade maps</string>
<string name="unlock_all_features">Unlock all OsmAnd features</string> <string name="unlock_all_features">Unlock all OsmAnd features</string>
<string name="purchase_dialog_title">Choose plan</string> <string name="purchase_dialog_title">Choose plan</string>
<string name="purchase_dialog_travel_description">Purchase one of the following to receive the offline travel guide functionality:</string> <string name="purchase_dialog_travel_description">Purchase one of the following to receive the offline travel guide functionality:</string>
@ -1416,7 +1418,7 @@
<string name="quick_action_showhide_osmbugs_descr">Button to show or hide OSM notes on the map.</string> <string name="quick_action_showhide_osmbugs_descr">Button to show or hide OSM notes on the map.</string>
<string name="sorted_by_distance">Sorted by distance</string> <string name="sorted_by_distance">Sorted by distance</string>
<string name="search_favorites">Search in Favorites</string> <string name="search_favorites">Search in Favorites</string>
<string name="hillshade_menu_download_descr">Download the \'Hillshade Overlay\' map to show vertical shading.</string> <string name="hillshade_menu_download_descr">Download the \'Hillshade\' overlay map to show vertical shading.</string>
<string name="hillshade_purchase_header">Install the \'Contour lines\' plugin to show graded vertical areas.</string> <string name="hillshade_purchase_header">Install the \'Contour lines\' plugin to show graded vertical areas.</string>
<string name="hide_from_zoom_level">Hide starting from zoom level</string> <string name="hide_from_zoom_level">Hide starting from zoom level</string>
<string name="srtm_menu_download_descr">Download the \'Contour line\' map for use in this region.</string> <string name="srtm_menu_download_descr">Download the \'Contour line\' map for use in this region.</string>
@ -1696,7 +1698,7 @@
<string name="access_direction_haptic_feedback_descr">Indicate target point direction by vibration.</string> <string name="access_direction_haptic_feedback_descr">Indicate target point direction by vibration.</string>
<string name="use_osm_live_routing_description">Enable navigation for OsmAnd Live changes.</string> <string name="use_osm_live_routing_description">Enable navigation for OsmAnd Live changes.</string>
<string name="use_osm_live_routing">OsmAnd Live navigation</string> <string name="use_osm_live_routing">OsmAnd Live navigation</string>
<string name="access_no_destination">Destination not set</string> <string name="access_no_destination">Accessibility plugin: No destination set</string>
<string name="map_widget_magnetic_bearing">Magnetic bearing</string> <string name="map_widget_magnetic_bearing">Magnetic bearing</string>
<string name="map_widget_bearing">Relative bearing</string> <string name="map_widget_bearing">Relative bearing</string>
<string name="access_disable_offroute_recalc">No route recalculation after leaving it</string> <string name="access_disable_offroute_recalc">No route recalculation after leaving it</string>

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

@ -67,6 +67,7 @@ import net.osmand.plus.voice.MediaCommandPlayerImpl;
import net.osmand.plus.voice.TTSCommandPlayerImpl; import net.osmand.plus.voice.TTSCommandPlayerImpl;
import net.osmand.plus.wikivoyage.data.TravelDbHelper; import net.osmand.plus.wikivoyage.data.TravelDbHelper;
import net.osmand.plus.wikivoyage.data.TravelHelper; import net.osmand.plus.wikivoyage.data.TravelHelper;
import net.osmand.plus.wikivoyage.data.TravelObfHelper;
import net.osmand.render.RenderingRulesStorage; import net.osmand.render.RenderingRulesStorage;
import net.osmand.router.RoutingConfiguration; import net.osmand.router.RoutingConfiguration;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
@ -459,7 +460,7 @@ public class AppInitializer implements IProgress {
app.mapViewTrackingUtilities = startupInit(new MapViewTrackingUtilities(app), MapViewTrackingUtilities.class); app.mapViewTrackingUtilities = startupInit(new MapViewTrackingUtilities(app), MapViewTrackingUtilities.class);
// TODOTRAVEL_OBF_HELPER check ResourceManager and use TravelObfHelper // TODOTRAVEL_OBF_HELPER check ResourceManager and use TravelObfHelper
app.travelHelper = new TravelDbHelper(app); app.travelHelper = !TravelDbHelper.checkIfDbFileExists(app) ? new TravelObfHelper(app) : new TravelDbHelper(app);
app.travelHelper.initializeDataOnAppStartup(); app.travelHelper.initializeDataOnAppStartup();
app.travelHelper = startupInit(app.travelHelper, TravelHelper.class); app.travelHelper = startupInit(app.travelHelper, TravelHelper.class);

103
OsmAnd/src/net/osmand/plus/SimplePopUpMenuItemAdapter.java
View file

@ -1,103 +0,0 @@
package net.osmand.plus;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import net.osmand.AndroidUtils;
import static net.osmand.plus.SimplePopUpMenuItemAdapter.SimplePopUpMenuItem;
import java.util.List;
public class SimplePopUpMenuItemAdapter
extends ArrayAdapter<SimplePopUpMenuItem> {
private List<SimplePopUpMenuItem> items;
public SimplePopUpMenuItemAdapter(@NonNull Context context, int resource,
List<SimplePopUpMenuItem> items) {
super(context, resource);
this.items = items;
}
@Override
public int getCount() {
return items.size();
}
@NonNull
@Override
public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
LayoutInflater inflater = LayoutInflater.from(getContext());
if (convertView == null) {
convertView = inflater.inflate(R.layout.popup_menu_item, parent, false);
}
SimplePopUpMenuItem item = getItem(position);
if (item != null) {
TextView tvTitle = convertView.findViewById(R.id.title);
tvTitle.setText(item.title);
ImageView ivIcon = convertView.findViewById(R.id.icon);
Drawable icon = item.icon;
if (icon != null) {
ivIcon.setImageDrawable(icon);
} else {
ivIcon.setVisibility(View.GONE);
}
if (item.selected) {
convertView.setBackgroundColor(UiUtilities.getColorWithAlpha(
AndroidUtils.getColorFromAttr(getContext(), R.attr.active_color_basic), 0.1f));
}
}
return convertView;
}
@Nullable
@Override
public SimplePopUpMenuItem getItem(int position) {
return items.get(position);
}
public static class SimplePopUpMenuItem {
private CharSequence title;
private Drawable icon;
private View.OnClickListener onClickListener;
boolean selected;
public SimplePopUpMenuItem(CharSequence title, Drawable icon) {
this.title = title;
this.icon = icon;
}
public SimplePopUpMenuItem(CharSequence title, Drawable icon, View.OnClickListener onClickListener) {
this(title, icon);
this.onClickListener = onClickListener;
}
public SimplePopUpMenuItem(CharSequence title, Drawable icon, View.OnClickListener onClickListener,
boolean selected) {
this(title, icon, onClickListener);
this.selected = selected;
}
public CharSequence getTitle() {
return title;
}
public Drawable getIcon() {
return icon;
}
public View.OnClickListener getOnClickListener() {
return onClickListener;
}
}
}

62
OsmAnd/src/net/osmand/plus/UiUtilities.java
View file

@ -21,7 +21,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewParent; import android.view.ViewParent;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
@ -34,7 +33,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import androidx.appcompat.content.res.AppCompatResources; import androidx.appcompat.content.res.AppCompatResources;
import androidx.appcompat.view.ContextThemeWrapper; import androidx.appcompat.view.ContextThemeWrapper;
import androidx.appcompat.widget.ListPopupWindow;
import androidx.appcompat.widget.SwitchCompat; import androidx.appcompat.widget.SwitchCompat;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
@ -60,13 +58,8 @@ import net.osmand.plus.widgets.style.CustomTypefaceSpan;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import java.util.ArrayList;
import java.util.List;
import gnu.trove.map.hash.TLongObjectHashMap; import gnu.trove.map.hash.TLongObjectHashMap;
import static net.osmand.plus.SimplePopUpMenuItemAdapter.SimplePopUpMenuItem;
public class UiUtilities { public class UiUtilities {
private static final Log LOG = PlatformUtil.getLog(UiUtilities.class); private static final Log LOG = PlatformUtil.getLog(UiUtilities.class);
@ -768,59 +761,4 @@ public class UiUtilities {
} }
return spannable; return spannable;
} }
public static ListPopupWindow createListPopupWindow(Context themedCtx,
View v, int minWidth,
List<SimplePopUpMenuItem> items,
final AdapterView.OnItemClickListener listener) {
int contentPadding = themedCtx.getResources().getDimensionPixelSize(R.dimen.content_padding);
int contentPaddingHalf = themedCtx.getResources().getDimensionPixelSize(R.dimen.content_padding_half);
int defaultListTextSize = themedCtx.getResources().getDimensionPixelSize(R.dimen.default_list_text_size);
int standardIconSize = themedCtx.getResources().getDimensionPixelSize(R.dimen.standard_icon_size);
boolean hasIcon = false;
List<String> titles = new ArrayList<>();
for (SimplePopUpMenuItem item : items) {
titles.add(String.valueOf(item.getTitle()));
hasIcon = hasIcon || item.getIcon() != null;
}
float itemWidth = AndroidUtils.getTextMaxWidth(defaultListTextSize, titles) + contentPadding * 2;
float iconPartWidth = hasIcon ? standardIconSize + contentPaddingHalf : 0;
int totalWidth = (int) (Math.max(itemWidth, minWidth) + iconPartWidth);
SimplePopUpMenuItemAdapter adapter =
new SimplePopUpMenuItemAdapter(themedCtx, R.layout.popup_menu_item, items);
final ListPopupWindow listPopupWindow = new ListPopupWindow(themedCtx);
listPopupWindow.setAnchorView(v);
listPopupWindow.setContentWidth((int) (totalWidth));
listPopupWindow.setDropDownGravity(Gravity.END | Gravity.TOP);
listPopupWindow.setVerticalOffset(-v.getHeight() + contentPaddingHalf);
listPopupWindow.setModal(true);
listPopupWindow.setAdapter(adapter);
listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (listener != null) {
listener.onItemClick(parent, view, position, id);
}
listPopupWindow.dismiss();
}
});
return listPopupWindow;
}
public static void showPopUpMenu(View v, final List<SimplePopUpMenuItemAdapter.SimplePopUpMenuItem> items) {
UiUtilities.createListPopupWindow(
v.getContext(), v, v.getWidth(), items, new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (position < items.size()) {
View.OnClickListener listener = items.get(position).getOnClickListener();
if (listener != null) {
listener.onClick(view);
}
}
}
}).show();
}
} }

8
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -740,9 +740,9 @@ public class MapActivityActions implements DialogProvider {
Map<String, RoutingProfileDataObject> profilesObjects = getRoutingProfiles(app); Map<String, RoutingProfileDataObject> profilesObjects = getRoutingProfiles(app);
for (final ApplicationMode appMode : activeModes) { for (final ApplicationMode appMode : activeModes) {
if (appMode.isCustomProfile()) { if (appMode.isCustomProfile()) {
modeDescription = getProfileDescription(app, appMode, profilesObjects, getString(R.string.profile_type_custom_string)); modeDescription = getProfileDescription(app, appMode, profilesObjects, getString(R.string.profile_type_user_string));
} else { } else {
modeDescription = getProfileDescription(app, appMode, profilesObjects, getString(R.string.profile_type_base_string)); modeDescription = getProfileDescription(app, appMode, profilesObjects, getString(R.string.profile_type_osmand_string));
} }
int tag = currentMode.equals(appMode) ? PROFILES_CHOSEN_PROFILE_TAG : PROFILES_NORMAL_PROFILE_TAG; int tag = currentMode.equals(appMode) ? PROFILES_CHOSEN_PROFILE_TAG : PROFILES_NORMAL_PROFILE_TAG;
@ -1048,9 +1048,9 @@ public class MapActivityActions implements DialogProvider {
String modeDescription; String modeDescription;
Map<String, RoutingProfileDataObject> profilesObjects = getRoutingProfiles(app); Map<String, RoutingProfileDataObject> profilesObjects = getRoutingProfiles(app);
if (currentMode.isCustomProfile()) { if (currentMode.isCustomProfile()) {
modeDescription = getProfileDescription(app, currentMode, profilesObjects, getString(R.string.profile_type_custom_string)); modeDescription = getProfileDescription(app, currentMode, profilesObjects, getString(R.string.profile_type_user_string));
} else { } else {
modeDescription = getProfileDescription(app, currentMode, profilesObjects, getString(R.string.profile_type_base_string)); modeDescription = getProfileDescription(app, currentMode, profilesObjects, getString(R.string.profile_type_osmand_string));
} }
int icArrowResId = listExpanded ? R.drawable.ic_action_arrow_drop_up : R.drawable.ic_action_arrow_drop_down; int icArrowResId = listExpanded ? R.drawable.ic_action_arrow_drop_up : R.drawable.ic_action_arrow_drop_down;

11
OsmAnd/src/net/osmand/plus/importfiles/SettingsImportTask.java
View file

@ -13,8 +13,10 @@ import net.osmand.FileUtils;
import net.osmand.IndexConstants; import net.osmand.IndexConstants;
import net.osmand.plus.AppInitializer; import net.osmand.plus.AppInitializer;
import net.osmand.plus.CustomOsmandPlugin; import net.osmand.plus.CustomOsmandPlugin;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
import net.osmand.plus.base.BaseLoadAsyncTask; import net.osmand.plus.base.BaseLoadAsyncTask;
import net.osmand.plus.settings.backend.ExportSettingsType; import net.osmand.plus.settings.backend.ExportSettingsType;
import net.osmand.plus.settings.backend.backup.PluginSettingsItem; import net.osmand.plus.settings.backend.backup.PluginSettingsItem;
@ -138,6 +140,10 @@ class SettingsImportTask extends BaseLoadAsyncTask<Void, Void, String> {
app.getPoiFilters().loadSelectedPoiFilters(); app.getPoiFilters().loadSelectedPoiFilters();
AppInitializer.loadRoutingFiles(app, null); AppInitializer.loadRoutingFiles(app, null);
FragmentActivity activity = activityRef.get(); FragmentActivity activity = activityRef.get();
AudioVideoNotesPlugin plugin = OsmandPlugin.getPlugin(AudioVideoNotesPlugin.class);
if (plugin != null) {
plugin.indexingFiles(null, true, true);
}
if (activity instanceof MapActivity) { if (activity instanceof MapActivity) {
((MapActivity) activity).getMapLayers().getMapWidgetRegistry().updateVisibleWidgets(); ((MapActivity) activity).getMapLayers().getMapWidgetRegistry().updateVisibleWidgets();
((MapActivity) activity).updateApplicationModeSettings(); ((MapActivity) activity).updateApplicationModeSettings();
@ -151,6 +157,7 @@ class SettingsImportTask extends BaseLoadAsyncTask<Void, Void, String> {
}; };
} }
private void handlePluginImport(final PluginSettingsItem pluginItem, final File file) { private void handlePluginImport(final PluginSettingsItem pluginItem, final File file) {
FragmentActivity activity = activityRef.get(); FragmentActivity activity = activityRef.get();
final ProgressDialog progress; final ProgressDialog progress;
@ -172,6 +179,10 @@ class SettingsImportTask extends BaseLoadAsyncTask<Void, Void, String> {
if (progress != null && AndroidUtils.isActivityNotDestroyed(activity)) { if (progress != null && AndroidUtils.isActivityNotDestroyed(activity)) {
progress.dismiss(); progress.dismiss();
} }
AudioVideoNotesPlugin pluginAudioVideo = OsmandPlugin.getPlugin(AudioVideoNotesPlugin.class);
if (pluginAudioVideo != null) {
pluginAudioVideo.indexingFiles(null, true, true);
}
CustomOsmandPlugin plugin = pluginItem.getPlugin(); CustomOsmandPlugin plugin = pluginItem.getPlugin();
plugin.loadResources(); plugin.loadResources();

60
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java
View file

@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.graphics.PointF; import android.graphics.PointF;
import android.graphics.drawable.Drawable;
import android.util.Pair; import android.util.Pair;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@ -47,6 +48,8 @@ import net.osmand.plus.helpers.GpxUiHelper.OrderedLineDataSet;
import net.osmand.plus.views.layers.GPXLayer; import net.osmand.plus.views.layers.GPXLayer;
import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory; import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController; import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
import net.osmand.plus.widgets.popup.PopUpMenuHelper;
import net.osmand.plus.widgets.popup.PopUpMenuItem;
import net.osmand.util.MapUtils; import net.osmand.util.MapUtils;
import java.util.ArrayList; import java.util.ArrayList;
@ -54,8 +57,6 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import static net.osmand.plus.SimplePopUpMenuItemAdapter.SimplePopUpMenuItem;
public class TrackDetailsMenu { public class TrackDetailsMenu {
private static final int MAX_DISTANCE_LOCATION_PROJECTION = 20; // in meters private static final int MAX_DISTANCE_LOCATION_PROJECTION = 20; // in meters
@ -773,22 +774,26 @@ public class TrackDetailsMenu {
yAxis.setOnClickListener(new View.OnClickListener() { yAxis.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Context themedContext = UiUtilities.getThemedContext(v.getContext(), nightMode); List<PopUpMenuItem> items = new ArrayList<>();
List<SimplePopUpMenuItem> items = new ArrayList<>();
for (GPXDataSetType[] types : availableTypes) { for (GPXDataSetType[] types : availableTypes) {
items.add(new SimplePopUpMenuItem( String title = GPXDataSetType.getName(app, types);
GPXDataSetType.getName(app, types), Drawable icon = GPXDataSetType.getImageDrawable(app, types);
GPXDataSetType.getImageDrawable(app, types))); items.add(new PopUpMenuItem.Builder(app)
.setTitle(title)
.setIcon(icon)
.create());
} }
UiUtilities.createListPopupWindow( AdapterView.OnItemClickListener listener = new AdapterView.OnItemClickListener() {
themedContext, v, v.getWidth(), items, new AdapterView.OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
GpxDisplayItem gpxItem = getGpxItem(); GpxDisplayItem gpxItem = getGpxItem();
gpxItem.chartTypes = availableTypes.get(position); gpxItem.chartTypes = availableTypes.get(position);
update(); update();
} }
}).show(); };
new PopUpMenuHelper.Builder(v, items, nightMode)
.setListener(listener)
.show();
} }
}); });
yAxisArrow.setVisibility(View.VISIBLE); yAxisArrow.setVisibility(View.VISIBLE);
@ -816,25 +821,26 @@ public class TrackDetailsMenu {
xAxis.setOnClickListener(new View.OnClickListener() { xAxis.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Context themedContext = UiUtilities.getThemedContext(v.getContext(), nightMode); List<PopUpMenuItem> items = new ArrayList<>();
List<SimplePopUpMenuItem> items = new ArrayList<>();
for (GPXDataSetAxisType type : GPXDataSetAxisType.values()) { for (GPXDataSetAxisType type : GPXDataSetAxisType.values()) {
items.add(new SimplePopUpMenuItem( items.add(new PopUpMenuItem.Builder(app)
app.getString(type.getStringId()), type.getImageDrawable(app))); .setTitleId(type.getStringId())
.setIcon(type.getImageDrawable(app))
.create());
} }
UiUtilities.createListPopupWindow(themedContext, new PopUpMenuHelper.Builder(v, items, nightMode)
v, v.getWidth(), items, new AdapterView.OnItemClickListener() { .setListener(new AdapterView.OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
GpxDisplayItem gpxItem = getGpxItem(); GpxDisplayItem gpxItem = getGpxItem();
if (gpxItem != null) { if (gpxItem != null) {
gpxItem.chartAxisType = GPXDataSetAxisType.values()[position]; gpxItem.chartAxisType = GPXDataSetAxisType.values()[position];
gpxItem.chartHighlightPos = -1; gpxItem.chartHighlightPos = -1;
gpxItem.chartMatrix = null; gpxItem.chartMatrix = null;
update(); update();
} }
} }
}).show(); }).show();
} }
}); });
xAxisArrow.setVisibility(View.VISIBLE); xAxisArrow.setVisibility(View.VISIBLE);

16
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
View file

@ -385,6 +385,22 @@ public class MeasurementEditingContext {
return allSegments.size() > 0 ? allSegments : null; return allSegments.size() > 0 ? allSegments : null;
} }
public void recalculateRouteSegmentsForAppMode() {
clearRouteSegmentsByAppMode();
updateSegmentsForSnap();
}
public void clearRouteSegmentsByAppMode() {
for (Pair<WptPt, WptPt> key : getOrderedRoadSegmentDataKeys()) {
if(key.first.getProfileType().equals(appMode.getStringKey())) {
RoadSegmentData data = roadSegmentData.get(key);
if (data != null) {
roadSegmentData.remove(key);
}
}
}
}
void splitSegments(int position) { void splitSegments(int position) {
List<WptPt> points = new ArrayList<>(); List<WptPt> points = new ArrayList<>();
points.addAll(before.points); points.addAll(before.points);

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

@ -71,6 +71,7 @@ import net.osmand.plus.measurementtool.command.RemovePointCommand;
import net.osmand.plus.measurementtool.command.ReorderPointCommand; import net.osmand.plus.measurementtool.command.ReorderPointCommand;
import net.osmand.plus.measurementtool.command.ReversePointsCommand; import net.osmand.plus.measurementtool.command.ReversePointsCommand;
import net.osmand.plus.routepreparationmenu.RouteOptionsBottomSheet; import net.osmand.plus.routepreparationmenu.RouteOptionsBottomSheet;
import net.osmand.plus.routepreparationmenu.RouteOptionsBottomSheet.DialogMode;
import net.osmand.plus.measurementtool.command.SplitPointsCommand; import net.osmand.plus.measurementtool.command.SplitPointsCommand;
import net.osmand.plus.routepreparationmenu.cards.BaseCard; import net.osmand.plus.routepreparationmenu.cards.BaseCard;
import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.ApplicationMode;
@ -107,7 +108,8 @@ import static net.osmand.plus.measurementtool.command.ClearPointsCommand.ClearCo
public class MeasurementToolFragment extends BaseOsmAndFragment implements RouteBetweenPointsFragmentListener, public class MeasurementToolFragment extends BaseOsmAndFragment implements RouteBetweenPointsFragmentListener,
OptionsFragmentListener, GpxApproximationFragmentListener, SelectedPointFragmentListener, OptionsFragmentListener, GpxApproximationFragmentListener, SelectedPointFragmentListener,
SaveAsNewTrackFragmentListener, MapControlsLayer.MapControlsThemeInfoProvider { SaveAsNewTrackFragmentListener, MapControlsLayer.MapControlsThemeInfoProvider,
RouteOptionsBottomSheet.OnAppModeConfiguredCallback{
public static final String TAG = MeasurementToolFragment.class.getSimpleName(); public static final String TAG = MeasurementToolFragment.class.getSimpleName();
public static final String TAPS_DISABLED_KEY = "taps_disabled_key"; public static final String TAPS_DISABLED_KEY = "taps_disabled_key";
@ -131,6 +133,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
private ImageView redoBtn; private ImageView redoBtn;
private ImageView mainIcon; private ImageView mainIcon;
private String fileName; private String fileName;
private OnBackPressedCallback onBackPressedCallback;
private InfoType currentInfoType; private InfoType currentInfoType;
@ -218,11 +221,12 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
requireMyActivity().getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) { onBackPressedCallback = new OnBackPressedCallback(true) {
public void handleOnBackPressed() { public void handleOnBackPressed() {
quit(true); quit(true);
} }
}); };
requireMyActivity().getOnBackPressedDispatcher().addCallback(this, onBackPressedCallback);
} }
@Nullable @Nullable
@ -531,7 +535,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
configBtn.setOnClickListener(new OnClickListener() { configBtn.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
RouteOptionsBottomSheet.showInstance(mapActivity.getSupportFragmentManager(), RouteOptionsBottomSheet.showInstance(
mapActivity, MeasurementToolFragment.this, DialogMode.PLAN_ROUTE,
editingCtx.getAppMode().getStringKey()); editingCtx.getAppMode().getStringKey());
} }
}); });
@ -551,6 +556,10 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
return view; return view;
} }
public OnBackPressedCallback getOnBackPressedCallback() {
return onBackPressedCallback;
}
private OnRadioItemClickListener getInfoTypeBtnListener(@NonNull final InfoType type) { private OnRadioItemClickListener getInfoTypeBtnListener(@NonNull final InfoType type) {
return new OnRadioItemClickListener() { return new OnRadioItemClickListener() {
@Override @Override
@ -687,6 +696,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
super.onResume(); super.onResume();
MapActivity mapActivity = getMapActivity(); MapActivity mapActivity = getMapActivity();
if (mapActivity != null) { if (mapActivity != null) {
onBackPressedCallback.setEnabled(true);
detailsMenu.setMapActivity(mapActivity); detailsMenu.setMapActivity(mapActivity);
mapActivity.getMapLayers().getMapControlsLayer().addThemeInfoProviderTag(TAG); mapActivity.getMapLayers().getMapControlsLayer().addThemeInfoProviderTag(TAG);
mapActivity.getMapLayers().getMapControlsLayer().showMapControlsIfHidden(); mapActivity.getMapLayers().getMapControlsLayer().showMapControlsIfHidden();
@ -1091,6 +1101,12 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
updateDistancePointsText(); updateDistancePointsText();
} }
@Override
public void onAppModeConfigured() {
editingCtx.recalculateRouteSegmentsForAppMode();
updateDistancePointsText();
}
@Override @Override
public void onChangeRouteTypeBefore() { public void onChangeRouteTypeBefore() {
MapActivity mapActivity = getMapActivity(); MapActivity mapActivity = getMapActivity();

22
OsmAnd/src/net/osmand/plus/measurementtool/SelectFileBottomSheet.java
View file

@ -20,7 +20,6 @@ import net.osmand.IndexConstants;
import net.osmand.OsmAndCollator; import net.osmand.OsmAndCollator;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.base.MenuBottomSheetDialogFragment; import net.osmand.plus.base.MenuBottomSheetDialogFragment;
import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
import net.osmand.plus.helpers.GpxTrackAdapter; import net.osmand.plus.helpers.GpxTrackAdapter;
@ -30,6 +29,8 @@ import net.osmand.plus.helpers.enums.TracksSortByMode;
import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter; import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter;
import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter.HorizontalSelectionAdapterListener; import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter.HorizontalSelectionAdapterListener;
import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter.HorizontalSelectionItem; import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter.HorizontalSelectionItem;
import net.osmand.plus.widgets.popup.PopUpMenuHelper;
import net.osmand.plus.widgets.popup.PopUpMenuItem;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@ -39,7 +40,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static net.osmand.plus.SimplePopUpMenuItemAdapter.SimplePopUpMenuItem;
import static net.osmand.plus.helpers.GpxUiHelper.getSortedGPXFilesInfo; import static net.osmand.plus.helpers.GpxUiHelper.getSortedGPXFilesInfo;
import static net.osmand.util.Algorithms.collectDirs; import static net.osmand.util.Algorithms.collectDirs;
@ -118,12 +118,12 @@ public class SelectFileBottomSheet extends MenuBottomSheetDialogFragment {
sortButton.setOnClickListener(new View.OnClickListener() { sortButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
final List<SimplePopUpMenuItem> items = new ArrayList<>(); final List<PopUpMenuItem> items = new ArrayList<>();
for (final TracksSortByMode mode : TracksSortByMode.values()) { for (final TracksSortByMode mode : TracksSortByMode.values()) {
items.add(new SimplePopUpMenuItem( items.add(new PopUpMenuItem.Builder(app)
getString(mode.getNameId()), .setTitleId(mode.getNameId())
app.getUIUtilities().getThemedIcon(mode.getIconId()), .setIcon(app.getUIUtilities().getThemedIcon(mode.getIconId()))
new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
sortByMode = mode; sortByMode = mode;
@ -135,10 +135,12 @@ public class SelectFileBottomSheet extends MenuBottomSheetDialogFragment {
sortFileList(); sortFileList();
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
} }
}, sortByMode == mode })
)); .setSelected(sortByMode == mode)
.create());
} }
UiUtilities.showPopUpMenu(v, items); new PopUpMenuHelper.Builder(v, items, nightMode)
.show();
} }
}); });

131
OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
View file

@ -23,7 +23,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.AbsListView; import android.widget.AbsListView;
import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.CheckBox; import android.widget.CheckBox;
@ -71,7 +70,6 @@ import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.SimplePopUpMenuItemAdapter.SimplePopUpMenuItem;
import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.OsmandBaseExpandableListAdapter; import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
@ -86,6 +84,8 @@ import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
import net.osmand.plus.osmedit.OsmEditingPlugin; import net.osmand.plus.osmedit.OsmEditingPlugin;
import net.osmand.plus.osmedit.oauth.OsmOAuthHelper.OsmAuthorizationListener; import net.osmand.plus.osmedit.oauth.OsmOAuthHelper.OsmAuthorizationListener;
import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.widgets.popup.PopUpMenuItem;
import net.osmand.plus.widgets.popup.PopUpMenuHelper;
import java.io.File; import java.io.File;
import java.text.DateFormat; import java.text.DateFormat;
@ -576,13 +576,14 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
if (itemId == R.id.action_sort) { if (itemId == R.id.action_sort) {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null) { if (activity != null) {
boolean nightMode = app.getSettings().isLightContent();
View menuSortItemView = getActivity().findViewById(R.id.action_sort); View menuSortItemView = getActivity().findViewById(R.id.action_sort);
final List<SimplePopUpMenuItem> items = new ArrayList<>(); final List<PopUpMenuItem> items = new ArrayList<>();
for (final TracksSortByMode mode : TracksSortByMode.values()) { for (final TracksSortByMode mode : TracksSortByMode.values()) {
items.add(new SimplePopUpMenuItem( items.add(new PopUpMenuItem.Builder(app)
getString(mode.getNameId()), .setTitleId(mode.getNameId())
app.getUIUtilities().getThemedIcon(mode.getIconId()), .setIcon(app.getUIUtilities().getThemedIcon(mode.getIconId()))
new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
updateTracksSort(mode); updateTracksSort(mode);
@ -590,10 +591,12 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
: R.color.active_buttons_and_links_text_dark; : R.color.active_buttons_and_links_text_dark;
item.setIcon(getIcon(mode.getIconId(), iconColorId)); item.setIcon(getIcon(mode.getIconId(), iconColorId));
} }
}, sortByMode == mode })
)); .setSelected(sortByMode == mode)
.create()
);
} }
UiUtilities.showPopUpMenu(menuSortItemView, items); new PopUpMenuHelper.Builder(menuSortItemView, items, nightMode).show();
} }
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
@ -1489,51 +1492,55 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
} }
private void openPopUpMenu(View v, final GpxInfo gpxInfo) { private void openPopUpMenu(View v, final GpxInfo gpxInfo) {
final List<SimplePopUpMenuItem> items = new ArrayList<>(); boolean nightMode = app.getSettings().isLightContent();
final List<PopUpMenuItem> items = new ArrayList<>();
UiUtilities iconsCache = getMyApplication().getUIUtilities(); UiUtilities iconsCache = getMyApplication().getUIUtilities();
items.add(new SimplePopUpMenuItem( items.add(new PopUpMenuItem.Builder(app)
getString(R.string.shared_string_show_on_map), .setTitleId(R.string.shared_string_show_on_map)
iconsCache.getThemedIcon(R.drawable.ic_show_on_map), .setIcon(iconsCache.getThemedIcon(R.drawable.ic_show_on_map))
new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
showGpxOnMap(gpxInfo); showGpxOnMap(gpxInfo);
} }
} })
)); .create()
);
GPXTrackAnalysis analysis; GPXTrackAnalysis analysis;
if ((analysis = getGpxTrackAnalysis(gpxInfo, app, null)) != null) { if ((analysis = getGpxTrackAnalysis(gpxInfo, app, null)) != null) {
if (analysis.totalDistance != 0 && !gpxInfo.currentlyRecordingTrack) { if (analysis.totalDistance != 0 && !gpxInfo.currentlyRecordingTrack) {
items.add(new SimplePopUpMenuItem( items.add(new PopUpMenuItem.Builder(app)
getString(R.string.analyze_on_map), .setTitleId(R.string.analyze_on_map)
iconsCache.getThemedIcon(R.drawable.ic_action_info_dark), .setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_info_dark))
new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
new OpenGpxDetailsTask(gpxInfo).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); new OpenGpxDetailsTask(gpxInfo).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} }
} })
)); .create()
);
} }
} }
items.add(new SimplePopUpMenuItem( items.add(new PopUpMenuItem.Builder(app)
getString(R.string.shared_string_move), .setTitleId(R.string.shared_string_move)
iconsCache.getThemedIcon(R.drawable.ic_action_folder_stroke), .setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_folder_stroke))
new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
moveGpx(gpxInfo); moveGpx(gpxInfo);
} }
} })
)); .create()
);
items.add(new SimplePopUpMenuItem( items.add(new PopUpMenuItem.Builder(app)
getString(R.string.shared_string_rename), .setTitleId(R.string.shared_string_rename)
iconsCache.getThemedIcon(R.drawable.ic_action_edit_dark), .setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_edit_dark))
new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
FileUtils.renameFile(getActivity(), gpxInfo.file, new RenameCallback() { FileUtils.renameFile(getActivity(), gpxInfo.file, new RenameCallback() {
@ -1544,14 +1551,15 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
} }
}); });
} }
} })
)); .create()
);
Drawable shareIcon = iconsCache.getThemedIcon((R.drawable.ic_action_gshare_dark)); Drawable shareIcon = iconsCache.getThemedIcon((R.drawable.ic_action_gshare_dark));
items.add(new SimplePopUpMenuItem( items.add(new PopUpMenuItem.Builder(app)
getString(R.string.shared_string_share), .setTitleId(R.string.shared_string_share)
AndroidUtils.getDrawableForDirection(app, shareIcon), .setIcon(AndroidUtils.getDrawableForDirection(app, shareIcon))
new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
final Uri fileUri = AndroidUtils.getUriForFile(getMyApplication(), gpxInfo.file); final Uri fileUri = AndroidUtils.getUriForFile(getMyApplication(), gpxInfo.file);
@ -1561,27 +1569,29 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
sendIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); sendIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
startActivity(sendIntent); startActivity(sendIntent);
} }
} })
)); .create()
);
final OsmEditingPlugin osmEditingPlugin = OsmandPlugin.getEnabledPlugin(OsmEditingPlugin.class); final OsmEditingPlugin osmEditingPlugin = OsmandPlugin.getEnabledPlugin(OsmEditingPlugin.class);
if (osmEditingPlugin != null && osmEditingPlugin.isActive()) { if (osmEditingPlugin != null && osmEditingPlugin.isActive()) {
items.add(new SimplePopUpMenuItem( items.add(new PopUpMenuItem.Builder(app)
getString(R.string.shared_string_export), .setTitleId(R.string.shared_string_export)
iconsCache.getThemedIcon(R.drawable.ic_action_export), .setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_export))
new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
osmEditingPlugin.sendGPXFiles(getActivity(), AvailableGPXFragment.this, gpxInfo); osmEditingPlugin.sendGPXFiles(getActivity(), AvailableGPXFragment.this, gpxInfo);
} }
} })
)); .create()
);
} }
items.add(new SimplePopUpMenuItem( items.add(new PopUpMenuItem.Builder(app)
getString(R.string.shared_string_delete), .setTitleId(R.string.shared_string_delete)
iconsCache.getThemedIcon(R.drawable.ic_action_delete_dark), .setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_delete_dark))
new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@ -1596,21 +1606,10 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
builder.setNegativeButton(R.string.shared_string_cancel, null); builder.setNegativeButton(R.string.shared_string_cancel, null);
builder.show(); builder.show();
} }
} })
)); .create()
);
UiUtilities.createListPopupWindow( new PopUpMenuHelper.Builder(v, items, nightMode).show();
getContext(), v, v.getWidth(), items, new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (position < items.size()) {
View.OnClickListener listener = items.get(position).getOnClickListener();
if (listener != null) {
listener.onClick(view);
}
}
}
}).show();
} }
public class DeleteGpxTask extends AsyncTask<GpxInfo, GpxInfo, String> { public class DeleteGpxTask extends AsyncTask<GpxInfo, GpxInfo, String> {

48
OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
View file

@ -75,7 +75,6 @@ import java.util.Map.Entry;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import static net.osmand.IndexConstants.VOICE_INDEX_DIR; import static net.osmand.IndexConstants.VOICE_INDEX_DIR;
/** /**
@ -210,7 +209,7 @@ public class ResourceManager {
protected final Map<String, AmenityIndexRepository> amenityRepositories = new ConcurrentHashMap<String, AmenityIndexRepository>(); protected final Map<String, AmenityIndexRepository> amenityRepositories = new ConcurrentHashMap<String, AmenityIndexRepository>();
// protected final Map<String, BinaryMapIndexReader> routingMapFiles = new ConcurrentHashMap<String, BinaryMapIndexReader>(); // protected final Map<String, BinaryMapIndexReader> routingMapFiles = new ConcurrentHashMap<String, BinaryMapIndexReader>();
protected final Map<String, BinaryMapReaderResource> transportRepositories = new ConcurrentHashMap<String, BinaryMapReaderResource>(); protected final Map<String, BinaryMapReaderResource> transportRepositories = new ConcurrentHashMap<String, BinaryMapReaderResource>();
protected final Map<String, BinaryMapReaderResource> travelRepositories = new ConcurrentHashMap<String, BinaryMapReaderResource>();
protected final Map<String, String> indexFileNames = new ConcurrentHashMap<String, String>(); protected final Map<String, String> indexFileNames = new ConcurrentHashMap<String, String>();
protected final Map<String, String> basemapFileNames = new ConcurrentHashMap<String, String>(); protected final Map<String, String> basemapFileNames = new ConcurrentHashMap<String, String>();
@ -634,6 +633,7 @@ public class ResourceManager {
collectFiles(roadsPath, IndexConstants.BINARY_MAP_INDEX_EXT, files); collectFiles(roadsPath, IndexConstants.BINARY_MAP_INDEX_EXT, files);
if (Version.isPaidVersion(context)) { if (Version.isPaidVersion(context)) {
collectFiles(context.getAppPath(IndexConstants.WIKI_INDEX_DIR), IndexConstants.BINARY_MAP_INDEX_EXT, files); collectFiles(context.getAppPath(IndexConstants.WIKI_INDEX_DIR), IndexConstants.BINARY_MAP_INDEX_EXT, files);
collectFiles(context.getAppPath(IndexConstants.WIKIVOYAGE_INDEX_DIR), IndexConstants.BINARY_TRAVEL_GUIDE_MAP_INDEX_EXT, files);
} }
if (OsmandPlugin.getEnabledPlugin(SRTMPlugin.class) != null || InAppPurchaseHelper.isSubscribedToLiveUpdates(context)) { if (OsmandPlugin.getEnabledPlugin(SRTMPlugin.class) != null || InAppPurchaseHelper.isSubscribedToLiveUpdates(context)) {
collectFiles(context.getAppPath(IndexConstants.SRTM_INDEX_DIR), IndexConstants.BINARY_MAP_INDEX_EXT, files); collectFiles(context.getAppPath(IndexConstants.SRTM_INDEX_DIR), IndexConstants.BINARY_MAP_INDEX_EXT, files);
@ -726,7 +726,10 @@ public class ResourceManager {
} }
renderer.initializeNewResource(progress, f, mapReader); renderer.initializeNewResource(progress, f, mapReader);
BinaryMapReaderResource resource = new BinaryMapReaderResource(f, mapReader); BinaryMapReaderResource resource = new BinaryMapReaderResource(f, mapReader);
if (collectTravelFiles(resource)){
//travel files are indexed
continue;
}
fileReaders.put(f.getName(), resource); fileReaders.put(f.getName(), resource);
if (!mapReader.getRegionNames().isEmpty()) { if (!mapReader.getRegionNames().isEmpty()) {
RegionAddressRepositoryBinary rarb = new RegionAddressRepositoryBinary(this, resource); RegionAddressRepositoryBinary rarb = new RegionAddressRepositoryBinary(this, resource);
@ -798,7 +801,43 @@ public class ResourceManager {
return warnings; return warnings;
} }
private List<BinaryMapIndexReader> getTravelRepositories() {
List<String> fileNames = new ArrayList<>(travelRepositories.keySet());
Collections.sort(fileNames, Algorithms.getStringVersionComparator());
List<BinaryMapIndexReader> res = new ArrayList<>();
for (String fileName : fileNames) {
BinaryMapReaderResource r = travelRepositories.get(fileName);
if (r != null) {
res.add(r.getReader(BinaryMapReaderResourceType.POI));
}
}
return res;
}
private List<BinaryMapIndexReader> getTravelRepositories(double topLat, double leftLon, double bottomLat, double rightLon) {
List<String> fileNames = new ArrayList<>(travelRepositories.keySet());
Collections.sort(fileNames, Algorithms.getStringVersionComparator());
int leftX31 = MapUtils.get31TileNumberX(leftLon);
int topX31 = MapUtils.get31TileNumberY(topLat);
int rightX31 = MapUtils.get31TileNumberX(rightLon);
int bottomX31 = MapUtils.get31TileNumberY(bottomLat);
List<BinaryMapIndexReader> res = new ArrayList<>();
for (String fileName : fileNames) {
BinaryMapReaderResource r = travelRepositories.get(fileName);
if (r != null && r.getShallowReader().containsPoiData(leftX31, topX31, rightX31, bottomX31)) {
res.add(r.getReader(BinaryMapReaderResourceType.POI));
}
}
return res;
}
private boolean collectTravelFiles(BinaryMapReaderResource resource) {
if (resource.getFileName().contains(IndexConstants.BINARY_TRAVEL_GUIDE_MAP_INDEX_EXT)){
travelRepositories.put(resource.getFileName(), resource);
return true;
}
return false;
}
public void initMapBoundariesCacheNative() { public void initMapBoundariesCacheNative() {
File indCache = context.getAppPath(INDEXES_CACHE); File indCache = context.getAppPath(INDEXES_CACHE);
@ -1065,6 +1104,7 @@ public class ResourceManager {
addressMap.remove(fileName); addressMap.remove(fileName);
transportRepositories.remove(fileName); transportRepositories.remove(fileName);
indexFileNames.remove(fileName); indexFileNames.remove(fileName);
travelRepositories.remove(fileName);
renderer.closeConnection(fileName); renderer.closeConnection(fileName);
BinaryMapReaderResource resource = fileReaders.remove(fileName); BinaryMapReaderResource resource = fileReaders.remove(fileName);
if(resource != null) { if(resource != null) {
@ -1080,6 +1120,7 @@ public class ResourceManager {
basemapFileNames.clear(); basemapFileNames.clear();
renderer.clearAllResources(); renderer.clearAllResources();
transportRepositories.clear(); transportRepositories.clear();
travelRepositories.clear();
addressMap.clear(); addressMap.clear();
amenityRepositories.clear(); amenityRepositories.clear();
for(BinaryMapReaderResource res : fileReaders.values()) { for(BinaryMapReaderResource res : fileReaders.values()) {
@ -1088,7 +1129,6 @@ public class ResourceManager {
fileReaders.clear(); fileReaders.clear();
} }
public BinaryMapIndexReader[] getRoutingMapFiles() { public BinaryMapIndexReader[] getRoutingMapFiles() {
Collection<BinaryMapReaderResource> fileReaders = getFileReaders(); Collection<BinaryMapReaderResource> fileReaders = getFileReaders();
List<BinaryMapIndexReader> readers = new ArrayList<>(fileReaders.size()); List<BinaryMapIndexReader> readers = new ArrayList<>(fileReaders.size());

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

@ -33,7 +33,6 @@ import net.osmand.data.RotatedTileBox;
import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.SimplePopUpMenuItemAdapter.SimplePopUpMenuItem;
import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities;
import net.osmand.plus.UiUtilities.DialogButtonType; import net.osmand.plus.UiUtilities.DialogButtonType;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
@ -64,6 +63,8 @@ import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
import net.osmand.plus.routing.RoutingHelper; import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.views.layers.MapControlsLayer; import net.osmand.plus.views.layers.MapControlsLayer;
import net.osmand.plus.widgets.popup.PopUpMenuHelper;
import net.osmand.plus.widgets.popup.PopUpMenuItem;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -613,11 +614,12 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
sortButton.setOnClickListener(new View.OnClickListener() { sortButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
List<SimplePopUpMenuItem> items = new ArrayList<>(); List<PopUpMenuItem> items = new ArrayList<>();
for (final TracksSortByMode mode : TracksSortByMode.values()) { for (final TracksSortByMode mode : TracksSortByMode.values()) {
items.add(new SimplePopUpMenuItem(getString(mode.getNameId()), items.add(new PopUpMenuItem.Builder(app)
app.getUIUtilities().getThemedIcon(mode.getIconId()), .setTitleId(mode.getNameId())
new View.OnClickListener() { .setIcon(app.getUIUtilities().getThemedIcon(mode.getIconId()))
.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
sortByMode = mode; sortByMode = mode;
@ -626,10 +628,12 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
tracksCard.setSortByMode(mode); tracksCard.setSortByMode(mode);
} }
} }
}, sortByMode == mode })
)); .setSelected(sortByMode == mode)
.create()
);
} }
UiUtilities.showPopUpMenu(v, items); new PopUpMenuHelper.Builder(v, items, isNightMode()).show();
} }
}); });
} }

2
OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
View file

@ -1535,7 +1535,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
private void clickRouteParams() { private void clickRouteParams() {
MapActivity mapActivity = getMapActivity(); MapActivity mapActivity = getMapActivity();
if (mapActivity != null) { if (mapActivity != null) {
RouteOptionsBottomSheet.showInstance(mapActivity.getSupportFragmentManager()); RouteOptionsBottomSheet.showInstance(mapActivity);
} }
} }

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

@ -55,6 +55,7 @@ import net.osmand.plus.settings.backend.CommonPreference;
import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.bottomsheets.ElevationDateBottomSheet; import net.osmand.plus.settings.bottomsheets.ElevationDateBottomSheet;
import net.osmand.plus.settings.fragments.BaseSettingsFragment; import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType;
import net.osmand.router.GeneralRouter; import net.osmand.router.GeneralRouter;
import net.osmand.router.GeneralRouter.RoutingParameter; import net.osmand.router.GeneralRouter.RoutingParameter;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
@ -67,8 +68,6 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static net.osmand.plus.measurementtool.RouteBetweenPointsBottomSheetDialogFragment.RouteBetweenPointsDialogMode.ALL;
import static net.osmand.plus.measurementtool.RouteBetweenPointsBottomSheetDialogFragment.RouteBetweenPointsDialogType.WHOLE_ROUTE_CALCULATION;
import static net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.DRIVING_STYLE; import static net.osmand.plus.routepreparationmenu.RoutingOptionsHelper.DRIVING_STYLE;
import static net.osmand.plus.settings.fragments.RouteParametersFragment.RELIEF_SMOOTHNESS_FACTOR; import static net.osmand.plus.settings.fragments.RouteParametersFragment.RELIEF_SMOOTHNESS_FACTOR;
import static net.osmand.plus.settings.fragments.RouteParametersFragment.getRoutingParameterTitle; import static net.osmand.plus.settings.fragments.RouteParametersFragment.getRoutingParameterTitle;
@ -80,7 +79,7 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
public static final String TAG = RouteOptionsBottomSheet.class.getSimpleName(); public static final String TAG = RouteOptionsBottomSheet.class.getSimpleName();
private static final Log LOG = PlatformUtil.getLog(RouteOptionsBottomSheet.class); private static final Log LOG = PlatformUtil.getLog(RouteOptionsBottomSheet.class);
public static final String APP_MODE_KEY = "APP_MODE_KEY"; public static final String APP_MODE_KEY = "APP_MODE_KEY";
public static final String PLANE_ROUTE = "PLANE_ROUTE"; public static final String DIALOG_MODE_KEY = "DIALOG_MODE_KEY";
private OsmandApplication app; private OsmandApplication app;
private OsmandSettings settings; private OsmandSettings settings;
@ -95,8 +94,38 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
private CommonPreference<Boolean> useHeightPref; private CommonPreference<Boolean> useHeightPref;
private StateChangedListener<Boolean> voiceMuteChangeListener; private StateChangedListener<Boolean> voiceMuteChangeListener;
private StateChangedListener<Boolean> useHeightChangeListener; private StateChangedListener<Boolean> useHeightChangeListener;
private boolean planRouteMode;
private List<RoutingParameter> reliefParameters = new ArrayList<>(); private List<RoutingParameter> reliefParameters = new ArrayList<>();
private DialogMode dialogMode;
public enum DialogMode {
DIRECTIONS(),
PLAN_ROUTE(MuteSoundRoutingParameter.class,
RouteSimulationItem.class,
GpxLocalRoutingParameter.class);
private final Class<? extends LocalRoutingParameter>[] excludeParameters;
@SafeVarargs
DialogMode(Class<? extends LocalRoutingParameter> ... excludeParameters) {
this.excludeParameters = excludeParameters;
}
public boolean isAvailableParameter(LocalRoutingParameter parameter) {
for (Class<? extends LocalRoutingParameter> c : excludeParameters) {
if (Algorithms.objectEquals(parameter.getClass(), c)) {
return false;
}
}
return true;
}
public static DialogMode getModeByName(String modeName) {
if (modeName != null) {
return valueOf(modeName);
}
return DIRECTIONS;
}
}
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@ -106,8 +135,9 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
String appMode = args.getString(APP_MODE_KEY, null); String appMode = args.getString(APP_MODE_KEY, null);
if (appMode != null) { if (appMode != null) {
applicationMode = ApplicationMode.valueOfStringKey(appMode, null); applicationMode = ApplicationMode.valueOfStringKey(appMode, null);
planRouteMode = true;
} }
String dialogModeName = args.getString(DIALOG_MODE_KEY, null);
dialogMode = DialogMode.getModeByName(dialogModeName);
} }
app = requiredMyApplication(); app = requiredMyApplication();
settings = app.getSettings(); settings = app.getSettings();
@ -117,6 +147,9 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
if (applicationMode == null) { if (applicationMode == null) {
applicationMode = routingHelper.getAppMode(); applicationMode = routingHelper.getAppMode();
} }
if (dialogMode == null) {
dialogMode = DialogMode.DIRECTIONS;
}
selectedModeColorId = applicationMode.getIconColorInfo().getColor(nightMode); selectedModeColorId = applicationMode.getIconColorInfo().getColor(nightMode);
voiceMuteChangeListener = new StateChangedListener<Boolean>() { voiceMuteChangeListener = new StateChangedListener<Boolean>() {
@Override @Override
@ -139,28 +172,27 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
items.add(new TitleItem(app.getString(R.string.shared_string_settings), nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light)); items.add(new TitleItem(app.getString(R.string.shared_string_settings), nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light));
List<LocalRoutingParameter> list = getRoutingParameters(applicationMode); List<LocalRoutingParameter> list = getRoutingParameters(applicationMode);
for (final LocalRoutingParameter optionsItem : list) { for (final LocalRoutingParameter optionsItem : list) {
if (!dialogMode.isAvailableParameter(optionsItem)) {
continue;
}
if (optionsItem instanceof DividerItem) { if (optionsItem instanceof DividerItem) {
items.add(new DividerStartItem(app)); if (isDividerRequired()) {
} else if (optionsItem instanceof MuteSoundRoutingParameter) { items.add(new DividerStartItem(app));
if (!planRouteMode) {
items.add(createMuteSoundItem(optionsItem));
} }
} else if (optionsItem instanceof MuteSoundRoutingParameter) {
items.add(createMuteSoundItem(optionsItem));
} else if (optionsItem instanceof ShowAlongTheRouteItem) { } else if (optionsItem instanceof ShowAlongTheRouteItem) {
items.add(createShowAlongTheRouteItem(optionsItem)); items.add(createShowAlongTheRouteItem(optionsItem));
} else if (optionsItem instanceof RouteSimulationItem) { } else if (optionsItem instanceof RouteSimulationItem) {
if (!planRouteMode) { items.add(createRouteSimulationItem(optionsItem));
items.add(createRouteSimulationItem(optionsItem));
}
} else if (optionsItem instanceof AvoidPTTypesRoutingParameter) { } else if (optionsItem instanceof AvoidPTTypesRoutingParameter) {
items.add(createAvoidPTTypesItem(optionsItem)); items.add(createAvoidPTTypesItem(optionsItem));
} else if (optionsItem instanceof AvoidRoadsRoutingParameter) { } else if (optionsItem instanceof AvoidRoadsRoutingParameter) {
items.add(createAvoidRoadsItem(optionsItem)); items.add(createAvoidRoadsItem(optionsItem));
} else if (optionsItem instanceof GpxLocalRoutingParameter) { } else if (optionsItem instanceof GpxLocalRoutingParameter) {
if (!planRouteMode) { items.add(createGpxRoutingItem(optionsItem));
items.add(createGpxRoutingItem(optionsItem));
}
} else if (optionsItem instanceof TimeConditionalRoutingItem) { } else if (optionsItem instanceof TimeConditionalRoutingItem) {
items.add(createTimeConditionalRoutingItem(optionsItem)); items.add(createTimeConditionalRoutingItem(optionsItem));
} else if (optionsItem instanceof OtherSettingsRoutingParameter) { } else if (optionsItem instanceof OtherSettingsRoutingParameter) {
@ -173,6 +205,11 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
} }
} }
private boolean isDividerRequired() {
// do not show two dividers at once
return items.size() > 1 && !(items.get(items.size() - 1) instanceof DividerStartItem);
}
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
@ -282,8 +319,7 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
voicePromptsBtn.setOnClickListener(new View.OnClickListener() { voicePromptsBtn.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
BaseSettingsFragment.showInstance( BaseSettingsFragment.showInstance(mapActivity, SettingsScreenType.VOICE_ANNOUNCES);
mapActivity, BaseSettingsFragment.SettingsScreenType.VOICE_ANNOUNCES);
dismiss(); dismiss();
} }
}); });
@ -508,10 +544,18 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
dismiss(); dismiss();
if (dialogMode == DialogMode.PLAN_ROUTE) {
Fragment fragment = getTargetFragment();
if (fragment instanceof MeasurementToolFragment) {
((MeasurementToolFragment) fragment).getOnBackPressedCallback().setEnabled(false);
}
}
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putBoolean(PLANE_ROUTE, planRouteMode); args.putString(DIALOG_MODE_KEY, dialogMode.name());
BaseSettingsFragment.showInstance(mapActivity, BaseSettingsFragment.SettingsScreenType.NAVIGATION, BaseSettingsFragment.showInstance(mapActivity,
applicationMode, args); SettingsScreenType.NAVIGATION, applicationMode, args);
} }
}) })
.create(); .create();
@ -614,16 +658,13 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
@Override @Override
public void onDismiss(@NonNull DialogInterface dialog) { public void onDismiss(@NonNull DialogInterface dialog) {
super.onDismiss(dialog); super.onDismiss(dialog);
updatePlanRoute(); notifyAppModeConfigurationChanged();
} }
private void updatePlanRoute() { private void notifyAppModeConfigurationChanged() {
MapActivity mapActivity = getMapActivity(); Fragment fragment = getTargetFragment();
if (mapActivity != null) { if (fragment instanceof OnAppModeConfiguredCallback) {
Fragment fragment = mapActivity.getSupportFragmentManager().findFragmentByTag(MeasurementToolFragment.TAG); ((OnAppModeConfiguredCallback) fragment).onAppModeConfigured();
if (fragment != null) {
((MeasurementToolFragment) fragment).onChangeApplicationMode(applicationMode, WHOLE_ROUTE_CALCULATION, ALL);
}
} }
} }
@ -658,17 +699,23 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
return (MapActivity) getActivity(); return (MapActivity) getActivity();
} }
public static void showInstance(FragmentManager fragmentManager) { public static void showInstance(MapActivity mapActivity) {
showInstance(fragmentManager, null); showInstance(mapActivity, null, DialogMode.DIRECTIONS, null);
} }
public static void showInstance(FragmentManager fm, String appModeKey) { public static void showInstance(MapActivity mapActivity,
Fragment targetFragment,
DialogMode dialogMode,
String appModeKey) {
try { try {
FragmentManager fm = mapActivity.getSupportFragmentManager();
if (!fm.isStateSaved()) { if (!fm.isStateSaved()) {
RouteOptionsBottomSheet fragment = new RouteOptionsBottomSheet(); RouteOptionsBottomSheet fragment = new RouteOptionsBottomSheet();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(APP_MODE_KEY, appModeKey); args.putString(APP_MODE_KEY, appModeKey);
args.putString(DIALOG_MODE_KEY, dialogMode.name());
fragment.setArguments(args); fragment.setArguments(args);
fragment.setTargetFragment(targetFragment, 0);
fragment.show(fm, TAG); fragment.show(fm, TAG);
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
@ -694,6 +741,10 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
} }
} }
public interface OnAppModeConfiguredCallback {
void onAppModeConfigured();
}
public enum AppModeOptions { public enum AppModeOptions {
CAR(MuteSoundRoutingParameter.KEY, CAR(MuteSoundRoutingParameter.KEY,

20
OsmAnd/src/net/osmand/plus/settings/backend/ApplicationMode.java
View file

@ -108,6 +108,14 @@ public class ApplicationMode {
.icon(R.drawable.ic_action_skiing) .icon(R.drawable.ic_action_skiing)
.description(R.string.base_profile_descr_ski).reg(); .description(R.string.base_profile_descr_ski).reg();
public static final ApplicationMode TRUCK = create(ApplicationMode.CAR, R.string.app_mode_truck, "truck")
.icon(R.drawable.ic_action_truck_dark)
.description(R.string.app_mode_truck).reg();
public static final ApplicationMode MOTORCYCLE = create(ApplicationMode.CAR, R.string.app_mode_motorcycle, "motorcycle")
.icon(R.drawable.ic_action_motorcycle_dark)
.description(R.string.app_mode_motorcycle).reg();
public static List<ApplicationMode> values(OsmandApplication app) { public static List<ApplicationMode> values(OsmandApplication app) {
if (customizationListener == null) { if (customizationListener == null) {
customizationListener = new OsmAndAppCustomization.OsmAndAppCustomizationListener() { customizationListener = new OsmAndAppCustomization.OsmAndAppCustomizationListener() {
@ -179,13 +187,13 @@ public class ApplicationMode {
} }
private static void initRegVisibility() { private static void initRegVisibility() {
// DEFAULT, CAR, BICYCLE, PEDESTRIAN, PUBLIC_TRANSPORT, BOAT, AIRCRAFT, SKI // DEFAULT, CAR, BICYCLE, PEDESTRIAN, PUBLIC_TRANSPORT, BOAT, AIRCRAFT, SKI, TRUCK
ApplicationMode[] exceptDefault = new ApplicationMode[] {CAR, BICYCLE, PEDESTRIAN, PUBLIC_TRANSPORT, BOAT, AIRCRAFT, SKI}; ApplicationMode[] exceptDefault = new ApplicationMode[] {CAR, BICYCLE, PEDESTRIAN, PUBLIC_TRANSPORT, BOAT, AIRCRAFT, SKI, TRUCK, MOTORCYCLE};
ApplicationMode[] all = null; ApplicationMode[] all = null;
ApplicationMode[] none = new ApplicationMode[] {}; ApplicationMode[] none = new ApplicationMode[] {};
// left // left
ApplicationMode[] navigationSet1 = new ApplicationMode[] {CAR, BICYCLE, BOAT, SKI}; ApplicationMode[] navigationSet1 = new ApplicationMode[] {CAR, BICYCLE, BOAT, SKI, TRUCK, MOTORCYCLE};
ApplicationMode[] navigationSet2 = new ApplicationMode[] {PEDESTRIAN, PUBLIC_TRANSPORT, AIRCRAFT}; ApplicationMode[] navigationSet2 = new ApplicationMode[] {PEDESTRIAN, PUBLIC_TRANSPORT, AIRCRAFT};
regWidgetVisibility(WIDGET_NEXT_TURN, navigationSet1); regWidgetVisibility(WIDGET_NEXT_TURN, navigationSet1);
@ -200,8 +208,8 @@ public class ApplicationMode {
regWidgetVisibility(WIDGET_DISTANCE, all); regWidgetVisibility(WIDGET_DISTANCE, all);
regWidgetVisibility(WIDGET_TIME, all); regWidgetVisibility(WIDGET_TIME, all);
regWidgetVisibility(WIDGET_INTERMEDIATE_TIME, all); regWidgetVisibility(WIDGET_INTERMEDIATE_TIME, all);
regWidgetVisibility(WIDGET_SPEED, CAR, BICYCLE, BOAT, SKI, PUBLIC_TRANSPORT, AIRCRAFT); regWidgetVisibility(WIDGET_SPEED, CAR, BICYCLE, BOAT, SKI, PUBLIC_TRANSPORT, AIRCRAFT, TRUCK, MOTORCYCLE);
regWidgetVisibility(WIDGET_MAX_SPEED, CAR); regWidgetVisibility(WIDGET_MAX_SPEED, CAR, TRUCK, MOTORCYCLE);
regWidgetVisibility(WIDGET_ALTITUDE, PEDESTRIAN, BICYCLE); regWidgetVisibility(WIDGET_ALTITUDE, PEDESTRIAN, BICYCLE);
regWidgetAvailability(WIDGET_INTERMEDIATE_DISTANCE, all); regWidgetAvailability(WIDGET_INTERMEDIATE_DISTANCE, all);
regWidgetAvailability(WIDGET_DISTANCE, all); regWidgetAvailability(WIDGET_DISTANCE, all);
@ -293,7 +301,7 @@ public class ApplicationMode {
} }
public boolean isCustomProfile() { public boolean isCustomProfile() {
return parentAppMode != null; return !defaultValues.contains(this);
} }
public boolean isDerivedRoutingFrom(ApplicationMode mode) { public boolean isDerivedRoutingFrom(ApplicationMode mode) {

2
OsmAnd/src/net/osmand/plus/settings/backend/ContextMenuItemsPreference.java
View file

@ -13,7 +13,7 @@ public class ContextMenuItemsPreference extends CommonPreference<ContextMenuItem
@Override @Override
protected ContextMenuItemsSettings getValue(Object prefs, ContextMenuItemsSettings defaultValue) { protected ContextMenuItemsSettings getValue(Object prefs, ContextMenuItemsSettings defaultValue) {
String s = getSettingsAPI().getString(prefs, getId(), ""); String s = getSettingsAPI().getString(prefs, getId(), defaultValue.writeToJsonString(idScheme));
return readValue(s); return readValue(s);
} }

8
OsmAnd/src/net/osmand/plus/settings/backend/ContextMenuItemsSettings.java
View file

@ -15,6 +15,8 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_DASHBOARD_ID;
public class ContextMenuItemsSettings implements Serializable { public class ContextMenuItemsSettings implements Serializable {
private static final Log LOG = PlatformUtil.getLog(ContextMenuItemsSettings.class.getName()); private static final Log LOG = PlatformUtil.getLog(ContextMenuItemsSettings.class.getName());
@ -99,4 +101,10 @@ public class ContextMenuItemsSettings implements Serializable {
public List<String> getOrderIds() { public List<String> getOrderIds() {
return Collections.unmodifiableList(orderIds); return Collections.unmodifiableList(orderIds);
} }
public static ContextMenuItemsSettings getDrawerDefaultInstance() {
ArrayList<String> hiddenByDefault = new ArrayList<>();
hiddenByDefault.add(DRAWER_DASHBOARD_ID);
return new ContextMenuItemsSettings(hiddenByDefault, new ArrayList<String>());
}
} }

4
OsmAnd/src/net/osmand/plus/settings/backend/ExportSettingsType.java
View file

@ -12,10 +12,10 @@ public enum ExportSettingsType {
POI_TYPES(R.string.poi_dialog_poi_type, R.drawable.ic_action_info_dark), POI_TYPES(R.string.poi_dialog_poi_type, R.drawable.ic_action_info_dark),
AVOID_ROADS(R.string.avoid_road, R.drawable.ic_action_alert), AVOID_ROADS(R.string.avoid_road, R.drawable.ic_action_alert),
FAVORITES(R.string.shared_string_favorites, R.drawable.ic_action_favorite), FAVORITES(R.string.shared_string_favorites, R.drawable.ic_action_favorite),
TRACKS(R.string.shared_string_tracks, R.drawable.ic_action_route_distance), TRACKS(R.string.shared_string_tracks, R.drawable.ic_action_polygom_dark),
OSM_NOTES(R.string.osm_notes, R.drawable.ic_action_openstreetmap_logo), OSM_NOTES(R.string.osm_notes, R.drawable.ic_action_openstreetmap_logo),
OSM_EDITS(R.string.osm_edits, R.drawable.ic_action_openstreetmap_logo), OSM_EDITS(R.string.osm_edits, R.drawable.ic_action_openstreetmap_logo),
MULTIMEDIA_NOTES(R.string.audionotes_plugin_name, R.drawable.ic_grouped_by_type), MULTIMEDIA_NOTES(R.string.notes, R.drawable.ic_grouped_by_type),
ACTIVE_MARKERS(R.string.map_markers, R.drawable.ic_action_flag), ACTIVE_MARKERS(R.string.map_markers, R.drawable.ic_action_flag),
HISTORY_MARKERS(R.string.markers_history, R.drawable.ic_action_flag), HISTORY_MARKERS(R.string.markers_history, R.drawable.ic_action_flag),
SEARCH_HISTORY(R.string.shared_string_search_history, R.drawable.ic_action_history), SEARCH_HISTORY(R.string.shared_string_search_history, R.drawable.ic_action_history),

4
OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
View file

@ -955,6 +955,8 @@ public class OsmandSettings {
ICON_RES_NAME.setModeDefaultValue(ApplicationMode.BOAT, "ic_action_sail_boat_dark"); ICON_RES_NAME.setModeDefaultValue(ApplicationMode.BOAT, "ic_action_sail_boat_dark");
ICON_RES_NAME.setModeDefaultValue(ApplicationMode.AIRCRAFT, "ic_action_aircraft"); ICON_RES_NAME.setModeDefaultValue(ApplicationMode.AIRCRAFT, "ic_action_aircraft");
ICON_RES_NAME.setModeDefaultValue(ApplicationMode.SKI, "ic_action_skiing"); ICON_RES_NAME.setModeDefaultValue(ApplicationMode.SKI, "ic_action_skiing");
ICON_RES_NAME.setModeDefaultValue(ApplicationMode.TRUCK, "ic_action_truck_dark");
ICON_RES_NAME.setModeDefaultValue(ApplicationMode.MOTORCYCLE, "ic_action_motorcycle_dark");
} }
public final CommonPreference<ProfileIconColors> ICON_COLOR = new EnumStringPreference<>(this, public final CommonPreference<ProfileIconColors> ICON_COLOR = new EnumStringPreference<>(this,
@ -2518,7 +2520,7 @@ public class OsmandSettings {
new ListStringPreference(this, "inactive_poi_filters", null, ",,").makeProfile().cache(); new ListStringPreference(this, "inactive_poi_filters", null, ",,").makeProfile().cache();
public final ContextMenuItemsPreference DRAWER_ITEMS = public final ContextMenuItemsPreference DRAWER_ITEMS =
(ContextMenuItemsPreference) new ContextMenuItemsPreference(this, "drawer_items", DRAWER_ITEM_ID_SCHEME, new ContextMenuItemsSettings()) (ContextMenuItemsPreference) new ContextMenuItemsPreference(this, "drawer_items", DRAWER_ITEM_ID_SCHEME, ContextMenuItemsSettings.getDrawerDefaultInstance())
.makeProfile().cache(); .makeProfile().cache();
public final ContextMenuItemsPreference CONFIGURE_MAP_ITEMS = public final ContextMenuItemsPreference CONFIGURE_MAP_ITEMS =

4
OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
View file

@ -886,9 +886,9 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
public static String getAppModeDescription(Context ctx, ApplicationMode mode) { public static String getAppModeDescription(Context ctx, ApplicationMode mode) {
String description; String description;
if (mode.isCustomProfile()) { if (mode.isCustomProfile()) {
description = ctx.getString(R.string.profile_type_custom_string); description = ctx.getString(R.string.profile_type_user_string);
} else { } else {
description = ctx.getString(R.string.profile_type_base_string); description = ctx.getString(R.string.profile_type_osmand_string);
} }
return description; return description;

2
OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsListFragment.java
View file

@ -126,7 +126,7 @@ public abstract class BaseSettingsListFragment extends BaseOsmAndFragment implem
} }
}); });
adapter = new ExportSettingsAdapter(app, this, nightMode); adapter = new ExportSettingsAdapter(app, exportMode, this, nightMode);
adapter.updateSettingsItems(dataList, selectedItemsMap); adapter.updateSettingsItems(dataList, selectedItemsMap);
expandableList.setAdapter(adapter); expandableList.setAdapter(adapter);
updateAvailableSpace(); updateAvailableSpace();

35
OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java
View file

@ -164,17 +164,26 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
} }
private void initSavedIds(ApplicationMode appMode) { private void initSavedIds(ApplicationMode appMode) {
hiddenMenuItems = new ArrayList<>(getSettingForScreen(app, screenType).getModeValue(appMode).getHiddenIds()); initSavedIds(appMode, false);
}
private void initSavedIds(ApplicationMode appMode, boolean useDefaultValue) {
ContextMenuItemsSettings settings = getMenuItemsSettings(appMode, useDefaultValue);
hiddenMenuItems = new ArrayList<>(settings.getHiddenIds());
menuItemsOrder = new HashMap<>(); menuItemsOrder = new HashMap<>();
List<String> orderIds = getSettingForScreen(app, screenType).getModeValue(appMode).getOrderIds(); List<String> orderIds = settings.getOrderIds();
for (int i = 0; i < orderIds.size(); i++) { for (int i = 0; i < orderIds.size(); i++) {
menuItemsOrder.put(orderIds.get(i), i); menuItemsOrder.put(orderIds.get(i), i);
} }
} }
private void initMainActionsIds(ApplicationMode appMode) { private void initMainActionsIds(ApplicationMode appMode) {
initMainActionsIds(appMode, false);
}
private void initMainActionsIds(ApplicationMode appMode, boolean useDefaultValue) {
List<ContextMenuItem> defItems = getCustomizableDefaultItems(contextMenuAdapter.getDefaultItems()); List<ContextMenuItem> defItems = getCustomizableDefaultItems(contextMenuAdapter.getDefaultItems());
ContextMenuItemsSettings pref = getSettingForScreen(app, screenType).getModeValue(appMode); ContextMenuItemsSettings pref = getMenuItemsSettings(appMode, useDefaultValue);
if (pref instanceof MainContextMenuItemsSettings) { if (pref instanceof MainContextMenuItemsSettings) {
mainActionItems = new ArrayList<>(((MainContextMenuItemsSettings) pref).getMainIds()); mainActionItems = new ArrayList<>(((MainContextMenuItemsSettings) pref).getMainIds());
if (mainActionItems.isEmpty()) { if (mainActionItems.isEmpty()) {
@ -276,7 +285,7 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
} }
if (fm != null) { if (fm != null) {
ChangeGeneralProfilesPrefBottomSheet.showInstance(fm, ChangeGeneralProfilesPrefBottomSheet.showInstance(fm,
getSettingForScreen(app, screenType).getId(), getSettingForScreen().getId(),
prefToSave, prefToSave,
getTargetFragment(), getTargetFragment(),
false, false,
@ -501,12 +510,12 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
menuItemsOrder.clear(); menuItemsOrder.clear();
wasReset = true; wasReset = true;
isChanged = true; isChanged = true;
getSettingForScreen(app, screenType).resetModeToDefault(appMode);
if (screenType == ScreenType.CONTEXT_MENU_ACTIONS) { if (screenType == ScreenType.CONTEXT_MENU_ACTIONS) {
mainActionItems.clear(); mainActionItems.clear();
} }
instantiateContextMenuAdapter(); instantiateContextMenuAdapter();
initMainActionsIds(appMode); initSavedIds(appMode, true);
initMainActionsIds(appMode, true);
rearrangeAdapter.updateItems(getAdapterItems()); rearrangeAdapter.updateItems(getAdapterItems());
} }
}); });
@ -536,6 +545,20 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
} }
} }
public ContextMenuItemsSettings getMenuItemsSettings(ApplicationMode appMode,
boolean useDefaultValue) {
ContextMenuItemsPreference preference = getSettingForScreen();
if (useDefaultValue) {
return preference.getProfileDefaultValue(appMode);
} else {
return preference.getModeValue(appMode);
}
}
public ContextMenuItemsPreference getSettingForScreen() {
return getSettingForScreen(app, screenType);
}
public static ContextMenuItemsPreference getSettingForScreen(OsmandApplication app, ScreenType screenType) throws IllegalArgumentException { public static ContextMenuItemsPreference getSettingForScreen(OsmandApplication app, ScreenType screenType) throws IllegalArgumentException {
switch (screenType) { switch (screenType) {
case DRAWER: case DRAWER:

7
OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureProfileFragment.java
View file

@ -36,6 +36,7 @@ import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.development.OsmandDevelopmentPlugin;
import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.helpers.FontCache; import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin; import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
@ -345,6 +346,12 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
if (mode.isCustomProfile() && !getBackupFileForCustomMode(app, mode.getStringKey()).exists()) { if (mode.isCustomProfile() && !getBackupFileForCustomMode(app, mode.getStringKey()).exists()) {
resetToDefault.setVisible(false); resetToDefault.setVisible(false);
} else { } else {
OsmandDevelopmentPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandDevelopmentPlugin.class);
if (plugin != null && mode.getParent() != null) {
String baseProfile = "(" + mode.getParent().toHumanString() + ")";
String title = getString(R.string.ltr_or_rtl_combine_via_space, getString(R.string.reset_to_default), baseProfile);
resetToDefault.setTitle(title);
}
resetToDefault.setIcon(app.getUIUtilities().getIcon(R.drawable.ic_action_reset_to_default_dark, resetToDefault.setIcon(app.getUIUtilities().getIcon(R.drawable.ic_action_reset_to_default_dark,
isNightMode() ? R.color.active_color_primary_dark : R.color.active_color_primary_light)); isNightMode() ? R.color.active_color_primary_dark : R.color.active_color_primary_light));
} }

2
OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java
View file

@ -296,7 +296,7 @@ public class ExportItemsBottomSheet extends MenuBottomSheetDialogFragment {
if (!Algorithms.isEmpty(routingProfile)) { if (!Algorithms.isEmpty(routingProfile)) {
builder.setDescription(getString(R.string.ltr_or_rtl_combine_via_colon, getString(R.string.nav_type_hint), routingProfile)); builder.setDescription(getString(R.string.ltr_or_rtl_combine_via_colon, getString(R.string.nav_type_hint), routingProfile));
} else { } else {
builder.setDescription(getString(R.string.profile_type_base_string)); builder.setDescription(getString(R.string.profile_type_osmand_string));
} }
int profileIconRes = AndroidUtils.getDrawableId(app, modeBean.iconName); int profileIconRes = AndroidUtils.getDrawableId(app, modeBean.iconName);
ProfileIconColors iconColor = modeBean.iconColor; ProfileIconColors iconColor = modeBean.iconColor;

6
OsmAnd/src/net/osmand/plus/settings/fragments/ExportSettingsAdapter.java
View file

@ -43,6 +43,7 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
private final OsmandApplication app; private final OsmandApplication app;
private final UiUtilities uiUtilities; private final UiUtilities uiUtilities;
private final boolean exportMode;
private List<ExportSettingsCategory> itemsTypes; private List<ExportSettingsCategory> itemsTypes;
private Map<ExportSettingsType, List<?>> selectedItemsMap; private Map<ExportSettingsType, List<?>> selectedItemsMap;
@ -59,8 +60,9 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
private final int childViewHeight; private final int childViewHeight;
private final int listBottomPadding; private final int listBottomPadding;
ExportSettingsAdapter(OsmandApplication app, OnItemSelectedListener listener, boolean nightMode) { ExportSettingsAdapter(OsmandApplication app, boolean exportMode, OnItemSelectedListener listener, boolean nightMode) {
this.app = app; this.app = app;
this.exportMode = exportMode;
this.listener = listener; this.listener = listener;
this.nightMode = nightMode; this.nightMode = nightMode;
uiUtilities = app.getUIUtilities(); uiUtilities = app.getUIUtilities();
@ -279,7 +281,7 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
} }
} }
String description; String description;
if (selectedTypes == 0) { if (selectedTypes == 0 && exportMode) {
description = app.getString(R.string.shared_string_none); description = app.getString(R.string.shared_string_none);
} else if (selectedTypes == items.getTypes().size()) { } else if (selectedTypes == items.getTypes().size()) {
description = app.getString(R.string.shared_string_all); description = app.getString(R.string.shared_string_all);

6
OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java
View file

@ -24,10 +24,12 @@ import net.osmand.map.ITileSource;
import net.osmand.map.TileSourceManager.TileSourceTemplate; import net.osmand.map.TileSourceManager.TileSourceTemplate;
import net.osmand.plus.AppInitializer; import net.osmand.plus.AppInitializer;
import net.osmand.plus.FavouritesDbHelper.FavoriteGroup; import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.SQLiteTileSource; import net.osmand.plus.SQLiteTileSource;
import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
import net.osmand.plus.download.ReloadIndexesTask; import net.osmand.plus.download.ReloadIndexesTask;
import net.osmand.plus.download.ReloadIndexesTask.ReloadIndexesListener; import net.osmand.plus.download.ReloadIndexesTask.ReloadIndexesListener;
import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo; import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
@ -189,6 +191,10 @@ public class ImportSettingsFragment extends BaseSettingsListFragment {
app.getRendererRegistry().updateExternalRenderers(); app.getRendererRegistry().updateExternalRenderers();
AppInitializer.loadRoutingFiles(app, null); AppInitializer.loadRoutingFiles(app, null);
reloadIndexes(items); reloadIndexes(items);
AudioVideoNotesPlugin plugin = OsmandPlugin.getPlugin(AudioVideoNotesPlugin.class);
if (plugin != null) {
plugin.indexingFiles(null, true, true);
}
FragmentManager fm = getFragmentManager(); FragmentManager fm = getFragmentManager();
if (fm != null && file != null) { if (fm != null && file != null) {
ImportCompleteFragment.showInstance(fm, items, file.getName()); ImportCompleteFragment.showInstance(fm, items, file.getName());

6
OsmAnd/src/net/osmand/plus/settings/fragments/ImportedSettingsItemsAdapter.java
View file

@ -87,7 +87,7 @@ public class ImportedSettingsItemsAdapter extends
holder.title.setText(R.string.configure_screen_quick_action); holder.title.setText(R.string.configure_screen_quick_action);
break; break;
case POI_TYPES: case POI_TYPES:
holder.icon.setImageDrawable(uiUtils.getIcon(R.drawable.ic_action_search_dark, activeColorRes)); holder.icon.setImageDrawable(uiUtils.getIcon(R.drawable.ic_action_info_dark, activeColorRes));
holder.title.setText(R.string.search_activity); holder.title.setText(R.string.search_activity);
break; break;
case MAP_SOURCES: case MAP_SOURCES:
@ -108,7 +108,7 @@ public class ImportedSettingsItemsAdapter extends
break; break;
case MULTIMEDIA_NOTES: case MULTIMEDIA_NOTES:
holder.icon.setImageDrawable(uiUtils.getIcon(R.drawable.ic_action_photo_dark, activeColorRes)); holder.icon.setImageDrawable(uiUtils.getIcon(R.drawable.ic_action_photo_dark, activeColorRes));
holder.title.setText(R.string.audionotes_plugin_name); holder.title.setText(R.string.notes);
break; break;
case TRACKS: case TRACKS:
holder.icon.setImageDrawable(uiUtils.getIcon(R.drawable.ic_action_route_distance, activeColorRes)); holder.icon.setImageDrawable(uiUtils.getIcon(R.drawable.ic_action_route_distance, activeColorRes));
@ -119,7 +119,7 @@ public class ImportedSettingsItemsAdapter extends
holder.title.setText(R.string.osm_notes); holder.title.setText(R.string.osm_notes);
break; break;
case OSM_EDITS: case OSM_EDITS:
holder.icon.setImageDrawable(uiUtils.getIcon(R.drawable.ic_action_info_dark, activeColorRes)); holder.icon.setImageDrawable(uiUtils.getIcon(R.drawable.ic_action_openstreetmap_logo, activeColorRes));
holder.title.setText(R.string.osm_edits); holder.title.setText(R.string.osm_edits);
break; break;
case FAVORITES: case FAVORITES:

31
OsmAnd/src/net/osmand/plus/settings/fragments/NavigationFragment.java
View file

@ -4,10 +4,14 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import androidx.activity.OnBackPressedCallback; import androidx.activity.OnBackPressedCallback;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.SwitchPreferenceCompat; import androidx.preference.SwitchPreferenceCompat;
import net.osmand.plus.measurementtool.MeasurementToolFragment;
import net.osmand.plus.routepreparationmenu.RouteOptionsBottomSheet; import net.osmand.plus.routepreparationmenu.RouteOptionsBottomSheet;
import net.osmand.plus.routepreparationmenu.RouteOptionsBottomSheet.DialogMode;
import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
@ -35,7 +39,7 @@ import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.IS
import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.PROFILE_KEY_ARG; import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.PROFILE_KEY_ARG;
import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.SELECTED_KEY; import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.SELECTED_KEY;
import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.TYPE_NAV_PROFILE; import static net.osmand.plus.profiles.SelectProfileBottomSheetDialogFragment.TYPE_NAV_PROFILE;
import static net.osmand.plus.routepreparationmenu.RouteOptionsBottomSheet.PLANE_ROUTE; import static net.osmand.plus.routepreparationmenu.RouteOptionsBottomSheet.DIALOG_MODE_KEY;
public class NavigationFragment extends BaseSettingsFragment { public class NavigationFragment extends BaseSettingsFragment {
@ -51,16 +55,31 @@ public class NavigationFragment extends BaseSettingsFragment {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
routingProfileDataObjects = getRoutingProfiles(app); routingProfileDataObjects = getRoutingProfiles(app);
requireMyActivity().getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) { setupOnBackPressedCallback();
}
private void setupOnBackPressedCallback() {
OnBackPressedCallback callback = new OnBackPressedCallback(true) {
public void handleOnBackPressed() { public void handleOnBackPressed() {
MapActivity mapActivity = getMapActivity();
Bundle args = getArguments(); Bundle args = getArguments();
if (args != null && args.getBoolean(PLANE_ROUTE, false)) { if (mapActivity != null && args != null) {
RouteOptionsBottomSheet.showInstance(getMapActivity().getSupportFragmentManager(), String dialogModeName = args.getString(DIALOG_MODE_KEY, null);
getSelectedAppMode().getStringKey()); if (DialogMode.getModeByName(dialogModeName) == DialogMode.PLAN_ROUTE) {
FragmentManager fm = mapActivity.getSupportFragmentManager();
Fragment fragment = fm.findFragmentByTag(MeasurementToolFragment.TAG);
if (fragment != null) {
RouteOptionsBottomSheet.showInstance(
mapActivity, fragment, DialogMode.PLAN_ROUTE,
getSelectedAppMode().getStringKey());
((MeasurementToolFragment) fragment).getOnBackPressedCallback().setEnabled(true);
}
}
} }
dismiss(); dismiss();
} }
}); };
requireMyActivity().getOnBackPressedDispatcher().addCallback(this, callback);
} }
@Override @Override

2
OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
View file

@ -393,7 +393,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
? changedProfile.parent.toHumanString() ? changedProfile.parent.toHumanString()
: getSelectedAppMode().toHumanString()); : getSelectedAppMode().toHumanString());
OsmandTextFieldBoxes baseProfileNameHint = (OsmandTextFieldBoxes) holder.findViewById(R.id.master_profile_otfb); OsmandTextFieldBoxes baseProfileNameHint = (OsmandTextFieldBoxes) holder.findViewById(R.id.master_profile_otfb);
baseProfileNameHint.setLabelText(getString(R.string.profile_type_base_string)); baseProfileNameHint.setLabelText(getString(R.string.profile_type_osmand_string));
FrameLayout selectNavTypeBtn = (FrameLayout) holder.findViewById(R.id.select_nav_type_btn); FrameLayout selectNavTypeBtn = (FrameLayout) holder.findViewById(R.id.select_nav_type_btn);
selectNavTypeBtn.setOnClickListener(new View.OnClickListener() { selectNavTypeBtn.setOnClickListener(new View.OnClickListener() {
@Override @Override

132
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
View file

@ -1,9 +1,7 @@
package net.osmand.plus.views.mapwidgets; package net.osmand.plus.views.mapwidgets;
import android.content.Context; import android.content.Context;
import android.view.Menu; import android.graphics.drawable.Drawable;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.LinearLayout; import android.widget.LinearLayout;
@ -11,6 +9,7 @@ import android.widget.LinearLayout;
import androidx.annotation.DrawableRes; import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import androidx.core.content.ContextCompat;
import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.ApplicationMode;
import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter;
@ -29,12 +28,16 @@ import net.osmand.plus.views.layers.MapQuickActionLayer;
import net.osmand.plus.views.OsmandMapLayer.DrawSettings; import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
import net.osmand.plus.views.mapwidgets.widgets.TextInfoWidget; import net.osmand.plus.views.mapwidgets.widgets.TextInfoWidget;
import net.osmand.plus.views.mapwidgets.widgetstates.WidgetState; import net.osmand.plus.views.mapwidgets.widgetstates.WidgetState;
import net.osmand.plus.widgets.IconPopupMenu; import net.osmand.plus.widgets.popup.PopUpMenuItem;
import net.osmand.plus.widgets.popup.PopUpMenuHelper;
import net.osmand.plus.widgets.popup.PopUpMenuHelper.PopUpMenuWidthType;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
@ -513,6 +516,7 @@ public class MapWidgetRegistry {
final String desc = mapActivity.getString(R.string.shared_string_collapse); final String desc = mapActivity.getString(R.string.shared_string_collapse);
final boolean nightMode = app.getDaynightHelper().isNightModeForMapControls(); final boolean nightMode = app.getDaynightHelper().isNightModeForMapControls();
final int currentModeColorRes = mode.getIconColorInfo().getColor(nightMode); final int currentModeColorRes = mode.getIconColorInfo().getColor(nightMode);
final int currentModeColor = ContextCompat.getColor(app, currentModeColorRes);
ContextMenuItem.ItemBuilder itemBuilder = new ContextMenuItem.ItemBuilder() ContextMenuItem.ItemBuilder itemBuilder = new ContextMenuItem.ItemBuilder()
.setIcon(r.getDrawableMenu()) .setIcon(r.getDrawableMenu())
.setSelected(selected) .setSelected(selected)
@ -530,14 +534,8 @@ public class MapWidgetRegistry {
return false; return false;
} }
View textWrapper = view.findViewById(R.id.text_wrapper); View textWrapper = view.findViewById(R.id.text_wrapper);
IconPopupMenu popup = new IconPopupMenu(view.getContext(), textWrapper); List<PopUpMenuItem> items = new ArrayList<>();
MenuInflater inflater = popup.getMenuInflater();
final Menu menu = popup.getMenu();
inflater.inflate(R.menu.widget_visibility_menu, menu);
UiUtilities ic = app.getUIUtilities(); UiUtilities ic = app.getUIUtilities();
menu.findItem(R.id.action_show).setIcon(ic.getThemedIcon(R.drawable.ic_action_view));
menu.findItem(R.id.action_hide).setIcon(ic.getThemedIcon(R.drawable.ic_action_hide));
menu.findItem(R.id.action_collapse).setIcon(ic.getThemedIcon(R.drawable.ic_action_widget_collapse));
final int[] menuIconIds = r.getDrawableMenuIds(); final int[] menuIconIds = r.getDrawableMenuIds();
final int[] menuTitleIds = r.getMessageIds(); final int[] menuTitleIds = r.getMessageIds();
@ -549,57 +547,77 @@ public class MapWidgetRegistry {
for (int i = 0; i < menuIconIds.length; i++) { for (int i = 0; i < menuIconIds.length; i++) {
int iconId = menuIconIds[i]; int iconId = menuIconIds[i];
int titleId = menuTitleIds[i]; int titleId = menuTitleIds[i];
int id = menuItemIds[i]; final int id = menuItemIds[i];
MenuItem menuItem = menu.add(R.id.single_selection_group, id, i, titleId) boolean isChecked = id == checkedId;
.setChecked(id == checkedId); String title = app.getString(titleId);
menuItem.setIcon(menuItem.isChecked() && selected Drawable icon = isChecked && selected ? ic.getIcon(iconId, currentModeColorRes) : ic.getThemedIcon(iconId);
? ic.getIcon(iconId, currentModeColorRes) : ic.getThemedIcon(iconId)); items.add(new PopUpMenuItem.Builder(app)
.setTitle(title)
.setIcon(icon)
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
r.changeState(id);
MapInfoLayer mil = mapActivity.getMapLayers().getMapInfoLayer();
if (mil != null) {
mil.recreateControls();
}
ContextMenuItem item = adapter.getItem(pos);
item.setIcon(r.getDrawableMenu());
if (r.getMessage() != null) {
item.setTitle(r.getMessage());
} else {
item.setTitle(mapActivity.getResources().getString(r.getMessageId()));
}
adapter.notifyDataSetChanged();
}
})
.showCompoundBtn(currentModeColor)
.setSelected(isChecked)
.create());
} }
menu.setGroupCheckable(R.id.single_selection_group, true, true);
menu.setGroupVisible(R.id.single_selection_group, true);
} }
popup.setOnMenuItemClickListener( // show
new IconPopupMenu.OnMenuItemClickListener() { items.add(new PopUpMenuItem.Builder(app)
.setTitleId(R.string.shared_string_show)
.setIcon(ic.getThemedIcon(R.drawable.ic_action_view))
.setOnClickListener(new View.OnClickListener() {
@Override @Override
public boolean onMenuItemClick(MenuItem menuItem) { public void onClick(View v) {
setVisibility(adapter, pos, true, false);
int i = menuItem.getItemId();
if (i == R.id.action_show) {
setVisibility(adapter, pos, true, false);
return true;
} else if (i == R.id.action_hide) {
setVisibility(adapter, pos, false, false);
return true;
} else if (i == R.id.action_collapse) {
setVisibility(adapter, pos, true, true);
return true;
} else {
if (menuItemIds != null) {
for (int menuItemId : menuItemIds) {
if (menuItem.getItemId() == menuItemId) {
r.changeState(menuItemId);
MapInfoLayer mil = mapActivity.getMapLayers().getMapInfoLayer();
if (mil != null) {
mil.recreateControls();
}
ContextMenuItem item = adapter.getItem(pos);
item.setIcon(r.getDrawableMenu());
if (r.getMessage() != null) {
item.setTitle(r.getMessage());
} else {
item.setTitle(mapActivity.getResources().getString(r.getMessageId()));
}
adapter.notifyDataSetChanged();
return true;
}
}
}
}
return false;
} }
}); })
popup.show(); .create());
// hide
items.add(new PopUpMenuItem.Builder(app)
.setTitleId(R.string.shared_string_hide)
.setIcon(ic.getThemedIcon(R.drawable.ic_action_hide))
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
setVisibility(adapter, pos, false, false);
}
})
.create());
// collapse
items.add(new PopUpMenuItem.Builder(app)
.setTitleId(R.string.shared_string_collapse)
.setIcon(ic.getThemedIcon(R.drawable.ic_action_widget_collapse))
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
setVisibility(adapter, pos, true, true);
}
})
.create());
new PopUpMenuHelper.Builder(textWrapper, items, nightMode)
.setWidthType(PopUpMenuWidthType.STANDARD)
.show();
return false; return false;
} }

83
OsmAnd/src/net/osmand/plus/widgets/popup/PopUpMenuArrayAdapter.java Normal file
View file

@ -0,0 +1,83 @@
package net.osmand.plus.widgets.popup;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.CompoundButton;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import net.osmand.AndroidUtils;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import java.util.List;
public class PopUpMenuArrayAdapter extends ArrayAdapter<PopUpMenuItem> {
private List<PopUpMenuItem> items;
private boolean nightMode;
public PopUpMenuArrayAdapter(@NonNull Context context,
int resource,
List<PopUpMenuItem> items,
boolean nightMode) {
super(context, resource);
this.items = items;
this.nightMode = nightMode;
}
@Override
public int getCount() {
return items.size();
}
@NonNull
@Override
public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
LayoutInflater inflater = LayoutInflater.from(getContext());
if (convertView == null) {
convertView = inflater.inflate(R.layout.popup_menu_item, parent, false);
}
PopUpMenuItem item = getItem(position);
if (item != null) {
TextView tvTitle = convertView.findViewById(R.id.title);
tvTitle.setText(item.getTitle());
ImageView ivIcon = convertView.findViewById(R.id.icon);
Drawable icon = item.getIcon();
if (icon != null) {
ivIcon.setImageDrawable(icon);
} else {
ivIcon.setVisibility(View.GONE);
}
CompoundButton radio = convertView.findViewById(R.id.radio);
if (item.isShowCompoundBtn()) {
UiUtilities.setupCompoundButton(nightMode, item.getCompoundBtnColor(), radio);
radio.setVisibility(View.VISIBLE);
} else {
radio.setVisibility(View.GONE);
}
if (item.isSelected()) {
if (item.isShowCompoundBtn()) {
radio.setChecked(true);
} else {
convertView.setBackgroundColor(UiUtilities.getColorWithAlpha(
AndroidUtils.getColorFromAttr(getContext(), R.attr.active_color_basic), 0.1f));
}
}
}
return convertView;
}
@Nullable
@Override
public PopUpMenuItem getItem(int position) {
return items.get(position);
}
}

138
OsmAnd/src/net/osmand/plus/widgets/popup/PopUpMenuHelper.java Normal file
View file

@ -0,0 +1,138 @@
package net.osmand.plus.widgets.popup;
import android.content.Context;
import android.view.Gravity;
import android.view.View;
import android.widget.AdapterView;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.ListPopupWindow;
import net.osmand.AndroidUtils;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import java.util.ArrayList;
import java.util.List;
public class PopUpMenuHelper {
private View anchorView;
private List<PopUpMenuItem> items;
private PopUpMenuWidthType widthType;
private AdapterView.OnItemClickListener listener;
private boolean nightMode;
private PopUpMenuHelper(@NonNull View anchorView,
@NonNull List<PopUpMenuItem> items,
PopUpMenuWidthType widthType,
AdapterView.OnItemClickListener listener,
boolean nightMode) {
this.anchorView = anchorView;
this.items = items;
this.widthType = widthType;
this.listener = listener;
this.nightMode = nightMode;
}
private void show() {
ListPopupWindow listPopupWindow = createPopUpWindow();
listPopupWindow.show();
}
private ListPopupWindow createPopUpWindow() {
Context ctx = UiUtilities.getThemedContext(anchorView.getContext(), nightMode);
int contentPadding = getDimensionPixelSize(ctx, R.dimen.content_padding);
int contentPaddingHalf = getDimensionPixelSize(ctx, R.dimen.content_padding_half);
int defaultListTextSize = getDimensionPixelSize(ctx, R.dimen.default_list_text_size);
int standardIconSize = getDimensionPixelSize(ctx, R.dimen.standard_icon_size);
boolean hasIcon = false;
List<String> titles = new ArrayList<>();
for (PopUpMenuItem item : items) {
titles.add(String.valueOf(item.getTitle()));
hasIcon = hasIcon || item.getIcon() != null;
}
float itemWidth = AndroidUtils.getTextMaxWidth(defaultListTextSize, titles) + contentPadding * 2;
float iconPartWidth = hasIcon ? standardIconSize + contentPaddingHalf : 0;
float compoundBtnWidth = contentPadding * 3;
int minWidth = widthType == PopUpMenuWidthType.AS_ANCHOR_VIEW ? anchorView.getWidth() : 0;
float additional;
if (widthType == PopUpMenuWidthType.STANDARD) {
additional = iconPartWidth + compoundBtnWidth;
} else {
additional = iconPartWidth;
}
int totalWidth =(int) (Math.max(itemWidth, minWidth) + additional);
PopUpMenuArrayAdapter adapter =
new PopUpMenuArrayAdapter(ctx, R.layout.popup_menu_item, items, nightMode);
final ListPopupWindow listPopupWindow = new ListPopupWindow(ctx);
listPopupWindow.setAnchorView(anchorView);
listPopupWindow.setContentWidth((int) (totalWidth));
listPopupWindow.setDropDownGravity(Gravity.START | Gravity.TOP);
listPopupWindow.setVerticalOffset(-anchorView.getHeight() + contentPaddingHalf);
listPopupWindow.setModal(true);
listPopupWindow.setAdapter(adapter);
listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (listener != null) {
listener.onItemClick(parent, view, position, id);
}
listPopupWindow.dismiss();
}
});
return listPopupWindow;
}
private int getDimensionPixelSize(Context ctx, int dimensionResId) {
return ctx.getResources().getDimensionPixelSize(dimensionResId);
}
public enum PopUpMenuWidthType {
STANDARD,
AS_ANCHOR_VIEW
}
public static class Builder {
private View anchorView;
private List<PopUpMenuItem> items;
private AdapterView.OnItemClickListener listener;
private PopUpMenuWidthType widthType = PopUpMenuWidthType.AS_ANCHOR_VIEW;
private boolean nightMode;
public Builder(View anchorView, List<PopUpMenuItem> items, boolean nightMode) {
this.anchorView = anchorView;
this.items = items;
this.nightMode = nightMode;
}
public Builder setListener(AdapterView.OnItemClickListener listener) {
this.listener = listener;
return this;
}
public Builder setWidthType(@NonNull PopUpMenuWidthType widthType) {
this.widthType = widthType;
return this;
}
public void show() {
if (listener == null) {
listener = new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (position < items.size()) {
View.OnClickListener listener = items.get(position).getOnClickListener();
if (listener != null) {
listener.onClick(view);
}
}
}
};
}
new PopUpMenuHelper(anchorView, items, widthType, listener, nightMode).show();
}
}
}

100
OsmAnd/src/net/osmand/plus/widgets/popup/PopUpMenuItem.java Normal file
View file

@ -0,0 +1,100 @@
package net.osmand.plus.widgets.popup;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.view.View;
import androidx.annotation.ColorInt;
public class PopUpMenuItem {
private CharSequence title;
private Drawable icon;
private View.OnClickListener onClickListener;
private boolean selected;
@ColorInt
private Integer compoundBtnColor;
private PopUpMenuItem(CharSequence title,
Drawable icon,
View.OnClickListener onClickListener,
boolean selected,
Integer compoundBtnColor) {
this.title = title;
this.icon = icon;
this.onClickListener = onClickListener;
this.selected = selected;
this.compoundBtnColor = compoundBtnColor;
}
public CharSequence getTitle() {
return title;
}
public Drawable getIcon() {
return icon;
}
public View.OnClickListener getOnClickListener() {
return onClickListener;
}
public boolean isShowCompoundBtn() {
return compoundBtnColor != null;
}
public Integer getCompoundBtnColor() {
return compoundBtnColor;
}
public boolean isSelected() {
return selected;
}
public static class Builder {
private Context ctx;
private CharSequence title;
private Drawable icon;
private View.OnClickListener onClickListener;
@ColorInt
private Integer compoundBtnColor;
private boolean selected;
public Builder(Context ctx) {
this.ctx = ctx;
}
public Builder setTitleId(int titleId) {
this.title = ctx.getString(titleId);
return this;
}
public Builder setTitle(CharSequence title) {
this.title = title;
return this;
}
public Builder setIcon(Drawable icon) {
this.icon = icon;
return this;
}
public Builder setOnClickListener(View.OnClickListener onClickListener) {
this.onClickListener = onClickListener;
return this;
}
public Builder showCompoundBtn(int compoundBtnColor) {
this.compoundBtnColor = compoundBtnColor;
return this;
}
public Builder setSelected(boolean selected) {
this.selected = selected;
return this;
}
public PopUpMenuItem create() {
return new PopUpMenuItem(title, icon, onClickListener, selected, compoundBtnColor);
}
}
}

12
OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelDbHelper.java
View file

@ -114,6 +114,18 @@ public class TravelDbHelper implements TravelHelper {
localDataHelper = new TravelLocalDataHelper(application); localDataHelper = new TravelLocalDataHelper(application);
} }
public static boolean checkIfDbFileExists(OsmandApplication app) {
File[] files = app.getAppPath(IndexConstants.WIKIVOYAGE_INDEX_DIR).listFiles();
if (files != null) {
for (File file : files) {
if (file.getName().endsWith(IndexConstants.BINARY_WIKIVOYAGE_MAP_INDEX_EXT)) {
return true;
}
}
}
return false;
}
public TravelLocalDataHelper getBookmarksHelper() { public TravelLocalDataHelper getBookmarksHelper() {
return localDataHelper; return localDataHelper;
} }

138
OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java Normal file
View file

@ -0,0 +1,138 @@
package net.osmand.plus.wikivoyage.data;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import net.osmand.CollatorStringMatcher;
import net.osmand.GPXUtilities;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.ResultMatcher;
import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.data.Amenity;
import net.osmand.data.MapObject;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.api.SQLiteAPI;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
public class TravelObfHelper implements TravelHelper {
private static final Log LOG = PlatformUtil.getLog(TravelObfHelper.class);
private final OsmandApplication application;
private TravelLocalDataHelper localDataHelper;
private List<TravelArticle> popularArticles = new ArrayList<TravelArticle>();
public TravelObfHelper(OsmandApplication application) {
this.application = application;
localDataHelper = new TravelLocalDataHelper(application);
}
public TravelLocalDataHelper getBookmarksHelper() {
return localDataHelper;
}
@Override
public void initializeDataOnAppStartup() {
}
@Override
public boolean isAnyTravelBookPresent() {
return checkIfObfFileExists(application);
}
public void initializeDataToDisplay() {
localDataHelper.refreshCachedData();
loadPopularArticles();
}
@NonNull
public List<WikivoyageSearchResult> search(final String searchQuery) {
List<WikivoyageSearchResult> res = new ArrayList<>();
return res;
}
@NonNull
public List<TravelArticle> getPopularArticles() {
return popularArticles;
}
@Override
public Map<WikivoyageSearchResult, List<WikivoyageSearchResult>> getNavigationMap(TravelArticle article) {
return null;
}
@Override
public TravelArticle getArticleById(String routeId, String lang) {
return null;
}
@Override
public TravelArticle getArticleByTitle(String title, String lang) {
return null;
}
@Override
public String getArticleId(String title, String lang) {
return null;
}
@Override
public ArrayList<String> getArticleLangs(String articleId) {
return null;
}
@NonNull
public List<TravelArticle> loadPopularArticles() {
popularArticles = new ArrayList<>();
return popularArticles;
}
public String getGPXName(TravelArticle article) {
return article.getTitle().replace('/', '_').replace('\'', '_')
.replace('\"', '_') + IndexConstants.GPX_FILE_EXT;
}
public File createGpxFile(TravelArticle article) {
final GPXUtilities.GPXFile gpx = article.getGpxFile();
File file = application.getAppPath(IndexConstants.GPX_TRAVEL_DIR + getGPXName(article));
if (!file.exists()) {
GPXUtilities.writeGpxFile(file, gpx);
}
return file;
}
@Override
public String getSelectedTravelBookName() {
return null;
}
public static boolean checkIfObfFileExists(OsmandApplication app) {
File[] files = app.getAppPath(IndexConstants.WIKIVOYAGE_INDEX_DIR).listFiles();
if (files != null) {
for (File f : files) {
if (f.getName().contains(IndexConstants.BINARY_TRAVEL_GUIDE_MAP_INDEX_EXT)) {
return true;
}
}
}
return false;
}
}