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

Merge branch 'master' into send-gpx

Browse source 
# Conflicts:
#	OsmAnd/res/layout/send_gpx_fragment.xml
This commit is contained in:
androiddevkkotlin 2020-11-13 16:50:04 +02:00
commit cc6fd93d7f
47 changed files with 755 additions and 266 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
View file

@ -55,7 +55,7 @@ public class GPXUtilities {
private static final String GAP_PROFILE_TYPE = "gap"; private static final String GAP_PROFILE_TYPE = "gap";
private static final String TRKPT_INDEX_EXTENSION = "trkpt_idx"; private static final String TRKPT_INDEX_EXTENSION = "trkpt_idx";
private final static String GPX_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'"; //$NON-NLS-1$ public final static String GPX_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'"; //$NON-NLS-1$
private final static String GPX_TIME_FORMAT_MILLIS = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; //$NON-NLS-1$ private final static String GPX_TIME_FORMAT_MILLIS = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; //$NON-NLS-1$
private final static NumberFormat latLonFormat = new DecimalFormat("0.00#####", new DecimalFormatSymbols( private final static NumberFormat latLonFormat = new DecimalFormat("0.00#####", new DecimalFormatSymbols(

2
OsmAnd-java/src/main/java/net/osmand/data/Amenity.java
View file

@ -134,7 +134,7 @@ public class Amenity extends MapObject {
} }
this.additionalInfo.put(tag, value); this.additionalInfo.put(tag, value);
if (OPENING_HOURS.equals(tag)) { if (OPENING_HOURS.equals(tag)) {
this.openingHours = value; this.openingHours = unzipContent(value);
} }
} }
} }

4
OsmAnd-java/src/main/java/net/osmand/data/City.java
View file

@ -24,6 +24,10 @@ public class City extends MapObject {
public double getRadius() { public double getRadius() {
return radius; return radius;
} }
public boolean storedAsSeparateAdminEntity() {
return this != DISTRICT && this != NEIGHBOURHOOD && this != BOROUGH;
}
public static String valueToString(CityType t) { public static String valueToString(CityType t) {
return t.toString().toLowerCase(); return t.toString().toLowerCase();

6
OsmAnd-telegram/res/values-ca/strings.xml
View file

@ -131,7 +131,7 @@
<string name="send_my_location">Envia la meva ubicació</string> <string name="send_my_location">Envia la meva ubicació</string>
<string name="gps_and_location">Ubicació</string> <string name="gps_and_location">Ubicació</string>
<string name="sharing_time">Temps de compartició</string> <string name="sharing_time">Temps de compartició</string>
<string name="expire_at">"Expiració: "</string> <string name="expire_at">Finalitza</string>
<string name="open_osmand">Obre l\'OsmAnd</string> <string name="open_osmand">Obre l\'OsmAnd</string>
<string name="shared_string_live">En directe</string> <string name="shared_string_live">En directe</string>
<string name="shared_string_bot">Bot</string> <string name="shared_string_bot">Bot</string>
@ -267,4 +267,8 @@
<string name="last_response_duration">Darrera resposta: fa %1$s</string> <string name="last_response_duration">Darrera resposta: fa %1$s</string>
<string name="duration_ago">fa %1$s</string> <string name="duration_ago">fa %1$s</string>
<string name="shared_string_error_short">ERR</string> <string name="shared_string_error_short">ERR</string>
<string name="shared_string_export">Exporta</string>
<string name="logcat_buffer">Memòria intermèdia del Logcat</string>
<string name="logcat_buffer_descr">Valida i comparteix enregistraments detallats de l\'aplicació</string>
<string name="send_report">Envia un informe</string>
</resources> </resources>

17
OsmAnd-telegram/res/values-is/strings.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="units_and_formats">Einingar og snið þeirra</string> <string name="units_and_formats">Einingar og snið</string>
<string name="install_osmand">Setja upp OsmAnd</string> <string name="install_osmand">Setja upp OsmAnd</string>
<string name="proxy_password">Lykilorð</string> <string name="proxy_password">Lykilorð</string>
<string name="average_altitude">Meðalhæð</string> <string name="average_altitude">Meðalhæð</string>
@ -44,7 +44,7 @@
<string name="last_update_from_telegram_duration">Síðasta uppfærsla frá Telegram: Fyrir %1$s síðan</string> <string name="last_update_from_telegram_duration">Síðasta uppfærsla frá Telegram: Fyrir %1$s síðan</string>
<string name="monitoring_is_disabled">Vöktun er óvirk</string> <string name="monitoring_is_disabled">Vöktun er óvirk</string>
<string name="status_widget_title">Staða OsmAnd-rekjara</string> <string name="status_widget_title">Staða OsmAnd-rekjara</string>
<string name="app_name_short">OsmAnd rekjari</string> <string name="app_name_short">OsmAnd-rekjari</string>
<string name="shared_string_group">Hópur</string> <string name="shared_string_group">Hópur</string>
<string name="min_mile">mín/ml</string> <string name="min_mile">mín/ml</string>
<string name="proxy_server">Netþjónn</string> <string name="proxy_server">Netþjónn</string>
@ -208,4 +208,17 @@
<string name="end_date">Lokadagsetning</string> <string name="end_date">Lokadagsetning</string>
<string name="osmand_service">Bakgrunnshamur</string> <string name="osmand_service">Bakgrunnshamur</string>
<string name="osmand_service_descr">OsmAnd-rakning keyrir í bakgrunni á meðan slökkt er á skjá.</string> <string name="osmand_service_descr">OsmAnd-rakning keyrir í bakgrunni á meðan slökkt er á skjá.</string>
<string name="not_found_yet">Ekki fundist ennþá</string>
<string name="received_gps_points">Móttók GPX-punkta: %1$s</string>
<string name="sharing_location">Deili staðsetningu</string>
<string name="logout_help_desc">Hvernig á að slökkva á OsmAnd-rekjaranum úr Telegram</string>
<string name="not_sent_yet">Ekki sent ennþá</string>
<string name="app_name">OsmAnd nettengdur GPS-rekjari</string>
<string name="logout_from_osmand_telegram">Skrá út úr OsmAnd-rekjara\?</string>
<string name="stop_sharing_all">Kveikt er á deilingu (slökkva)</string>
<string name="disconnect_from_telegram">Hvernig á að slökkva á OsmAnd-rekjaranum úr Telegram</string>
<string name="gps_not_available">Virkjaðu \"Staðsetning\" í stillingunum stýrikerfisins</string>
<string name="live_now_description">Tengiliðir og hópar sem deila staðsetningu til þín.</string>
<string name="logout_no_internet_msg">Tengstu við internetið til að geta skráð þig til fulls út úr Telegram.</string>
<string name="privacy_policy_agree">Með því að smella á \'Halda áfram\', samþykkir þú ákvæði og skilyrði varðandi gagnaleynd hjá Telegram og OsmAnd.</string>
</resources> </resources>

27
OsmAnd/res/drawable/ic_action_route_start_destination.xml Normal file
View file

@ -0,0 +1,27 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M10,15C10,16.6569 8.6568,18 7,18C5.3432,18 4,16.6569 4,15V13H2V15C2,17.7614 4.2386,20 7,20C9.7614,20 12,17.7614 12,15L12,8.5C12,7.1193 13.1193,6 14.5,6C15.8807,6 17,7.1193 17,8.5V11H19V8.5C19,6.0147 16.9853,4 14.5,4C12.0147,4 10,6.0147 10,8.5V15Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M4,8H2V11H4V8Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M19,17H17V20H19V17Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M2,4H7V8H2V4Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M17,13H22V17H17V13Z"
android:fillColor="#ffffff"/>
</vector>

14
OsmAnd/res/layout/send_gpx_fragment.xml
View file

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:osmand="http://schemas.android.com/apk/res-auto" xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
@ -27,7 +27,6 @@
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_medium" /> osmand:typeface="@string/font_roboto_medium" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/message_label" android:id="@+id/message_label"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -42,8 +41,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:background = "?attr/background_field" android:background = "?attr/background_field"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="actionDone" android:imeOptions="actionDone" />
android:paddingTop = "@dimen/empty_state_image_margin_bottom"/>
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
@ -104,8 +103,9 @@
android:paddingBottom="@dimen/context_menu_first_line_top_margin" android:paddingBottom="@dimen/context_menu_first_line_top_margin"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:text="@string/gpx_visibility_txt" osmand:typeface="@string/font_roboto_medium"
osmand:typeface="@string/font_roboto_medium" /> tools:text="@string/gpx_visibility_txt" />
</LinearLayout> </LinearLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
@ -201,5 +201,5 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout>

146
OsmAnd/res/values-ar/phrases.xml
View file

@ -123,7 +123,7 @@
<string name="poi_recycling_printer_cartridges">خراطيش الطابعة</string> <string name="poi_recycling_printer_cartridges">خراطيش الطابعة</string>
<string name="poi_recycling_car_batteries">بطاريات سيارات</string> <string name="poi_recycling_car_batteries">بطاريات سيارات</string>
<string name="poi_recycling_cars">سيارات</string> <string name="poi_recycling_cars">سيارات</string>
<string name="poi_caravan_site">موقع خاص للقوافل</string> <string name="poi_caravan_site">موقع خاص للمقطورات</string>
<string name="poi_int_name">الإسم الدولي</string> <string name="poi_int_name">الإسم الدولي</string>
<string name="poi_nat_name">الإسم الوطني</string> <string name="poi_nat_name">الإسم الوطني</string>
<string name="poi_reg_name">الإسم الإقليمي</string> <string name="poi_reg_name">الإسم الإقليمي</string>
@ -264,11 +264,11 @@
<string name="poi_city_gate">باب مدينة</string> <string name="poi_city_gate">باب مدينة</string>
<string name="poi_courthouse">محكمة</string> <string name="poi_courthouse">محكمة</string>
<string name="poi_restaurant">مطعم</string> <string name="poi_restaurant">مطعم</string>
<string name="poi_place_of_worship">مكان للعبادة</string> <string name="poi_place_of_worship">مكان عبادة</string>
<string name="poi_government">حكومة</string> <string name="poi_government">حكومة</string>
<string name="poi_building">مبنى</string> <string name="poi_building">مبنى</string>
<string name="poi_hairdresser">حلاق</string> <string name="poi_hairdresser">حلاق</string>
<string name="poi_toilets">مرحاض; حمام</string> <string name="poi_toilets">دورة مياة; حمام</string>
<string name="poi_traffic_calming_bump">مطب قوي</string> <string name="poi_traffic_calming_bump">مطب قوي</string>
<string name="poi_highway_crossing">ممر الراجلين</string> <string name="poi_highway_crossing">ممر الراجلين</string>
<string name="poi_post_office">مكتب بريد</string> <string name="poi_post_office">مكتب بريد</string>
@ -314,7 +314,7 @@
<string name="poi_tunnel_waterway">نفق مياه</string> <string name="poi_tunnel_waterway">نفق مياه</string>
<string name="poi_tunnel_pedestrian">نفق ممر الراجلين</string> <string name="poi_tunnel_pedestrian">نفق ممر الراجلين</string>
<string name="poi_tunnel_railway">نفق سكك حديدية</string> <string name="poi_tunnel_railway">نفق سكك حديدية</string>
<string name="poi_river">وادي</string> <string name="poi_river">نهر</string>
<string name="poi_craft_tailor">خياط</string> <string name="poi_craft_tailor">خياط</string>
<string name="poi_motorway_junction">تقاطع الطريق السريع</string> <string name="poi_motorway_junction">تقاطع الطريق السريع</string>
<string name="poi_tram_stop">توقف الترام</string> <string name="poi_tram_stop">توقف الترام</string>
@ -695,7 +695,7 @@
<string name="poi_aerialway_magic_carpet">رافعة سجاد</string> <string name="poi_aerialway_magic_carpet">رافعة سجاد</string>
<string name="poi_craft_upholsterer">منجد</string> <string name="poi_craft_upholsterer">منجد</string>
<string name="poi_craft_watchmaker">صانع ساعات</string> <string name="poi_craft_watchmaker">صانع ساعات</string>
<string name="poi_craft_window_construction">بناء إطار النوافذ</string> <string name="poi_craft_window_construction">بناء النوافذ</string>
<string name="poi_funeral_directors">إدارة الجنائز</string> <string name="poi_funeral_directors">إدارة الجنائز</string>
<string name="poi_craft_computer">تركيب الحواسيب</string> <string name="poi_craft_computer">تركيب الحواسيب</string>
<string name="poi_beauty">صالون تجميل</string> <string name="poi_beauty">صالون تجميل</string>
@ -704,13 +704,13 @@
<string name="poi_tattoo">صالون وشم</string> <string name="poi_tattoo">صالون وشم</string>
<string name="poi_dry_cleaning">التنظيف الجاف</string> <string name="poi_dry_cleaning">التنظيف الجاف</string>
<string name="poi_laundry">غسيل الملابس</string> <string name="poi_laundry">غسيل الملابس</string>
<string name="poi_car_rental">تأجير السيارات</string> <string name="poi_car_rental">تأجير سيارات</string>
<string name="poi_car_sharing">مشاركة السيارات</string> <string name="poi_car_sharing">مشاركة السيارات</string>
<string name="poi_boat_sharing">مشاركة القوارب</string> <string name="poi_boat_sharing">مشاركة القوارب</string>
<string name="poi_shower">دش</string> <string name="poi_shower">دش</string>
<string name="poi_brothel">بيت دعارة</string> <string name="poi_brothel">بيت دعارة</string>
<string name="poi_smoking_area">منطقة للتدخين</string> <string name="poi_smoking_area">منطقة للتدخين</string>
<string name="poi_mortuary">مشرحة</string> <string name="poi_mortuary">ثلاجة الموتى</string>
<string name="poi_crematorium">محرقة</string> <string name="poi_crematorium">محرقة</string>
<string name="poi_amenity_atm">صراف آلي</string> <string name="poi_amenity_atm">صراف آلي</string>
<string name="poi_money_lender">قرض المال</string> <string name="poi_money_lender">قرض المال</string>
@ -724,7 +724,7 @@
<string name="poi_ridge">قمة</string> <string name="poi_ridge">قمة</string>
<string name="poi_glacier">نهر جليدي</string> <string name="poi_glacier">نهر جليدي</string>
<string name="poi_waterfall">شلال</string> <string name="poi_waterfall">شلال</string>
<string name="poi_stream">تيار</string> <string name="poi_stream">مجرى مائي</string>
<string name="poi_rapids">منحدر نهر</string> <string name="poi_rapids">منحدر نهر</string>
<string name="poi_stone">حجر تذكاري</string> <string name="poi_stone">حجر تذكاري</string>
<string name="poi_beach">شاطئ</string> <string name="poi_beach">شاطئ</string>
@ -746,7 +746,7 @@
<string name="poi_club_freemasonry">محفل ماسوني</string> <string name="poi_club_freemasonry">محفل ماسوني</string>
<string name="poi_club_sailing">نادي الإبحار</string> <string name="poi_club_sailing">نادي الإبحار</string>
<string name="poi_club_scout">نادي الكشافة</string> <string name="poi_club_scout">نادي الكشافة</string>
<string name="poi_piste_snow_park">حديقة ثلجية</string> <string name="poi_piste_snow_park">حديقة الثلج</string>
<string name="poi_piste_ice_skate">تزلج على الجليد</string> <string name="poi_piste_ice_skate">تزلج على الجليد</string>
<string name="poi_ski_rental">استئجار لوازم التزلج</string> <string name="poi_ski_rental">استئجار لوازم التزلج</string>
<string name="poi_arts_centre">مركز الفنون</string> <string name="poi_arts_centre">مركز الفنون</string>
@ -768,7 +768,7 @@
<string name="poi_water_park">حديقة مائية</string> <string name="poi_water_park">حديقة مائية</string>
<string name="poi_park">منتزه</string> <string name="poi_park">منتزه</string>
<string name="poi_recreation_ground">أرض للترفيه</string> <string name="poi_recreation_ground">أرض للترفيه</string>
<string name="poi_fast_food">أكل خفيف</string> <string name="poi_fast_food">وجبات سريعة</string>
<string name="poi_attraction_water_slide">منزلق مائي</string> <string name="poi_attraction_water_slide">منزلق مائي</string>
<string name="poi_lodging">سكن</string> <string name="poi_lodging">سكن</string>
<string name="poi_guest_house">بيت ضيافة</string> <string name="poi_guest_house">بيت ضيافة</string>
@ -814,8 +814,8 @@
<string name="poi_aeroway_terminal">محطة المطار</string> <string name="poi_aeroway_terminal">محطة المطار</string>
<string name="poi_aeroway_gate">بوابة الصعود</string> <string name="poi_aeroway_gate">بوابة الصعود</string>
<string name="poi_club_art">نادي الفنون</string> <string name="poi_club_art">نادي الفنون</string>
<string name="poi_club_astronomy">نادي علم الفلك</string> <string name="poi_club_astronomy">نادي فلكي</string>
<string name="poi_club_computer">نادي الإعلام الآلي</string> <string name="poi_club_computer">نادي الكمبيوتر</string>
<string name="poi_club_motorcycle">نادي الدراجات النارية</string> <string name="poi_club_motorcycle">نادي الدراجات النارية</string>
<string name="poi_club_sport">نادي للرياضة</string> <string name="poi_club_sport">نادي للرياضة</string>
<string name="poi_club_game">نادي للألعاب</string> <string name="poi_club_game">نادي للألعاب</string>
@ -829,23 +829,23 @@
<string name="poi_craft_tiler">مبلط</string> <string name="poi_craft_tiler">مبلط</string>
<string name="poi_sinkhole">حفرة</string> <string name="poi_sinkhole">حفرة</string>
<string name="poi_water">ماء</string> <string name="poi_water">ماء</string>
<string name="poi_wetland">الأراضي الرطبة</string> <string name="poi_wetland">أراضي رطبة</string>
<string name="poi_wood">خشب و غابة</string> <string name="poi_wood">خشب و غابة</string>
<string name="poi_tree">شجرة</string> <string name="poi_tree">شجرة</string>
<string name="poi_nature_reserve">حضيرة طبيعية محمية</string> <string name="poi_nature_reserve">محمية طبيعية</string>
<string name="poi_island">جزيرة</string> <string name="poi_island">جزيرة</string>
<string name="poi_islet">جزيرة صغيرة</string> <string name="poi_islet">جزيرة صغيرة</string>
<string name="poi_anchorage">مرسى</string> <string name="poi_anchorage">مرسى</string>
<string name="poi_beacon_safe_water">منارة المياه المأمونة</string> <string name="poi_beacon_safe_water">منارة المياه الآمنة</string>
<string name="poi_beacon_special_purpose">منارة ﻷغراض خاصة</string> <string name="poi_beacon_special_purpose">منارة خاصة</string>
<string name="poi_distance_mark">علامة المسافة</string> <string name="poi_distance_mark">علامة المسافة</string>
<string name="poi_small_craft_facility">مرفق الحرف الصغيرة</string> <string name="poi_small_craft_facility">مرفق الحرف الصغيرة</string>
<string name="poi_military_barracks">ثكنة عسكرية</string> <string name="poi_military_barracks">ثكنة عسكرية</string>
<string name="poi_military_danger_area">منطقة خطرة</string> <string name="poi_military_danger_area">منطقة خطرة</string>
<string name="poi_military_nuclear_explosion_site">موقع انفجار نووي</string> <string name="poi_military_nuclear_explosion_site">موقع انفجار نووي</string>
<string name="poi_wiki_place">ويكيبيديا</string> <string name="poi_wiki_place">ويكيبيديا</string>
<string name="poi_wiki_lang_en">ويكي بالإنجليزية</string> <string name="poi_wiki_lang_en">ويكي بالإنجليزي</string>
<string name="poi_wiki_lang_ar">ويكي بالعربية</string> <string name="poi_wiki_lang_ar">ويكي بالعربي</string>
<string name="poi_wiki_lang_be">ويكي بالبلاروسية</string> <string name="poi_wiki_lang_be">ويكي بالبلاروسية</string>
<string name="poi_wiki_lang_bg">ويكي البلغارية</string> <string name="poi_wiki_lang_bg">ويكي البلغارية</string>
<string name="poi_wiki_lang_ca">ويكي الكاتالونية</string> <string name="poi_wiki_lang_ca">ويكي الكاتالونية</string>
@ -925,9 +925,9 @@
<string name="poi_clock">ساعة</string> <string name="poi_clock">ساعة</string>
<string name="poi_travel_agent">وكيل سفر</string> <string name="poi_travel_agent">وكيل سفر</string>
<string name="poi_camp_site">موقع تخييم</string> <string name="poi_camp_site">موقع تخييم</string>
<string name="poi_picnic_site">موقع نزهة</string> <string name="poi_picnic_site">موقع تنزه</string>
<string name="poi_hot_spring">ينبوع ساخن</string> <string name="poi_hot_spring">ينبوع ساخن</string>
<string name="poi_grave_yard">مقبرة</string> <string name="poi_grave_yard">مقبرة داخل الكنيسة</string>
<string name="poi_tomb">قبر</string> <string name="poi_tomb">قبر</string>
<string name="poi_shelter">مأوى</string> <string name="poi_shelter">مأوى</string>
<string name="poi_resort">منتجع</string> <string name="poi_resort">منتجع</string>
@ -939,28 +939,28 @@
<string name="poi_playground">ملعب للأطفال</string> <string name="poi_playground">ملعب للأطفال</string>
<string name="poi_bar">حانة</string> <string name="poi_bar">حانة</string>
<string name="poi_pub">حانة</string> <string name="poi_pub">حانة</string>
<string name="poi_drinking_water">مياه الشرب</string> <string name="poi_drinking_water">مياه شرب</string>
<string name="poi_barbecue">الشواء</string> <string name="poi_barbecue">الشواء</string>
<string name="poi_craft_agricultural_engines">محركات زراعية</string> <string name="poi_craft_agricultural_engines">محركات زراعية</string>
<string name="poi_craft_basket_maker">صانع السلال</string> <string name="poi_craft_basket_maker">صانع السلال</string>
<string name="poi_craft_beekeeper">النحال</string> <string name="poi_craft_beekeeper">نحال</string>
<string name="poi_craft_blacksmith">حداد</string> <string name="poi_craft_blacksmith">حداد</string>
<string name="poi_craft_brewery">مصنع الجعة</string> <string name="poi_craft_brewery">مصنع الجعة</string>
<string name="poi_craft_clockmaker">ساعاتي</string> <string name="poi_craft_clockmaker">ساعاتي</string>
<string name="poi_craft_dressmaker">خياطة</string> <string name="poi_craft_dressmaker">خياط</string>
<string name="poi_craft_electrician">كهربائي</string> <string name="poi_craft_electrician">كهربائي</string>
<string name="poi_craft_gardener">البستاني</string> <string name="poi_craft_gardener">بستاني</string>
<string name="poi_craft_handicraft">الحرف اليدوية</string> <string name="poi_craft_handicraft">حرف يدوية</string>
<string name="poi_craft_hvac">التدفئة والتهوية وتكييف الهواء</string> <string name="poi_craft_hvac">تدفئة، تهوية، تكييف</string>
<string name="poi_craft_insulation">العزل</string> <string name="poi_craft_insulation">عزل</string>
<string name="poi_craft_jeweller">تاجر المجوهرات</string> <string name="poi_craft_jeweller">صائغ مجوهرات</string>
<string name="poi_craft_photographic_laboratory">مختبر التصوير الفوتوغرافي</string> <string name="poi_craft_photographic_laboratory">مختبر التصوير الفوتوغرافي</string>
<string name="poi_craft_pottery">حرفة الفخار</string> <string name="poi_craft_pottery">حرفة الفخار</string>
<string name="poi_beacon">منارة</string> <string name="poi_beacon">منارة</string>
<string name="poi_fog_signal">إشارة الضباب</string> <string name="poi_fog_signal">إشارة ضباب</string>
<string name="poi_harbour_basin">حوض الميناء</string> <string name="poi_harbour_basin">حوض الميناء</string>
<string name="poi_seamark_harbour">الميناء</string> <string name="poi_seamark_harbour">ميناء</string>
<string name="poi_signal_station_warning">محطة إشارة، وتحذير</string> <string name="poi_signal_station_warning">محطة إشارة، تحذير</string>
<string name="poi_military_bunker">وقود السفن العسكرية</string> <string name="poi_military_bunker">وقود السفن العسكرية</string>
<string name="poi_wiki_lang_ce">ويكي الشيشان</string> <string name="poi_wiki_lang_ce">ويكي الشيشان</string>
<string name="poi_wiki_lang_ur">ويكي الأردية</string> <string name="poi_wiki_lang_ur">ويكي الأردية</string>
@ -1678,4 +1678,88 @@
<string name="poi_socket_type2_combo_output_filter">نوع 2 مخرج combo</string> <string name="poi_socket_type2_combo_output_filter">نوع 2 مخرج combo</string>
<string name="poi_theme_park">حديقه</string> <string name="poi_theme_park">حديقه</string>
<string name="poi_aquarium">حوض سمك</string> <string name="poi_aquarium">حوض سمك</string>
<string name="poi_wiki_lang_af">ويكي أفريقيا</string>
<string name="poi_wiki_lang_nn">النرويجية نينورسك ويكي</string>
<string name="poi_wiki_lang_new">ويكي نيوار</string>
<string name="poi_military_range">النطاق العسكري</string>
<string name="poi_seamark_clearance_width">العرض المسموح به</string>
<string name="poi_seamark_clearance_height_open">الارتفاع المسموح به (مفتوح)</string>
<string name="poi_seamark_clearance_height_closed">الارتفاع المسموح به (مغلق)</string>
<string name="poi_seamark_clearance_height">الارتفاع المسموح به، علامة بحرية</string>
<string name="poi_seamark_wreck">حطام, علامة بحريّة</string>
<string name="poi_seamark_rock">صخرة, علامة بحريّة</string>
<string name="poi_topmark">علامة علوية، علامة بحرية</string>
<string name="poi_signal_station_traffic">محطة إشارة، حركة المرور</string>
<string name="poi_radio_station">محطة إذاعية، علامة مائية</string>
<string name="poi_radar_transponder">جهاز إرسال واستقبال راداري، علامة بحرية</string>
<string name="poi_pile">كومة</string>
<string name="poi_notice">إشعار، علامة مائية</string>
<string name="poi_lock_basin">حوض مقفول</string>
<string name="poi_mooring">رباط</string>
<string name="poi_seamark_light_vessel">ضوء السفينة ، علامة مائية</string>
<string name="poi_seamark_light_float">عوامة منيرة، علامة مائية</string>
<string name="poi_seamark_light_minor">ضوء رئيسي، علامة البحر</string>
<string name="poi_seamark_light_major">ضوء رئيسي، علامة البحر</string>
<string name="poi_seamark_light">ضوء, علامة بحريّة</string>
<string name="poi_landmark">علامة</string>
<string name="poi_floating_dock">رصيف عائم</string>
<string name="poi_seamark_dyke">حاجز علامة البحر</string>
<string name="poi_dry_dock">حوض جاف</string>
<string name="poi_daymark">علامة النهار</string>
<string name="poi_buoy_special_purpose">عوامة الأغراض الخاصة</string>
<string name="poi_buoy_lateral">عوامة جانبية</string>
<string name="poi_buoy_isolated_danger">عوامة ، خطر معزول</string>
<string name="poi_buoy_installation">عوامة التثبيت</string>
<string name="poi_seamark_bridge">جسر اتجاهات البحر</string>
<string name="poi_seamark_building">مبنى اتجاهات البحر</string>
<string name="poi_buoy_cardinal">عوامة الاتجاهات</string>
<string name="poi_berth">رصيف Berth</string>
<string name="poi_beacon_lateral">منارة جانبية</string>
<string name="poi_beacon_cardinal">منارة الكاردينال</string>
<string name="poi_anchor_berth">مرساة مرسى</string>
<string name="poi_strait">مضيق</string>
<string name="poi_valley">وادي</string>
<string name="poi_cape">رأس (بحري)</string>
<string name="poi_payment_terminal">محطة دفع</string>
<string name="poi_atm">صراف آلي ATM</string>
<string name="poi_sauna">ساونا</string>
<string name="poi_cutline">خط مقطوع في الغابة</string>
<string name="poi_dock">رصيف</string>
<string name="poi_car_pooling">مكان استلام السيارات</string>
<string name="poi_craft_tinsmith">سمكري</string>
<string name="poi_craft_sweep">مسح</string>
<string name="poi_craft_sun_protection">صانع حامي الشمس</string>
<string name="poi_craft_stonemason">بَناء</string>
<string name="poi_craft_scaffolder">سقالات</string>
<string name="poi_craft_sawmill">منشرة</string>
<string name="poi_craft_sailmaker">صانع الشراع</string>
<string name="poi_craft_saddler">صانع السرج</string>
<string name="poi_craft_roofer">سقاف</string>
<string name="poi_craft_rigger">ريجر</string>
<string name="poi_craft_plasterer">جصاص</string>
<string name="poi_craft_parquet_layer">طبقة الباركيه</string>
<string name="poi_craft_painter">دهان</string>
<string name="poi_craft_optician">أخصائي بصريات</string>
<string name="poi_craft_metal_construction">حرفة الصناعات المعدنية</string>
<string name="poi_craft_key_cutter">ناسخ مفاتيح</string>
<string name="poi_craft_locksmith">صانع ومصلح المفاتيح</string>
<string name="poi_craft_glaziery">زجاج</string>
<string name="poi_craft_carpet_layer">سجاد وموكيت</string>
<string name="poi_craft_bookbinder">تجليد الكتب</string>
<string name="poi_craft_boatbuilder">بناة القوارب</string>
<string name="poi_food_court">صالة طعام</string>
<string name="poi_village_green">مساحة خضراء في المناطق المأهولة</string>
<string name="poi_club_board_games">نادي ألعاب اللوح</string>
<string name="poi_funicular">قطار جبلي</string>
<string name="poi_geyser">فوارة حارة</string>
<string name="poi_spring">‮‮نبع</string>
<string name="poi_denomination_shia">الرافضية</string>
<string name="poi_lean_to">ملحق ملاصق للمبنى</string>
<string name="poi_cycle_barrier">حاجز دراجات</string>
<string name="poi_wiki_lang_ast">ويكي أستور وليوني</string>
<string name="poi_wiki_lang_zhminnan">جنوب مين ويكي</string>
<string name="poi_wiki_lang_sh">ويكي الصربية الكرواتية</string>
<string name="poi_wiki_lang_nds">منخفض ساكسون ويكي</string>
<string name="poi_wiki_lang_ml">ويكي المالايالامية</string>
<string name="poi_wiki_lang_fy">فريسك ويكي</string>
</resources> </resources>

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

@ -3934,10 +3934,25 @@
<string name="navigate_point_mgrs">النظام المرجعي للشبكة العسكرية</string> <string name="navigate_point_mgrs">النظام المرجعي للشبكة العسكرية</string>
<string name="navigate_point_format_mgrs">النظام المرجعي للشبكة العسكرية</string> <string name="navigate_point_format_mgrs">النظام المرجعي للشبكة العسكرية</string>
<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>
<string name="login_open_street_map">تسجيل الدخول إلى خريطة الشارع المفتوح</string>
<string name="login_open_street_map_org">تسجيل الدخول إلى OpenStreetMap.org</string>
<string name="sing_in_with_open_street_map">تسجيل الخروج</string>
<string name="open_street_map_login_mode">تحتاج إلى تسجيل الدخول لرفع التغييرات الجديدة أو المعدلة.
\n
\nيمكنك تسجيل الدخول باستخدام طريقة التفويض الآمنة أو استخدام تسجيل الدخول وكلمة المرور.</string>
<string name="use_login_password">استخدام تسجيل الدخول وكلمة المرور</string>
<string name="login_account">الحساب</string>
<string name="user_login">تسجيل الدخول</string>
<string name="gpx_upload_trackable_visibility_descr">إمكانية التتبع تعني أن التتبع لن يظهر في أي قوائم عامة ولكن ستظل نقاط التتبع الصادرة عنه متاحة من خلال واجهة برمجة تطبيقات GPS API العامة مع طوابع زمنية. سيتمكن المستخدمون الآخرون فقط من تنزيل نقاط التتبع المعالجة من التتبع الخاص بك والتي لا يمكن ربطها بك مباشرةً.</string>
<string name="markers_history">سجل تاريخ العلامات</string>
<string name="send_files_to_openstreetmap">أرسل ملف GPX إلى OpenStreetMap</string>
<string name="enter_text_separated">أدخل العلامات مفصولة بفاصلة.</string>
<string name="gpx_upload_private_visibility_descr">\"خاص\"يعني أن التتبع لن يظهر في أي قوائم عامة ، ولكن نقاط التتبع الصادرة عنه ستظل متاحة من خلال واجهة برمجة تطبيقات GPS API العامة بدون طوابع زمنية ولكن لن يتم ترتيبها ترتيبًا زمنيًا.</string>
<string name="sign_in_with_open_street_map">قم بتسجيل الدخول باستخدام OpenStreetMap</string>
</resources> </resources>

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

@ -699,7 +699,7 @@
<string name="poi_dry_cleaning">Neteja en sec</string> <string name="poi_dry_cleaning">Neteja en sec</string>
<string name="poi_car_sharing">Cotxe multiusuari</string> <string name="poi_car_sharing">Cotxe multiusuari</string>
<string name="poi_boat_sharing">Vaixell multiusuari</string> <string name="poi_boat_sharing">Vaixell multiusuari</string>
<string name="poi_toilets">Vàter públic</string> <string name="poi_toilets">Bany; Lavabos</string>
<string name="poi_brothel">Bordell</string> <string name="poi_brothel">Bordell</string>
<string name="poi_smoking_area">Àrea de fumadors</string> <string name="poi_smoking_area">Àrea de fumadors</string>
<string name="poi_internet_cafe">Ciberlocal</string> <string name="poi_internet_cafe">Ciberlocal</string>
@ -769,8 +769,8 @@
<string name="poi_wiki_lang_lv">Wiki en letó</string> <string name="poi_wiki_lang_lv">Wiki en letó</string>
<string name="poi_wiki_lang_ms">Wiki en malai</string> <string name="poi_wiki_lang_ms">Wiki en malai</string>
<string name="poi_wiki_lang_new">Wiki en newar</string> <string name="poi_wiki_lang_new">Wiki en newar</string>
<string name="poi_wiki_lang_nl">"Wiki en holandès"</string> <string name="poi_wiki_lang_nl">Wiki en holandès</string>
<string name="poi_wiki_lang_nn">"Wiki en noruec (nynorsk)"</string> <string name="poi_wiki_lang_nn">Wiki en noruec (nynorsk)</string>
<string name="poi_wiki_lang_no">Wiki en noruec</string> <string name="poi_wiki_lang_no">Wiki en noruec</string>
<string name="poi_wiki_lang_pl">Wiki en polonès</string> <string name="poi_wiki_lang_pl">Wiki en polonès</string>
<string name="poi_wiki_lang_pt">Wiki en portuguès</string> <string name="poi_wiki_lang_pt">Wiki en portuguès</string>
@ -2181,8 +2181,8 @@
<string name="poi_aeroway_fuel">Benzinera per avions</string> <string name="poi_aeroway_fuel">Benzinera per avions</string>
<string name="poi_waterway_fuel">Benzinera per embarcacions</string> <string name="poi_waterway_fuel">Benzinera per embarcacions</string>
<string name="poi_ice_hockey">Hoquei sobre gel</string> <string name="poi_ice_hockey">Hoquei sobre gel</string>
<string name="poi_internet_access_fee_yes">Accés a Internet - de pagament</string> <string name="poi_internet_access_fee_yes">Accés a Internet: de pagament</string>
<string name="poi_internet_access_fee_no">Accés a Internet - de franc</string> <string name="poi_internet_access_fee_no">Accés a Internet: de franc</string>
<string name="poi_club_freemasonry">Lògia maçònica</string> <string name="poi_club_freemasonry">Lògia maçònica</string>
<string name="poi_club_sailing">Club nàutic</string> <string name="poi_club_sailing">Club nàutic</string>
<string name="poi_club_scout">Club d\'escoltes</string> <string name="poi_club_scout">Club d\'escoltes</string>

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

@ -3406,7 +3406,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="delete_profiles_descr">Al prémer \'Aplica\', s\'esborraran definitivament els perfils suprimits.</string> <string name="delete_profiles_descr">Al prémer \'Aplica\', s\'esborraran definitivament els perfils suprimits.</string>
<string name="master_profile">Perfil principal</string> <string name="master_profile">Perfil principal</string>
<string name="select_color">Seleccioneu el color</string> <string name="select_color">Seleccioneu el color</string>
<string name="edit_profiles_descr">Els perfils predeterminats de l\'OsmAnd no no poden ser esborrats, però podeu desactivar-los (a la pantalla anterior), o ordenar-los cap a la part inferior.</string> <string name="edit_profiles_descr">Els perfils predeterminats de l\'OsmAnd no es poden esborrar però si desactivar-se (a la pantalla anterior) o reordenar-se cap al el final.</string>
<string name="edit_profiles">Edita els perfils</string> <string name="edit_profiles">Edita els perfils</string>
<string name="select_nav_profile_dialog_message">El \'tipus de navegació\' determina com es calculen les rutes.</string> <string name="select_nav_profile_dialog_message">El \'tipus de navegació\' determina com es calculen les rutes.</string>
<string name="profile_appearance">Aparença del perfil</string> <string name="profile_appearance">Aparença del perfil</string>
@ -3442,7 +3442,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="route_recalculation">Recàlcul de la ruta</string> <string name="route_recalculation">Recàlcul de la ruta</string>
<string name="accessibility_announce">Anunci</string> <string name="accessibility_announce">Anunci</string>
<string name="login_and_pass">Nom d\'usuari i contrasenya</string> <string name="login_and_pass">Nom d\'usuari i contrasenya</string>
<string name="plugin_global_prefs_info">Aquesta configuració afecta tots els perfils.</string> <string name="plugin_global_prefs_info">Aquest paràmetre de connectors és global i afecta tots els perfils.</string>
<string name="osm_editing">Edició OSM</string> <string name="osm_editing">Edició OSM</string>
<string name="osm_edits_view_descr">Consulteu les vostres edicions o errors OSM encara no pujats a %1$s. Els punts enviats ja no es veuran més.</string> <string name="osm_edits_view_descr">Consulteu les vostres edicions o errors OSM encara no pujats a %1$s. Els punts enviats ja no es veuran més.</string>
<string name="select_nav_icon_descr">La icona es mostra mentre navegueu o us mogueu.</string> <string name="select_nav_icon_descr">La icona es mostra mentre navegueu o us mogueu.</string>
@ -3714,9 +3714,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="track_show_start_finish_icons">Mostra icones d\'inici i final</string> <string name="track_show_start_finish_icons">Mostra icones d\'inici i final</string>
<string name="select_track_width">Triar amplària</string> <string name="select_track_width">Triar amplària</string>
<string name="route_between_points_add_track_desc">Trieu un arxiu de ruta al qual s\'afegirà un nou segment.</string> <string name="route_between_points_add_track_desc">Trieu un arxiu de ruta al qual s\'afegirà un nou segment.</string>
<string name="route_between_points_warning_desc">Per usar aquesta opció OsmAnd ha d\'ajustar la seua ruta a les vies del mapa. <string name="route_between_points_warning_desc">Desprès, ajusteu la traçada a la carretera permesa més propera amb un dels vostres perfils de navegació per utilitzar aquesta opció.</string>
\n
\nEn el pas següent cal que elegiu el perfil de navegació per detectar vies permeses i el llindar de distància per aproximar la ruta a les vies.</string>
<string name="route_between_points_desc">Trieu com connectar els punts, amb una línia recta, o calcular la ruta entre ells segons s\'indica a continuació.</string> <string name="route_between_points_desc">Trieu com connectar els punts, amb una línia recta, o calcular la ruta entre ells segons s\'indica a continuació.</string>
<string name="gpx_split_interval_descr">Trieu l\'interval a què les marques de distància o temps sobre la ruta es mostraran.</string> <string name="gpx_split_interval_descr">Trieu l\'interval a què les marques de distància o temps sobre la ruta es mostraran.</string>
<string name="shared_string_custom">Personalitzat</string> <string name="shared_string_custom">Personalitzat</string>
@ -3881,4 +3879,6 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="icon_group_emergency">Emergència</string> <string name="icon_group_emergency">Emergència</string>
<string name="use_native_pt">Desenvolupament local de Transport Public</string> <string name="use_native_pt">Desenvolupament local de Transport Public</string>
<string name="app_mode_gap">Discontinu</string> <string name="app_mode_gap">Discontinu</string>
<string name="lenght_limit_description">Proporcioneu la llargada del vostre vehicle, pot haver-hi rutes restringides als vehicles llargs.</string>
<string name="gpx_parse_error">No s\'ha generat correctament l\'arxiu GPX. Indiqueu-ho a l\'equip de suport per continuar investigant.</string>
</resources> </resources>

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

@ -313,7 +313,7 @@
<string name="global_app_settings">Globale Einstellungen</string> <string name="global_app_settings">Globale Einstellungen</string>
<string name="user_name">OSM-Benutzername</string> <string name="user_name">OSM-Benutzername</string>
<string name="open_street_map_login_descr">Benötigt für openstreetmap.org-Beiträge.</string> <string name="open_street_map_login_descr">Benötigt für openstreetmap.org-Beiträge.</string>
<string name="user_password">OSM-Passwort</string> <string name="user_password">Passwort</string>
<string name="osmand_service">Hintergrundmodus</string> <string name="osmand_service">Hintergrundmodus</string>
<string name="osmand_service_descr">OsmAnd läuft bei ausgeschaltetem Bildschirm im Hintergrund.</string> <string name="osmand_service_descr">OsmAnd läuft bei ausgeschaltetem Bildschirm im Hintergrund.</string>
<string name="download_files_not_enough_space">Speicherplatz (frei: %2$s MB) reicht nicht aus, um %1$s MB herunterzuladen.</string> <string name="download_files_not_enough_space">Speicherplatz (frei: %2$s MB) reicht nicht aus, um %1$s MB herunterzuladen.</string>
@ -3439,7 +3439,7 @@
<string name="file_does_not_contain_routing_rules">Die Datei \'%1$s\' enthält keine Routing-Regeln. Bitte eine andere Datei wählen.</string> <string name="file_does_not_contain_routing_rules">Die Datei \'%1$s\' enthält keine Routing-Regeln. Bitte eine andere Datei wählen.</string>
<string name="monitoring_min_speed_descr">Dies ist ein Filter, welcher Punkte unter einer gewissen Geschwindigkeit nicht aufzeichnet. Dadurch können aufgezeichnete Tracks auf der Karte gleichmäßiger aussehen.</string> <string name="monitoring_min_speed_descr">Dies ist ein Filter, welcher Punkte unter einer gewissen Geschwindigkeit nicht aufzeichnet. Dadurch können aufgezeichnete Tracks auf der Karte gleichmäßiger aussehen.</string>
<string name="monitoring_min_speed_descr_side_effect">Nebeneffekt: Auf Ihrer Strecke fehlen alle Abschnitte, in denen das Mindestgeschwindigkeitskriterium nicht erfüllt wurde (z. B., wenn Sie Ihr Fahrrad einen steilen Hügel hinaufschieben). Außerdem wird es keine Informationen über Ruhezeiten wie Pausen geben. Dies hat Auswirkungen auf jede Analyse oder Nachbearbeitung, z. B., wenn Sie versuchen, die Gesamtlänge Ihrer Reise, die Zeit in Bewegung oder Ihre Durchschnittsgeschwindigkeit zu bestimmen.</string> <string name="monitoring_min_speed_descr_side_effect">Nebeneffekt: Auf Ihrer Strecke fehlen alle Abschnitte, in denen das Mindestgeschwindigkeitskriterium nicht erfüllt wurde (z. B., wenn Sie Ihr Fahrrad einen steilen Hügel hinaufschieben). Außerdem wird es keine Informationen über Ruhezeiten wie Pausen geben. Dies hat Auswirkungen auf jede Analyse oder Nachbearbeitung, z. B., wenn Sie versuchen, die Gesamtlänge Ihrer Reise, die Zeit in Bewegung oder Ihre Durchschnittsgeschwindigkeit zu bestimmen.</string>
<string name="plugin_global_prefs_info">Diese Einstellungen gelten für alle Profile.</string> <string name="plugin_global_prefs_info">Diese Modul-Einstellungen sind global und gelten für alle Profile</string>
<string name="live_monitoring_time_buffer">Zeitpuffer</string> <string name="live_monitoring_time_buffer">Zeitpuffer</string>
<string name="live_monitoring_tracking_interval">Aufzeichnungsintervall</string> <string name="live_monitoring_tracking_interval">Aufzeichnungsintervall</string>
<string name="live_monitoring_adress">Webadresse</string> <string name="live_monitoring_adress">Webadresse</string>
@ -3520,7 +3520,7 @@
<string name="import_profile_dialog_description">Das importierte Profil enthält zusätzliche Daten. Klicken Sie auf \"Importieren\", um nur Profildaten zu importieren, oder wählen Sie zusätzliche Daten aus.</string> <string name="import_profile_dialog_description">Das importierte Profil enthält zusätzliche Daten. Klicken Sie auf \"Importieren\", um nur Profildaten zu importieren, oder wählen Sie zusätzliche Daten aus.</string>
<string name="export_profile_dialog_description">Sie können zusätzliche Daten zum Exportieren zusammen mit dem Profil auswählen.</string> <string name="export_profile_dialog_description">Sie können zusätzliche Daten zum Exportieren zusammen mit dem Profil auswählen.</string>
<string name="index_name_antarctica">Antarktis</string> <string name="index_name_antarctica">Antarktis</string>
<string name="osm_edits_view_descr">Sie finden Ihre noch nicht übertragenen Änderungen oder OSM-Fehler in %1$s. Hochgeladene Punkte werden nicht mehr angezeigt.</string> <string name="osm_edits_view_descr">Sie können alle Ihre noch nicht hochgeladenen Bearbeitungen oder OSM-Fehlermeldungen in %1$s anzeigen. Hochgeladene Punkte werden in OsmAnd nicht angezeigt.</string>
<string name="monitoring_min_speed_descr_recommendation">Empfehlung: Versuchen Sie zunächst, die Bewegungserkennung über den Filter zur Mindestabstandsmessung (B) zu verwenden. Das kann zu besseren Ergebnissen führen und Sie werden weniger Daten verlieren. Sollten Ihre Tracks bei niedrigen Geschwindigkeiten ungenau bleiben, versuchen Sie hier Werte ungleich Null. Bitte beachten Sie, dass einige Messungen (einige netzwerkbasierte Methoden) möglicherweise überhaupt keine Geschwindigkeitswerte anzeigen. In diesem Fall wird nichts aufgezeichnet.</string> <string name="monitoring_min_speed_descr_recommendation">Empfehlung: Versuchen Sie zunächst, die Bewegungserkennung über den Filter zur Mindestabstandsmessung (B) zu verwenden. Das kann zu besseren Ergebnissen führen und Sie werden weniger Daten verlieren. Sollten Ihre Tracks bei niedrigen Geschwindigkeiten ungenau bleiben, versuchen Sie hier Werte ungleich Null. Bitte beachten Sie, dass einige Messungen (einige netzwerkbasierte Methoden) möglicherweise überhaupt keine Geschwindigkeitswerte anzeigen. In diesem Fall wird nichts aufgezeichnet.</string>
<string name="monitoring_min_accuracy_descr">Es werden nur Punkte aufgezeichnet, die mit der gewählten Mindestgenauigkeit bestimmt wurden (in Metern/Fuß, wie von Android je nach Chipsatz bereitgestellt). Die Genauigkeit beschreibt die Nähe der Messungen zur wahren Position und steht nicht unmittelbar in Bezug zur Präzision, der Streuung wiederholter Messungen.</string> <string name="monitoring_min_accuracy_descr">Es werden nur Punkte aufgezeichnet, die mit der gewählten Mindestgenauigkeit bestimmt wurden (in Metern/Fuß, wie von Android je nach Chipsatz bereitgestellt). Die Genauigkeit beschreibt die Nähe der Messungen zur wahren Position und steht nicht unmittelbar in Bezug zur Präzision, der Streuung wiederholter Messungen.</string>
<string name="monitoring_min_accuracy_descr_remark">Bemerkung: Wenn das GPS unmittelbar vor einer Aufzeichnung ausgeschaltet war, kann der erste gemessene Punkt eine verminderte Genauigkeit haben, sodass wir in unserem Code vielleicht eine Sekunde oder so warten wollen, bevor ein Punkt (oder der beste von 3 aufeinanderfolgenden Punkten usw.) aufgezeichnet wird. Das ist aber noch nicht implementiert.</string> <string name="monitoring_min_accuracy_descr_remark">Bemerkung: Wenn das GPS unmittelbar vor einer Aufzeichnung ausgeschaltet war, kann der erste gemessene Punkt eine verminderte Genauigkeit haben, sodass wir in unserem Code vielleicht eine Sekunde oder so warten wollen, bevor ein Punkt (oder der beste von 3 aufeinanderfolgenden Punkten usw.) aufgezeichnet wird. Das ist aber noch nicht implementiert.</string>
@ -3951,10 +3951,26 @@
<string name="icon_group_symbols">Symbole</string> <string name="icon_group_symbols">Symbole</string>
<string name="shared_string_local_maps">Lokale Karten</string> <string name="shared_string_local_maps">Lokale Karten</string>
<string name="icon_group_special">Spezial</string> <string name="icon_group_special">Spezial</string>
<string name="message_you_need_add_two_points_to_show_graphs">Sie müssen mindestens zwei Punkte hinzufügen.</string> <string name="message_you_need_add_two_points_to_show_graphs">Sie müssen mindestens zwei Punkte hinzufügen</string>
<string name="manage_subscription">Abonnement verwalten</string> <string name="manage_subscription">Abonnement verwalten</string>
<string name="subscription_payment_issue_title">Es gibt ein Problem mit Ihrem Abonnement. Klicken Sie auf die Schaltfläche, um zu den Einstellungen des Google Play Abonnements zu gelangen und Ihre Zahlungsmethode zu überprüfen.</string> <string name="subscription_payment_issue_title">Es gibt ein Problem mit Ihrem Abonnement. Klicken Sie auf die Schaltfläche, um zu den Einstellungen des Google Play Abonnements zu gelangen und Ihre Zahlungsmethode zu überprüfen.</string>
<string name="subscription_expired_title">OsmAnd Live Abonnement ist abgelaufen</string> <string name="subscription_expired_title">OsmAnd Live Abonnement ist abgelaufen</string>
<string name="subscription_paused_title">OsmAnd Live Abonnement wurde ausgesetzt</string> <string name="subscription_paused_title">OsmAnd Live Abonnement wurde ausgesetzt</string>
<string name="subscription_on_hold_title">OsmAnd Live Abonnement liegt auf Eis</string> <string name="subscription_on_hold_title">OsmAnd Live Abonnement liegt auf Eis</string>
<string name="login_open_street_map">Anmeldung bei OpenStreetMap</string>
<string name="login_open_street_map_org">Anmeldung bei OpenStreetMap.org</string>
<string name="sign_in_with_open_street_map">Anmelden mit OpenStreetMap</string>
<string name="open_street_map_login_mode">Sie müssen sich anmelden, um Änderungen hochzuladen.
\n
\nSie können sich mit der sicheren OAuth-Methode anmelden oder Ihren Benutzernamen und Ihr Passwort verwenden.</string>
<string name="use_login_password">Benutzername und Passwort verwenden</string>
<string name="login_account">Konto</string>
<string name="user_login">Login</string>
<string name="markers_history">Historie der Marker</string>
<string name="send_files_to_openstreetmap">GPX-Datei an OpenStreetMap senden</string>
<string name="enter_text_separated">Geben Sie durch Komma getrennte Tags ein.</string>
<string name="gpx_upload_public_visibility_descr">Öffentlich bedeutet, dass der Track in Ihren GPS-Tracks und in GPS-Track Verzeichnissen öffentlich angezeigt wird. Die über die API bereitgestellten Daten verweisen nicht auf Ihre Track-Seite. Die Zeitstempel der Trackpunkte sind nicht über die öffentliche GPS-API verfügbar, und die Punkte sind nicht chronologisch geordnet. Andere Benutzer können jedoch nach wie vor den Rohtrack aus der öffentlichen Trackliste und alle darin enthaltenen Zeitstempel herunterladen.</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. Andere Benutzer können den Rohtrack herunterladen und mit Ihrem Benutzernamen verknüpfen. Daten, die über die Trackpunkte-API geliefert werden, verweisen auf Ihre ursprüngliche Track-Seite. Die Zeitstempel der Trackpunkte sind über die öffentliche GPS-API verfügbar.</string>
<string name="gpx_upload_private_visibility_descr">Privat bedeutet, dass der Track nicht in öffentlichen Verzeichnissen auftaucht. Punkte des Tracks werden weiterhin über die öffentliche GPS-API ohne Zeitstempel verfügbar sein, aber nicht chronologisch geordnet.</string>
<string name="gpx_upload_trackable_visibility_descr">Verfolgbar bedeutet, dass der Track in keiner öffentlichen Auflistung auftaucht, aber Trackpunkte weiterhin über die öffentliche GPS API mit Zeitstempel verfügbar sein werden. Andere Benutzer werden nur verarbeitete Trackpunkte Ihres Tracks herunterladen können, die nicht direkt mit Ihnen in Verbindung gebracht werden können.</string>
</resources> </resources>

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

@ -1324,7 +1324,7 @@
<string name="global_app_settings">Ĝeneralaj agordoj de aplikaĵo</string> <string name="global_app_settings">Ĝeneralaj agordoj de aplikaĵo</string>
<string name="user_name">Via OSM-uzantnomo</string> <string name="user_name">Via OSM-uzantnomo</string>
<string name="open_street_map_login_descr">Bezonata por sendoj al openstreetmap.org.</string> <string name="open_street_map_login_descr">Bezonata por sendoj al openstreetmap.org.</string>
<string name="user_password">Via OSM-pasvorto</string> <string name="user_password">Pasvorto</string>
<string name="osmand_service">Fona reĝimo</string> <string name="osmand_service">Fona reĝimo</string>
<string name="osmand_service_descr">OsmAnd funkcias fone kiam la ekrano estas malaktiva.</string> <string name="osmand_service_descr">OsmAnd funkcias fone kiam la ekrano estas malaktiva.</string>
<string name="city_type_village">Vilaĝo</string> <string name="city_type_village">Vilaĝo</string>
@ -3424,9 +3424,9 @@
<string name="button_rate">Taksi</string> <string name="button_rate">Taksi</string>
<string name="accessibility_announce">Anonco</string> <string name="accessibility_announce">Anonco</string>
<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 influas 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">Montri ĉiujn nesenditajn redaktojn kaj rimarkojn ĉe %1$s. Senditaj puntoj malaperos de tie ĉi.</string> <string name="osm_edits_view_descr">Vi povas vidigi ĉiujn viajn nepublikigitajn redaktojn aŭ rimarkojn ĉ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>
@ -3946,10 +3946,26 @@
<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 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">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_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>
<string name="login_open_street_map">Ensaluti al OpenStreetMap</string>
<string name="login_open_street_map_org">Ensaluti al OpenStreetMap.org</string>
<string name="sign_in_with_open_street_map">Ensaluti per OpenStreetMap</string>
<string name="open_street_map_login_mode">Vi devas ensaluti por alŝuti novajn aŭ modifitajn ŝanĝojn.
\n
\nVi povas ensaluti per la sekura metodo OAuth aŭ per enigi uzantnomon kaj pasvorton.</string>
<string name="use_login_password">Uzi uzantnomon kaj pasvorton</string>
<string name="login_account">Konto</string>
<string name="user_login">Uzantnomo</string>
<string name="markers_history">Historio de markoj</string>
<string name="send_files_to_openstreetmap">Sendi GPX‑dosieron al OpenStreetMap</string>
<string name="enter_text_separated">Enigu etikedojn disigitajn per komo (,).</string>
<string name="gpx_upload_public_visibility_descr">“Publika” signifas, ke la GPX‑spuro estos publika videbla en “miaj spuroj” kaj en la publika listo de spuro (GPS‑spuroj). Datumoj liverataj per la API ne ligos al paĝo de via spuro. Tempindikoj de punktoj ne estos akireblaj per la publika API GPS, kaj la punktoj ne estos ordigitaj laŭtempe. Tamen aliaj uzantoj plue povos elŝuti la nepritraktitan spuron el la publika listo de spuroj kune kun ĉiuj ampleksitaj tempindikoj.</string>
<string name="gpx_upload_private_visibility_descr">“Privata” signifas, ke la GPX‑spuro montriĝos en neniu publika listo, sed ĝiaj punktoj plue estos akireblaj per la publika API GPS sen tempindikoj, sed tiuj punktoj estos ordigitaj laŭtempe.</string>
<string name="gpx_upload_identifiable_visibility_descr">“Identigebla” signifas, ke la GPX‑spuro estos publike videbla en “miaj spuroj” kaj en la publika listo de spuroj (GPS‑spuroj), aliaj uzantoj povos elŝuti vian nepritraktitan spuron kaj ligi ĝin al via uzantnomo. Datumoj liveritaj per la API de spuroj ligos al originala paĝo de via spuro. Tempindikoj de la spuro estos akireblaj per la publika API GPS.</string>
<string name="gpx_upload_trackable_visibility_descr">“Spurebla” signifas, ke la GPX‑spuro ne estos montrata en publikaj listoj, sed punktoj el ĝi plue estos akireblaj per la publika API GPS kune kun tempindikoj. Aliaj uzantoj povos elŝuti nur pritraktitajn punktojn el via spuro, kiuj ne povos esti senpere ligitaj al vi.</string>
</resources> </resources>

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

@ -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">Debes 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>
@ -3966,4 +3966,12 @@
<string name="use_login_password">Utilice nombre de usuario y contraseña</string> <string name="use_login_password">Utilice nombre de usuario y contraseña</string>
<string name="login_account">Cuenta</string> <string name="login_account">Cuenta</string>
<string name="user_login">Iniciar sesión</string> <string name="user_login">Iniciar sesión</string>
<string name="sign_in_with_open_street_map">Ingresar con OpenStreetMap</string>
<string name="markers_history">Historial de marcadores</string>
<string name="send_files_to_openstreetmap">Enviar archivo GPX a OpenStreetMap</string>
<string name="enter_text_separated">Ingresa etiquetas separadas por comas.</string>
<string name="gpx_upload_trackable_visibility_descr">Trazable significa que la traza no aparecerá en ninguna lista pública pero el conjunto de puntos estarán disponibles a través de la API pública de GPS y con marcas de tiempo. Otros usuarios sólo podrán descargar el conjunto de puntos procesados de su traza que no se pueden asociar directamente con usted.</string>
<string name="gpx_upload_private_visibility_descr">Privado significa que la traza no aparecerá en ninguna lista pública, pero el conjunto de puntos seguirá estando disponible en orden cronológico a través de la API pública de GPS y sin marcas de tiempo.</string>
<string name="gpx_upload_public_visibility_descr">Público significa que la traza se mostrará públicamente en tu listado de trazas y en los listados de trazas GPS públicas. Los datos servidos a través de la API no harán referencia a su página de trazas. Las marcas de tiempo de los puntos de la traza no estarán disponible a través de la API pública de GPS, aunque los puntos se ordenan cronológicamente. Sin embargo, otros usuarios podrán descargar la traza en bruto de la lista de trazas públicas y las marcas de tiempo que contiene.</string>
<string name="gpx_upload_identifiable_visibility_descr">Identificable significa que la traza se mostrará públicamente en tu listado de trazas y en el listado de trazas GPS públicas, es decir que otros usuarios podrán descargar la traza en bruto y asociarla con su nombre de usuario. Los datos servidos a través de la API de conjunto de puntos hará referencia a la página original de la traza. Las marcas de tiempo de los puntos de la traza estarán disponibles a través de la API pública de GPS.</string>
</resources> </resources>

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

@ -600,7 +600,7 @@
<string name="use_magnetic_sensor">Usar sensor magnético</string> <string name="use_magnetic_sensor">Usar sensor magnético</string>
<string name="other_location">Otra</string> <string name="other_location">Otra</string>
<string name="files_limit">Quedan %1$d archivos</string> <string name="files_limit">Quedan %1$d archivos</string>
<string name="available_downloads_left">%1$d archivos para descargar</string> <string name="available_downloads_left">Faltan descargar %1$d archivos</string>
<string name="install_paid">Versión completa</string> <string name="install_paid">Versión completa</string>
<string name="cancel_route">Descartar ruta</string> <string name="cancel_route">Descartar ruta</string>
<string name="cancel_navigation">Parar navegación</string> <string name="cancel_navigation">Parar navegación</string>
@ -1033,7 +1033,7 @@
<string name="global_app_settings">Ajustes globales de la aplicación</string> <string name="global_app_settings">Ajustes globales de la aplicación</string>
<string name="user_name">Nombre de usuario de OSM</string> <string name="user_name">Nombre de usuario de OSM</string>
<string name="open_street_map_login_descr">Necesario para envíos a OpenStreetMap.org.</string> <string name="open_street_map_login_descr">Necesario para envíos a OpenStreetMap.org.</string>
<string name="user_password">Contraseña de OSM</string> <string name="user_password">Contraseña</string>
<string name="osmand_service">Modo reposo</string> <string name="osmand_service">Modo reposo</string>
<string name="osmand_service_descr">OsmAnd se ejecuta en modo reposo con la pantalla apagada.</string> <string name="osmand_service_descr">OsmAnd se ejecuta en modo reposo con la pantalla apagada.</string>
<string name="download_files_not_enough_space">Sin espacio suficiente para descargar %1$s MB (disponible: %2$s).</string> <string name="download_files_not_enough_space">Sin espacio suficiente para descargar %1$s MB (disponible: %2$s).</string>
@ -3121,22 +3121,24 @@
<string name="shared_string_crash">Error</string> <string name="shared_string_crash">Error</string>
<string name="last_launch_crashed">OsmAnd falló la última vez. Por favor, ayúdanos a mejorar OsmAnd compartiendo el mensaje de error.</string> <string name="last_launch_crashed">OsmAnd falló la última vez. Por favor, ayúdanos a mejorar OsmAnd compartiendo el mensaje de error.</string>
<string name="app_mode_ufo">OVNI</string> <string name="app_mode_ufo">OVNI</string>
<string name="release_3_4">• Perfiles de aplicación: crea un perfil personalizado según tus necesidades, con un icono y color personalizado <string name="release_3_4">• Perfiles de aplicación: crea un perfil personalizado según tus necesidades, con un icono y color personalizado.
\n \n
\n • Ahora puedes personalizar las velocidades predefinidas, máximas y mínimas de cualquier perfil \n • Ahora puedes personalizar las velocidades predefinidas, máximas y mínimas de cualquier perfil
\n \n
\n • Se ha añadido un widget para las coordenadas actuales \n • Se ha añadido un widget para las coordenadas actuales
\n \n
\n • Se añadieron opciones para mostrar la brújula y una regla radial en el mapa \n • Se añadieron opciones para mostrar la brújula y una regla radial en el mapa
\n \n
\n • Se ha corregido la grabación de trazas en segundo plano \n • Se ha corregido la grabación de trazas en segundo plano
\n \n
\n • Se mejoraron las descargas de mapas en segundo plano \n • Se mejoraron las descargas de mapas en segundo plano
\n \n
\n • Se ha vuelto a añadir la opción «Encender pantalla»
\n
\n • Se ha corregido la selección de idioma de Wikipedia \n • Se ha corregido la selección de idioma de Wikipedia
\n \n
\n • Se ha corregido el comportamiento de los botones de la brújula durante la navegación \n • Se ha corregido el comportamiento de los botones de la brújula durante la navegación
\n \n
\n • Otras correcciones de errores \n • Otras correcciones de errores
\n \n
\n</string> \n</string>
@ -3428,7 +3430,7 @@
<string name="route_recalculation">Recálculo de la ruta</string> <string name="route_recalculation">Recálculo de la ruta</string>
<string name="accessibility_announce">Anunciar</string> <string name="accessibility_announce">Anunciar</string>
<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">Estos ajustes 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 no subidas o errores de OSM en «%1$s». Los puntos subidos no se muestran en OsmAnd.</string> <string name="osm_edits_view_descr">Puedes ver todas tus ediciones no subidas o errores de OSM en «%1$s». Los puntos subidos no se muestran en OsmAnd.</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
@ -3946,4 +3948,26 @@
<string name="icon_group_emergency">Emergencia</string> <string name="icon_group_emergency">Emergencia</string>
<string name="icon_group_amenity">Comodidad</string> <string name="icon_group_amenity">Comodidad</string>
<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="user_login">Iniciar sesión</string>
<string name="use_login_password">Utilice nombre de usuario y contraseña</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_paused_title">La suscripción a OsmAnd Live se ha pausado</string>
<string name="subscription_on_hold_title">La suscripción a OsmAnd Live está en espera</string>
<string name="subscription_expired_title">La suscripción a OsmAnd Live ha caducado</string>
<string name="sign_in_with_open_street_map">Ingresar con OpenStreetMap</string>
<string name="send_files_to_openstreetmap">Enviar archivo GPX a OpenStreetMap</string>
<string name="open_street_map_login_mode">Necesitas iniciar sesión para subir cambios nuevos o modificados.
\n
\nPuedes ingresar usando el método seguro de OAuth o usar el 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="markers_history">Historial de marcadores</string>
<string name="manage_subscription">Gestionar suscripción</string>
<string name="login_open_street_map_org">Ingresar a OpenStreetMap.org</string>
<string name="login_open_street_map">Iniciar sesión en OpenStreetMap</string>
<string name="login_account">Cuenta</string>
<string name="gpx_upload_trackable_visibility_descr">Trazable significa que la traza no aparecerá en ninguna lista pública pero el conjunto de puntos estarán disponibles a través de la API pública de GPS y con marcas de tiempo. Otros usuarios sólo podrán descargar el conjunto de puntos procesados de su traza que no se pueden asociar directamente con usted.</string>
<string name="gpx_upload_public_visibility_descr">Público significa que la traza se mostrará públicamente en tu listado de trazas y en los listados de trazas GPS públicas. Los datos servidos a través de la API no harán referencia a su página de trazas. Las marcas de tiempo de los puntos de la traza no estarán disponible a través de la API pública de GPS, aunque los puntos se ordenan cronológicamente. Sin embargo, otros usuarios podrán descargar la traza en bruto de la lista de trazas públicas y las marcas de tiempo que contiene.</string>
<string name="gpx_upload_private_visibility_descr">Privado significa que la traza no aparecerá en ninguna lista pública, pero el conjunto de puntos seguirá estando disponible en orden cronológico a través de la API pública de GPS y sin marcas de tiempo.</string>
<string name="gpx_upload_identifiable_visibility_descr">Identificable significa que la traza se mostrará públicamente en tu listado de trazas y en el listado de trazas GPS públicas, es decir que otros usuarios podrán descargar la traza en bruto y asociarla con su nombre de usuario. Los datos servidos a través de la API de conjunto de puntos hará referencia a la página original de la traza. Las marcas de tiempo de los puntos de la traza estarán disponibles a través de la API pública de GPS.</string>
<string name="enter_text_separated">Ingresa etiquetas separadas por comas.</string>
</resources> </resources>

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

@ -3798,7 +3798,7 @@
<string name="mgrs_format_descr">OsmAnd kasutab MGRS-vormingut, mis on sarnane NATO UTM-vormingule.</string> <string name="mgrs_format_descr">OsmAnd kasutab MGRS-vormingut, mis on sarnane NATO UTM-vormingule.</string>
<string name="navigate_point_format_mgrs">MGRS</string> <string name="navigate_point_format_mgrs">MGRS</string>
<string name="navigate_point_mgrs">MGRS</string> <string name="navigate_point_mgrs">MGRS</string>
<string name="message_you_need_add_two_points_to_show_graphs">Graafiku joonistamiseks pead lisama vähemalt kaks punkti.</string> <string name="message_you_need_add_two_points_to_show_graphs">Graafiku joonistamiseks peaksid lisama vähemalt kaks punkti</string>
<string name="subscription_on_hold_title">OsmAnd Live tellimus on ootel</string> <string name="subscription_on_hold_title">OsmAnd Live tellimus on ootel</string>
<string name="subscription_paused_title">OsmAnd Live tellimus on peatatud</string> <string name="subscription_paused_title">OsmAnd Live tellimus on peatatud</string>
<string name="subscription_expired_title">OsmAnd Live tellimus on aegunud</string> <string name="subscription_expired_title">OsmAnd Live tellimus on aegunud</string>
@ -3811,4 +3811,5 @@
\n \n
\nSa võid selleks kasutada mõnd turvalust OAuth võimalust või oma kasutajanime ning salasõna.</string> \nSa võid selleks kasutada mõnd turvalust OAuth võimalust või oma kasutajanime ning salasõna.</string>
<string name="login_account">Kasutajakonto</string> <string name="login_account">Kasutajakonto</string>
<string name="send_files_to_openstreetmap">Saada GPX fail OpenStreetMappi</string>
</resources> </resources>

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

@ -357,7 +357,7 @@
<string name="global_app_settings">تنظیمات کلی برنامه</string> <string name="global_app_settings">تنظیمات کلی برنامه</string>
<string name="user_name">نام کاربری OSM شما</string> <string name="user_name">نام کاربری OSM شما</string>
<string name="open_street_map_login_descr">برای ارسال داده به سایت openstreetmap.org لازم است.</string> <string name="open_street_map_login_descr">برای ارسال داده به سایت openstreetmap.org لازم است.</string>
<string name="user_password">گذرواژهٔ OSM شما</string> <string name="user_password">گذرواژه</string>
<string name="west_south_west">غرب-جنوب‌غرب</string> <string name="west_south_west">غرب-جنوب‌غرب</string>
<string name="west">غرب</string> <string name="west">غرب</string>
<string name="west_north_west">غرب-شمال‌غرب</string> <string name="west_north_west">غرب-شمال‌غرب</string>
@ -2361,7 +2361,7 @@
<string name="lang_kab">بربری</string> <string name="lang_kab">بربری</string>
<string name="lang_ber">بربری</string> <string name="lang_ber">بربری</string>
<string name="osm_edit_context_menu_delete">حذف ویرایش OSM</string> <string name="osm_edit_context_menu_delete">حذف ویرایش OSM</string>
<string name="shared_string_logoff">خروج</string> <string name="shared_string_logoff">ثبت خروج</string>
<string name="shared_string_action_template">کنش {0}</string> <string name="shared_string_action_template">کنش {0}</string>
<string name="osn_modify_dialog_error">ویرایش یادداشت ناموفق بود.</string> <string name="osn_modify_dialog_error">ویرایش یادداشت ناموفق بود.</string>
<string name="osn_modify_dialog_title">اصلاح یادداشت</string> <string name="osn_modify_dialog_title">اصلاح یادداشت</string>
@ -3412,7 +3412,7 @@
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string> <string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
<string name="ltr_or_rtl_combine_via_comma">%1$s،‏ %2$s</string> <string name="ltr_or_rtl_combine_via_comma">%1$s،‏ %2$s</string>
<string name="personal_category_name">شخصی</string> <string name="personal_category_name">شخصی</string>
<string name="shared_string_downloading_formatted">در حال بارگیری %s</string> <string name="shared_string_downloading_formatted">در حال دانلود %s</string>
<string name="rendering_value_thick_name">ضخیم</string> <string name="rendering_value_thick_name">ضخیم</string>
<string name="desert_render_descr">برای بیابان‌ها و سایر نواحی با جمعیت پراکنده. جزئیات بیشتری دارد.</string> <string name="desert_render_descr">برای بیابان‌ها و سایر نواحی با جمعیت پراکنده. جزئیات بیشتری دارد.</string>
<string name="add_new_profile_q">پروفایل تازهٔ «%1$s» اضافه شود؟</string> <string name="add_new_profile_q">پروفایل تازهٔ «%1$s» اضافه شود؟</string>
@ -3456,7 +3456,7 @@
<string name="button_rate">امتیاز بدهید</string> <string name="button_rate">امتیاز بدهید</string>
<string name="monitoring_prefs_descr">ناوبری، صحت ردنگاری</string> <string name="monitoring_prefs_descr">ناوبری، صحت ردنگاری</string>
<string name="multimedia_notes_prefs_descr">اندازهٔ عکس، کیفیت صدا و ویدئو</string> <string name="multimedia_notes_prefs_descr">اندازهٔ عکس، کیفیت صدا و ویدئو</string>
<string name="osm_editing_prefs_descr">ورود، گذرواژه، ویرایش آفلاین</string> <string name="osm_editing_prefs_descr">ثبت ورود، گذرواژه، ویرایش آفلاین</string>
<string name="accessibility_prefs_descr">انتخاب نماد، رنگ و نام</string> <string name="accessibility_prefs_descr">انتخاب نماد، رنگ و نام</string>
<string name="live_monitoring">ردیابی آنلاین</string> <string name="live_monitoring">ردیابی آنلاین</string>
<string name="save_track_logging_accuracy">صحت ردنگاری</string> <string name="save_track_logging_accuracy">صحت ردنگاری</string>
@ -3464,7 +3464,7 @@
<string name="photo_notes">یادداشت‌های عکسی</string> <string name="photo_notes">یادداشت‌های عکسی</string>
<string name="route_recalculation">محاسبهٔ مجدد مسیر</string> <string name="route_recalculation">محاسبهٔ مجدد مسیر</string>
<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="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>
@ -3481,7 +3481,7 @@
<string name="live_monitoring_descr">اجازه می‌دهد موقعیت کنونی با استفاده از ضبط سفر هم‌رسانی شود.</string> <string name="live_monitoring_descr">اجازه می‌دهد موقعیت کنونی با استفاده از ضبط سفر هم‌رسانی شود.</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">ویرایش‌ها یا یادداشت‌های OSMای خود که هنوز بارگذاری نشده‌اند را در %1$s ببینید. نقاط بارگذاری‌شده را دیگر نمی‌بینید.</string> <string name="osm_edits_view_descr">می‌توانید همهٔ ویرایش‌ها یا یادداشت‌های OSMای خود را که آپلود کرده‌اید در %1$s ببینید. نقاط آپلودشده را دیگر در OsmAnd نمی‌بینید.</string>
<string name="logcat_buffer_descr">لاگ‌های جزئی برنامه را بررسی و هم‌رسانی کنید</string> <string name="logcat_buffer_descr">لاگ‌های جزئی برنامه را بررسی و هم‌رسانی کنید</string>
<string name="multimedia_use_system_camera">استفاده از برنامهٔ سیستم</string> <string name="multimedia_use_system_camera">استفاده از برنامهٔ سیستم</string>
<string name="multimedia_photo_play_sound">صدای شاتر دوربین</string> <string name="multimedia_photo_play_sound">صدای شاتر دوربین</string>
@ -3950,4 +3950,34 @@
<string name="icon_group_sport">ورزش</string> <string name="icon_group_sport">ورزش</string>
<string name="icon_group_emergency">اورژانس</string> <string name="icon_group_emergency">اورژانس</string>
<string name="icon_group_travel">سفر</string> <string name="icon_group_travel">سفر</string>
<string name="what_is_new">تازه‌ها</string>
<string name="perform_oauth_authorization_description">برای استفاده از قابلیت‌های ویرایشی، از طریق OAuth ثبت ورود کنید</string>
<string name="perform_oauth_authorization">ثبت ورود از طریق OAuth</string>
<string name="clear_osm_token">پاک‌سازی توکن OAuth اوپن‌استریت‌مپ</string>
<string name="osm_edit_logout_success">ثبت خروج موفقیت‌آمیز بود</string>
<string name="file_already_imported">فایل قبلاً در OsmAnd درون‌برد شده است</string>
<string name="use_two_phase_routing">استفاده از الگوریتم مسیریابی دومرحله‌ای A*‎</string>
<string name="shared_string_graph">نمودار</string>
<string name="message_need_calculate_route_before_show_graph">دادهٔ %1$s فقط در جاده ارائه می‌شود. برای اینکه آن را داشته باشید با استفاده از «مسیریابی بین نقطه‌ها» مسیری محاسبه کنید.</string>
<string name="message_graph_will_be_available_after_recalculation">منتظر بمانید تا مسیر دوباره محاسبه شود.
\nنمودار پس از بازمحاسبه در دسترس قرار خواهد گرفت.</string>
<string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
<string name="message_you_need_add_two_points_to_show_graphs">دست‌کم باید دو نقطه اضافه کنید</string>
<string name="login_open_street_map">ثبت ورود در اوپن‌استریت‌مپ</string>
<string name="login_open_street_map_org">ثبت ورود در OpenStreetMap.org</string>
<string name="sign_in_with_open_street_map">ثبت ورود از طریق اوپن‌استریت‌مپ</string>
<string name="open_street_map_login_mode">برای آپلود تغییرات جدید باید ثبت ورود (login) کنید.
\n
\nبرای ثبت ورود می‌توانید از روش امن OAuth یا روش نام کاربری و گذرواژه استفاده کنید.</string>
<string name="use_login_password">استفاده از نام کاربری و گذرواژه</string>
<string name="login_account">حساب</string>
<string name="user_login">ثبت ورود</string>
<string name="manage_subscription">مدیریت اشتراک</string>
<string name="subscription_payment_issue_title">در رابطه با اشتراک شما مشکلی وجود دارد. روی دکمه کلیک کنید تا به تنظیمات اشتراک گوگل‌پلی بروید و شیوهٔ پرداخت خود را اصلاح نمایید.</string>
<string name="markers_history">تاریخچهٔ نشانه‌ها</string>
<string name="send_files_to_openstreetmap">ارسال فایل GPX به اوپن‌استریت‌مپ</string>
<string name="gpx_upload_public_visibility_descr">عمومی یا Public به این معنی است که رد به‌صورت عمومی در ردهای جی‌پی‌اس شما و لیست ردهای عمومی جی‌پی‌اس نمایش داده می‌شود. دادهٔ نقاط رد که از طریق API در دسترس قرار می‌گیرد، به صفحهٔ ردهای شما ارجاع نمی‌دهد. مهر زمان نقاط رد از طریق API جی‌پی‌اس‌های عمومی دست‌یافتنی نیست و نقاط رد بر اساس زمان مرتب نیستند. به هر حال، سایر کاربران هنوز می‌توانند فایل رد خام را از لیست ردهای عمومی دانلود کنند و این فایل مهر زمان نقاط را هم دارد.</string>
<string name="gpx_upload_private_visibility_descr">خصوصی یا Private به این معنی است که رد در هیچ‌یک از لیست‌های عمومی نشان داده نمی‌شود اما نقاط رد از طریق API جی‌پی‌اس‌های عمومی بدون مهر زمان و بدون ترتیب زمانی دست‌یافتنی است.</string>
<string name="gpx_upload_identifiable_visibility_descr">قابل‌شناسایی یا Identifiable به این معنی است که رد به‌صورت عمومی در لیست ردهای جی‌پی‌اس شما و لیست عمومی ردهای جی‌پی‌اس نمایش داده می‌شود، یعنی سایر کاربران می‌توانند رد خام را دانلود کنند و بدانند که مربوط به نام کاربری شماست. دادهٔ نقاط رد که از طریق API در دسترس قرار می‌گیرد، به صفحهٔ ردهای شما ارجاع می‌دهد. مهر زمان نقاط رد از طریق API جی‌پی‌اس‌های عمومی دست‌یافتنی است.</string>
<string name="gpx_upload_trackable_visibility_descr">قابل‌ردیابی یا Trackable به این معنی است که رد در هیچ‌یک از لیست‌های عمومی نشان داده نمی‌شود اما نقاط رد + مهر زمان نقاط از طریق API جی‌پی‌اس‌های عمومی دست‌یافتنی است. سایر کاربران فقط می‌توانند نقاط پردازش‌شدهٔ رد شما را دانلود کنند که مستقیماً امکان ارجاع به نام کاربری شما را ندارد.</string>
</resources> </resources>

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

@ -1494,4 +1494,32 @@
<string name="poi_embassy">Suurlähetystö</string> <string name="poi_embassy">Suurlähetystö</string>
<string name="poi_silo">Siilo</string> <string name="poi_silo">Siilo</string>
<string name="poi_windmill">Tuulimylly</string> <string name="poi_windmill">Tuulimylly</string>
<string name="poi_railway_level_crossing">Tasoristeys</string>
<string name="poi_railway_crossing">Rautatien ylitys</string>
<string name="poi_crossing_traffic_signals">Liikennevaloilla</string>
<string name="poi_highway_crossing">Valtatien ylitys</string>
<string name="poi_building_type_pyramid">Rakennuksen tyyppi: pyramidi</string>
<string name="poi_building_type_shrine">Rakennuksen tyyppi: pyhäkkö</string>
<string name="poi_building_type_synagogue">Rakennuksen tyyppi: synagoga</string>
<string name="poi_building_type_basilica">Rakennuksen tyyppi: basilika</string>
<string name="poi_building_type_monastery">Rakennuksen tyyppi: luostari</string>
<string name="poi_building_type_cathedral">Rakennuksen tyyppi: katedraali</string>
<string name="poi_building_type_temple">Rakennuksen tyyppi: temppeli</string>
<string name="poi_building_type_mosque">Rakennuksen tyyppi: moskeija</string>
<string name="poi_building_type_chapel">Rakennuksen tyyppi: kappeli</string>
<string name="poi_building_type_church">Rakennuksen tyyppi: kirkko</string>
<string name="poi_building">Rakennus</string>
<string name="poi_viewpoint">Näköalapaikka</string>
<string name="poi_charging_station">Latausasema</string>
<string name="poi_marina">Venesatama</string>
<string name="poi_firepit">Nuotiopaikka</string>
<string name="poi_leisure_track">Urheilurata</string>
<string name="poi_dog_park">Koirapuisto</string>
<string name="poi_pitch">Urheilukenttä</string>
<string name="poi_religion_pagan">Pakanuus</string>
<string name="poi_religion_jain">Jainalaisuus</string>
<string name="poi_chalet">Alppimaja</string>
<string name="poi_guest_house">Vieras talo</string>
<string name="poi_lodging">Majapaikka</string>
<string name="poi_attraction_roller_coaster">Vuoristorata</string>
</resources> </resources>

77
OsmAnd/res/values-fi/strings.xml
View file

@ -174,7 +174,8 @@
<string name="open_street_map_login_descr">Tarvitaan openstreetmap.org ehdotuksia varten</string> <string name="open_street_map_login_descr">Tarvitaan openstreetmap.org ehdotuksia varten</string>
<string name="user_password">OSM salasanasi</string> <string name="user_password">OSM salasanasi</string>
<string name="download_files_not_enough_space">Ei ole tarpeeksi tilaa jotta voitaisiin ladata %1$s MB (vapaana: %2$s).</string> <string name="download_files_not_enough_space">Ei ole tarpeeksi tilaa jotta voitaisiin ladata %1$s MB (vapaana: %2$s).</string>
<string name="download_files_question_space">Lataa {0} tiedosto(a)\? {1} Mt (/ {2} Mt) käytetään.</string> <string name="download_files_question_space">Lataa {0} tiedosto(a)\?
\n{1} Mt (/ {2} Mt) käytetään.</string>
<string name="delete_confirmation_msg">Poista %1$s?</string> <string name="delete_confirmation_msg">Poista %1$s?</string>
<string name="city_type_suburb">Lähiö</string> <string name="city_type_suburb">Lähiö</string>
<string name="city_type_hamlet">Kylä</string> <string name="city_type_hamlet">Kylä</string>
@ -315,7 +316,7 @@
<string name="error_calculating_route">Virhe reitin laskennassa</string> <string name="error_calculating_route">Virhe reitin laskennassa</string>
<string name="new_route_calculated_dist">Uusi reitti laskettu, etäisyys</string> <string name="new_route_calculated_dist">Uusi reitti laskettu, etäisyys</string>
<string name="arrived_at_destination">Olet saapunut perille.</string> <string name="arrived_at_destination">Olet saapunut perille.</string>
<string name="invalid_locations">Koordinaatit ovat virheelliset!</string> <string name="invalid_locations">Virheelliset koordinaatit</string>
<string name="shared_string_close">Sulje</string> <string name="shared_string_close">Sulje</string>
<string name="loading_data">Ladataan tietoja…</string> <string name="loading_data">Ladataan tietoja…</string>
<string name="reading_indexes">Luetaan paikallista dataa…</string> <string name="reading_indexes">Luetaan paikallista dataa…</string>
@ -510,7 +511,7 @@
<string name="local_index_installed">Paikallinen versio</string> <string name="local_index_installed">Paikallinen versio</string>
<string name="poi_remove_confirm_template">Poista {0} (lisää kommentti)?</string> <string name="poi_remove_confirm_template">Poista {0} (lisää kommentti)?</string>
<string name="osb_comment_dialog_author">Tekijän nimi</string> <string name="osb_comment_dialog_author">Tekijän nimi</string>
<string name="download_roads_only_item">"Tiet "</string> <string name="download_roads_only_item">Vain tiet</string>
<string name="download_regular_maps">Tavalliset kartat</string> <string name="download_regular_maps">Tavalliset kartat</string>
<string name="no_buildings_found">Rakennuksia ei löytynyt.</string> <string name="no_buildings_found">Rakennuksia ei löytynyt.</string>
<string name="search_villages_and_postcodes">Etsi lisää paikkakuntia/postinumeroita</string> <string name="search_villages_and_postcodes">Etsi lisää paikkakuntia/postinumeroita</string>
@ -579,7 +580,7 @@
<string name="recording_description">Nauhoitus %1$s %2$s / %3$s</string> <string name="recording_description">Nauhoitus %1$s %2$s / %3$s</string>
<string name="destination_point">Kohde %1$s</string> <string name="destination_point">Kohde %1$s</string>
<string name="context_menu_item_destination_point">Valitse määränpääksi</string> <string name="context_menu_item_destination_point">Valitse määränpääksi</string>
<string name="please_select_address">Valitse kaupunki tai katu ensin</string> <string name="please_select_address">Aseta kaupunki tai katu ensin</string>
<string name="search_street_in_neighborhood_cities">Etsi katua lähikaupungeista</string> <string name="search_street_in_neighborhood_cities">Etsi katua lähikaupungeista</string>
<string name="intermediate_items_sort_by_distance">Lajittele ovelta ovelle</string> <string name="intermediate_items_sort_by_distance">Lajittele ovelta ovelle</string>
<string name="local_osm_changes_backup_successful">OSM muutostiedosto luotiin onnistuneesti %1$s</string> <string name="local_osm_changes_backup_successful">OSM muutostiedosto luotiin onnistuneesti %1$s</string>
@ -608,8 +609,8 @@
<string name="driving_region_japan">Japani</string> <string name="driving_region_japan">Japani</string>
<string name="driving_region_us">Yhdysvallat</string> <string name="driving_region_us">Yhdysvallat</string>
<string name="driving_region_canada">Kanada</string> <string name="driving_region_canada">Kanada</string>
<string name="driving_region_europe_asia">Eurooppa &amp; Aasia</string> <string name="driving_region_europe_asia">Eurooppa, Aasia, Latinalainen Amerikka ja vastaavat</string>
<string name="driving_region_uk">Iso Britannia, Intia, Australia ja vastaavat</string> <string name="driving_region_uk">Iso Britannia, Intia ja vastaavat</string>
<string name="amenity_type_seamark">Merimerkki</string> <string name="amenity_type_seamark">Merimerkki</string>
<string name="app_modes_choose_descr">Valitse näkyvät profiilit.</string> <string name="app_modes_choose_descr">Valitse näkyvät profiilit.</string>
<string name="shared_string_is_open">Avoinna nyt</string> <string name="shared_string_is_open">Avoinna nyt</string>
@ -730,7 +731,7 @@
<string name="waypoint_visit_before">Käy ennen</string> <string name="waypoint_visit_before">Käy ennen</string>
<string name="simulate_your_location">Simuloi sijaintisi</string> <string name="simulate_your_location">Simuloi sijaintisi</string>
<string name="short_location_on_map">Lev %1$s <string name="short_location_on_map">Lev %1$s
Pit %2$s</string> \nPit %2$s</string>
<string name="tips_and_tricks_descr">Usein kysytyt kysymykset, viimeaikaiset muutokset, ja muut.</string> <string name="tips_and_tricks_descr">Usein kysytyt kysymykset, viimeaikaiset muutokset, ja muut.</string>
<string name="general_settings_2">Yleiset asetukset</string> <string name="general_settings_2">Yleiset asetukset</string>
<string name="shared_string_ellipsis">…</string> <string name="shared_string_ellipsis">…</string>
@ -824,7 +825,7 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
<string name="route_calculation">Reitin laskenta</string> <string name="route_calculation">Reitin laskenta</string>
<string name="gpx_no_tracks_title">Sinulla ei ole vielä yhtään GPX-tiedostoa</string> <string name="gpx_no_tracks_title">Sinulla ei ole vielä yhtään GPX-tiedostoa</string>
<string name="gpx_no_tracks_title_folder">Voit myös lisätä GPX-tiedostoja hakemistoon</string> <string name="gpx_no_tracks_title_folder">Voit myös lisätä GPX-tiedostoja hakemistoon</string>
<string name="gpx_add_track">Lisää jälki</string> <string name="gpx_add_track">Lisää enemmän…</string>
<string name="shared_string_appearance">Ulkoasu</string> <string name="shared_string_appearance">Ulkoasu</string>
<string name="trip_rec_notification_settings">Ota pikanauhoitus käyttöön</string> <string name="trip_rec_notification_settings">Ota pikanauhoitus käyttöön</string>
<string name="trip_rec_notification_settings_desc">Näytä ilmoitus, josta voi aloittaa matkan tallennuksen painamalla Nauhoita-näppäintä.</string> <string name="trip_rec_notification_settings_desc">Näytä ilmoitus, josta voi aloittaa matkan tallennuksen painamalla Nauhoita-näppäintä.</string>
@ -1008,7 +1009,9 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
\n- hallita ryhmiä ja laitteita henkilökohtaisella hallintapaneelilla websivustolla.</string> \n- hallita ryhmiä ja laitteita henkilökohtaisella hallintapaneelilla websivustolla.</string>
<string name="osm_user_stat">Muokkauksia %1$s, sijoitus %2$s, muokkaukset yhteensä %3$s</string> <string name="osm_user_stat">Muokkauksia %1$s, sijoitus %2$s, muokkaukset yhteensä %3$s</string>
<string name="osm_editors_ranking">OSM-muokkaajien sijoitukset</string> <string name="osm_editors_ranking">OSM-muokkaajien sijoitukset</string>
<string name="download_files_error_not_enough_space">Tilaa ei ole tarpeeksi! {3} Mt tarvitaan väliaikaisesti, {1} Mt pysyvästi. (Vain {2} Mt on käytettävissä.)</string> <string name="download_files_error_not_enough_space">Tilaa ei ole tarpeeksi!
\n{3} Mt tarvitaan väliaikaisesti, {1} Mt pysyvästi.
\n(Vain {2} Mt on käytettävissä.)</string>
<string name="download_files_question_space_with_temp">Lataa {0} tiedosto(a)? <string name="download_files_question_space_with_temp">Lataa {0} tiedosto(a)?
Tallennnustilaa käytetään {3} Mt hetkellisesti, {1} Mt pysyvästi. Tallennnustilaa käytetään {3} Mt hetkellisesti, {1} Mt pysyvästi.
(Vapaata tilaa on {2} Mt.)</string> (Vapaata tilaa on {2} Mt.)</string>
@ -1058,7 +1061,7 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
<string name="av_video_quality_high">Korkein laatu</string> <string name="av_video_quality_high">Korkein laatu</string>
<string name="av_video_quality">Video tulosteen laatu</string> <string name="av_video_quality">Video tulosteen laatu</string>
<string name="av_video_quality_descr">Valitse videon laatu.</string> <string name="av_video_quality_descr">Valitse videon laatu.</string>
<string name="av_audio_format">"Ääni tulosteen laatu"</string> <string name="av_audio_format">Ääni tulosteen laatu</string>
<string name="av_audio_format_descr">Valitse äänilähdön muoto.</string> <string name="av_audio_format_descr">Valitse äänilähdön muoto.</string>
<string name="please_specify_poi_type_only_from_list">Ole hyvä ja valitse oikea KP tyyppi tai ohita se.</string> <string name="please_specify_poi_type_only_from_list">Ole hyvä ja valitse oikea KP tyyppi tai ohita se.</string>
<string name="access_from_map_description">Valikkonäppäin käynnistää hallintapaneelin eikä valikkoa</string> <string name="access_from_map_description">Valikkonäppäin käynnistää hallintapaneelin eikä valikkoa</string>
@ -1179,8 +1182,8 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
<string name="osm_settings">OSM muokkaus</string> <string name="osm_settings">OSM muokkaus</string>
<string name="share_note">Jaa huomautus</string> <string name="share_note">Jaa huomautus</string>
<string name="location_on_map">Sijainti: <string name="location_on_map">Sijainti:
Lat %1$s \nLev %1$s
Lon %2$s</string> \nPit %2$s</string>
<string name="watch">Katso</string> <string name="watch">Katso</string>
<string name="online_map">Online kartta</string> <string name="online_map">Online kartta</string>
<string name="rendering_attr_pisteRoutes_name">Laskettelurinteet</string> <string name="rendering_attr_pisteRoutes_name">Laskettelurinteet</string>
@ -1388,10 +1391,10 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
<string name="gpx_timespan">AIkajänne: %1$s</string> <string name="gpx_timespan">AIkajänne: %1$s</string>
<string name="gpx_timemoving">Aika liikkeessä: %1$s</string> <string name="gpx_timemoving">Aika liikkeessä: %1$s</string>
<string name="gpx_selection_segment_title">Segmentti</string> <string name="gpx_selection_segment_title">Segmentti</string>
<string name="gpx_selection_number_of_points">" %1$s pistettä"</string> <string name="gpx_selection_number_of_points">%1$s pistettä</string>
<string name="gpx_selection_point">Piste %1$s</string> <string name="gpx_selection_point">Piste %1$s</string>
<string name="gpx_selection_route_points">%1$s <string name="gpx_selection_route_points">%1$s
Reitin pisteet %2$s</string> \nReitin pisteet %2$s</string>
<string name="gpx_selection_points">%1$s <string name="gpx_selection_points">%1$s
\nPisteet</string> \nPisteet</string>
<string name="gpx_selection_track">%1$s <string name="gpx_selection_track">%1$s
@ -1444,10 +1447,10 @@ Reitin pisteet %2$s</string>
<string name="osmand_play_title_30_chars">OsmAnd kartat &amp; suunnistus</string> <string name="osmand_play_title_30_chars">OsmAnd kartat &amp; suunnistus</string>
<string name="osmand_plus_play_title_30_chars">OsmAnd+ kartat ja suunnistus</string> <string name="osmand_plus_play_title_30_chars">OsmAnd+ kartat ja suunnistus</string>
<string name="bg_service_sleep_mode_off">Suorita <string name="bg_service_sleep_mode_off">Suorita
sovellutus taustalla</string> \nsovellus taustalla</string>
<string name="map_widget_renderer">Karttatyyli</string> <string name="map_widget_renderer">Karttatyyli</string>
<string name="bg_service_sleep_mode_on">Pysäytä <string name="bg_service_sleep_mode_on">Pysäytä
sovellutuksen suoritus taustalta</string> \nsovelluksen suoritus taustalta</string>
<string name="map_widget_mini_route">Pienoisreittikartta</string> <string name="map_widget_mini_route">Pienoisreittikartta</string>
<string name="bg_service_interval">Aseta virkistyksen aikaväli:</string> <string name="bg_service_interval">Aseta virkistyksen aikaväli:</string>
<string name="select_animate_speedup">Aseta nopeus reitin simuloinnille</string> <string name="select_animate_speedup">Aseta nopeus reitin simuloinnille</string>
@ -1472,7 +1475,7 @@ Reitin pisteet %2$s</string>
<string name="arrival_distance_factor_early">Aikaisin</string> <string name="arrival_distance_factor_early">Aikaisin</string>
<string name="arrival_distance_factor_normally">Normaali</string> <string name="arrival_distance_factor_normally">Normaali</string>
<string name="arrival_distance_factor_late">Myöhään</string> <string name="arrival_distance_factor_late">Myöhään</string>
<string name="arrival_distance_factor_at_last">"Viime metreillä"</string> <string name="arrival_distance_factor_at_last">Viime metreillä</string>
<string name="arrival_distance">Saapumisilmoitus</string> <string name="arrival_distance">Saapumisilmoitus</string>
<string name="arrival_distance_descr">Kuinka aikaisin haluat saapumisilmoituksen?</string> <string name="arrival_distance_descr">Kuinka aikaisin haluat saapumisilmoituksen?</string>
<string name="rendering_out_of_memory">Ei tarpeeksi prosessointimuistia valitun alueen näyttämiseksi</string> <string name="rendering_out_of_memory">Ei tarpeeksi prosessointimuistia valitun alueen näyttämiseksi</string>
@ -1537,7 +1540,7 @@ Reitin pisteet %2$s</string>
<string name="app_modes_choose">Sovellusprofiilit</string> <string name="app_modes_choose">Sovellusprofiilit</string>
<string name="app_mode_hiking">Retkeily</string> <string name="app_mode_hiking">Retkeily</string>
<string name="local_osm_changes_delete_all_confirm">Olet poistamassa %1$d OSM muutosta. Oletko varma?</string> <string name="local_osm_changes_delete_all_confirm">Olet poistamassa %1$d OSM muutosta. Oletko varma?</string>
<string name="route_descr_map_location">"Kartta: "</string> <string name="route_descr_map_location">Kartta:</string>
<string name="route_descr_lat_lon">Pit %1$.3f, lev %2$.3f</string> <string name="route_descr_lat_lon">Pit %1$.3f, lev %2$.3f</string>
<string name="route_descr_destination">Päämäärä</string> <string name="route_descr_destination">Päämäärä</string>
<string name="route_via">Kautta:</string> <string name="route_via">Kautta:</string>
@ -1645,12 +1648,12 @@ Reitin pisteet %2$s</string>
<string name="loading_smth">Ladataan %1$s…</string> <string name="loading_smth">Ladataan %1$s…</string>
<string name="map_widget_plain_time">Aika nyt</string> <string name="map_widget_plain_time">Aika nyt</string>
<string name="shared_string_waypoint">Väyläpiste</string> <string name="shared_string_waypoint">Väyläpiste</string>
<string name="gpx_info_waypoints">"Väyläpisteet: %1$s "</string> <string name="gpx_info_waypoints">Väyläpisteet: %1$s</string>
<string name="gpx_info_distance">"Etäisyys: %1$s (%2$s pistettä) "</string> <string name="gpx_info_distance">Etäisyys: %1$s (%2$s pistettä)</string>
<string name="gpx_info_start_time">"Lähtöaika: %1$tF, %1$tT "</string> <string name="gpx_info_start_time">Lähtöaika: %1$tF, %1$tT</string>
<string name="gpx_info_end_time">"Saapumisaika: %1$tF, %1$tT "</string> <string name="gpx_info_end_time">Saapumisaika: %1$tF, %1$tT</string>
<string name="gpx_info_average_speed">"Keskinopeus: %1$s "</string> <string name="gpx_info_average_speed">Keskinopeus: %1$s</string>
<string name="gpx_info_maximum_speed">"Maksiminopeus: %1$s "</string> <string name="gpx_info_maximum_speed">Maksiminopeus: %1$s</string>
<string name="gpx_info_avg_altitude">Keskikorkeus: %1$s</string> <string name="gpx_info_avg_altitude">Keskikorkeus: %1$s</string>
<string name="gpx_info_diff_altitude">Korkeusväli: %1$s</string> <string name="gpx_info_diff_altitude">Korkeusväli: %1$s</string>
<string name="lang_zh">Kiina</string> <string name="lang_zh">Kiina</string>
@ -1718,9 +1721,9 @@ Reitin pisteet %2$s</string>
<string name="text_size_descr">Aseta tekstin koko kartalle.</string> <string name="text_size_descr">Aseta tekstin koko kartalle.</string>
<string name="background_service_is_enabled_question">OsmAnd taustapalvelu on vielä suorituksessa. Haluatko puysäyttää myös sen?</string> <string name="background_service_is_enabled_question">OsmAnd taustapalvelu on vielä suorituksessa. Haluatko puysäyttää myös sen?</string>
<string name="save_track_to_gpx_globally_headline">Jäljen kirjaus tarpeen vaatiessa</string> <string name="save_track_to_gpx_globally_headline">Jäljen kirjaus tarpeen vaatiessa</string>
<string name="selected_gpx_info_show"> <string name="selected_gpx_info_show">"
\n
Paina ja pidä nähdäksesi kartalla</string> \nPaina pitkään nähdäksesi kartalla"</string>
<string name="local_index_gpx_info_show"> <string name="local_index_gpx_info_show">
Paina ja pidä nähdäksesi kartalla</string> Paina ja pidä nähdäksesi kartalla</string>
@ -1760,7 +1763,7 @@ Paina ja pidä nähdäksesi kartalla</string>
<string name="interrupt_music_descr">Keskeytä musiikki täydellisesti ääniohjeiden ajaksi (ei ainoastaan hiljennystä)</string> <string name="interrupt_music_descr">Keskeytä musiikki täydellisesti ääniohjeiden ajaksi (ei ainoastaan hiljennystä)</string>
<string name="map_widget_next_next_turn">Toinen käännös</string> <string name="map_widget_next_next_turn">Toinen käännös</string>
<string name="native_app_allocated_memory_descr">Sovelluksen varaama natiivi muisti yhteensä %1$s MB (Dalvik %2$s MB, muut %3$s MB). <string name="native_app_allocated_memory_descr">Sovelluksen varaama natiivi muisti yhteensä %1$s MB (Dalvik %2$s MB, muut %3$s MB).
Suhteellinen muisti %4$s MB (Android raja %5$s MB, Dalvik %6$s MB).</string> \nSuhteellinen muisti %4$s MB (Android raja %5$s MB, Dalvik %6$s MB).</string>
<string name="rendering_attr_noPolygons_description">Tee kaikki maankäyttäominaisuudet läpikuultaviksi kartalla.</string> <string name="rendering_attr_noPolygons_description">Tee kaikki maankäyttäominaisuudet läpikuultaviksi kartalla.</string>
<string name="direction_style_sidewise">Sivuittain (8 sektoria)</string> <string name="direction_style_sidewise">Sivuittain (8 sektoria)</string>
<string name="settings_direction_style_descr">Valitse tyyli ilmaistaksesi suhteelliset suunnat liikuttaessa</string> <string name="settings_direction_style_descr">Valitse tyyli ilmaistaksesi suhteelliset suunnat liikuttaessa</string>
@ -1846,7 +1849,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
<string name="incomplete_locale">epätäydellinen</string> <string name="incomplete_locale">epätäydellinen</string>
<string name="send_location_way_choose_title">Jaa sijainti käyttäen</string> <string name="send_location_way_choose_title">Jaa sijainti käyttäen</string>
<string name="send_location_sms_pattern">Sijainti: %1$s <string name="send_location_sms_pattern">Sijainti: %1$s
%2$s</string> \n%2$s</string>
<string name="add_waypoint_dialog_added">GPX väyläpiste \'\'{0}\'\' lisätty</string> <string name="add_waypoint_dialog_added">GPX väyläpiste \'\'{0}\'\' lisätty</string>
<string name="add_waypoint_dialog_title">Lisää väyläpiste tallennettuun GPX jälkeen</string> <string name="add_waypoint_dialog_title">Lisää väyläpiste tallennettuun GPX jälkeen</string>
<string name="amenity_type_administrative">Hallinnollinen</string> <string name="amenity_type_administrative">Hallinnollinen</string>
@ -1881,7 +1884,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
<string name="failed_to_upload">Vieminen epäonnistui</string> <string name="failed_to_upload">Vieminen epäonnistui</string>
<string name="successfully_uploaded_pattern">Viety {0}/{1}</string> <string name="successfully_uploaded_pattern">Viety {0}/{1}</string>
<string name="offline_maps_and_navigation">Offline Kartat <string name="offline_maps_and_navigation">Offline Kartat
&amp; Suunnistus</string> \n&amp; Suunnistus</string>
<string name="commit_poi"/> <string name="commit_poi"/>
<string name="tab_title_advanced"/> <string name="tab_title_advanced"/>
<string name="confirm_download_roadmaps">Vain tiet-karttaa ei tarvita, koska sinulla on jo vakio (täysi) kartta. Ladataanko se silti\?</string> <string name="confirm_download_roadmaps">Vain tiet-karttaa ei tarvita, koska sinulla on jo vakio (täysi) kartta. Ladataanko se silti\?</string>
@ -2545,7 +2548,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
<string name="radius_ruler_item">Sädeviivain</string> <string name="radius_ruler_item">Sädeviivain</string>
<string name="download_unsupported_action">Ei tuettu toiminto %1$s</string> <string name="download_unsupported_action">Ei tuettu toiminto %1$s</string>
<string name="travel_item">Matkailu (Wikivoyage ja Wikipedia)</string> <string name="travel_item">Matkailu (Wikivoyage ja Wikipedia)</string>
<string name="select_track_file">"Valitse reitti tiedosto "</string> <string name="select_track_file">Valitse reitti tiedosto</string>
<string name="wiki_menu_download_descr">Lisäkarttoja tarvitaan Wikipedian erikoiskohteiden tarkastelemiseen kartalla.</string> <string name="wiki_menu_download_descr">Lisäkarttoja tarvitaan Wikipedian erikoiskohteiden tarkastelemiseen kartalla.</string>
<string name="select_wikipedia_article_langs">Valitse kielet, joilla Wikipedia-artikkelit näkyvät kartalla. Voit vaihtaa kaikkien käytettävissä olevien kielten välillä lukiessasi artikkelia.</string> <string name="select_wikipedia_article_langs">Valitse kielet, joilla Wikipedia-artikkelit näkyvät kartalla. Voit vaihtaa kaikkien käytettävissä olevien kielten välillä lukiessasi artikkelia.</string>
<string name="some_articles_may_not_available_in_lang">Jotkut Wikipedia-artikkelit eivät välttämättä ole saatavilla omalla kielelläsi.</string> <string name="some_articles_may_not_available_in_lang">Jotkut Wikipedia-artikkelit eivät välttämättä ole saatavilla omalla kielelläsi.</string>
@ -2560,4 +2563,14 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
<string name="settings_item_read_error">Ei voitu lukea \'%1$s\'.</string> <string name="settings_item_read_error">Ei voitu lukea \'%1$s\'.</string>
<string name="settings_item_write_error">Ei voitu kirjoittaa \'%1$s\'.</string> <string name="settings_item_write_error">Ei voitu kirjoittaa \'%1$s\'.</string>
<string name="settings_item_import_error">Ei voitu tuoda kohteesta \'%1$s\'.</string> <string name="settings_item_import_error">Ei voitu tuoda kohteesta \'%1$s\'.</string>
<string name="days_5">Päivää</string>
<string name="days_2_4">Päivää</string>
<string name="day">Päivä</string>
<string name="weeks_5">Viikkoa</string>
<string name="weeks_2_4">Viikkoa</string>
<string name="week">Viikko</string>
<string name="shared_string_bearing">Suuntima</string>
<string name="plan_a_route">Suunnittele reitti</string>
<string name="plan_route_last_edited">Viimeksi muokattu</string>
<string name="plan_route_create_new_route">Luo uusi reitti</string>
</resources> </resources>

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

@ -3406,7 +3406,7 @@
<string name="route_recalculation">Recalcul de l\'itinéraire</string> <string name="route_recalculation">Recalcul de l\'itinéraire</string>
<string name="accessibility_announce">Annonce</string> <string name="accessibility_announce">Annonce</string>
<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">Ces paramètres s\'appliquent à tous les profils.</string> <string name="plugin_global_prefs_info">Les paramètres du 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 non téléversées comme vos bugs OSM dans %1$s. Les points envoyés ne sont plus affichés dans OsmAnd.</string> <string name="osm_edits_view_descr">Vous pouvez consulter vos modifications non téléversées comme vos bugs OSM dans %1$s. Les points envoyés ne sont plus affichés dans OsmAnd.</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
@ -3926,7 +3926,7 @@
<string name="mgrs_format_descr">OsmAnd utilise le système de référence MDRS de l\'OTAN dérivé des formats UTM et UPS.</string> <string name="mgrs_format_descr">OsmAnd utilise le système de référence MDRS de l\'OTAN dérivé des formats UTM et UPS.</string>
<string name="navigate_point_format_mgrs">MGRS</string> <string name="navigate_point_format_mgrs">MGRS</string>
<string name="navigate_point_mgrs">MGRS</string> <string name="navigate_point_mgrs">MGRS</string>
<string name="message_you_need_add_two_points_to_show_graphs">Vous devez, au moins, ajouter deux points.</string> <string name="message_you_need_add_two_points_to_show_graphs">Vous devez, au moins, ajouter deux points</string>
<string name="subscription_on_hold_title">L\'abonnement OsmAnd Live est en attente</string> <string name="subscription_on_hold_title">L\'abonnement OsmAnd Live est en attente</string>
<string name="subscription_expired_title">L’abonnement OsmAnd Live a expiré</string> <string name="subscription_expired_title">L’abonnement OsmAnd Live a expiré</string>
<string name="subscription_paused_title">L\'abonnement OsmAnd Live a été suspendu</string> <string name="subscription_paused_title">L\'abonnement OsmAnd Live a été suspendu</string>
@ -3937,4 +3937,8 @@
<string name="use_login_password">Utiliser un identifiant et un mot de passe</string> <string name="use_login_password">Utiliser un identifiant et un mot de passe</string>
<string name="login_account">Compte</string> <string name="login_account">Compte</string>
<string name="manage_subscription">Gérer l\'abonnement</string> <string name="manage_subscription">Gérer l\'abonnement</string>
<string name="sign_in_with_open_street_map">Se connecter avec OpenStreetMap</string>
<string name="markers_history">Historique des marqueurs</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>
</resources> </resources>

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

@ -800,7 +800,7 @@
<string name="global_app_settings">Axustes globais da aplicación</string> <string name="global_app_settings">Axustes globais da aplicación</string>
<string name="user_name">O teu nome de usuario no OSM</string> <string name="user_name">O teu nome de usuario no OSM</string>
<string name="open_street_map_login_descr">Precísase para os envíos ó openstreetmap.org.</string> <string name="open_street_map_login_descr">Precísase para os envíos ó openstreetmap.org.</string>
<string name="user_password">O teu contrasinal en OSM</string> <string name="user_password">Contrasinal</string>
<string name="osmand_service">Modo en segundo plano</string> <string name="osmand_service">Modo en segundo plano</string>
<string name="osmand_service_descr">O OsmAnd execútase en segundo plano coa pantalla apagada.</string> <string name="osmand_service_descr">O OsmAnd execútase en segundo plano coa pantalla apagada.</string>
<string name="download_files_not_enough_space">Non fica moito espazo libre para baixar %1$s MB (libre: %2$s).</string> <string name="download_files_not_enough_space">Non fica moito espazo libre para baixar %1$s MB (libre: %2$s).</string>
@ -3448,9 +3448,9 @@ Lon %2$s</string>
<string name="route_recalculation">Recálculo da ruta</string> <string name="route_recalculation">Recálculo da ruta</string>
<string name="accessibility_announce">Anuncio</string> <string name="accessibility_announce">Anuncio</string>
<string name="login_and_pass">Nome de usuario e contrasinal</string> <string name="login_and_pass">Nome de usuario e contrasinal</string>
<string name="plugin_global_prefs_info">Estes axustes aplícanse a todos os perfís.</string> <string name="plugin_global_prefs_info">Os axustes deste complemento son globais e aplícanse a todos os perfís</string>
<string name="osm_editing">Edición do OSM</string> <string name="osm_editing">Edición do OSM</string>
<string name="osm_edits_view_descr">Ollar as túas edicións ou erros do OSM aínda non subidos en %1$s. Os puntos subidos xa non se amosarán.</string> <string name="osm_edits_view_descr">Podes ollar todas as túas edición non subidas ou erros do OSM en %1$s. Os puntos subidos non se amosan no OsmAnd.</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">A icona amósase mentres se navega ou se move pola pantalla.</string> <string name="select_nav_icon_descr">A icona amósase mentres se navega ou se move pola pantalla.</string>
<string name="select_map_icon_descr">A icona amósase en asueto.</string> <string name="select_map_icon_descr">A icona amósase en asueto.</string>
@ -3971,10 +3971,26 @@ Lon %2$s</string>
<string name="icon_group_sport">Deporte</string> <string name="icon_group_sport">Deporte</string>
<string name="icon_group_emergency">Emerxencia</string> <string name="icon_group_emergency">Emerxencia</string>
<string name="icon_group_travel">Viaxe</string> <string name="icon_group_travel">Viaxe</string>
<string name="message_you_need_add_two_points_to_show_graphs">Tes que engadir polo menos dous puntos.</string> <string name="message_you_need_add_two_points_to_show_graphs">Tes que engadir polo menos dous puntos</string>
<string name="manage_subscription">Xestionar subscrición</string> <string name="manage_subscription">Xestionar subscrición</string>
<string name="subscription_payment_issue_title">Hai un problema coa túa subscrición. Preme no botón para ir ós axustes de subscrición da Google Play e corrixir o teu método de pagamento.</string> <string name="subscription_payment_issue_title">Hai un problema coa túa subscrición. Preme no botón para ir ós axustes de subscrición da Google Play e corrixir o teu método de pagamento.</string>
<string name="subscription_expired_title">A subscrición do OsmAnd Live expirou</string> <string name="subscription_expired_title">A subscrición do OsmAnd Live expirou</string>
<string name="subscription_paused_title">A subscrición do OsmAnd Live foi detida</string> <string name="subscription_paused_title">A subscrición do OsmAnd Live foi detida</string>
<string name="subscription_on_hold_title">A subscrición do OsmAnd Live está en espera</string> <string name="subscription_on_hold_title">A subscrición do OsmAnd Live está en espera</string>
<string name="gpx_upload_public_visibility_descr">Público significa que a pista amosarase de xeito público na túa listaxe de pistas e nas listaxes de pistas GPS públicas. Os datos servidos a través da API non farán referencia á túa páxina de pistas. As marcaxes de tempo dos puntos da pista non estarán dispoñíbeis a través da API pública de GPS, aínda que os puntos ordénanse de xeito cronolóxico. Porén, outros usuarios poderán baixar a pista en bruto da listaxe de pistas públicas e as marcaxes de tempo que contén.</string>
<string name="login_open_street_map">Iniciar sesión no OpenStreetMap</string>
<string name="login_open_street_map_org">Entrar ó OpenStreetMap.org</string>
<string name="sign_in_with_open_street_map">Entrar co OpenStreetMap</string>
<string name="open_street_map_login_mode">Precisas iniciar sesión para subir modificacións novas.
\n
\nPodes iniciar sesión empregando o método seguro de OAuth ou empregar o nome de usuario e contrasinal.</string>
<string name="use_login_password">Empregar nome de usuario e contrasinal</string>
<string name="login_account">Conta</string>
<string name="user_login">Iniciar sesión</string>
<string name="markers_history">Historial de marcaxes</string>
<string name="send_files_to_openstreetmap">Enviar ficheiro GPX ó OpenStreetMap</string>
<string name="enter_text_separated">Insire etiquetas separadas por comas.</string>
<string name="gpx_upload_private_visibility_descr">Privado significa que a pista non aparecerá en ningunha listaxe pública, mais o conxunto de puntos seguirá estando dispoñíbel en orde cronolóxica a través da API pública de GPS e sen marcaxes de tempo.</string>
<string name="gpx_upload_trackable_visibility_descr">Rastrexábel (ou trazábel) significa que a pista non aparecerá en ningunha listaxe pública pero o conxunto de puntos estarán dispoñíbeis a través da API pública de GPS e con marcaxes de tempo. Outros usuarios só poderán baixar o conxunto de puntos procesados da túa pista que non se poden asociar directamente contigo.</string>
<string name="gpx_upload_identifiable_visibility_descr">Identificábel significa que a pista amosarase de xeito público na túa listaxe de pistas e na listaxe de pistas GPS públicas, é dicir que outros usuarios poderán baixar a pista en bruto e asociala co teu nome de usuario. Os datos servidos a través da API de conxunto de puntos fará referencia á páxina orixinal da pista. As marcaxes de tempo dos puntos da traza estarán dispoñíbeis a través da API pública de GPS.</string>
</resources> </resources>

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

@ -114,7 +114,7 @@
<string name="global_app_settings">Globális beállítások az alkalmazáshoz</string> <string name="global_app_settings">Globális beállítások az alkalmazáshoz</string>
<string name="user_name">OSM felhasználóneved</string> <string name="user_name">OSM felhasználóneved</string>
<string name="open_street_map_login_descr">Az openstreetmap.org felé történő adatküldéshez szükséges.</string> <string name="open_street_map_login_descr">Az openstreetmap.org felé történő adatküldéshez szükséges.</string>
<string name="user_password">OSM jelszavad</string> <string name="user_password">Jelszó</string>
<string name="osmand_service">Háttérmód</string> <string name="osmand_service">Háttérmód</string>
<string name="osmand_service_descr">Az OsmAnd háttérben fut kikapcsolt kijelzővel.</string> <string name="osmand_service_descr">Az OsmAnd háttérben fut kikapcsolt kijelzővel.</string>
<string name="switch_to_raster_map_to_see">Erre a területre letölthet offline vektoros térképet a Beállításokban (Térképfájlok kezelése), vagy váltson át az Online térképek bővítményre.</string> <string name="switch_to_raster_map_to_see">Erre a területre letölthet offline vektoros térképet a Beállításokban (Térképfájlok kezelése), vagy váltson át az Online térképek bővítményre.</string>
@ -3420,7 +3420,7 @@
<string name="route_recalculation">Útvonal újraszámítása</string> <string name="route_recalculation">Útvonal újraszámítása</string>
<string name="accessibility_announce">Bejelentés</string> <string name="accessibility_announce">Bejelentés</string>
<string name="login_and_pass">Felhasználónév és jelszó</string> <string name="login_and_pass">Felhasználónév és jelszó</string>
<string name="plugin_global_prefs_info">Ezek a beállítások minden profilra vonatkoznak.</string> <string name="plugin_global_prefs_info">Ezek a bővítménybeállítások globálisak, és minden profilra vonatkoznak</string>
<string name="osm_editing">OSM-szerkesztés</string> <string name="osm_editing">OSM-szerkesztés</string>
<string name="osm_edits_view_descr">Az összes még fel nem töltött szerkesztés vagy OSM-hiba megtalálható a %1$s helyen. A már feltöltött pontok nem láthatók az OsmAndban.</string> <string name="osm_edits_view_descr">Az összes még fel nem töltött szerkesztés vagy OSM-hiba megtalálható a %1$s helyen. A már feltöltött pontok nem láthatók az OsmAndban.</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
@ -3938,6 +3938,26 @@
<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 kell hozzáadnia</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őség azt jelenti, hogy a nyomvonal semmilyen nyilvános listában nem jelenik meg, de a nyomvonalpontok az időbélyegekkel együtt továbbra is elérhetők lesznek a nyilvános GPS API-n keresztül. Más felhasználók csak a feldolgozott nyomvonalpontokat tölthetik le az Ön nyomvonalából, amelyek közvetlenül nem társítható Önhöz.</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 szolgáltatott adatok hivatkozni fognak az Ön eredeti nyomvonaloldalára. A nyomvonalpontok időbélyegei elérhetők a nyilvános GPS API-n keresztül.</string>
<string name="gpx_upload_public_visibility_descr">A nyilvános azt jelenti, hogy a nyomvonal nyilvánosan megjelenik az Ön GPS-nyomvonalai között és a GPS-nyomvonalak nyilvános listáin. Az API-n keresztül szolgáltatott adatok nem hivatkoznak az Ön nyomvonaloldalára. A nyomvonalpontok időbélyegei nem érhetők el a nyilvános GPS API-n keresztül, és a pontok nincsenek időrend szerint sorba állítva. Más felhasználók azonban továbbra is letölthetik a nyers nyomvonalat (a benne található időbélyegeket) a nyilvános nyomvonallistáról.</string>
<string name="gpx_upload_private_visibility_descr">A privát azt jelenti, hogy a nyomvonal semmilyen nyilvános listán nem jelenik meg, de az abból származó nyomvonalpontok továbbra is elérhetők lesznek a nyilvános GPS API-n időbélyegzők nélkül, nem időrend szerint sorba állítva.</string>
<string name="enter_text_separated">A címkéket vesszővel elválasztva írja be.</string>
<string name="send_files_to_openstreetmap">GPX-fájl küldése az OpenStreetMapre</string>
<string name="markers_history">Jelölők előzményei</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_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="user_login">Bejelentkezés</string>
<string name="login_account">Fiók</string>
<string name="use_login_password">Fióknév és jelszó használata</string>
<string name="open_street_map_login_mode">Az új vagy módosított szerkesztések feltöltéséhez be kell jelentkeznie.
\n
\nBejelentkezhet a biztonságos OAuth-módszerrel vagy használhatja fióknevét és jelszavát.</string>
<string name="sign_in_with_open_street_map">Bejelentkezés OpenStreetMap-fiókkal</string>
<string name="login_open_street_map">Bejelentkezés az OpenStreetMapre</string>
<string name="login_open_street_map_org">Bejelentkezés az OpenStreetMap.org-ra</string>
</resources> </resources>

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

@ -3834,4 +3834,5 @@
<string name="poi_parking_sheds">Skýli</string> <string name="poi_parking_sheds">Skýli</string>
<string name="poi_parking_rooftop">Á þaki</string> <string name="poi_parking_rooftop">Á þaki</string>
<string name="poi_gpx_point">GPX-punktur</string> <string name="poi_gpx_point">GPX-punktur</string>
<string name="poi_radar_tower">Radarturn</string>
</resources> </resources>

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

@ -887,7 +887,7 @@
<string name="index_settings">Sýsla með kortaskrár</string> <string name="index_settings">Sýsla með kortaskrár</string>
<string name="global_app_settings">Víðværar stillingar forrits</string> <string name="global_app_settings">Víðværar stillingar forrits</string>
<string name="user_name">OSM-notandanafnið þitt</string> <string name="user_name">OSM-notandanafnið þitt</string>
<string name="user_password">OSM-lykilorðið þitt</string> <string name="user_password">Lykilorð</string>
<string name="use_transparent_map_theme">Gegnsætt þema</string> <string name="use_transparent_map_theme">Gegnsætt þema</string>
<string name="pref_overlay">Yfirlag / Undirlag</string> <string name="pref_overlay">Yfirlag / Undirlag</string>
<string name="file_with_name_already_exist">Skrá með sama heiti er þegar til.</string> <string name="file_with_name_already_exist">Skrá með sama heiti er þegar til.</string>
@ -3429,7 +3429,7 @@
<string name="live_monitoring">Rakning með netstuðningi</string> <string name="live_monitoring">Rakning með netstuðningi</string>
<string name="save_track_logging_accuracy">Nákvæmni skráninga</string> <string name="save_track_logging_accuracy">Nákvæmni skráninga</string>
<string name="route_recalculation">Endurreikningur leiðar</string> <string name="route_recalculation">Endurreikningur leiðar</string>
<string name="plugin_global_prefs_info">Þessar stillingar eiga við um öll snið.</string> <string name="plugin_global_prefs_info">Þessar stillingar eru víðværar og eiga við um öll snið</string>
<string name="osm_editing">OSM-breytingar</string> <string name="osm_editing">OSM-breytingar</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">Táknið birtist þegar leiðsögn er í gangi eða á meðan verið er á ferðinni.</string> <string name="select_nav_icon_descr">Táknið birtist þegar leiðsögn er í gangi eða á meðan verið er á ferðinni.</string>
@ -3459,7 +3459,7 @@
<string name="multimedia_photo_play_sound">Hljóð við myndatöku</string> <string name="multimedia_photo_play_sound">Hljóð við myndatöku</string>
<string name="osm_authorization_success">Heimild fékkst</string> <string name="osm_authorization_success">Heimild fékkst</string>
<string name="not_support_file_type_with_ext">Veljið studda %1$s kerfisviðaukaskrá í staðinn.</string> <string name="not_support_file_type_with_ext">Veljið studda %1$s kerfisviðaukaskrá í staðinn.</string>
<string name="osm_edits_view_descr">Skoðaðu breytingarnar þínar eða villur í OSM sem ekki hafa enn verið sendar inn í %1$s. Innsendir punktar verða ekki lengur birtir.</string> <string name="osm_edits_view_descr">Þú getur skoðað allar óinnsendar breytingar þínar eða villur í OSM í %1$s. Innsendir punktar eru ekki birtir í OsmAnd.</string>
<string name="monitoring_min_speed_descr_side_effect">Aukaverkanir: Ferilinn þinn mun vanta alla þá hluta þar sem kröfur um lágmarkshraða voru ekki uppfylltar (t.d. þar sem þú ert að ýta hjólinu þínu upp bratta brekku). Að auki verða engar upplýsingar um kyrrstöður, eins og t.d. hvíldarstaði. Þetta hefur áhrif á alla greiningu eða eftirvinnslu, eins og þegar verið er að skilgreina heildarlengd ferðar, tíma á ferðinni eða meðalhraða þinn.</string> <string name="monitoring_min_speed_descr_side_effect">Aukaverkanir: Ferilinn þinn mun vanta alla þá hluta þar sem kröfur um lágmarkshraða voru ekki uppfylltar (t.d. þar sem þú ert að ýta hjólinu þínu upp bratta brekku). Að auki verða engar upplýsingar um kyrrstöður, eins og t.d. hvíldarstaði. Þetta hefur áhrif á alla greiningu eða eftirvinnslu, eins og þegar verið er að skilgreina heildarlengd ferðar, tíma á ferðinni eða meðalhraða þinn.</string>
<string name="monitoring_min_speed_descr_recommendation">Ábending: Reyndu fyrst að nota hreyfiskynjun í gegnum síuna sem mælis skráða lágmarkshliðrun (B), hún gæti gefið betri niðurstöður og þú tapar minna af gögnum. Ef ferlarnir þínir eru áfram loðnir við lágan hraða, skaltu prófa hér gildi sem ekki eru núll. Athugaðu að sumar mælingar gætu gefið gildi án hraða (sumar mæliaðferðir sem byggjast á netkerfum), í þeim tilfellum myndi ekkert vera skráð.</string> <string name="monitoring_min_speed_descr_recommendation">Ábending: Reyndu fyrst að nota hreyfiskynjun í gegnum síuna sem mælis skráða lágmarkshliðrun (B), hún gæti gefið betri niðurstöður og þú tapar minna af gögnum. Ef ferlarnir þínir eru áfram loðnir við lágan hraða, skaltu prófa hér gildi sem ekki eru núll. Athugaðu að sumar mælingar gætu gefið gildi án hraða (sumar mæliaðferðir sem byggjast á netkerfum), í þeim tilfellum myndi ekkert vera skráð.</string>
<string name="monitoring_min_speed_descr_remark">Athugaðu: ef hraði &gt; 0 skoðaðu: Flest GPS kubbasett gefa aðeins upp hraðagildi ef reikniritið ákvarðar að tækið sé á hreyfingu, en gefa ekki neitt gildi ef svo er ekki. Þar af leiðir að sé notuð stillingin &gt; 0 í þessari síu má segja að sé verið að nota hreyfiskynjunina í GPS kubbasettinu. En jafnvel þó þetta sé ekki síað á meðan skráningu stendur, þá notum við samt þennan eiginleika í greiningu okkar á GPX-ferlinum til að ákvarða leiðrétta vegalengd, þ.e.a.s. gildið sem birtist í þeim reit er einmitt skráð vegalengd á meðan verið er á ferðinni.</string> <string name="monitoring_min_speed_descr_remark">Athugaðu: ef hraði &gt; 0 skoðaðu: Flest GPS kubbasett gefa aðeins upp hraðagildi ef reikniritið ákvarðar að tækið sé á hreyfingu, en gefa ekki neitt gildi ef svo er ekki. Þar af leiðir að sé notuð stillingin &gt; 0 í þessari síu má segja að sé verið að nota hreyfiskynjunina í GPS kubbasettinu. En jafnvel þó þetta sé ekki síað á meðan skráningu stendur, þá notum við samt þennan eiginleika í greiningu okkar á GPX-ferlinum til að ákvarða leiðrétta vegalengd, þ.e.a.s. gildið sem birtist í þeim reit er einmitt skráð vegalengd á meðan verið er á ferðinni.</string>
@ -3954,4 +3954,25 @@
<string name="icon_group_sport">Íþróttir</string> <string name="icon_group_sport">Íþróttir</string>
<string name="icon_group_emergency">Neyðartilfelli</string> <string name="icon_group_emergency">Neyðartilfelli</string>
<string name="icon_group_travel">Ferðalög</string> <string name="icon_group_travel">Ferðalög</string>
<string name="open_street_map_login_mode">Þú þarft að skrá þig inn til að geta sent inn ný atriði eða breytingar.
\n
\nÞú getur skráð þig inn með öruggu OAuth-aðferðinni eða notað notandanafn og lykilorð innskráningar.</string>
<string name="subscription_payment_issue_title">Það er vandamál með áskriftina þína. Smelltu á hnappinn til að fara í stillingar Google Play áskriftarinnar og laga þar greiðslumátann.</string>
<string name="use_login_password">Nota notandanafn og lykilorð</string>
<string name="login_open_street_map">Skrá inn á OpenStreetMap</string>
<string name="user_login">Innskrá</string>
<string name="enter_text_separated">Settu inn merki aðskilin með kommu.</string>
<string name="send_files_to_openstreetmap">Senda GPX-skrá til OpenStreetMap</string>
<string name="subscription_expired_title">Áskrift að OsmAnd Live er útrunnin</string>
<string name="sign_in_with_open_street_map">Skrá inn með OpenStreetMap</string>
<string name="subscription_on_hold_title">Áskrift að OsmAnd Live er í biðstöðu</string>
<string name="login_account">Notandaaðgangur</string>
<string name="login_open_street_map_org">Skrá inn á OpenStreetMap.org</string>
<string name="markers_history">Vinnsluferill kortamerkja</string>
<string name="message_you_need_add_two_points_to_show_graphs">Þú þarft að bæta við a.m.k. tveimur punktum</string>
<string name="navigate_point_mgrs">MGRS</string>
<string name="subscription_paused_title">Áskrift að OsmAnd Live hefur verið sett í bið</string>
<string name="mgrs_format_descr">OsmAnd notar MGRS, sem er svipað og UTM-snið NATO.</string>
<string name="manage_subscription">Sýsla með áskrift</string>
<string name="navigate_point_format_mgrs">MGRS</string>
</resources> </resources>

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

@ -3961,4 +3961,11 @@
<string name="manage_subscription">ניהול מינוי</string> <string name="manage_subscription">ניהול מינוי</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="open_street_map_login_mode">עליך להיכנס כדי להעלות דברים חדשים או כאלו ששינית.
\n
\nניתן להיכנס בשיטת OAuth המאובטחת או להשתמש בשם הכניסה והססמה שלך.</string>
<string name="subscription_payment_issue_title">יש בעיה עם המינוי שלך. יש ללחוץ על הכפתור כדי לגשת להגדרות המינוי של Google Play ולתקן את שיטת התשלום שלך.</string>
<string name="subscription_on_hold_title">המינוי ל־OsmAnd Live מוחזק</string>
<string name="markers_history">היסטוריית סמנים</string>
<string name="send_files_to_openstreetmap">שליחת קובץ GPX ל־OpenStreetMap</string>
</resources> </resources>

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

@ -358,7 +358,7 @@ POIの更新は利用できません</string>
<string name="finished_task">終了</string> <string name="finished_task">終了</string>
<string name="use_online_routing_descr">ルート計算にインターネットを使用します</string> <string name="use_online_routing_descr">ルート計算にインターネットを使用します</string>
<string name="use_online_routing">オンラインルーティングを使用</string> <string name="use_online_routing">オンラインルーティングを使用</string>
<string name="user_password">OSM パスワード</string> <string name="user_password">パスワード</string>
<string name="osm_settings_descr">Openstreetmap.org (OSM)にデータを提出する際に必要な項目の設定をおこないます。</string> <string name="osm_settings_descr">Openstreetmap.org (OSM)にデータを提出する際に必要な項目の設定をおこないます。</string>
<string name="data_settings_descr">言語、データのダウンロード/リロードを指定します</string> <string name="data_settings_descr">言語、データのダウンロード/リロードを指定します</string>
<string name="data_settings">データ</string> <string name="data_settings">データ</string>
@ -3443,9 +3443,9 @@ POIの更新は利用できません</string>
<string name="route_recalculation">ルート再計算</string> <string name="route_recalculation">ルート再計算</string>
<string name="accessibility_announce">案内</string> <string name="accessibility_announce">案内</string>
<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">%1$sにまだアップロードされていない編集内容やOSMバグを表示します。アップロード後には表示されなくなります。</string> <string name="osm_edits_view_descr">まだアップロードしていない編集やOSMバグを%1$sで表示できます。アップロードされた後にはOsmAndに表示されません。</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>
@ -3914,4 +3914,36 @@ POIの更新は利用できません</string>
<string name="complex_routing_descr">カーナビゲーション向けの2段階ルート計算です。</string> <string name="complex_routing_descr">カーナビゲーション向けの2段階ルート計算です。</string>
<string name="use_two_phase_routing">2段階 A*ルーティングアルゴリズムを使用</string> <string name="use_two_phase_routing">2段階 A*ルーティングアルゴリズムを使用</string>
<string name="file_already_imported">ファイルはすでにOsmAndにインポートされています</string> <string name="file_already_imported">ファイルはすでにOsmAndにインポートされています</string>
<string name="icon_group_amenity">公共施設</string>
<string name="shared_string_local_maps">ローカルマップ</string>
<string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
<string name="icon_group_special">特殊</string>
<string name="icon_group_transport">公共交通機関</string>
<string name="icon_group_service">サービス</string>
<string name="icon_group_symbols">シンボル・道標</string>
<string name="icon_group_sport">スポーツ</string>
<string name="icon_group_emergency">緊急</string>
<string name="icon_group_travel">旅行</string>
<string name="message_you_need_add_two_points_to_show_graphs">少なくとも2つの地点を追加する必要があります</string>
<string name="login_open_street_map">OpenStreetMapにログイン</string>
<string name="login_open_street_map_org">OpenStreetMap.orgにログイン</string>
<string name="sign_in_with_open_street_map">OpenStreetMapに登録</string>
<string name="open_street_map_login_mode">変更をアップロードするには、ログインする必要があります。
\n
\n安全なOAuth方式を使用してログイン、または通常のユーザー名とパスワード方式が選択できます。</string>
<string name="use_login_password">ユーザー名とパスワードを使用する</string>
<string name="user_login">ログイン</string>
<string name="manage_subscription">サブスクリプションの管理</string>
<string name="subscription_payment_issue_title">サブスクリプションに際し問題が発生しています。ボタンをタップしてGooglePlayサブスクリプション設定に移動し、お支払い方法を確認してください。</string>
<string name="subscription_expired_title">OsmAndLiveサブスクリプションの有効期限が切れました</string>
<string name="subscription_paused_title">OsmAndLiveサブスクリプションが一時停止されました</string>
<string name="subscription_on_hold_title">OsmAndLiveサブスクリプションは保留中です</string>
<string name="markers_history">マーカーの履歴</string>
<string name="send_files_to_openstreetmap">GPXファイルをOpenStreetMapに送信</string>
<string name="enter_text_separated">タグはカンマで区切って入力してください。</string>
<string name="gpx_upload_public_visibility_descr">パブリック状態は、経路がGPS経路およびGPS経路リストに公開を目的として表示されることを示唆しています。 APIを介して提供されるデータは、経路ページを参照していません。経路ポイントのタイムスタンプは、パブリックGPS APIからは入手できず、各地点は時系列で並べられることはありません。ただし他のユーザーは、公開経路リストとその中のタイムスタンプから生の経路データをダウンロードすることができます。</string>
<string name="gpx_upload_identifiable_visibility_descr">識別可能状態は、経路がGPS経路およびパブリックGPS経路リストに表示されることを示唆しています。他のユーザーは現在の経路をダウンロードして、ユーザー名とリンクできます。 trackpoints APIを介して配信されるデータは、元の経路追跡ページを参照します。経路ポイントのタイムスタンプは、パブリックGPSAPIを介して入手できます。</string>
<string name="gpx_upload_private_visibility_descr">プライベート状態は、経路がパブリックリストに表示されないことを示唆しています。経路ポイントは、タイムスタンプなしでパブリックGPS APIを介して引き続き利用できますが、時系列で並べられることはありません。</string>
<string name="gpx_upload_trackable_visibility_descr">追跡可能状態にある場合は経路が公開リストに表示されないことを示唆していますが、経路ポイントは自体はタイムスタンプ付きの公開GPSAPIを介して引き続き利用できます。他のユーザーからはあなたに直接関連付けることはできず、自身の処理済み経路ポイントのみをダウンロードできます。</string>
<string name="login_account">アカウント</string>
</resources> </resources>

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

@ -3887,4 +3887,9 @@
<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">Du må legge til minst to punkter.</string>
<string name="gpx_upload_trackable_visibility_descr"></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="login_account">Konto</string>
<string name="send_files_to_openstreetmap">Send GPX-fil til OpenStreetMap</string>
</resources> </resources>

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

@ -127,7 +127,7 @@
<string name="system_locale">Systemowy</string> <string name="system_locale">Systemowy</string>
<string name="preferred_locale_descr">Wybiera język interfejsu (po zmianie należy uruchomić OsmAnd ponownie).</string> <string name="preferred_locale_descr">Wybiera język interfejsu (po zmianie należy uruchomić OsmAnd ponownie).</string>
<string name="preferred_locale">Język interfejsu</string> <string name="preferred_locale">Język interfejsu</string>
<string name="shared_string_next">Naprzód</string> <string name="shared_string_next">Dalej</string>
<string name="shared_string_previous">Poprzedni</string> <string name="shared_string_previous">Poprzedni</string>
<string name="unit_of_length_descr">Zmienia jednostki długości.</string> <string name="unit_of_length_descr">Zmienia jednostki długości.</string>
<string name="unit_of_length">Jednostki długości</string> <string name="unit_of_length">Jednostki długości</string>
@ -422,7 +422,7 @@
<string name="finished_task">Zakończono</string> <string name="finished_task">Zakończono</string>
<string name="use_online_routing_descr">Użyj Internetu do wyznaczenia trasy.</string> <string name="use_online_routing_descr">Użyj Internetu do wyznaczenia trasy.</string>
<string name="use_online_routing">Użyj nawigacji online</string> <string name="use_online_routing">Użyj nawigacji online</string>
<string name="user_password">Hasło konta OSM</string> <string name="user_password">Hasło</string>
<string name="osm_settings_descr">Skonfiguruj ustawienia potrzebne do wysyłania danych do Openstreetmap.org (OSM).</string> <string name="osm_settings_descr">Skonfiguruj ustawienia potrzebne do wysyłania danych do Openstreetmap.org (OSM).</string>
<string name="data_settings_descr">Ustaw język, pobierz/wczytaj ponownie dane.</string> <string name="data_settings_descr">Ustaw język, pobierz/wczytaj ponownie dane.</string>
<string name="data_settings">Dane</string> <string name="data_settings">Dane</string>
@ -3426,7 +3426,7 @@
<string name="route_recalculation">Ponowne wyliczenie trasy</string> <string name="route_recalculation">Ponowne wyliczenie trasy</string>
<string name="accessibility_announce">Zapowiedź</string> <string name="accessibility_announce">Zapowiedź</string>
<string name="login_and_pass">Nazwa użytkownika i hasło</string> <string name="login_and_pass">Nazwa użytkownika i hasło</string>
<string name="plugin_global_prefs_info">Te ustawienia mają zastosowanie do wszystkich profilów.</string> <string name="plugin_global_prefs_info">Ustawienia tej wtyczki są globalne i dotyczą wszystkich profili</string>
<string name="osm_editing">Edycja OSM</string> <string name="osm_editing">Edycja OSM</string>
<string name="app_mode_osm">OSM</string> <string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">Ikona wyświetlana podczas nawigacji lub ruchu.</string> <string name="select_nav_icon_descr">Ikona wyświetlana podczas nawigacji lub ruchu.</string>
@ -3549,7 +3549,7 @@
<string name="shared_string_quick_actions">Szybka czynność</string> <string name="shared_string_quick_actions">Szybka czynność</string>
<string name="keep_both">Zatrzymaj oba</string> <string name="keep_both">Zatrzymaj oba</string>
<string name="shared_string_rendering_style">Styl renderowania</string> <string name="shared_string_rendering_style">Styl renderowania</string>
<string name="osm_edits_view_descr">Zobacz swoje zmiany lub błędy OSM, które nie zostały jeszcze przesłane w %1$s. Przesłane punkty nie będą już wyświetlane.</string> <string name="osm_edits_view_descr">Możesz zobaczyć wszystkie nieopublikowane edycje lub błędy OSM w %1$s. Przesłane punkty nie są wyświetlane w OsmAnd.</string>
<string name="import_rendering_file">Importowanie pliku renderowania</string> <string name="import_rendering_file">Importowanie pliku renderowania</string>
<string name="restore_all_profile_settings">Przywrócić wszystkie ustawienia profilu\?</string> <string name="restore_all_profile_settings">Przywrócić wszystkie ustawienia profilu\?</string>
<string name="saving_new_profile">Zapisywanie nowego profilu</string> <string name="saving_new_profile">Zapisywanie nowego profilu</string>
@ -3813,7 +3813,7 @@
<string name="select_track_width">Wybierz szerokość</string> <string name="select_track_width">Wybierz szerokość</string>
<string name="gpx_split_interval_none_descr">Wybierz żądaną opcję podziału: według czasu lub odległości.</string> <string name="gpx_split_interval_none_descr">Wybierz żądaną opcję podziału: według czasu lub odległości.</string>
<string name="track_coloring_solid">Stałe</string> <string name="track_coloring_solid">Stałe</string>
<string name="gpx_parse_error">OsmAnd GPX nie jest dobrze uformowany, prosimy o kontakt z zespołem wsparcia technicznego w celu dalszego zbadania sprawy.</string> <string name="gpx_parse_error">Plik OsmAnd GPX nie jest poprawnie skonstruowany, prosimy o kontakt z zespołem wsparcia technicznego w celu dalszego zbadania sprawy.</string>
<string name="turn_screen_on_wake_time_descr">Wybierz limit czasu ekranu po przebudzeniu. (\"%1$s\" nie powoduje przekroczenia limitu czasu.)</string> <string name="turn_screen_on_wake_time_descr">Wybierz limit czasu ekranu po przebudzeniu. (\"%1$s\" nie powoduje przekroczenia limitu czasu.)</string>
<string name="track_show_start_finish_icons">Pokaż ikony początku i końca</string> <string name="track_show_start_finish_icons">Pokaż ikony początku i końca</string>
<string name="gpx_split_interval_descr">Wybierz przedział czasowy, w którym będą wyświetlane znaki z odległością lub czasem na torze.</string> <string name="gpx_split_interval_descr">Wybierz przedział czasowy, w którym będą wyświetlane znaki z odległością lub czasem na torze.</string>
@ -3955,7 +3955,16 @@
<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">Należy dodać co najmniej dwa punkty.</string> <string name="message_you_need_add_two_points_to_show_graphs">Musisz dodać 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ą. Kliknij 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="login_open_street_map">Zaloguj się do OpenStreetMap</string>
<string name="login_open_street_map_org">Zaloguj się do OpenStreetMap.org</string>
<string name="sing_in_with_open_street_map">Zaloguj się za pomocą OpenStreetMap</string>
<string name="open_street_map_login_mode">Musisz się zalogować, aby przesłać nowe lub zmodyfikowane zmiany.
\n
\nMożesz zalogować się za pomocą bezpiecznej metody autoryzacji OAuth lub użyć swojego loginu i hasła.</string>
<string name="use_login_password">Użyj loginu i hasła</string>
<string name="login_account">Konto</string>
</resources> </resources>

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

@ -3941,7 +3941,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, 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">Você deve adicionar pelo menos dois pontos.</string> <string name="message_you_need_add_two_points_to_show_graphs">Você precisa adicionar 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. Clique 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">Há um problema com sua assinatura. Clique no botão para ir para as configurações de assinatura do Google Play para corrigir sua forma 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>
@ -3957,4 +3957,12 @@
<string name="use_login_password">Usar a entrada e senha</string> <string name="use_login_password">Usar a entrada e senha</string>
<string name="login_account">Conta</string> <string name="login_account">Conta</string>
<string name="user_login">Entrar</string> <string name="user_login">Entrar</string>
<string name="sign_in_with_open_street_map">Entrar com o OpenStreetMap</string>
<string name="markers_history">Histórico de marcadores</string>
<string name="send_files_to_openstreetmap">Enviar arquivo GPX para OpenStreetMap</string>
<string name="enter_text_separated">Insira as etiquetas separadas por vírgula.</string>
<string name="gpx_upload_public_visibility_descr">Público significa que o traçado será mostrado publicamente em Seus traços de GPS e em listas públicas de traços de GPS. Os dados fornecidos por meio da API não fazem referência à sua página de rastreamento. Os carimbos de data/hora dos pontos de rastreamento não estão disponíveis por meio da API GPS pública e os pontos não são ordenados cronologicamente. No entanto, outros usuários ainda podem fazer o download do rastreamento bruto da lista pública de rastreamento e de quaisquer carimbos de data/hora contidos nela.</string>
<string name="gpx_upload_private_visibility_descr">Privado significa que o rastreamento não aparecerá em nenhuma lista pública, mas os pontos de trilha dele ainda estarão disponíveis por meio da API GPS pública sem carimbos de data/hora, mas não serão ordenados cronologicamente.</string>
<string name="gpx_upload_identifiable_visibility_descr">Identificável significa que o traço será mostrado publicamente em Seus traços de GPS e em listas públicas de traços de GPS, ou seja, outros usuários poderão fazer download do traço bruto e associá-lo ao seu nome de usuário. Os dados fornecidos por meio da API de pontos de trilha farão referência à sua página de rastreamento original. Os carimbos de data/hora dos pontos de rastreamento estão disponíveis por meio da API GPS pública.</string>
<string name="gpx_upload_trackable_visibility_descr">Rastreável significa que o rastreamento não aparecerá em nenhuma lista pública, mas os pontos de trilha dele ainda estarão disponíveis por meio da API GPS pública com carimbos de data/hora. Outros usuários só poderão baixar pontos de trilha processados de seu trace, que não podem ser associados a você diretamente.</string>
</resources> </resources>

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

@ -269,7 +269,7 @@
<string name="finished_task">Concluído</string> <string name="finished_task">Concluído</string>
<string name="use_online_routing_descr">Utilize a Internet para calcular uma rota.</string> <string name="use_online_routing_descr">Utilize a Internet para calcular uma rota.</string>
<string name="use_online_routing">Utilizar navegação online</string> <string name="use_online_routing">Utilizar navegação online</string>
<string name="user_password">A sua palavra-passe no OSM</string> <string name="user_password">Palavra-passe</string>
<string name="osm_settings_descr">Especifique as configurações de OpenStreetMap.org (OSM) necessárias para envios ao OSM.</string> <string name="osm_settings_descr">Especifique as configurações de OpenStreetMap.org (OSM) necessárias para envios ao OSM.</string>
<string name="data_settings_descr">Especifique o idioma, descarregar/enviar dados.</string> <string name="data_settings_descr">Especifique o idioma, descarregar/enviar dados.</string>
<string name="data_settings">Dados</string> <string name="data_settings">Dados</string>
@ -3566,9 +3566,9 @@
<string name="logcat_buffer_descr">Verifique e compartilhe registos detalhados da app</string> <string name="logcat_buffer_descr">Verifique e compartilhe registos detalhados da app</string>
<string name="select_map_icon_descr">Ícone mostrado em repouso.</string> <string name="select_map_icon_descr">Ícone mostrado em repouso.</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="osm_edits_view_descr">Pode ver todos os erros de OSM do editor carregado em %1$s. Os pontos enviados não são exibidos no OsmAnd.</string> <string name="osm_edits_view_descr">Pode ver todas as suas edições descarregadas ou bugs OSM em %1$s. Pontos enviados não aparecem no OsmAnd.</string>
<string name="osm_editing">Edição OSM</string> <string name="osm_editing">Edição OSM</string>
<string name="plugin_global_prefs_info">Essas configurações aplicam-se a todos os perfis.</string> <string name="plugin_global_prefs_info">Estas configurações de extensão são globais e aplicam-se a todos os perfis</string>
<string name="login_and_pass">Utilizador e palavra-passe</string> <string name="login_and_pass">Utilizador e palavra-passe</string>
<string name="accessibility_announce">Anunciar</string> <string name="accessibility_announce">Anunciar</string>
<string name="route_recalculation">Recálculo da rota</string> <string name="route_recalculation">Recálculo da rota</string>
@ -3955,4 +3955,13 @@
<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>
<string name="open_street_map_login_mode">Precisa fazer login para enviar alterações novas ou modificadas.
\n
\nPode entrar a usar o método seguro OAuth ou usar o seu nome de utilizador e a sua palavra-passe.</string>
<string name="login_open_street_map">Fazer login ao OpenStreetMap</string>
<string name="login_open_street_map_org">Entrar com OpenStreetMap.org</string>
<string name="sing_in_with_open_street_map">Entrar com OpenStreetMap</string>
<string name="use_login_password">Usar nome do utilizador e palavra-passe</string>
<string name="login_account">Conta</string>
<string name="user_login">Entrar</string>
</resources> </resources>

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

@ -3503,9 +3503,9 @@
<string name="photo_notes">Фотозаметки</string> <string name="photo_notes">Фотозаметки</string>
<string name="route_recalculation">Пересчёт маршрута</string> <string name="route_recalculation">Пересчёт маршрута</string>
<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. Отправленные точки больше не будут отображаться.</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>
@ -3941,5 +3941,9 @@
<string name="navigate_point_format_mgrs">MGRS</string> <string name="navigate_point_format_mgrs">MGRS</string>
<string name="mgrs_format_descr">OsmAnd использует MGRS, который похож на формат UTM NATO.</string> <string name="mgrs_format_descr">OsmAnd использует MGRS, который похож на формат UTM NATO.</string>
<string name="use_native_pt">Развитие местного общественного транспорта</string> <string name="use_native_pt">Развитие местного общественного транспорта</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="message_need_calculate_route_before_show_graph">Данные %1$s доступны только для дорог, нужно рассчитать маршрут с помощью «Маршрут между точками».</string>
<string name="enter_text_separated">Вводите теги через запятую.</string>
<string name="use_native_pt_desc">Перейти на расчет маршрутов общественного транспорта с помощью Java (safe)</string>
<string name="use_two_phase_routing">Использовать 2-фазный алгоритм A*</string>
</resources> </resources>

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

@ -3902,7 +3902,7 @@
<string name="icon_group_sport">Spor</string> <string name="icon_group_sport">Spor</string>
<string name="icon_group_emergency">Acil</string> <string name="icon_group_emergency">Acil</string>
<string name="icon_group_travel">Seyahat</string> <string name="icon_group_travel">Seyahat</string>
<string name="message_you_need_add_two_points_to_show_graphs">En az iki nokta eklemelisiniz.</string> <string name="message_you_need_add_two_points_to_show_graphs">En az iki nokta eklemelisiniz</string>
<string name="login_open_street_map">OpenStreetMap\'te oturum aç</string> <string name="login_open_street_map">OpenStreetMap\'te oturum aç</string>
<string name="login_open_street_map_org">OpenStreetMap.org\'da oturum aç</string> <string name="login_open_street_map_org">OpenStreetMap.org\'da oturum aç</string>
<string name="sing_in_with_open_street_map">OpenStreetMap ile giriş yap</string> <string name="sing_in_with_open_street_map">OpenStreetMap ile giriş yap</string>
@ -3917,4 +3917,8 @@
<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>
<string name="sign_in_with_open_street_map">OpenStreetMap ile oturum aç</string>
<string name="markers_history">İşaretleyiciler geçmişi</string>
<string name="send_files_to_openstreetmap">GPX dosyasını OpenStreetMap\'e gönder</string>
<string name="enter_text_separated">Virgülle ayrılmış etiketleri girin.</string>
</resources> </resources>

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

@ -3943,7 +3943,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 використовує 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>
@ -3958,4 +3958,12 @@
<string name="use_login_password">Використовувати ім\'я і пароль</string> <string name="use_login_password">Використовувати ім\'я і пароль</string>
<string name="login_account">Обліковий запис</string> <string name="login_account">Обліковий запис</string>
<string name="user_login">Ім\'я користувача</string> <string name="user_login">Ім\'я користувача</string>
<string name="sign_in_with_open_street_map">Увійти за допомогою OpenStreetMap</string>
<string name="markers_history">Історія маркерів</string>
<string name="send_files_to_openstreetmap">Надіслати файл GPX на OpenStreetMap</string>
<string name="enter_text_separated">Введіть мітки через коми.</string>
<string name="gpx_upload_public_visibility_descr">Загальнодоступне означає, що трасування буде показано загальнодоступно у ваших GPS-трасуваннях та у загальнодоступних списках GPS-трасування. Дані, що подаються через API, не посилаються на вашу сторінку трасування. Мітки часу точок трасування недоступні через загальнодоступний API GPS і не впорядковані хронологічно. Однак інші користувачі все ще можуть завантажувати необроблену трасування із загальнодоступного списку трасування та будь-які часові позначки, що містяться всередині.</string>
<string name="gpx_upload_private_visibility_descr">Приватне означає, що трасування не з\'являтиметься в жодному загальнодоступному списку, але контрольні точки з нього все одно будуть доступні через загальнодоступний API GPS без позначок часу та не впорядковані за хронологією.</string>
<string name="gpx_upload_identifiable_visibility_descr">Ідентифікований означає, що трасування буде показано публічно у вашому трасуванні GPS і в загальнодоступних списках трасування GPS, тобто інші користувачі зможуть завантажити необроблене трасування та пов\'язати його з вашим ім\'ям користувача. Дані, подані за допомогою API точок відстеження, посилаються на вихідну сторінку трасування. Позначки часу точок трасування доступні через загальнодоступний GPS API.</string>
<string name="gpx_upload_trackable_visibility_descr">Відстежуваний означає, що трасування не з\'явиться в жодному загальнодоступному списку, але точки від нього все одно будуть доступні через загальнодоступний API GPS із позначками часу. Інші користувачі зможуть завантажувати лише оброблені контрольні точки з вашого трасування, які не можуть бути безпосередньо пов’язані з вами.</string>
</resources> </resources>

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

@ -335,7 +335,7 @@
<string name="global_app_settings">整體程式設定</string> <string name="global_app_settings">整體程式設定</string>
<string name="user_name">您 OSM 的使用者名稱</string> <string name="user_name">您 OSM 的使用者名稱</string>
<string name="open_street_map_login_descr">需要向 openstreetmap.org 提出意見。</string> <string name="open_street_map_login_descr">需要向 openstreetmap.org 提出意見。</string>
<string name="user_password">您 OSM 的密碼</string> <string name="user_password">密碼</string>
<string name="osmand_service">背景模式</string> <string name="osmand_service">背景模式</string>
<string name="osmand_service_descr">當螢幕關閉後，讓 OsmAnd 在背景運行。</string> <string name="osmand_service_descr">當螢幕關閉後，讓 OsmAnd 在背景運行。</string>
<string name="download_files_not_enough_space">空間不足以下載 %1$s MB (空間剩餘：%2$s)。</string> <string name="download_files_not_enough_space">空間不足以下載 %1$s MB (空間剩餘：%2$s)。</string>
@ -3420,7 +3420,7 @@
<string name="route_recalculation">路徑重新計算</string> <string name="route_recalculation">路徑重新計算</string>
<string name="accessibility_announce">公告</string> <string name="accessibility_announce">公告</string>
<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="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>
@ -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">檢視您的編輯或 OSM 臭蟲尚未上傳到 %1$s。已上傳的點將不會再顯示。</string> <string name="osm_edits_view_descr">您可以在 %1$s 中檢視您所有未上傳的編輯或 OSM 臭蟲。已上傳的點不會在 OsmAnd 中顯示。</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>
@ -3942,10 +3942,27 @@
<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 使用 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>
<string name="login_open_street_map">登入到 OpenStreetMap</string>
<string name="login_open_street_map_org">登入到 OpenStreetMap.org</string>
<string name="sing_in_with_open_street_map">以 OpenStreetMap 登入</string>
<string name="open_street_map_login_mode">您必須登入以上傳新的或修正過的變更。
\n
\n您可以使用安全的 OAuth 方法或使用您的登入與密碼來登入。</string>
<string name="use_login_password">使用登入與密碼</string>
<string name="login_account">帳號</string>
<string name="user_login">登入</string>
<string name="sign_in_with_open_street_map">使用 OpenStreetMap 登入</string>
<string name="markers_history">標記歷史</string>
<string name="send_files_to_openstreetmap">傳送 GPX 檔案到 OpenStreetMap</string>
<string name="enter_text_separated">輸入以逗號分隔的標籤。</string>
<string name="gpx_upload_public_visibility_descr">公開代表軌跡將會公開顯示在您的 GPS 軌跡與公開的 GPS 軌跡清單中。透過 API 取得的 API 不會參考您的軌跡頁面。軌跡點的時間戳不會透過公開的 GPS API 提供，也不會按時間排序。不過，其他使用者仍可以從公開的軌跡清單下載原始軌跡與任何其中包含的時間戳。</string>
<string name="gpx_upload_private_visibility_descr">私有代表了軌跡不會顯示在任何公開的清單中，但其軌跡點仍可透過公開的 GPS API 取得，但沒有時間戳，也不會按時間順序排列。</string>
<string name="gpx_upload_identifiable_visibility_descr">可識別代表軌跡將會在您的 GPS 軌跡與公開 GPS 軌跡清單中顯示，亦即其他使用者將可以下載原始軌跡並將其與您的使用者名稱相關聯。透過軌跡點 API 提供的資料將會參考您的原始軌跡頁面。軌跡點的時間戳可透過公開的 GPS API 取得。</string>
<string name="gpx_upload_trackable_visibility_descr">可追蹤代表軌跡不會顯示在任何公開的清單中，但其追蹤點仍可以透過帶有時間戳的公開 GPS API 使用。其他使用者將只能從您的軌跡中下載處理過的追蹤點，但這些追蹤點無法直接與與您相關聯。</string>
</resources> </resources>

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

@ -3165,7 +3165,7 @@
<string name="use_fluorescent_overlays">Fluorescent overlays</string> <string name="use_fluorescent_overlays">Fluorescent overlays</string>
<string name="use_fluorescent_overlays_descr">Use fluorescent colors to display tracks and routes.</string> <string name="use_fluorescent_overlays_descr">Use fluorescent colors to display tracks and routes.</string>
<string name="offline_edition">Offline editing</string> <string name="offline_edition">Offline editing</string>
<string name="offline_edition_descr">Always use offline editing.</string> <string name="offline_edition_descr">If offline editing is enabled, then changes will be saved locally first and uploaded by request, otherwise changes will be uploaded immediately.</string>
<string name="update_poi_does_not_change_indexes">POI changes inside app do not affect downloaded map files, changes are saved as a file on your device instead.</string> <string name="update_poi_does_not_change_indexes">POI changes inside app do not affect downloaded map files, changes are saved as a file on your device instead.</string>
<string name="local_openstreetmap_uploading">Uploading…</string> <string name="local_openstreetmap_uploading">Uploading…</string>
<string name="local_openstreetmap_were_uploaded">{0} POI/notes were uploaded</string> <string name="local_openstreetmap_were_uploaded">{0} POI/notes were uploaded</string>

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

@ -85,6 +85,7 @@ import java.util.Map;
import java.util.Random; import java.util.Random;
import btools.routingapp.BRouterServiceConnection; import btools.routingapp.BRouterServiceConnection;
import btools.routingapp.IBRouterService;
import static net.osmand.plus.AppVersionUpgradeOnInit.LAST_APP_VERSION; import static net.osmand.plus.AppVersionUpgradeOnInit.LAST_APP_VERSION;
import static net.osmand.plus.liveupdates.LiveUpdatesHelper.getPendingIntent; import static net.osmand.plus.liveupdates.LiveUpdatesHelper.getPendingIntent;
@ -422,13 +423,9 @@ public class AppInitializer implements IProgress {
osmandSettings.APPLICATION_MODE.set(osmandSettings.DEFAULT_APPLICATION_MODE.get()); osmandSettings.APPLICATION_MODE.set(osmandSettings.DEFAULT_APPLICATION_MODE.get());
} }
startTime = System.currentTimeMillis(); startTime = System.currentTimeMillis();
try {
app.bRouterServiceConnection = startupInit(BRouterServiceConnection.connect(app), BRouterServiceConnection.class);
} catch (Exception e) {
e.printStackTrace();
}
getLazyRoutingConfig(); getLazyRoutingConfig();
app.applyTheme(app); app.applyTheme(app);
startupInit(app.reconnectToBRouter(), IBRouterService.class);
app.inAppPurchaseHelper = startupInit(new InAppPurchaseHelperImpl(app), InAppPurchaseHelperImpl.class); app.inAppPurchaseHelper = startupInit(new InAppPurchaseHelperImpl(app), InAppPurchaseHelperImpl.class);
app.poiTypes = startupInit(MapPoiTypes.getDefaultNoInit(), MapPoiTypes.class); app.poiTypes = startupInit(MapPoiTypes.getDefaultNoInit(), MapPoiTypes.class);
app.transportRoutingHelper = startupInit(new TransportRoutingHelper(app), TransportRoutingHelper.class); app.transportRoutingHelper = startupInit(new TransportRoutingHelper(app), TransportRoutingHelper.class);

73
OsmAnd/src/net/osmand/plus/NavigationService.java
View file

@ -1,5 +1,6 @@
package net.osmand.plus; package net.osmand.plus;
import android.annotation.SuppressLint;
import android.app.AlarmManager; import android.app.AlarmManager;
import android.app.Notification; import android.app.Notification;
import android.app.PendingIntent; import android.app.PendingIntent;
@ -33,16 +34,14 @@ public class NavigationService extends Service implements LocationListener {
// global id don't conflict with others // global id don't conflict with others
public static int USED_BY_NAVIGATION = 1; public static int USED_BY_NAVIGATION = 1;
public static int USED_BY_GPX = 2; public static int USED_BY_GPX = 2;
public static int USED_BY_LIVE = 4;
public final static String USAGE_INTENT = "SERVICE_USED_BY"; public final static String USAGE_INTENT = "SERVICE_USED_BY";
public final static String USAGE_OFF_INTERVAL = "SERVICE_OFF_INTERVAL"; public final static String USAGE_OFF_INTERVAL = "SERVICE_OFF_INTERVAL";
private NavigationServiceBinder binder = new NavigationServiceBinder(); private final NavigationServiceBinder binder = new NavigationServiceBinder();
private int serviceOffInterval; private int serviceOffInterval;
private String serviceOffProvider; private String serviceOffProvider;
private int serviceError; private int serviceErrorTimeout;
private long nextManualWakeup; private long nextManualWakeup;
private OsmandSettings settings; private OsmandSettings settings;
private Handler handler; private Handler handler;
@ -61,19 +60,11 @@ public class NavigationService extends Service implements LocationListener {
protected synchronized static PowerManager.WakeLock getLock(Context context) { protected synchronized static PowerManager.WakeLock getLock(Context context) {
if (lockStatic == null) { if (lockStatic == null) {
PowerManager mgr = (PowerManager) context.getSystemService(Context.POWER_SERVICE); PowerManager mgr = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
lockStatic = mgr.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "OsmandServiceLock"); lockStatic = mgr.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "OsmAnd:NavigationServiceLock");
} }
return lockStatic; return lockStatic;
} }
protected Handler getHandler() {
return handler;
}
public int getServiceError() {
return serviceError;
}
public long getNextManualWakeup() { public long getNextManualWakeup() {
return nextManualWakeup; return nextManualWakeup;
} }
@ -90,10 +81,6 @@ public class NavigationService extends Service implements LocationListener {
return usedBy; return usedBy;
} }
public String getServiceOffProvider() {
return serviceOffProvider;
}
public boolean isUsed() { public boolean isUsed() {
return usedBy != 0; return usedBy != 0;
} }
@ -112,13 +99,9 @@ public class NavigationService extends Service implements LocationListener {
} else { } else {
// Issue #3604 // Issue #3604
final OsmandApplication app = (OsmandApplication) getApplication(); final OsmandApplication app = (OsmandApplication) getApplication();
if ((usedBy == 2) && (app.navigationServiceGpsInterval(app.getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get()) != 0) && (serviceOffInterval == 0)) { if ((usedBy == USED_BY_GPX) && (app.navigationServiceGpsInterval(app.getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get()) != 0) && (serviceOffInterval == 0)) {
serviceOffInterval = app.getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get(); serviceOffInterval = app.getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get();
// From onStartCommand: setupServiceErrorTimeout();
serviceError = serviceOffInterval / 5;
serviceError = Math.min(serviceError, 12 * 60 * 1000);
serviceError = Math.max(serviceError, 30 * 1000);
serviceError = Math.min(serviceError, serviceOffInterval);
app.setNavigationService(this); app.setNavigationService(this);
AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE); AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
pendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(this, OnNavigationServiceAlarmReceiver.class), PendingIntent.FLAG_UPDATE_CURRENT); pendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(this, OnNavigationServiceAlarmReceiver.class), PendingIntent.FLAG_UPDATE_CURRENT);
@ -132,7 +115,6 @@ public class NavigationService extends Service implements LocationListener {
alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, serviceOffInterval, pendingIntent); alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, serviceOffInterval, pendingIntent);
} }
} }
app.getNotificationHelper().updateTopNotification(); app.getNotificationHelper().updateTopNotification();
app.getNotificationHelper().refreshNotifications(); app.getNotificationHelper().refreshNotifications();
} }
@ -150,14 +132,7 @@ public class NavigationService extends Service implements LocationListener {
} }
// use only gps provider // use only gps provider
serviceOffProvider = LocationManager.GPS_PROVIDER; serviceOffProvider = LocationManager.GPS_PROVIDER;
serviceError = serviceOffInterval / 5; setupServiceErrorTimeout();
// 1. not more than 12 mins
serviceError = Math.min(serviceError, 12 * 60 * 1000);
// 2. not less than 30 seconds
serviceError = Math.max(serviceError, 30 * 1000);
// 3. not more than serviceOffInterval
serviceError = Math.min(serviceError, serviceOffInterval);
locationProvider = app.getLocationProvider(); locationProvider = app.getLocationProvider();
app.setNavigationService(this); app.setNavigationService(this);
@ -204,7 +179,6 @@ public class NavigationService extends Service implements LocationListener {
} }
} }
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
@ -215,6 +189,15 @@ public class NavigationService extends Service implements LocationListener {
return serviceOffInterval == 0; return serviceOffInterval == 0;
} }
private void setupServiceErrorTimeout() {
serviceErrorTimeout = serviceOffInterval / 5;
// 1. not more than 12 mins
serviceErrorTimeout = Math.min(serviceErrorTimeout, 12 * 60 * 1000);
// 2. not less than 30 seconds
serviceErrorTimeout = Math.max(serviceErrorTimeout, 30 * 1000);
// 3. not more than serviceOffInterval
serviceErrorTimeout = Math.min(serviceErrorTimeout, serviceOffInterval);
}
@Override @Override
public void onDestroy() { public void onDestroy() {
@ -254,6 +237,29 @@ public class NavigationService extends Service implements LocationListener {
}, 500); }, 500);
} }
@SuppressLint("MissingPermission")
public void onWakeUp() {
// request location updates
final LocationManager locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
try {
locationManager.requestLocationUpdates(serviceOffProvider, 0, 0, this);
if (serviceOffInterval > serviceErrorTimeout) {
handler.postDelayed(new Runnable() {
@Override
public void run() {
WakeLock lock = getLock(NavigationService.this);
if (lock.isHeld()) {
lock.release();
locationManager.removeUpdates(NavigationService.this);
}
}
}, serviceErrorTimeout);
}
} catch (RuntimeException e) {
// ignore
}
}
@Override @Override
public void onLocationChanged(Location l) { public void onLocationChanged(Location l) {
if (l != null && !settings.MAP_ACTIVITY_ENABLED.get()) { if (l != null && !settings.MAP_ACTIVITY_ENABLED.get()) {
@ -273,7 +279,6 @@ public class NavigationService extends Service implements LocationListener {
} }
locationProvider.setLocationFromService(location, isContinuous()); locationProvider.setLocationFromService(location, isContinuous());
} }
} }
@Override @Override

26
OsmAnd/src/net/osmand/plus/OnNavigationServiceAlarmReceiver.java
View file

@ -1,17 +1,18 @@
package net.osmand.plus; package net.osmand.plus;
import android.annotation.SuppressLint;
import android.app.AlarmManager; import android.app.AlarmManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.location.LocationManager;
import android.os.Build; import android.os.Build;
import android.os.PowerManager.WakeLock; import android.os.PowerManager.WakeLock;
import android.os.SystemClock; import android.os.SystemClock;
public class OnNavigationServiceAlarmReceiver extends BroadcastReceiver { public class OnNavigationServiceAlarmReceiver extends BroadcastReceiver {
@SuppressLint("WakelockTimeout")
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
final WakeLock lock = NavigationService.getLock(context); final WakeLock lock = NavigationService.getLock(context);
@ -25,29 +26,9 @@ public class OnNavigationServiceAlarmReceiver extends BroadcastReceiver {
return; return;
} }
//
lock.acquire(); lock.acquire();
rescheduleAlarm(context, service); rescheduleAlarm(context, service);
service.onWakeUp();
// request location updates
final LocationManager locationManager = (LocationManager) service.getSystemService(Context.LOCATION_SERVICE);
try {
locationManager.requestLocationUpdates(service.getServiceOffProvider(), 0, 0, service);
if (service.getServiceOffInterval() > service.getServiceError()) {
service.getHandler().postDelayed(new Runnable() {
@Override
public void run() {
// if lock is not anymore held
if (lock.isHeld()) {
lock.release();
locationManager.removeUpdates(service);
}
}
}, service.getServiceError());
}
} catch (RuntimeException e) {
// ignore
}
} }
private void rescheduleAlarm(Context context, NavigationService service) { private void rescheduleAlarm(Context context, NavigationService service) {
@ -67,5 +48,4 @@ public class OnNavigationServiceAlarmReceiver extends BroadcastReceiver {
} }
} }
} }
} }

42
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -109,17 +109,16 @@ public class OsmandApplication extends MultiDexApplication {
private static final org.apache.commons.logging.Log LOG = PlatformUtil.getLog(OsmandApplication.class); private static final org.apache.commons.logging.Log LOG = PlatformUtil.getLog(OsmandApplication.class);
final AppInitializer appInitializer = new AppInitializer(this); final AppInitializer appInitializer = new AppInitializer(this);
OsmandSettings osmandSettings = null; Handler uiHandler;
OsmandSettings osmandSettings;
OsmAndAppCustomization appCustomization; OsmAndAppCustomization appCustomization;
NavigationService navigationService;
DownloadService downloadService;
OsmandAidlApi aidlApi;
private final SQLiteAPI sqliteAPI = new SQLiteAPIImpl(this); private final SQLiteAPI sqliteAPI = new SQLiteAPIImpl(this);
private final OsmAndTaskManager taskManager = new OsmAndTaskManager(this); private final OsmAndTaskManager taskManager = new OsmAndTaskManager(this);
private final UiUtilities iconsCache = new UiUtilities(this); private final UiUtilities iconsCache = new UiUtilities(this);
Handler uiHandler;
NavigationService navigationService;
DownloadService downloadService;
OsmandAidlApi aidlApi;
// start variables // start variables
ResourceManager resourceManager; ResourceManager resourceManager;
@ -157,10 +156,8 @@ public class OsmandApplication extends MultiDexApplication {
QuickActionRegistry quickActionRegistry; QuickActionRegistry quickActionRegistry;
private Resources localizedResources; private Resources localizedResources;
private Map<String, Builder> customRoutingConfigs = new ConcurrentHashMap<>(); private Map<String, Builder> customRoutingConfigs = new ConcurrentHashMap<>();
private Locale preferredLocale;
private Locale preferredLocale = null;
private Locale defaultLocale; private Locale defaultLocale;
private File externalStorageDirectory; private File externalStorageDirectory;
private boolean externalStorageDirectoryReadOnly; private boolean externalStorageDirectoryReadOnly;
@ -591,8 +588,7 @@ public class OsmandApplication extends MultiDexApplication {
while (getNavigationService() != null) { while (getNavigationService() != null) {
try { try {
Thread.sleep(100); Thread.sleep(100);
} } catch (InterruptedException e) {
catch (InterruptedException e) {
} }
} }
@ -782,12 +778,28 @@ public class OsmandApplication extends MultiDexApplication {
setLanguage(c); setLanguage(c);
c.setTheme(themeResId); c.setTheme(themeResId);
} }
IBRouterService reconnectToBRouter() {
try {
bRouterServiceConnection = BRouterServiceConnection.connect(this);
if (bRouterServiceConnection != null) {
return bRouterServiceConnection.getBrouterService();
}
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
public IBRouterService getBRouterService() { public IBRouterService getBRouterService() {
if(bRouterServiceConnection == null) { if (bRouterServiceConnection == null) {
return null; return null;
} }
return bRouterServiceConnection.getBrouterService(); IBRouterService s = bRouterServiceConnection.getBrouterService();
if (s != null && !s.asBinder().isBinderAlive()) {
s = reconnectToBRouter();
}
return s;
} }
public void setLanguage(Context context) { public void setLanguage(Context context) {

1
OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
View file

@ -488,7 +488,6 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
private void addTrackPoint(WptPt pt, boolean newSegment, long time) { private void addTrackPoint(WptPt pt, boolean newSegment, long time) {
List<TrkSegment> points = currentTrack.getModifiablePointsToDisplay(); List<TrkSegment> points = currentTrack.getModifiablePointsToDisplay();
Track track = currentTrack.getModifiableGpxFile().tracks.get(0); Track track = currentTrack.getModifiableGpxFile().tracks.get(0);
assert track.segments.size() == points.size();
if (points.size() == 0 || newSegment) { if (points.size() == 0 || newSegment) {
points.add(new TrkSegment()); points.add(new TrkSegment());
} }

46
OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java
View file

@ -35,17 +35,23 @@ import org.apache.commons.logging.Log;
import java.io.File; import java.io.File;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TimeZone;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import static net.osmand.GPXUtilities.GPX_TIME_FORMAT;
import static net.osmand.data.PointDescription.POINT_TYPE_MAP_MARKER; import static net.osmand.data.PointDescription.POINT_TYPE_MAP_MARKER;
public class MapMarkersHelper { public class MapMarkersHelper {
@ -1005,6 +1011,20 @@ public class MapMarkersHelper {
}); });
} }
public List<MapMarker> getMapMarkersFromDefaultGroups(boolean history) {
List<MapMarker> mapMarkers = new ArrayList<>();
for (MapMarkersGroup group : mapMarkersGroups) {
if (group.getType() == MapMarkersGroup.ANY_TYPE) {
for (MapMarker marker : group.getMarkers()) {
if (history && marker.history || !history && !marker.history) {
mapMarkers.add(marker);
}
}
}
}
return mapMarkers;
}
public String saveMarkersToFile(String fileName) { public String saveMarkersToFile(String fileName) {
GPXFile gpxFile = generateGpx(); GPXFile gpxFile = generateGpx();
String dirName = IndexConstants.GPX_INDEX_DIR + IndexConstants.MAP_MARKERS_INDEX_DIR; String dirName = IndexConstants.GPX_INDEX_DIR + IndexConstants.MAP_MARKERS_INDEX_DIR;
@ -1024,6 +1044,9 @@ public class MapMarkersHelper {
} }
public GPXFile generateGpx(List<MapMarker> markers, boolean completeBackup) { public GPXFile generateGpx(List<MapMarker> markers, boolean completeBackup) {
SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
format.setTimeZone(TimeZone.getTimeZone("UTC"));
GPXFile gpxFile = new GPXFile(Version.getFullVersion(ctx)); GPXFile gpxFile = new GPXFile(Version.getFullVersion(ctx));
for (MapMarker marker : markers) { for (MapMarker marker : markers) {
WptPt wpt = new WptPt(); WptPt wpt = new WptPt();
@ -1033,10 +1056,10 @@ public class MapMarkersHelper {
wpt.setColor(ContextCompat.getColor(ctx, MapMarker.getColorId(marker.colorIndex))); wpt.setColor(ContextCompat.getColor(ctx, MapMarker.getColorId(marker.colorIndex)));
if (completeBackup) { if (completeBackup) {
if (marker.creationDate != 0) { if (marker.creationDate != 0) {
wpt.getExtensionsToWrite().put(CREATION_DATE, String.valueOf(marker.creationDate)); wpt.getExtensionsToWrite().put(CREATION_DATE, format.format(new Date(marker.creationDate)));
} }
if (marker.visitedDate != 0) { if (marker.visitedDate != 0) {
wpt.getExtensionsToWrite().put(VISITED_DATE, String.valueOf(marker.visitedDate)); wpt.getExtensionsToWrite().put(VISITED_DATE, format.format(new Date(marker.visitedDate)));
} }
} }
gpxFile.addPoint(wpt); gpxFile.addPoint(wpt);
@ -1045,6 +1068,9 @@ public class MapMarkersHelper {
} }
public List<MapMarker> readMarkersFromGpx(GPXFile gpxFile, boolean history) { public List<MapMarker> readMarkersFromGpx(GPXFile gpxFile, boolean history) {
SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
format.setTimeZone(TimeZone.getTimeZone("UTC"));
List<MapMarker> mapMarkers = new ArrayList<>(); List<MapMarker> mapMarkers = new ArrayList<>();
for (WptPt point : gpxFile.getPoints()) { for (WptPt point : gpxFile.getPoints()) {
LatLon latLon = new LatLon(point.lat, point.lon); LatLon latLon = new LatLon(point.lat, point.lon);
@ -1055,8 +1081,8 @@ public class MapMarkersHelper {
String visitedDateStr = point.getExtensionsToRead().get(VISITED_DATE); String visitedDateStr = point.getExtensionsToRead().get(VISITED_DATE);
String creationDateStr = point.getExtensionsToRead().get(CREATION_DATE); String creationDateStr = point.getExtensionsToRead().get(CREATION_DATE);
marker.visitedDate = Algorithms.parseLongSilently(visitedDateStr, 0); marker.visitedDate = parseTime(visitedDateStr, format);
marker.creationDate = Algorithms.parseLongSilently(creationDateStr, 0); marker.creationDate = parseTime(creationDateStr, format);
marker.nextKey = history ? MapMarkersDbHelper.HISTORY_NEXT_VALUE : MapMarkersDbHelper.TAIL_NEXT_VALUE; marker.nextKey = history ? MapMarkersDbHelper.HISTORY_NEXT_VALUE : MapMarkersDbHelper.TAIL_NEXT_VALUE;
mapMarkers.add(marker); mapMarkers.add(marker);
@ -1064,6 +1090,18 @@ public class MapMarkersHelper {
return mapMarkers; return mapMarkers;
} }
private static long parseTime(String text, SimpleDateFormat format) {
long time = 0;
if (text != null) {
try {
time = format.parse(text).getTime();
} catch (ParseException e) {
LOG.error(e);
}
}
return time;
}
// --------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------
// accessors to active markers: // accessors to active markers:

49
OsmAnd/src/net/osmand/plus/osmedit/UploadGPXFilesTask.java
View file

@ -1,29 +1,36 @@
package net.osmand.plus.osmedit; package net.osmand.plus.osmedit;
import java.io.File; import android.app.Activity;
import android.os.AsyncTask;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import net.osmand.AndroidUtils;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo; import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo;
import net.osmand.plus.osmedit.OsmEditingPlugin.UploadVisibility; import net.osmand.plus.osmedit.OsmEditingPlugin.UploadVisibility;
import android.app.Activity;
import android.os.AsyncTask; import java.io.File;
import android.widget.Toast; import java.lang.ref.WeakReference;
public class UploadGPXFilesTask extends AsyncTask<GpxInfo, String, String> { public class UploadGPXFilesTask extends AsyncTask<GpxInfo, String, String> {
private final OsmandApplication app;
private final WeakReference<Activity> activityRef;
private final String visibility; private final String visibility;
private final String description; private final String description;
private final String tagstring; private final String tagstring;
private Activity la;
public UploadGPXFilesTask(Activity la, public UploadGPXFilesTask(@NonNull Activity activity, String description, String tagsString,
String description, String tagstring, UploadVisibility visibility) { @Nullable UploadVisibility visibility) {
this.la = la; app = (OsmandApplication) activity.getApplication();
this.activityRef = new WeakReference<>(activity);
this.description = description; this.description = description;
this.tagstring = tagstring; this.tagstring = tagsString;
this.visibility = visibility != null ? visibility.asURLparam() : UploadVisibility.PRIVATE.asURLparam(); this.visibility = visibility != null ? visibility.asURLparam() : UploadVisibility.PRIVATE.asURLparam();
} }
@Override @Override
@ -32,10 +39,9 @@ public class UploadGPXFilesTask extends AsyncTask<GpxInfo, String, String> {
int total = 0; int total = 0;
for (GpxInfo info : params) { for (GpxInfo info : params) {
if (!isCancelled() && info.file != null) { if (!isCancelled() && info.file != null) {
String warning = null;
File file = info.file; File file = info.file;
warning = new OpenstreetmapRemoteUtil((OsmandApplication) la.getApplication()).uploadGPXFile(tagstring, description, visibility, OpenstreetmapRemoteUtil remoteUtil = new OpenstreetmapRemoteUtil(app);
file); String warning = remoteUtil.uploadGPXFile(tagstring, description, visibility, file);
total++; total++;
if (warning == null) { if (warning == null) {
count++; count++;
@ -44,7 +50,7 @@ public class UploadGPXFilesTask extends AsyncTask<GpxInfo, String, String> {
} }
} }
} }
return la.getString(R.string.local_index_items_uploaded, count, total); return app.getString(R.string.local_index_items_uploaded, count, total);
} }
@Override @Override
@ -57,19 +63,24 @@ public class UploadGPXFilesTask extends AsyncTask<GpxInfo, String, String> {
} }
b.append(values[i]); b.append(values[i]);
} }
Toast.makeText(la, b.toString(), Toast.LENGTH_LONG).show(); app.showToastMessage(b.toString());
} }
} }
@Override @Override
protected void onPreExecute() { protected void onPreExecute() {
la.setProgressBarIndeterminateVisibility(true); Activity activity = activityRef.get();
if (AndroidUtils.isActivityNotDestroyed(activity)) {
activity.setProgressBarIndeterminateVisibility(true);
}
} }
@Override @Override
protected void onPostExecute(String result) { protected void onPostExecute(String result) {
la.setProgressBarIndeterminateVisibility(false); Activity activity = activityRef.get();
Toast.makeText(la, result, Toast.LENGTH_LONG).show(); if (AndroidUtils.isActivityNotDestroyed(activity)) {
activity.setProgressBarIndeterminateVisibility(false);
}
app.showToastMessage(result);
} }
} }

21
OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendGpxBottomSheetFragment.java
View file

@ -3,7 +3,6 @@ package net.osmand.plus.osmedit.dialogs;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
@ -21,6 +20,7 @@ import com.google.android.material.textfield.TextInputEditText;
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.UiUtilities;
import net.osmand.plus.UiUtilities.DialogButtonType;
import net.osmand.plus.base.MenuBottomSheetDialogFragment; import net.osmand.plus.base.MenuBottomSheetDialogFragment;
import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem; import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter; import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter;
@ -35,7 +35,6 @@ import net.osmand.util.Algorithms;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional;
public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment { public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment {
@ -53,15 +52,15 @@ public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment {
@Override @Override
public void createMenuItems(Bundle savedInstanceState) { public void createMenuItems(Bundle savedInstanceState) {
LayoutInflater themedInflater = UiUtilities.getInflater(requireContext(), nightMode);
View sendOsmPoiView = themedInflater.inflate(R.layout.send_gpx_fragment, null);
messageField = sendOsmPoiView.findViewById(R.id.message_field);
tagsField = sendOsmPoiView.findViewById(R.id.tags_field);
OsmandApplication app = requiredMyApplication(); OsmandApplication app = requiredMyApplication();
OsmandSettings settings = app.getSettings(); OsmandSettings settings = app.getSettings();
LayoutInflater themedInflater = UiUtilities.getInflater(app, nightMode);
View sendOsmPoiView = themedInflater.inflate(R.layout.send_gpx_fragment, null);
tagsField = sendOsmPoiView.findViewById(R.id.tags_field);
messageField = sendOsmPoiView.findViewById(R.id.message_field);
TextView accountName = sendOsmPoiView.findViewById(R.id.user_name); TextView accountName = sendOsmPoiView.findViewById(R.id.user_name);
if (!Algorithms.isEmpty(settings.USER_DISPLAY_NAME.get())) { if (!Algorithms.isEmpty(settings.USER_DISPLAY_NAME.get())) {
accountName.setText(settings.USER_DISPLAY_NAME.get()); accountName.setText(settings.USER_DISPLAY_NAME.get());
@ -108,12 +107,11 @@ public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment {
.setCustomView(sendOsmPoiView) .setCustomView(sendOsmPoiView)
.create(); .create();
items.add(titleItem); items.add(titleItem);
setRetainInstance(true);
} }
@Override @Override
protected UiUtilities.DialogButtonType getRightBottomButtonType() { protected DialogButtonType getRightBottomButtonType() {
return (UiUtilities.DialogButtonType.PRIMARY); return DialogButtonType.PRIMARY;
} }
@Override @Override
@ -141,6 +139,7 @@ public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment {
SendGpxBottomSheetFragment fragment = new SendGpxBottomSheetFragment(); SendGpxBottomSheetFragment fragment = new SendGpxBottomSheetFragment();
fragment.setTargetFragment(targetFragment, 0); fragment.setTargetFragment(targetFragment, 0);
fragment.setGpxInfos(info); fragment.setGpxInfos(info);
fragment.setRetainInstance(true);
fragment.show(fragmentManager, TAG); fragment.show(fragmentManager, TAG);
} }
} }

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

@ -46,7 +46,7 @@ public class HistoryMarkersSettingsItem extends CollectionSettingsItem<MapMarker
protected void init() { protected void init() {
super.init(); super.init();
markersHelper = app.getMapMarkersHelper(); markersHelper = app.getMapMarkersHelper();
existingItems = new ArrayList<>(markersHelper.getMapMarkersHistory()); existingItems = new ArrayList<>(markersHelper.getMapMarkersFromDefaultGroups(true));
} }
@NonNull @NonNull

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

@ -46,7 +46,7 @@ public class MarkersSettingsItem extends CollectionSettingsItem<MapMarker> {
protected void init() { protected void init() {
super.init(); super.init();
markersHelper = app.getMapMarkersHelper(); markersHelper = app.getMapMarkersHelper();
existingItems = new ArrayList<>(markersHelper.getMapMarkers()); existingItems = new ArrayList<>(markersHelper.getMapMarkersFromDefaultGroups(false));
} }
@NonNull @NonNull

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

@ -597,7 +597,7 @@ public class SettingsHelper {
if (!files.isEmpty()) { if (!files.isEmpty()) {
dataList.put(ExportSettingsType.VOICE, files); dataList.put(ExportSettingsType.VOICE, files);
} }
List<MapMarker> mapMarkers = app.getMapMarkersHelper().getMapMarkers(); List<MapMarker> mapMarkers = app.getMapMarkersHelper().getMapMarkersFromDefaultGroups(false);
if (!mapMarkers.isEmpty()) { if (!mapMarkers.isEmpty()) {
String name = app.getString(R.string.map_markers); String name = app.getString(R.string.map_markers);
String groupId = ExportSettingsType.ACTIVE_MARKERS.name(); String groupId = ExportSettingsType.ACTIVE_MARKERS.name();
@ -605,7 +605,7 @@ public class SettingsHelper {
markersGroup.setMarkers(mapMarkers); markersGroup.setMarkers(mapMarkers);
dataList.put(ExportSettingsType.ACTIVE_MARKERS, Collections.singletonList(markersGroup)); dataList.put(ExportSettingsType.ACTIVE_MARKERS, Collections.singletonList(markersGroup));
} }
List<MapMarker> markersHistory = app.getMapMarkersHelper().getMapMarkersHistory(); List<MapMarker> markersHistory = app.getMapMarkersHelper().getMapMarkersFromDefaultGroups(true);
if (!markersHistory.isEmpty()) { if (!markersHistory.isEmpty()) {
String name = app.getString(R.string.shared_string_history); String name = app.getString(R.string.shared_string_history);
String groupId = ExportSettingsType.HISTORY_MARKERS.name(); String groupId = ExportSettingsType.HISTORY_MARKERS.name();

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

@ -141,7 +141,7 @@ public class ImportSettingsFragment extends BaseOsmAndFragment {
progressBar = root.findViewById(R.id.progress_bar); progressBar = root.findViewById(R.id.progress_bar);
setupToolbar(toolbar); setupToolbar(toolbar);
ViewCompat.setNestedScrollingEnabled(expandableList, true); ViewCompat.setNestedScrollingEnabled(expandableList, true);
View header = inflater.inflate(R.layout.list_item_description_header, container, false); View header = inflater.inflate(R.layout.list_item_description_header, null);
description = header.findViewById(R.id.description); description = header.findViewById(R.id.description);
description.setText(R.string.select_data_to_import); description.setText(R.string.select_data_to_import);
expandableList.addHeaderView(header); expandableList.addHeaderView(header);