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

Merge branch 'master' into trip_recording_starting

Browse source
This commit is contained in:
Vitaliy 2021-03-22 13:34:51 +02:00
commit 3323d0ebb7
85 changed files with 2616 additions and 727 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,9 @@ public class IndexConstants {
public static final String BINARY_ROAD_MAP_INDEX_EXT = ".road.obf"; //$NON-NLS-1$
public static final String BINARY_ROAD_MAP_INDEX_EXT_ZIP = ".road.obf.zip"; //$NON-NLS-1$
public static final String BINARY_SRTM_MAP_INDEX_EXT = ".srtm.obf"; //$NON-NLS-1$
public static final String BINARY_SRTM_FEET_MAP_INDEX_EXT = ".srtmf.obf"; //$NON-NLS-1$
public static final String BINARY_SRTM_MAP_INDEX_EXT_ZIP = ".srtm.obf.zip"; //$NON-NLS-1$
public static final String BINARY_SRTM_FEET_MAP_INDEX_EXT_ZIP = ".srtmf.obf.zip"; //$NON-NLS-1$
public static final String EXTRA_EXT = ".extra";
public static final String EXTRA_ZIP_EXT = ".extra.zip";

24
OsmAnd-java/src/main/java/net/osmand/data/QuadRect.java
View file

@ -6,6 +6,7 @@ public class QuadRect {
public double top;
public double bottom;
// left & right / top & bottom could be flipped (so it's useful for latlon bbox)
public QuadRect(double left, double top, double right, double bottom) {
this.left = left;
this.right = right;
@ -21,16 +22,18 @@ public class QuadRect {
}
public double width() {
return right - left;
return Math.abs(right - left);
}
public double height() {
return bottom - top;
return Math.abs(bottom - top);
}
public boolean contains(double left, double top, double right, double bottom) {
return this.left < this.right && this.top < this.bottom && this.left <= left && this.top <= top && this.right >= right
&& this.bottom >= bottom;
return Math.min(this.left, this.right) <= Math.min(left, right)
&& Math.max(this.left, this.right) >= Math.max(left, right)
&& Math.min(this.top, this.bottom) <= Math.min(top, bottom)
&& Math.max(this.top, this.bottom) >= Math.max(top, bottom);
}
public boolean contains(QuadRect box) {
@ -38,12 +41,15 @@ public class QuadRect {
}
public static boolean intersects(QuadRect a, QuadRect b) {
return a.left < b.right && b.left < a.right && a.top < b.bottom && b.top < a.bottom;
}
public static boolean trivialOverlap(QuadRect a, QuadRect b) {
return !((a.right < b.left) || (a.left > b.right) || (a.top < b.bottom) || (a.bottom > b.top));
return Math.min(a.left, a.right) <= Math.max(b.left, b.right)
&& Math.max(a.left, a.right) >= Math.min(b.left, b.right)
&& Math.min(a.bottom, a.top) <= Math.max(b.bottom, b.top)
&& Math.max(a.bottom, a.top) >= Math.min(b.bottom, b.top);
}
public static boolean trivialOverlap(QuadRect a, QuadRect b) {
return intersects(a, b);
}
public double centerX() {
return (left + right) / 2;

18
OsmAnd-java/src/main/java/net/osmand/data/QuadTree.java
View file

@ -103,18 +103,16 @@ public class QuadTree<T> {
void splitBox(QuadRect node_extent, QuadRect[] n) {
// coord2d c=node_extent.center();
double width = node_extent.width();
double height = node_extent.height();
double lox = node_extent.left;
double loy = node_extent.top;
double hix = node_extent.right;
double hiy = node_extent.bottom;
double lx = node_extent.left;
double ly = node_extent.top;
double hx = node_extent.right;
double hy = node_extent.bottom;
n[0] = new QuadRect(lox, loy, lox + width * ratio, loy + height * ratio);
n[1] = new QuadRect(hix - width * ratio, loy, hix, loy + height * ratio);
n[2] = new QuadRect(lox, hiy - height * ratio, lox + width * ratio, hiy);
n[3] = new QuadRect(hix - width * ratio, hiy - height * ratio, hix, hiy);
n[0] = new QuadRect(lx, ly, lx + (hx - lx) * ratio, ly + (hy - ly) * ratio);
n[1] = new QuadRect(lx + (hx - lx) * (1 - ratio), ly, hx, ly + (hy - ly) * ratio);
n[2] = new QuadRect(lx, ly + (hy - ly) * (1 - ratio), lx + (hx - lx) * ratio, hy);
n[3] = new QuadRect(lx + (hx - lx) * (1 - ratio), ly + (hy - ly) * (1 - ratio), hx, hy);
}
}

2
OsmAnd-telegram/res/values-cs/strings.xml
View file

@ -75,4 +75,6 @@
<string name="logcat_buffer">Zásobník logcat</string>
<string name="logcat_buffer_descr">Zkontrolovat a sdílet podrobné záznamy aplikace</string>
<string name="by_name">Podle názvu</string>
<string name="shared_string_distance">Vzdálenost</string>
<string name="shared_string_later">Později</string>
</resources>

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

@ -59,7 +59,7 @@
<string name="shared_string_map">نقشه</string>
<string name="average_altitude">میانگین ارتفاع</string>
<string name="average_speed">میانگین سرعت</string>
<string name="shared_string_update">به‌روزرسانی</string>
<string name="shared_string_update">روزآمدسازی</string>
<string name="shared_string_ok">خُب</string>
<string name="shared_string_search">جست‌وجو</string>
<string name="altitude">ارتفاع</string>
@ -81,5 +81,5 @@
<string name="send_report">ارسال گزارش</string>
<string name="shared_string_export">برون‌برد</string>
<string name="logcat_buffer">بافر لاگ‌کت</string>
<string name="logcat_buffer_descr">لاگ‌های جزئی برنامه را بررسی و هم‌رسانی کنید</string>
<string name="logcat_buffer_descr">لاگ‌های باجزئیات برنامه را بررسی و هم‌رسانی کنید</string>
</resources>

2
OsmAnd-telegram/res/values-nl/strings.xml
View file

@ -258,7 +258,7 @@
<string name="unit_of_speed_system_descr">Definieer de eenheid voor snelheid.</string>
<string name="unit_of_speed_system">Eenheid van snelheid</string>
<string name="send_report">Stuur rapport</string>
<string name="shared_string_export">Exporteer naar OSM</string>
<string name="shared_string_export">Exporteer</string>
<string name="logcat_buffer">Logcat buffer</string>
<string name="logcat_buffer_descr">Controleer en deel gedetailleerde logs van de app</string>
</resources>

270
OsmAnd-telegram/res/values-sv/strings.xml
View file

@ -1,4 +1,274 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="last_update_from_telegram_date">Senaste uppdatering från Telegram: %1$s</string>
<string name="timeline">Tidslinje</string>
<string name="live_now">Direkt nu</string>
<string name="my_location">Min plats</string>
<string name="welcome_descr"><b>OsmAnd Tracker</b> låter dig dela din plats och se andras i OsmAnd. <br/> <br/>Appen använder Telegram API, så du behöver ett Telegram-konto.</string>
<string name="shared_string_second_short">sek</string>
<string name="shared_string_minute_short">min</string>
<string name="shared_string_hour_short">t</string>
<string name="si_mi_meters">Miles/meter</string>
<string name="si_nm">Distansminuter</string>
<string name="si_km_m">Kilomter/meter</string>
<string name="si_mi_yard">Miles/yard</string>
<string name="si_mi_feet">Miles/fot</string>
<string name="si_nm_h">Distansminuter per timme (knop)</string>
<string name="si_min_m">Minuter per mile</string>
<string name="si_min_km">Minuter per kilometer</string>
<string name="si_m_s">Meter per sekund</string>
<string name="si_mph">Miles per timme</string>
<string name="si_kmh">Kilometer per timme</string>
<string name="mile_per_hour">mph</string>
<string name="km_h">km/h</string>
<string name="m_s">m/s</string>
<string name="nm_h">di/h</string>
<string name="min_km">min/km</string>
<string name="min_mile">min/mi</string>
<string name="nm">di</string>
<string name="m">m</string>
<string name="km">km</string>
<string name="mile">mi</string>
<string name="foot">ft</string>
<string name="yard">yd</string>
<string name="shared_string_welcome">Välkommen</string>
<string name="shared_string_authorization_descr">Ange ditt Telegram-telefonnummer i internationellt format</string>
<string name="shared_string_authorization">Tillstånd</string>
<string name="active_chats">Aktivera chattar</string>
<string name="show_users_on_map">Visa användare på kartan</string>
<string name="install_osmand">Installera OsmAnd</string>
<string name="install_osmand_dialog_message">Du måste installera den gratis eller betalda versionen av OsmAnd först</string>
<string name="osmand_logo">OsmAnd logotyp</string>
<string name="process_service">OsmAnd Tracker tjänst</string>
<string name="sharing_location">Delar plats</string>
<string name="share_location">Dela plats</string>
<string name="shared_string_distance">Avstånd</string>
<string name="osmand_service_descr">OsmAnd Tracker körs i bakgrunden med skärmen av.</string>
<string name="osmand_service">Bakgrundsläge</string>
<string name="location_service_no_gps_available">Välj en av platsleverantörerna för att dela din plats.</string>
<string name="gps_not_available">Aktivera \"Plats\" i systeminställningarna</string>
<string name="no_location_permission">App saknar behörighet för plats data.</string>
<string name="shared_string_settings">Inställningar</string>
<string name="shared_string_cancel">Avbryt</string>
<string name="shared_string_continue">Fortsätt</string>
<string name="not_logged_in">Du är inte inloggad</string>
<string name="gps_network_not_enabled">Starta \"Platsdelning\"\?</string>
<string name="closing">Stänger</string>
<string name="logging_out">Loggar ut</string>
<string name="initialization">Startar</string>
<string name="shared_string_logout">Logga ut</string>
<string name="shared_string_login">Logga in</string>
<string name="password_descr">Telegram-lösenord</string>
<string name="enter_password">Ange lösenord</string>
<string name="authentication_code_descr">Telegram har skickat en kod till dig för OmsAnd för inloggning till ditt konto.</string>
<string name="authentication_code">Autentiseringskod</string>
<string name="enter_code">Ange kod</string>
<string name="shared_string_password">Lösenord</string>
<string name="phone_number_descr">Telefonnummer i internationellt format</string>
<string name="phone_number_title">Telefonnummer</string>
<string name="app_name">OsmAnd Online GPS Tracker</string>
<string name="show_on_map">Visa på karta</string>
<string name="start_location_sharing">Platsdelning</string>
<string name="my_location_search_hint">Sök: Grupp och kontakt</string>
<string name="location_sharing_description">Välj de kontakter och grupper du vill dela din plats med.</string>
<string name="set_time">Ange tid</string>
<string name="set_time_description">Ställ in tiden att dina valda kontakter och grupper ska se din plats i realtid.</string>
<string name="visible_time_for_all">Synlig tid för alla</string>
<string name="shared_string_back">Bakåt</string>
<string name="shared_string_share">Dela</string>
<string name="shared_string_install">Installera</string>
<string name="hours_format">%1$d t</string>
<string name="minutes_format">%1$d m</string>
<string name="hours_and_minutes_format">%1$d t %2$d m</string>
<string name="set_visible_time_for_all">Ställ in synlig tid för alla</string>
<string name="enter_authentication_code">Ange autentiseringskod</string>
<string name="enter_phone_number">Skriv in telefonnummer</string>
<string name="do_not_have_telegram">Jag har inget Telegramkonto</string>
<string name="already_registered_in_telegram">Du behöver ett registrerat Telegramkonto och ett telefonnummer</string>
<string name="shared_string_off">Av</string>
<string name="shared_string_all">Alla</string>
<string name="get_telegram_after_creating_account">Efter det kan du använda denna app.</string>
<string name="get_telegram_description_continue">Installera Telegram och registrera ett konto.</string>
<string name="get_telegram_account_first">Du behöver ett Telegramkonto för att använda platsdelning.</string>
<string name="get_telegram_title">Registrering i Telegram</string>
<string name="shared_string_bot">Bot</string>
<string name="shared_string_live">Direkt</string>
<string name="open_osmand">Öppna OsmAnd</string>
<string name="turn_off_location_sharing">Stäng av platsdelning</string>
<string name="stop_sharing_all">Delning är påslagen (stäng av)</string>
<string name="expire_at">Går ut</string>
<string name="sharing_time">Delningstid</string>
<string name="gps_and_location">Plats</string>
<string name="send_my_location">Skicka min plats</string>
<string name="send_my_location_desc">Ställ in minsta intervall för platsdelning.</string>
<string name="stale_location">Ingen rörelse</string>
<string name="stale_location_desc">Senaste tid en kontakt rört sig.</string>
<string name="location_history">Platshistorik</string>
<string name="location_history_desc">Göm kontakter som inte har rört sig inom given tid.</string>
<string name="osmand_connect">Anslutning till OsmAnd</string>
<string name="osmand_connect_desc">Välj den OsmAnd-version som OsmAnd Tracker använder för att visa positioner.</string>
<string name="in_time">i %1$s</string>
<string name="shared_string_account">Konto</string>
<string name="connected_account">Anlutet konto</string>
<string name="logout_help_desc">Hur man stänger av OsmAnd Tracker från Telegram</string>
<string name="disconnect_from_telegram">Hur man stänger av OsmAnd Tracker från Telegram</string>
<string name="disconnect_from_telegram_desc">För att återkalla platsdelningsåtkomst. Öppna Telegram, gå till Inställningar → Sekretess och säkerhet → Sessioner och avsluta OsmAnd Tracker-sessionen.</string>
<string name="shared_string_close">Stäng</string>
<string name="logout_no_internet_msg">Anslut till internet för att logga ut ordentligt från Telegram.</string>
<string name="shared_string_group">Grupp</string>
<string name="last_response">Senaste svar</string>
<string name="time_ago">sedan</string>
<string name="shared_string_exit">Utgång</string>
<string name="turn_off_all">Stäng av allt</string>
<string name="disable_all_sharing">Inaktivera all delning</string>
<string name="disable_all_sharing_desc">Stäng av platsdelning i alla valda chatter (%1$d).</string>
<string name="choose_osmand">Välj OsmAnd version att använda</string>
<string name="choose_osmand_desc">Välj OsmAnd version där kontakter kommer att visas på kartan.</string>
<string name="shared_string_sort_by">Sortera efter</string>
<string name="shared_string_sort">Sortera</string>
<string name="by_group">Efter grupp</string>
<string name="by_name">Efter namn</string>
<string name="by_distance">Avstånd</string>
<string name="shared_string_name">Namn</string>
<string name="logout_from_osmand_telegram">Logga ut från OsmAnd Tracker\?</string>
<string name="logout_from_osmand_telegram_descr">Är du säker på att du vill logga ut från OsmAnd Tracker så att du inte kan dela plats eller se andras plats\?</string>
<string name="live_now_description">Kontakter och grupper delar plats med dig.</string>
<string name="share_location_as">Dela plats som</string>
<string name="add_device">Lägg till enhet</string>
<string name="shared_string_save">Spara</string>
<string name="shared_string_disable">Inaktivera</string>
<string name="no_internet_connection">Ingen internet-anslutning</string>
<string name="no_gps_connection">Ingen GPS-anslutning</string>
<string name="shared_string_status">Status</string>
<string name="shared_string_enabled">Aktiverat</string>
<string name="location_sharing_status">Delar: %1$s</string>
<string name="sharing_status">Delar status</string>
<string name="last_available_location">Senaste tillgängliga plats</string>
<string name="re_send_location">Skicka plats igen</string>
<string name="not_found_yet">Hittades inte än</string>
<string name="not_sent_yet">Inte skickat än</string>
<string name="shared_string_later">Senare</string>
<string name="go_to_settings">Gå till inställningar</string>
<string name="sharing_in_background">Delar i bakgrunden</string>
<string name="battery_optimization_description">Stäng av batterioptimering för OsmAnd Tracker så att den inte plötsligt stängs av i bakgrunden.</string>
<string name="background_work">Bakgrundsarbete</string>
<string name="background_work_description">Ändra batterioptimeringsinställningarna för att stabilisera platsdelning.</string>
<string name="connecting_to_the_internet">Ansluter till internet</string>
<string name="searching_for_gps">Positionering …</string>
<string name="initializing">Startar</string>
<string name="sending_location_messages">Skickar plats</string>
<string name="waiting_for_response_from_telegram">Väntar på svar från Telegram</string>
<string name="not_possible_to_send_to_telegram_chats">Inte möjligt att skicka till Telegram-chattar:</string>
<string name="successfully_sent_and_updated">Skickades och uppdaterades</string>
<string name="last_updated_location">Senast uppdaterad plats:</string>
<string name="share_location_as_description">Om du vill ansluta flera enheter till ett telegramkonto måste du använda olika enheter för att dela din plats.</string>
<string name="share_location_as_description_second_line">Du kan skapa och visa enhets-ID i Telegram-klienten genom att använda %1$s chatt-bot. %2$s</string>
<string name="shared_string_hide">Göm</string>
<string name="device_name">Enhetsnamn</string>
<string name="device_name_cannot_be_empty">Enhetsnamn kan inte vara tomt</string>
<string name="device_name_is_too_long">Enhetsnamn för långt</string>
<string name="enter_device_name_description">Namnge din nya enhet med max 200 symboler.</string>
<string name="error_adding_new_device">Kunde inte lägga till ny enhet</string>
<string name="shared_string_add">Lägg till</string>
<string name="device_added_successfully">%1$s tillagt.</string>
<string name="enter_another_device_name">Välj ett namn som du inte redan har använt</string>
<string name="last_update_from_telegram">Senaste uppdatering från Telegram</string>
<string name="map_and_text">Karta och text</string>
<string name="shared_string_text">Text</string>
<string name="shared_string_map">Karta</string>
<string name="send_location_as_descr">Välj hur meddelanden med din plats ska se ut.</string>
<string name="send_location_as">Skicka plats som</string>
<string name="start_date">Start datum</string>
<string name="end_date">Slutdatum</string>
<string name="open_in_osmand">Visa i OsmAnd</string>
<string name="average_speed">Genomsnittlig hastighet</string>
<string name="average_altitude">Genomsnittlig höjd</string>
<string name="time_on_the_move">Rörelse tid</string>
<string name="monitoring_is_disabled">Övervakning är inaktiverad</string>
<string name="monitoring_is_enabled">Övervakning är aktiverad</string>
<string name="shared_string_sent">Skickat</string>
<string name="gps_points">GPS-punkter</string>
<string name="shared_string_collected">Samlade</string>
<string name="shared_string_date">Datum</string>
<string name="points_size">%1$d punkter</string>
<string name="gps_points_in_buffer">skicka (%1$d i buffer)</string>
<string name="shared_string_update">Uppdatering</string>
<string name="please_update_osmand">var snäll uppdatera OsmAnd för att visa data på kartan</string>
<string name="show_gps_points_descr">Visa antal samlade och skickade GPS-punkter.</string>
<string name="show_gps_points">Visa GPS-punkter</string>
<string name="shared_string_appearance">Utseende</string>
<string name="received_gps_points">Fick GPX-punkter: %1$s</string>
<string name="how_it_works">Hur det fungerar</string>
<string name="osmand_privacy_policy">OsmAnd integritetspolicy</string>
<string name="telegram_privacy_policy">Telegram integritetspolicy</string>
<string name="shared_string_accept">Acceptera</string>
<string name="privacy_policy_agree">Genom att klicka på \"Fortsätt\" godkänner du villkoren i Telegram- och OsmAnds integritetspolicy.</string>
<string name="privacy_policy_telegram_client">OsmAnd tracker är en av klienterna som använder Telegram öppen plattform. Dina kontakter kan använda vilken Telegram-klient som helst.</string>
<string name="privacy_policy_use_telegram">Telegram (meddelandeappen) används för att ansluta och kommunicera med människor.</string>
<string name="shared_string_telegram">Telegram</string>
<string name="app_name_short">OsmAnd Tracker</string>
<string name="timeline_description">Aktivera övervakning för att spara alla platser i historiken.</string>
<string name="location_recording_enabled">Platsinspelning aktiverad</string>
<string name="disable_monitoring">Deaktivera övervakning</string>
<string name="timeline_available_for_free_now">Tidslinje är nu tillgängligt utan extra kostnad.</string>
<string name="shared_string_ok">OK</string>
<string name="shared_string_search">Sök</string>
<string name="type_contact_or_group_name">Skriv kontakt eller gruppnamn</string>
<string name="search_contacts_descr">Sök i alla dina grupper och kontakter.</string>
<string name="search_contacts">Sök kontakter</string>
<string name="bearing">Riktning</string>
<string name="altitude">Höjd över havet</string>
<string name="precision">Precision</string>
<string name="direction">Riktning</string>
<string name="privacy">Integritet</string>
<string name="proxy">Proxy</string>
<string name="proxy_settings">Proxy-inställningar</string>
<string name="proxy_disconnected">Frånkopplad</string>
<string name="proxy_connected">Ansluten</string>
<string name="proxy_type">Proxy-typ</string>
<string name="shared_string_enable">Aktivera</string>
<string name="shared_string_connection">Anslutning</string>
<string name="proxy_server">Server</string>
<string name="proxy_port">Port</string>
<string name="proxy_credentials">Referenser</string>
<string name="proxy_username">Användarnamn</string>
<string name="proxy_password">Lösenord</string>
<string name="proxy_key">Nyckel</string>
<string name="gpx_settings">GPX-inställningar</string>
<string name="min_logging_speed_descr">Filter: ingen loggning under valda hastigheten</string>
<string name="min_logging_speed">Minsta loggningshastighet</string>
<string name="min_logging_accuracy_descr">Filter: ingen loggning utan att nogranheten är nodd</string>
<string name="min_logging_accuracy">Minsta loggningsnoggrannhet</string>
<string name="min_logging_distance_descr">Filter: minsta avstånd för att logga en ny punkt</string>
<string name="min_logging_distance">Minsta loggningsavstånd</string>
<string name="shared_string_select">Välj</string>
<string name="timeline_no_data">Ingen data</string>
<string name="timeline_no_data_descr">Vi har inget sparad data för den valda dagen</string>
<string name="start_end_date">Start - Slut datum</string>
<string name="set_time_timeline_descr">Välj tid att visa</string>
<string name="shared_string_apply">Verkställ</string>
<string name="shared_string_start">Start</string>
<string name="shared_string_end">Slut</string>
<string name="saved_messages">Sparade meddelanden</string>
<string name="unit_of_speed_system">Enhet för hastighet</string>
<string name="unit_of_speed_system_descr">Definera enhet för hastighet.</string>
<string name="unit_of_length">Enhet för längd</string>
<string name="unit_of_length_descr">Ändra vad avstånd mäts i.</string>
<string name="units_and_formats">Enheter &amp; format</string>
<string name="time_zone">Tidszon</string>
<string name="time_zone_descr">Välj tidszon som ska visas i dina platsmeddelanden.</string>
<string name="buffer_time">Buffertens utgångstid</string>
<string name="buffer_time_descr">Maximal tid att lagra poäng i bufferten</string>
<string name="status_widget_title">OsmAnd Tracler status</string>
<string name="shared_string_suggested">Förslagen</string>
<string name="back_to_osmand">Tillbaka till OsmAnd</string>
<string name="duration_ago">%1$s sedan</string>
<string name="last_response_duration">Senaste svar: %1$s sedan</string>
<string name="last_update_from_telegram_duration">Senaste uppdatering från Telegram: %1$s sedan</string>
<string name="last_response_date">Senast response: %1$s</string>
<string name="shared_string_error_short">ERR</string>
<string name="shared_string_export">Export</string>
<string name="logcat_buffer">Logcat buffer</string>
<string name="logcat_buffer_descr">Kontrollera och dela detaljerade loggar för appen</string>
<string name="send_report">Skicka rapport</string>
</resources>

6
OsmAnd/build.gradle
View file

@ -84,14 +84,14 @@ android {
manifest.srcFile "AndroidManifest-nightlyFree.xml"
}
amazonFree {
java.srcDirs = ["src-nogms", "src-google"]
java.srcDirs = ["src-nogms", "src-amazon"]
manifest.srcFile "AndroidManifest-gplayFree.xml"
}
amazonFull {
java.srcDirs = ["src-nogms", "src-google"]
java.srcDirs = ["src-nogms", "src-amazon"]
}
huawei {
java.srcDirs = ["src-nogms", "src-google"]
java.srcDirs = ["src-nogms", "src-huawei"]
manifest.srcFile "AndroidManifest-huawei.xml"
}

9
OsmAnd/res/drawable/ic_action_at_mail.xml Normal file
View file

@ -0,0 +1,9 @@
<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="M12,2C6.48,2 2,6.48 2,12C2,17.52 6.48,22 12,22H17V20H12C7.66,20 4,16.34 4,12C4,7.66 7.66,4 12,4C16.34,4 20,7.66 20,12V13.43C20,14.22 19.29,15 18.5,15C17.71,15 17,14.22 17,13.43V12C17,9.24 14.76,7 12,7C9.24,7 7,9.24 7,12C7,14.76 9.24,17 12,17C13.38,17 14.64,16.44 15.54,15.53C16.19,16.42 17.31,17 18.5,17C20.47,17 22,15.4 22,13.43V12C22,6.48 17.52,2 12,2ZM12,15C10.34,15 9,13.66 9,12C9,10.34 10.34,9 12,9C13.66,9 15,10.34 15,12C15,13.66 13.66,15 12,15Z"
android:fillColor="#ffffff"/>
</vector>

63
OsmAnd/res/drawable/ic_action_dialog.xml Normal file
View file

@ -0,0 +1,63 @@
<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="M22,2V19C22,20.6569 20.6569,22 19,22H5C3.3431,22 2,20.6569 2,19V2H4V18H20V2H22Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M13,14.2C13,14.0895 13.0895,14 13.2,14H17.8C17.9105,14 18,14.0895 18,14.2V15.8C18,15.9105 17.9105,16 17.8,16H13.2C13.0895,16 13,15.9105 13,15.8V14.2Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M6,6H9V8H6V6Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M11,6H18V8H11V6Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M4,4H20V2H4V4Z"
android:strokeAlpha="0.7"
android:fillColor="#ffffff"
android:fillAlpha="0.7"/>
<path
android:pathData="M4,4H20V18H4V4Z"
android:strokeAlpha="0.1"
android:fillColor="#ffffff"
android:fillAlpha="0.1"/>
<path
android:pathData="M6,9H11V10H6V9Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M6,11H7V12H6V11Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M12,9H14V10H12V9Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M15,9H18V10H15V9Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M8,11H12V12H8V11Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M13,11H18V12H13V11Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
<path
android:pathData="M6.2,14C6.0895,14 6,14.0895 6,14.2V15.8C6,15.9105 6.0895,16 6.2,16H10.8C10.9105,16 11,15.9105 11,15.8V14.2C11,14.0895 10.9105,14 10.8,14H6.2Z"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
</vector>

18
OsmAnd/res/drawable/ic_action_help_online.xml Normal file
View file

@ -0,0 +1,18 @@
<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="M2,12C2,16.9406 5.5829,21.0444 10.2922,21.8547C10.1025,21.2707 10,20.6473 10,20C10,17.913 11.0655,16.0749 12.6822,15L11.0001,15L11,11.9338L12.7455,10.8865C13.2136,10.6056 13.5,10.0998 13.5,9.554L13.5,9.25C13.5,8.5597 12.9403,8 12.25,8H12C11.4477,8 11,8.4477 11,9H9C9,7.3432 10.3431,6 12,6H12.25C14.0449,6 15.5,7.4551 15.5,9.25L15.5,9.554C15.4999,10.8024 14.845,11.9592 13.7745,12.6015L13,13.0662L13.0001,14.8027C13.8826,14.2922 14.9072,14 16,14H21.8C21.9311,13.3538 22,12.6849 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M16,16H17V18H16C14.8954,18 14,18.8954 14,20C14,21.1046 14.8954,22 16,22H17V24H16C13.7909,24 12,22.2091 12,20C12,17.7909 13.7909,16 16,16Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M20,22H19V24H20C22.2091,24 24,22.2091 24,20C24,17.7909 22.2091,16 20,16H19V18H20C21.1046,18 22,18.8954 22,20C22,21.1046 21.1046,22 20,22Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M16,20C16,19.4477 16.4477,19 17,19H19C19.5523,19 20,19.4477 20,20C20,20.5523 19.5523,21 19,21H17C16.4477,21 16,20.5523 16,20Z"
android:fillColor="#ffffff"/>
</vector>

17
OsmAnd/res/layout-land/fragment_measurement_tool.xml
View file

@ -195,11 +195,13 @@
<include
android:id="@+id/add_point_button"
layout="@layout/bottom_sheet_dialog_button"
android:layout_width="@dimen/measurement_tool_button_width"
android:layout_width="wrap_content"
android:layout_height="@dimen/measurement_tool_button_height"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" />
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:minWidth="@dimen/measurement_tool_button_width" />
</RelativeLayout>
<RelativeLayout
@ -211,14 +213,15 @@
<include
android:id="@+id/apply_move_point_button"
layout="@layout/bottom_sheet_dialog_button"
android:layout_width="wrap_content"
android:layout_height="@dimen/measurement_tool_button_height"
android:layout_width="@dimen/measurement_tool_button_width"
android:layout_marginEnd="@dimen/measurement_tool_button_margin"
android:layout_marginRight="@dimen/measurement_tool_button_margin"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
layout="@layout/bottom_sheet_dialog_button" />
android:layout_marginEnd="@dimen/measurement_tool_button_margin"
android:layout_marginRight="@dimen/measurement_tool_button_margin"
android:minWidth="@dimen/measurement_tool_button_width" />
<net.osmand.plus.widgets.TextViewEx

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

@ -233,14 +233,15 @@
<include
android:id="@+id/apply_move_point_button"
layout="@layout/bottom_sheet_dialog_button"
android:layout_width="wrap_content"
android:layout_height="@dimen/measurement_tool_button_height"
android:layout_width="@dimen/measurement_tool_button_width"
android:layout_marginEnd="@dimen/measurement_tool_button_margin"
android:layout_marginRight="@dimen/measurement_tool_button_margin"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
layout="@layout/bottom_sheet_dialog_button" />
android:layout_marginEnd="@dimen/measurement_tool_button_margin"
android:layout_marginRight="@dimen/measurement_tool_button_margin"
android:minWidth="@dimen/measurement_tool_button_width" />
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/cancel_move_point_button"

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

@ -824,7 +824,7 @@
<string name="poi_craft_sculptor">نحات</string>
<string name="poi_craft_shoemaker">إسكافي</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_wetland">أراضي رطبة</string>
<string name="poi_wood">خشب و غابة</string>
@ -3689,4 +3689,18 @@
<string name="poi_denomination_united_methodist">الكنيسة الميثودية</string>
<string name="poi_denomination_pentecostal">الخمسينية</string>
<string name="poi_denomination_presbyterian">المشيخية</string>
<string name="poi_conference_centre">مركز مؤتمرات</string>
<string name="poi_mobile_library">موقف المكتبة المتنقلة</string>
<string name="poi_summit_register_no">تسجيل للوصول للقمة: لا</string>
<string name="poi_summit_register_yes">تسجيل للوصول للقمة: نعم</string>
<string name="poi_piste_status_closed">حالة الزحلقة: مغلقة</string>
<string name="poi_piste_status_open">حالة الزحلقة: مفتوحة</string>
<string name="poi_patrolled_no">محروس : لا</string>
<string name="poi_patrolled_yes">محروس: نعم</string>
<string name="poi_gladed_yes">التزلج عبر الأشجار</string>
<string name="poi_piste_name">اسم الزحلقة</string>
<string name="poi_piste_ski_jump">القفز على الجليد</string>
<string name="poi_geodesist">الجيوديسيا (شكل الأرض ومساحتها)</string>
<string name="poi_local_ref">المرجع المحلي</string>
<string name="poi_piste">الزحلقه</string>
</resources>

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

@ -4099,7 +4099,7 @@
<string name="latest_openstreetmap_update">آخر تحديث خريطة الشارع المفتوح المتاحة:</string>
<string name="updated">تحديث: %s</string>
<string name="last_time_checked">آخر مرة تم التحقق منها: %s</string>
<string name="update_frequency">تحديث التردد</string>
<string name="update_frequency">معدل التحديث</string>
<string name="live_update_frequency_week_variant">سيتم فحص تحديثات الخريطة كل أسبوع. المرة القادمة %1$s في %2$s.</string>
<string name="live_update_frequency_day_variant">سيتم التحقق من تحديثات الخرائط كل يوم. في المرة القادمة%1$s في %2$s.</string>
<string name="live_update_frequency_hour_variant">سيتم التحقق من تحديثات الخرائط كل ساعة. في المرة القادمة%1$s في %2$s.</string>
@ -4112,4 +4112,6 @@
<string name="shared_string_interval">الفاصل الزمني</string>
<string name="track_has_no_altitude">لا يحتوي المسار على بيانات الارتفاع.</string>
<string name="track_has_no_speed">لا يحتوي المسار على بيانات السرعة.</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">إخفاء المحميات الطبيعية والمناطق المحمية وحدود المتنزهات الوطنية</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">حدود الطبيعة</string>
</resources>

20
OsmAnd/res/values-be/phrases.xml
View file

@ -3832,7 +3832,7 @@
<string name="poi_embassy_filter">Амбасада</string>
<string name="poi_embassy_high_commission">Вярхоўны камісарыят</string>
<string name="poi_embassy_delegation">Дэлегацыя</string>
<string name="poi_embassy_branch_embassy">Аддзяленне</string>
<string name="poi_embassy_branch_embassy">Філіял</string>
<string name="poi_embassy_yes">На чале з амбасадарам</string>
<string name="poi_diplomatic_liaison">Сувязь</string>
<string name="poi_diplomatic_embassy">Амбасада</string>
@ -3841,4 +3841,22 @@
<string name="poi_parking_sheds">Навесы</string>
<string name="poi_parking_rooftop">Дах</string>
<string name="poi_gpx_point">Пункт GPX</string>
<string name="poi_diplomatic_services_citizen_services_no">Не</string>
<string name="poi_diplomatic_services_citizen_services_yes">Так</string>
<string name="poi_diplomatic_services_immigrant_visas_no">Не</string>
<string name="poi_diplomatic_services_immigrant_visas_yes">Так</string>
<string name="poi_diplomatic_services_non_immigrant_visas_no">Не</string>
<string name="poi_diplomatic_services_non_immigrant_visas_yes">Так</string>
<string name="poi_liaison_subnational">Субнацыянальны</string>
<string name="poi_liaison_representative_office">Прадстаўніцтва</string>
<string name="poi_liaison_liaison_office">Офіс</string>
<string name="poi_consulate_honorary_consul">Ганаровы консул</string>
<string name="poi_consulate_consulate_general">Генеральнае консульства</string>
<string name="poi_consulate_consular_office">Консульскі офіс</string>
<string name="poi_consulate_consular_agency">Консульскае агенцтва</string>
<string name="poi_consulate_yes">На чале з консулам</string>
<string name="poi_embassy_residence">Рэзідэнцыя</string>
<string name="poi_embassy_nunciature">Нунцыятура</string>
<string name="poi_embassy_mission">Місія</string>
<string name="poi_embassy_interests_section">Аддзел інтарэсаў</string>
</resources>

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

@ -514,7 +514,7 @@
<string name="use_fluorescent_overlays">Флюарэсцэнтныя пласты</string>
<string name="use_fluorescent_overlays_descr">Ужываць флюарэсцэнтныя колеры для слядоў і шляхоў.</string>
<string name="offline_edition">Пазасеціўнае рэдагаванне</string>
<string name="offline_edition_descr">Калі выкарыстоўваецца рэдагаванне на прыладзе, то змены будуць захаваныя лакальна і загружаныя на сервер толькі па запыце, інакш яны будуць загружацца неадкладна.</string>
<string name="offline_edition_descr">Калі ўключана пазасеціўнае рэдагаванне, то змены будуць захоўвацца на прыладзе і адпраўляцца на сервер толькі па запыце, інакш будуць адпраўляцца неадкладна.</string>
<string name="update_poi_does_not_change_indexes">Змены цікавых пунктаў (POI) у праграме не паўплываюць на cпампаваныя файлы мапаў, змены захоўваюцца як файлы на вашай прыладзе.</string>
<string name="local_openstreetmap_uploading">Запампоўка…</string>
<string name="local_openstreetmap_were_uploaded">{0} POI/нататкі запампаваныя</string>
@ -1573,7 +1573,7 @@
<string name="routing_attr_height_name">Абмежаванне па вышыні</string>
<string name="routing_attr_height_description">Пазначыць вышыню транспартнага сродку для разліку маршруту.</string>
<string name="use_fast_recalculation">Разумны пераразлік маршруту</string>
<string name="use_fast_recalculation_desc">Пераразлічваць толькі пачатак маршруту. Карысна для доўгіх паездак.</string>
<string name="use_fast_recalculation_desc">Пераразлічваецца толькі пачатковы адрэзак маршруту. Карысна для доўгіх паездак.</string>
<string name="shared_string_logoff">Выйсці</string>
<string name="rendering_value_disabled_name">Выключана</string>
<string name="rendering_value_walkingRoutesOSMC_name">Афарбоўка па пешаходнаму сімвалу OSMC</string>
@ -1984,7 +1984,7 @@
<string name="map_widget_bearing">Адносны азімут</string>
<string name="map_widget_magnetic_bearing">Магнітны азімут</string>
<string name="use_osm_live_routing">Навігацыя OsmAnd Live</string>
<string name="access_no_destination">Убудова спецыяльных магчымасцей: Пункт прызначэння не зададзены</string>
<string name="access_no_destination">Убудова адмысловых магчымасцяў: пункт прызначэння не вызначаны</string>
<string name="follow_us">Сачыце за намі</string>
<string name="access_direction_audio_feedback">Гукавая напрамкі</string>
<string name="access_direction_audio_feedback_descr">Індыцыраваць гукам кірунак на мэтавы пункт.</string>
@ -2313,7 +2313,7 @@
<string name="srtm_color_scheme">Каляровая схема</string>
<string name="routing_attr_allow_private_name">Дазволіць прыватны доступ</string>
<string name="routing_attr_allow_private_description">Дазволіць доступ на прыватную тэрыторыю.</string>
<string name="hillshade_menu_download_descr">Спампуйце мапу \"Покрыва зацянення рэльефу\" для адлюстравання вертыкальнага зацянення гэтага рэгіёна.</string>
<string name="hillshade_menu_download_descr">Спампуйце мапу зацянення рэльефу для адлюстравання вертыкальнага зацянення гэтага рэгіёна.</string>
<string name="hillshade_purchase_header">Усталюйце убудову \"Контурныя лініі\" для адлюстравання градыентаў вертыкальных абласцей.</string>
<string name="hide_from_zoom_level">Схаваць ад узроўню маштабавання</string>
<string name="srtm_menu_download_descr">Спампуйце мапу \"Контурныя лініі\" для выкарыстання ў гэтым рэгіёне.</string>
@ -2473,7 +2473,7 @@
<string name="average">Сярэдняя</string>
<string name="of">%1$d з %2$d</string>
<string name="ascent_descent">Пад\'ём/Cпуск</string>
<string name="moving_time">Час у руху</string>
<string name="moving_time">Час руху</string>
<string name="max_min">Макс/Мін</string>
<string name="min_max">Мін/Макс</string>
<string name="rendering_value_translucent_pink_name">Паўпразрысты ружовы</string>
@ -3148,7 +3148,7 @@
<string name="quick_action_need_to_add_item_to_list">Дадаць прынамсі адзін элемент у спіс \"Хуткае дзеянне\" у наладах</string>
<string name="routing_attr_piste_type_downhill_name">Альпійскія і горныя лыжы</string>
<string name="routing_attr_piste_type_downhill_description">Схілы для горных лыжаў і доступ да пад\'ёмнікаў.</string>
<string name="routing_attr_piste_type_nordic_name">Бегавыя і скандынаўскія лыжы</string>
<string name="routing_attr_piste_type_nordic_name">Лыжныя гонкі і скандынаўскія тыпы</string>
<string name="routing_attr_piste_type_nordic_description">Трасы для лыжных гонак і іх паўночных тыпаў.</string>
<string name="routing_attr_allow_intermediate_name">Дазволіць прамежкавыя маршруты</string>
<string name="routing_attr_allow_intermediate_description">Больш складаныя трасы са стромкімі ўчасткамі. Пэўныя перашкоды, якіх варта пазбягаць.</string>
@ -3410,7 +3410,7 @@
<string name="osmand_purchases_item">Пакупкі OsmAnd</string>
<string name="legend_item_description">Даведка па знаках мапы.</string>
<string name="navigation_profiles_item">Профілі навігацыі</string>
<string name="create_edit_poi">Стварыць ці Рэдагаваць POI</string>
<string name="create_edit_poi">Стварыць ці змяніць POI</string>
<string name="parking_positions">Месца паркоўкі</string>
<string name="add_edit_favorite">Дадаць ці рэдагаваць улюбёнае</string>
<string name="reset_deafult_order">Аднавіць прадвызначаны парадак элементаў</string>
@ -3521,8 +3521,8 @@
<string name="open_saved_track">Адкрыць захаваны след</string>
<string name="shared_string_is_saved">захавана</string>
<string name="save_track_to_gpx">Аўтаматычна запісваць след падчас навігацыі</string>
<string name="disable_recording_once_app_killed_descrp">Спыненне запісу GPX, падчас прымусовага спынення (праз апошнія прыкладанні). (Апавяшчэнне ў вобласці падказак Android пра фонавы рэжым OsmAnd знікне.)</string>
<string name="save_global_track_interval_descr">Вызначце інтэрвал запісу трэка (уключаецца праз віджэт \"Запіс паездкі\" на мапе).</string>
<string name="disable_recording_once_app_killed_descrp">Спыненне запісу GPX падчас прымусовага спынення (праз нядаўнія праграмы). (Значок на прасторы апавяшчэнняў Android пра фонавы рэжым OsmAnd знікне.)</string>
<string name="save_global_track_interval_descr">Вызначце інтэрвал запісу следу (уключаецца праз віджэт \"Запіс паездкі\" на мапе).</string>
<string name="monitoring_control_start">ЗАПІС</string>
<string name="shared_string_done">Завершана</string>
<string name="shared_string_save_as_gpx">Захаваць як новы файл следу</string>
@ -3627,7 +3627,7 @@
<string name="previous_segment">Папярэдні сегмент</string>
<string name="all_previous_segments">Усе папярэднія сегменты</string>
<string name="only_selected_segment_recalc">Толькі абраны сегмент пералічыцца з выкарыстаннем абранага профілю.</string>
<string name="osm_edits_view_descr">Прагледзець усе вашы яшчэ не загружаныя паўкі OSM або памылкі ў %1$s. Ужо загружаныя змены больш не будуць паказвацца.</string>
<string name="osm_edits_view_descr">Тут паказваюцца ўсе вашыя неадпраўленыя праўкі і хібы OSM, яшчэ не адпраўленыя ў %1$s. Адпраўленыя змены не паказваюцца.</string>
<string name="live_monitoring_adress_descr">Пазначце сеціўны адрас з наступнымі параметрамі: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
<string name="monitoring_min_distance_descr_recommendation">Рэкамендацыя: наладка ў 5 метраў можа вас задаволіць, калі вам не патрэбна фіксаваць больш кароткія перамяшчэнні, і вы не хочаце відавочна збіраць даныя ў стане спакою.</string>
<string name="monitoring_min_distance_descr_side_effect">Пабочныя эфекты: перыяды ў стане спакою не запісваюцца наогул альбо па адным пункце кожны. Невялікія (у рэальным свеце) перамяшчэнні (напрыклад, убок, што адзначаюць магчымы паварот у вашай паездцы) могуць быць адфільтраваныя. Файл змяшчае менш інфармацыі для наступнай апрацоўкі і мае горшую статыстыку, адфільтроўваючы відавочна лішнія пункты падчас запісу. Пры гэтым патэнцыйна захоўваюцца артэфакты, выкліканыя дрэнным прыёмам альбо эфектамі модуля GPS.</string>
@ -3852,7 +3852,7 @@
<string name="what_is_new">Што новага</string>
<string name="contour_lines_thanks">Дзякуй за набыццё ўбудовы «Контурныя лініі»</string>
<string name="osm_live_payment_desc_hw">Плата за падпіску спаганяецца за абраны перыяд. Скасаваць яе на AppGallery можна у любы момант.</string>
<string name="osm_live_payment_subscription_management_hw">Пры пацвярджэнні пакупкі аплата будзе спаганяцца з рахунка, звязанага з вашым акаўнтам AppGallery.
<string name="osm_live_payment_subscription_management_hw">Пры пацвярджэнні куплі аплата будзе спаганяцца з рахунка, звязанага з вашым акаўнтам AppGallery.
\n
\nПадпіска аўтаматычна працягваецца, калі вы не скасуеце яе да даты працягу. З вашага рахунка будзе адзін раз спаганяцца аплата за перыяд працягу (месяц/тры месяцы/год).
\n
@ -3867,7 +3867,7 @@
<string name="use_native_pt_desc">Перайсці на разлік маршруту грамадскага транспарту з дапамогай Java (бяспечны)</string>
<string name="file_already_imported">Файл ужо імпартаваны ў OsmAnd</string>
<string name="start_finish_icons">Значкі старту і фінішу</string>
<string name="perform_oauth_authorization_description">Выканайце ўваход з дапамогай OAuth, каб выкарыстоўваць функцыі osmedit</string>
<string name="perform_oauth_authorization_description">Увайдзіце з дапамогай OAuth, каб выкарыстоўваць функцыі osmedit</string>
<string name="clear_osm_token">Ачысціць токен OpenStreetMap OAuth</string>
<string name="osm_edit_logout_success">Вы выйшлі</string>
<string name="use_live_public_transport">Даныя OsmAnd Live</string>
@ -3879,24 +3879,24 @@
<string name="navigate_point_format_mgrs">MGRS</string>
<string name="mgrs_format_descr">OsmAnd выкарыстоўвае MGRS, які падобны да фармату UTM NATO.</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">Калі ласка пачакайце.
<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="shared_string_local_maps">Лакальныя мапы</string>
<string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
<string name="app_mode_gap">Разрыў</string>
<string name="icon_group_amenity">Выгады</string>
<string name="icon_group_special">Спецыяльныя</string>
<string name="icon_group_amenity">Выгоды</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_emergency">Экстранныя службы</string>
<string name="icon_group_travel">Вандроўка</string>
<string name="message_you_need_add_two_points_to_show_graphs">Дадайце прынамсі два пункты</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="sign_in_with_open_street_map">Увайсці праз OpenStreetMap</string>
<string name="open_street_map_login_mode">Вам неабходна ўвайсці ў сістэму, каб адправіць змены.
\n
\nВы можаце ўвайсці з дапамогай OAuth або лагіна і пароля.</string>

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

@ -174,7 +174,7 @@
<string name="general_settings">Paràmetres generals</string>
<string name="general_settings_descr">Configureu els paràmetres generals i de visualització de l\'aplicació.</string>
<string name="user_name">El vostre nom d\'usuari d\'OSM</string>
<string name="user_password">La vostra contrasenya a OSM</string>
<string name="user_password">Contrasenya</string>
<string name="download_files_not_enough_space">No hi ha prou espai lliure per baixar %1$s MB (lliure: %2$s).</string>
<string name="download_files_question_space">Voleu baixar {0} fitxer(s)\?
\nS\'ocuparà {1} MB (de {2} MB).</string>
@ -1532,7 +1532,7 @@
<string name="routing_attr_height_name">Límit d\'alçada</string>
<string name="routing_attr_height_description">Indiqueu l\'alçada del vehicle que les rutes han d\'admetre.</string>
<string name="use_fast_recalculation">Recàlcul intel·ligent de la ruta</string>
<string name="use_fast_recalculation_desc">Actualitza només la part inicial de la ruta. Pot ser usat per a viatges llargs.</string>
<string name="use_fast_recalculation_desc">Actualitza només la part inicial de la ruta. Útil per a viatges llargs.</string>
<string name="shared_string_logoff">Surt</string>
<string name="rendering_value_disabled_name">Desactivat</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Acoloreix segons el tipus de xarxa</string>
@ -2158,7 +2158,6 @@
<string name="rendering_attr_depthContours_description">Mostra isòbates i fondàries puntuals.</string>
<string name="rendering_attr_depthContours_name">Isòbates</string>
<string name="routing_attr_height_obstacles_name">Utilitza les cotes d\'elevació</string>
<string name="route_altitude">Alçat de la ruta</string>
<string name="altitude_descent">Descens</string>
<string name="altitude_ascent">Ascens</string>
@ -3324,9 +3323,9 @@
<string name="route_recalculation">Recàlcul de la ruta</string>
<string name="accessibility_announce">Anunci</string>
<string name="login_and_pass">Nom d\'usuari i contrasenya</string>
<string name="plugin_global_prefs_info">Aquest paràmetre de connectors és global i afecta tots els perfils</string>
<string name="plugin_global_prefs_info">Aquests paràmetres de connectors són global i afecten tots els perfils</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 totes les vostres edicions o errors OSM que encara no s\'han pujat a %1$s. Els canvis ja enviats 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_map_icon_descr">La icona es mostra en repòs.</string>
<string name="logcat_buffer_descr">Valida i comparteix enregistraments detallats de l\'aplicació</string>
@ -3753,7 +3752,7 @@
<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>
<string name="save_track_to_gpx">Enregistra automàticament la traça durant la navegació</string>
<string name="message_you_need_add_two_points_to_show_graphs">Cal afegir almenys dos punts</string>
<string name="message_you_need_add_two_points_to_show_graphs">Afegiu almenys dos punts</string>
<string name="use_dev_url_descr">Canvieu per utilitzar dev.openstreetmap.org en lloc d\'openstreetmap.org en provar la pujada de nota OSM / PDI / GPX.</string>
<string name="osm_edit_close_note">Tanca la nota d\'OSM</string>
<string name="osm_edit_comment_note">Comentari de la nota d\'OSM</string>
@ -3815,4 +3814,15 @@
<string name="routing_attr_allow_streams_name">Permet rierols i torrents</string>
<string name="routing_attr_allow_intermittent_description">Permet les vies navegables no permanents</string>
<string name="routing_attr_allow_intermittent_name">Permet les vies navegables no permanents</string>
<string name="purchases">Compres</string>
<string name="select_category_descr">Seleccioneu una categoria o afegiu-ne una de nova</string>
<string name="track_recording_will_be_continued">L\'enregistrament continuarà.</string>
<string name="copy_poi_name">Copia el nom del PDI</string>
<string name="quick_action_show_hide_title">Mostra/amaga</string>
<string name="shared_string_interval">Interval</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Amaga reserves naturals, àrees protegides i delimitacions de parcs nacionals</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Fronteres naturals</string>
<string name="track_has_no_altitude">La traça no conté dades d\'altitud.</string>
<string name="track_has_no_speed">La traça no conté dades de velocitat.</string>
<string name="select_another_colorization">Seleccioneu un altre tipus de coloració.</string>
</resources>

20
OsmAnd/res/values-cs/phrases.xml
View file

@ -3881,13 +3881,17 @@
<string name="poi_embassy_delegation">Delegace</string>
<string name="poi_embassy_branch_embassy">Pobočka</string>
<string name="poi_embassy_yes">Vedená velvyslancem</string>
<string name="poi_mobile_library"/>
<string name="poi_summit_register_no"/>
<string name="poi_summit_register_yes"/>
<string name="poi_piste_status_closed"/>
<string name="poi_piste_status_open"/>
<string name="poi_patrolled_no"/>
<string name="poi_patrolled_yes"/>
<string name="poi_piste_name"/>
<string name="poi_mobile_library">Místo zastavení mobilní knihovny</string>
<string name="poi_summit_register_no">Vrcholová kniha: ne</string>
<string name="poi_summit_register_yes">Vrcholová kniha: ano</string>
<string name="poi_piste_status_closed">Stav sjezdovky: zavřená</string>
<string name="poi_piste_status_open">Stav sjezdovky: otevřená</string>
<string name="poi_patrolled_no">Hlídané: ne</string>
<string name="poi_patrolled_yes">Hlídané: ano</string>
<string name="poi_piste_name">Název sjezdovky</string>
<string name="poi_piste_ski_jump">Skoky na lyžích</string>
<string name="poi_local_ref">Místní reference</string>
<string name="poi_geodesist">Geodet</string>
<string name="poi_conference_centre">Konferenční centrum</string>
<string name="poi_gladed_yes">Ve volném terénu: ano</string>
</resources>

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

@ -4043,4 +4043,6 @@
<string name="track_has_no_altitude">Stopa neobsahuje údaje o nadmořské výšce.</string>
<string name="track_has_no_speed">Stopa neobsahuje údaje o rychlosti.</string>
<string name="select_another_colorization">Vyberte prosím jiný typ obarvení.</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Skrýt hranice přírodních rezervací, chráněných území a národních parků</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Hranice přírody</string>
</resources>

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

@ -1232,7 +1232,7 @@
<string name="poi_material_metal">Material: Metall</string>
<string name="poi_material_steel">Material: Stahl</string>
<string name="poi_material_stone">Material: Stein</string>
<string name="poi_material_plastic">Martial: Plastik</string>
<string name="poi_material_plastic">Material: Plastik</string>
<string name="poi_material_sandstone">Material: Sandstein</string>
<string name="poi_material_granite_stone">Material: Granit</string>
<string name="poi_material_metal_wood">Material: Metall, Holz</string>
@ -1479,7 +1479,7 @@
<string name="poi_material_reinforced_concrete">Material: Stahlbeton</string>
<string name="poi_material_concrete">Material: Beton</string>
<string name="poi_material_masonry">Material: Mauerwerk</string>
<string name="poi_material_brick">Martial: Ziegel</string>
<string name="poi_material_brick">Material: Ziegel</string>
<string name="poi_material_composite">Material: Verbundstoff</string>
<string name="poi_material_limestone">Material: Kalkstein</string>
<string name="poi_material_marble">Material: Marmor</string>
@ -3891,4 +3891,7 @@
<string name="poi_gladed_yes">Geglättet: ja</string>
<string name="poi_piste_name">Pistenname</string>
<string name="poi_piste_ski_jump">Skispringen</string>
<string name="poi_local_ref">Lokale Referenz</string>
<string name="poi_geodesist">Geodät</string>
<string name="poi_conference_centre">Konferenzzentrum</string>
</resources>

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

@ -675,8 +675,8 @@
<string name="uploading_data">Daten hochladen …</string>
<string name="uploading">Hochladen …</string>
<string name="search_nothing_found">Kein Treffer</string>
<string name="searching">Suchen …</string>
<string name="searching_address">Adresse suchen …</string>
<string name="searching">Suche…</string>
<string name="searching_address">Suche Adresse…</string>
<string name="search_osm_nominatim">Online-Suche mit OSM Nominatim</string>
<string name="hint_search_online">Online-Suche: Hausnummer, Straße, Ort</string>
<string name="search_offline_address">Offline-Suche</string>
@ -3163,7 +3163,7 @@
<string name="manage_profiles_descr">Profile erstellen, importieren, bearbeiten</string>
<string name="manage_profiles">App-Profile verwalten …</string>
<string name="osmand_settings_descr">Die gesamte App betreffend</string>
<string name="osmand_settings">OsmAnd-Einstellungen</string>
<string name="osmand_settings">OsmAnd Einstellungen</string>
<string name="copy_from_other_profile">Aus anderem Profil kopieren</string>
<string name="turn_screen_on">Bildschirm einschalten</string>
<string name="map_during_navigation_info">Karte während Navigation</string>
@ -4025,4 +4025,29 @@
<string name="track_has_no_altitude">Der Track enthält keine Höhendaten.</string>
<string name="track_has_no_speed">Der Track enthält keine Geschwindigkeitsdaten.</string>
<string name="select_another_colorization">Bitte wähle eine andere Art der Einfärbung aus.</string>
<string name="map_widget_distance_by_tap">Entfernung durch Antippen</string>
<string name="select_segments">Segmente auswählen</string>
<string name="select_segments_description">%1$s enthält mehr als ein Segment, Sie müssen den benötigten Teil für die Navigation auswählen.</string>
<string name="segments_count">Segment %1$d</string>
<string name="temporary_conditional_routing_descr">Verwenden Sie Straßeneinschränkungen, die jetzt in der Karte aktiv sind</string>
<string name="routing_attr_short_way_description">Optimierte kürzere Route (energiesparend)</string>
<string name="routing_attr_driving_style_description">Wählen Sie den Fahrzweck, um eine kürzere, schnellere oder sicherere Route zu erhalten</string>
<string name="snap_to_road_descr">Das Symbol für den aktuellen Standort wird an die aktuelle Navigationsroute angehängt</string>
<string name="map_orientation_threshold_descr">Kartenansicht nicht drehen, wenn die Geschwindigkeit kleiner als ein Schwellenwert ist</string>
<string name="track_recording_description">Sind Sie sicher, dass Sie die Aufnahme beenden wollen\?
\nAlle nicht gespeicherten Daten gehen verloren.</string>
<string name="on_pause">Pausiert</string>
<string name="app_restart_required">Neustart der Anwendung erforderlich, um einige Einstellungen zu übernehmen.</string>
<string name="routing_attr_height_obstacles_description">Die Streckenführung könnte starke Steigungen vermeiden.</string>
<string name="quick_action_coordinates_widget_descr">Ein Umschalter zum Ein- und Ausblenden des Koordinaten-Widgets auf der Karte.</string>
<string name="latest_openstreetmap_update">Aktuelles OpenStreetMap Update verfügbar:</string>
<string name="last_time_checked">Zuletzt geprüft: %s</string>
<string name="update_frequency">Aktualisierungsintervall</string>
<string name="live_update_frequency_week_variant">Die Kartenaktualisierung wird wöchentlich überprüft. Das nächste Mal %1$s in %2$s.</string>
<string name="live_update_frequency_day_variant">Die Kartenaktualisierung wird täglich überprüft. Das nächste Mal %1$s in %2$s.</string>
<string name="live_update_frequency_hour_variant">Die Kartenaktualisierung wird stündlich überprüft. Das nächste Mal %1$s in %2$s.</string>
<string name="live_update_delete_updates_msg">Sind Sie sicher, dass Sie alle %s Live-Updates löschen möchten\?</string>
<string name="select_category_descr">Kategorie auswählen oder neue hinzufügen</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Grenzen von Naturschutzgebieten, Schutzgebieten und Nationalparks ausblenden</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Grenzen von Schutzgebieten</string>
</resources>

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

@ -4043,4 +4043,6 @@
<string name="purchases">Aĉetoj</string>
<string name="quick_action_show_hide_title">Montri/kaŝi</string>
<string name="shared_string_interval">Intertempo</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Kaŝi limojn de naturaj rezervejoj, protektataj areoj kaj naciaj parkoj</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Limoj de rezervejoj</string>
</resources>

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

@ -4032,9 +4032,9 @@
<string name="updated">Actualizado: %s</string>
<string name="last_time_checked">Última comprobación: %s</string>
<string name="update_frequency">Frecuencia de actualización</string>
<string name="live_update_frequency_week_variant">Las actualizaciones del mapa serán comprobadas cada semana. La próxima vez %1$s en %2$s.</string>
<string name="live_update_frequency_day_variant">Las actualizaciones del mapa serán comprobadas cada día. La próxima vez %1$s en %2$s.</string>
<string name="live_update_frequency_hour_variant">Las actualizaciones del mapa serán comprobadas cada hora. La próxima vez %1$s en %2$s.</string>
<string name="live_update_frequency_week_variant">Las actualizaciones del mapa serán comprobadas cada semana. Próxima vez el %1$s a las %2$s hs.</string>
<string name="live_update_frequency_day_variant">Las actualizaciones del mapa serán comprobadas cada día. Próxima vez el %1$s a las %2$s hs.</string>
<string name="live_update_frequency_hour_variant">Las actualizaciones del mapa serán comprobadas cada hora. Próxima vez el %1$s a las %2$s hs.</string>
<string name="delete_updates">Borrar actualizaciones</string>
<string name="live_update_delete_updates_msg">¿Borrar todas las actualizaciones en vivo de «%s»\?</string>
<string name="purchases">Compras</string>
@ -4045,4 +4045,6 @@
<string name="track_has_no_altitude">La traza no contiene datos de altitud.</string>
<string name="track_has_no_speed">La traza no contiene datos de velocidad.</string>
<string name="select_another_colorization">Elige otro tipo de color.</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Fronteras naturales</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Oculta fronteras de reservas naturales, áreas protegidas y parques nacionales</string>
</resources>

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

@ -380,10 +380,10 @@
<string name="error_avoid_specific_road">No se ha encontrado un desvío</string>
<string name="map_update">Actualización disponible para %1$s mapa(s)</string>
<string name="wake_on_voice">Encender pantalla</string>
<string name="osmand_rastermaps_plugin_description">Accede a tantos tipos de mapas en línea (llamados teselas o ráster) que desees, desde teselas predefinidas de OSM (como Mapnik) a imágenes satelitales y capas de propósito especial como mapas del tiempo, mapas del clima, mapas geológicos, capas de sombreado, etc.
\n
\nCualquiera de estos mapas puede usarse como el mapa predefinido que se mostrará, o como una superposición o subyacencia de otro mapa base (como los mapas estándar de OsmAnd en línea). Ciertos elementos de los mapas vectoriales de OsmAnd pueden ocultarse a través del menú «Configurar mapa» para hacer cualquier subyacencia mas visible.
\n
<string name="osmand_rastermaps_plugin_description">Accede a tantos tipos de mapas en línea (llamados teselas o ráster) que desees, desde teselas predefinidas de OSM (como Mapnik) a imágenes satelitales y capas de propósito especial como mapas meteorológicos, mapas del clima, mapas geológicos, capas de sombreado, etc.
\n
\nCualquiera de estos mapas puede usarse como el mapa predefinido que se mostrará, o como una superposición o subyacencia de otro mapa base (como los mapas estándar de OsmAnd en línea). Ciertos elementos de los mapas vectoriales de OsmAnd pueden ocultarse a través del menú «Configurar mapa» para hacer cualquier subyacencia mas visible.
\n
\nDescarga las teselas de los mapas directamente en línea, o prepáralo para su uso sin conexión (copiar manualmente en la carpeta de datos OsmAnd) como una base de datos SQLite que puede ser producida por una variedad de herramientas de preparación de mapas de terceros.</string>
<string name="record_plugin_description">Activa la funcionalidad para registrar y guardar tus trazas manualmente pulsando el widget de grabación GPX en el mapa, o automáticamente registrando todas tus rutas navegadas en un archivo GPX.
\n
@ -418,7 +418,7 @@
<string name="osmand_parking_plugin_description">Registra dónde se ha estacionado el automóvil, incluyendo cuánto tiempo queda.
\n Tanto la ubicación como el tiempo del estacionamiento se muestran en el menú principal y en un widget sobre el mapa. Se puede añadir una alarma de recordatorio al calendario de Android.</string>
<string name="osmand_distance_planning_plugin_description">Crea caminos pulsando el mapa, usando o modificando archivos GPX existentes, para planificar un viaje y medir la distancia entre puntos. El resultado puede guardarse como un archivo GPX y usarse luego para la orientación.</string>
<string name="osmand_accessibility_description">Activa las funciones de accesibilidad del dispositivo, directamente en OsmAnd. Facilita por ejemplo, el ajuste de la velocidad de la voz para voces de texto a voz, la configuración de navegación D-pad, usando la rueda de desplazamiento para el control del zoom, o la retroalimentación de texto a voz, por ejemplo, para anunciar la ubicación automáticamente.</string>
<string name="osmand_accessibility_description">Activa las funciones de accesibilidad del dispositivo, directamente en OsmAnd. Facilita por ejemplo, el ajuste de la velocidad de la voz para voces de texto a voz, la configuración de navegación del pad direccional, usando la rueda de desplazamiento para el control del zoom, o la retroalimentación de texto a voz, por ejemplo, para anunciar la ubicación automáticamente.</string>
<string name="osm_editing_plugin_description">Haz contribuciones en OSM, como el crear o modificar objetos PDI, abrir o comentar notas de OSM y contribuir con archivos de trazas GPX grabados en OsmAnd, proporcionando tu nombre de usuario y contraseña. OpenStreetMap.org es un proyecto de mapeo de dominio público, global, libre e impulsado por la comunidad.</string>
<string name="osmand_development_plugin_description">Ajusta las funciones de desarrollo y depuración, como la simulación de navegación, el rendimiento del renderizado o las indicaciones por voz. Destinado para desarrolladores, no es necesario para el normal uso de la aplicación.</string>
<string name="world_ski_missing">Descargar el mapa especial sin conexión para mostrar las instalaciones de esquí.</string>
@ -1057,7 +1057,7 @@
<string name="city_type_suburb">Suburbio</string>
<string name="city_type_hamlet">Aldea</string>
<string name="city_type_village">Villa</string>
<string name="city_type_town">Pueblo</string>
<string name="city_type_town">Ciudad pequeña</string>
<string name="city_type_city">Ciudad</string>
<string name="animate_route_off">Parar simulación</string>
<string name="animate_route">Iniciar simulación</string>
@ -1662,7 +1662,7 @@
<string name="shared_string_navigation">Navegación</string>
<string name="osmand_running_in_background">Ejecutar en modo reposo</string>
<string name="favourites_edit_dialog_title">Información del favorito</string>
<string name="favourites_context_menu_add">Añadir a Favoritos</string>
<string name="favourites_context_menu_add">Añadir favorito</string>
<string name="roads">Caminos</string>
<string name="default_speed_system_descr">Define la unidad de velocidad.</string>
<string name="default_speed_system">Unidad de velocidad</string>
@ -2667,7 +2667,7 @@
<string name="shared_string_wikivoyage">Wikiviajes</string>
<string name="index_item_world_wikivoyage">Artículos de Wikiviajes en todo el mundo</string>
<string name="online_webpage_warning">La página sólo está disponible en línea. ¿Abrirla en el navegador web?</string>
<string name="images_cache">Caché de imágenes</string>
<string name="images_cache">Almacén de imágenes</string>
<string name="delete_search_history">Borrar historial de búsquedas</string>
<string name="show_images">Mostrar imágenes</string>
<string name="shared_string_dont">No</string>
@ -3301,7 +3301,7 @@
<string name="select_color">Elegir el color</string>
<string name="edit_profiles_descr">Los perfiles predefinidos de OsmAnd no se pueden borrar, sino desactivar (en la pantalla anterior) u ordenarse en la parte inferior.</string>
<string name="edit_profiles">Editar perfiles</string>
<string name="select_nav_profile_dialog_message">El «Tipo de navegación» rige la forma en que se calculan las rutas.</string>
<string name="select_nav_profile_dialog_message">El «Tipo de navegación» determina cómo se calculan las rutas.</string>
<string name="profile_appearance">Aspecto del perfil</string>
<string name="choose_icon_color_name">Icono, color y nombre</string>
<string name="reorder_profiles">Editar la lista de perfiles</string>
@ -3530,7 +3530,7 @@
<string name="search_poi_types">Buscar por tipos de PDI</string>
<string name="radius_ruler_item">Regla radial</string>
<string name="quick_action_item">Acción rápida</string>
<string name="osmand_purchases_item">Compras de OsmAnd</string>
<string name="osmand_purchases_item">Compras en OsmAnd</string>
<string name="osm_live_payment_subscription_management">El pago será cargado a la cuenta de Google Play al confirmar la compra.
\n
\nLa suscripción se renueva automáticamente a menos que se cancele antes de la fecha de renovación. Se le cobrará a su cuenta el período de renovación (mes/trimestre/año) sólo en la fecha de renovación.
@ -3561,7 +3561,7 @@
<string name="lang_ky">Kirguís</string>
<string name="lang_kk">Kazajo</string>
<string name="lang_jv">Javanés</string>
<string name="lang_gu">Gujarati</string>
<string name="lang_gu">Gujaratí</string>
<string name="lang_cv">Chuvash</string>
<string name="lang_ce">Checheno</string>
<string name="lang_bar">Bávaro</string>
@ -3905,7 +3905,7 @@
<string name="plan_route_add_new_segment">Añadir nuevo segmento</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="lang_de_casual">Alemán (casual)</string>
<string name="app_mode_light_aircraft">Avión ligero</string>
<string name="app_mode_light_aircraft">Aeronave ligera</string>
<string name="shared_string_last_used">Usado por última vez</string>
<string name="routing_attr_prefer_hiking_routes_name">Preferir rutas de senderismo</string>
<string name="routing_attr_prefer_hiking_routes_description">Prefiere rutas de senderismo</string>
@ -4006,4 +4006,45 @@
<string name="activity_type_hiking_name">Senderismo</string>
<string name="activity_type_cycling_name">Bicicleta</string>
<string name="activity_type_car_name">Automóvil</string>
<string name="select_segments">Elegir segmentos</string>
<string name="select_segments_description">«%1$s» contiene más de un segmento, debe marcar la parte necesaria para la navegación.</string>
<string name="segments_count">Segmento %1$d</string>
<string name="temporary_conditional_routing_descr">Usar las restricciones viales que están activas ahora en el mapa</string>
<string name="routing_attr_short_way_description">Ruta optimizada más corta (bajo consumo)</string>
<string name="routing_attr_driving_style_description">Elige el propósito de la conducción para obtener la ruta más corta, más rápida o más segura</string>
<string name="snap_to_road_descr">El icono de la ubicación actual se ajustará a la ruta de navegación actual</string>
<string name="map_orientation_threshold_descr">No girar la vista del mapa si la velocidad es inferior a un umbral</string>
<string name="restart">Reiniciar</string>
<string name="shared_strings_all_regions">Todas las regiones</string>
<string name="delete_number_files_question">¿Borrar %1$d archivos\?</string>
<string name="track_recording_stop_without_saving">Parar sin guardar</string>
<string name="track_recording_save_and_stop">Guardar y parar la grabación</string>
<string name="track_recording_title">Grabación de la traza detenida</string>
<string name="track_recording_description">¿Dejar de grabar\?
\nTodos los datos no guardados se perderán.</string>
<string name="on_pause">En pausa</string>
<string name="app_restart_required">Es necesario reiniciar la aplicación para aplicar algunos ajustes.</string>
<string name="routing_attr_height_obstacles_description">La ruta podría evitar las fuertes subidas.</string>
<string name="quick_action_coordinates_widget_descr">Alternar para mostrar u ocultar el widget de coordenadas en el mapa.</string>
<string name="map_widget_distance_by_tap">Distancia al pulsar</string>
<string name="latest_openstreetmap_update">Última actualización de OpenStreetMap disponible:</string>
<string name="updated">Actualizado: %s</string>
<string name="last_time_checked">Última comprobación: %s</string>
<string name="update_frequency">Frecuencia de actualización</string>
<string name="live_update_frequency_week_variant">Las actualizaciones del mapa serán comprobadas cada semana. Próxima vez el %1$s a las %2$s hs.</string>
<string name="live_update_frequency_day_variant">Las actualizaciones del mapa serán comprobadas cada día. Próxima vez el %1$s a las %2$s hs.</string>
<string name="live_update_frequency_hour_variant">Las actualizaciones del mapa serán comprobadas cada hora. Próxima vez el %1$s a las %2$s hs.</string>
<string name="delete_updates">Borrar actualizaciones</string>
<string name="live_update_delete_updates_msg">¿Borrar todas las actualizaciones en vivo de «%s»\?</string>
<string name="purchases">Compras</string>
<string name="select_category_descr">Marca una categoría o añade una nueva</string>
<string name="track_recording_will_be_continued">La grabación continuará.</string>
<string name="copy_poi_name">Copiar nombre del PDI</string>
<string name="quick_action_show_hide_title">Mostrar/Ocultar</string>
<string name="shared_string_interval">Intervalo</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Oculta fronteras de reservas naturales, áreas protegidas y parques nacionales</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Fronteras naturales</string>
<string name="track_has_no_altitude">La traza no contiene datos de altitud.</string>
<string name="track_has_no_speed">La traza no contiene datos de velocidad.</string>
<string name="select_another_colorization">Elige otro tipo de color.</string>
</resources>

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

@ -2005,7 +2005,7 @@
<string name="tts_missing_language_data">Kas läheme valitud keele alla laadimiseks rakendusepoodi\?</string>
<string name="gpx_option_reverse_route">Raja vastupidine suund</string>
<string name="gpx_option_destination_point">Kasuta olemasoleva sihtkohta</string>
<string name="gpx_option_from_start_point">Mööda kogu rada</string>
<string name="gpx_option_from_start_point">Järgi teekonda täielikult</string>
<string name="choose_audio_stream">Hääljuhiste väljund</string>
<string name="choose_audio_stream_descr">Vali kõlar hääljuhiste esitamiseks.</string>
<string name="voice_stream_voice_call">Telefonikõne hääl (et katkestada auto Bluetooth raadioid)</string>
@ -3925,9 +3925,9 @@
<string name="upload_photo_completed">Sai üleslaaditud</string>
<string name="upload_photo">Laadin üles</string>
<string name="activity_type_offroad_name">Maastikul</string>
<string name="live_update_frequency_week_variant">Kaardi värskendusi kontrollitakse kord nädalas. Järgmine kord %1$s %2$s.</string>
<string name="live_update_frequency_day_variant">Kaardi värskendusi kontrollitakse kord päevas. Järgmine kord %1$s %2$s.</string>
<string name="live_update_frequency_hour_variant">Kaardi värskendusi kontrollitakse kord tunnis. Järgmine kord %1$s %2$s.</string>
<string name="live_update_frequency_week_variant">Kaardi värskendusi kontrollitakse kord nädalas. Järgmine kord: %1$s %2$s.</string>
<string name="live_update_frequency_day_variant">Kaardi värskendusi kontrollitakse kord päevas. Järgmine kord: %1$s %2$s.</string>
<string name="live_update_frequency_hour_variant">Kaardi värskendusi kontrollitakse kord tunnis. Järgmine kord: %1$s %2$s.</string>
<string name="voice_prompts_timetable">Häälteavituste ajad</string>
<string name="routing_attr_prefer_hiking_routes_description">Eelista matkaradu</string>
<string name="routing_attr_prefer_hiking_routes_name">Eelista matkaradu</string>
@ -4050,4 +4050,6 @@
<string name="shared_string_turn">Pööra</string>
<string name="purchases">Ostud</string>
<string name="map_widget_distance_by_tap">Kaugus toksamise järgi</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Peida (loodus)kaitsealade ja rahvusparkide piirid</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Looduse piirid</string>
</resources>

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

@ -8,10 +8,10 @@
<string name="poi_beverages">فروشگاه نوشیدنی</string>
<string name="poi_butcher">فروشگاه گوشت</string>
<string name="poi_deli">بقالی</string>
<string name="poi_farm">فروشگاه محصولات دامی</string>
<string name="poi_farm">فروشگاه محصولات مزرعه</string>
<string name="poi_greengrocer">میوه و سبزی‌فروشی</string>
<string name="poi_seafood">فروشگاه غذاهای دریایی</string>
<string name="poi_confectionery">شیرینی و آجیل فروشی</string>
<string name="poi_confectionery">شیرینی و آب‌نبات فروشی</string>
<string name="poi_ice_cream">بستنی فروشی</string>
<string name="poi_supermarket">فروشگاه بزرگ</string>
<string name="poi_tea">فروشگاه چای</string>
@ -19,18 +19,18 @@
<string name="poi_vending_machine">دستگاه فروش خودکار</string>
<string name="poi_books">کتابفروشی</string>
<string name="poi_bicycle">فروشگاه دوچرخه</string>
<string name="poi_anime">فروشگاه کارتون</string>
<string name="poi_anime">فروشگاه انیمه</string>
<string name="poi_antiques">عتیقه فروشی</string>
<string name="poi_art">فروشگاه هنر</string>
<string name="poi_baby_goods">کالای کودک</string>
<string name="poi_bag">فروشگاه کیف</string>
<string name="poi_bag">کیف فروشی</string>
<string name="poi_bathroom_furnishing">لوازم حمام</string>
<string name="poi_bed">مبلمان اتاق خواب</string>
<string name="poi_boutique">بوتیک</string>
<string name="poi_carpet">فروشگاه فرش</string>
<string name="poi_carpet">فرش فروشی</string>
<string name="poi_chemist">فروشگاه محصولات بهداشتی و آرایشی</string>
<string name="poi_clothes">فروشگاه پوشاک</string>
<string name="poi_clothes_children">\فروشگاه پوشاک کودکان</string>
<string name="poi_clothes_children">فروشگاه پوشاک کودک</string>
<string name="poi_shoes">کفش فروشی</string>
<string name="poi_computer">فروشگاه کامپیوتر</string>
<string name="poi_copyshop">فروشگاه چاپ و تکثیر</string>
@ -63,7 +63,7 @@
<string name="poi_musical_instrument">فروشگاه لوزم موسیقی</string>
<string name="poi_newsagent">روزنامه فروشی</string>
<string name="poi_optician">عینک سازی</string>
<string name="poi_organic">مواد غذایی ارگانیک</string>
<string name="poi_organic">محصولات ارگانیک</string>
<string name="poi_outdoor">بازار روز</string>
<string name="poi_paint">رنگ فروشی</string>
<string name="poi_pet">فروشگاه حیوانات خانگی</string>
@ -72,8 +72,8 @@
<string name="poi_ship_chandler">کشتی</string>
<string name="poi_sports">لوازم ورزشی</string>
<string name="poi_stationery">فروشگاه نوشت افزار</string>
<string name="poi_tableware">فروشگاه کارد و چنگال</string>
<string name="poi_ticket">فروشگاه بلیط</string>
<string name="poi_tableware">فروشگاه ظروف غذاخوری</string>
<string name="poi_ticket">بلیت فروشی</string>
<string name="poi_tobacco">دخانیات</string>
<string name="poi_toys">اسباب بازی فروشی</string>
<string name="poi_trade"/>
@ -121,7 +121,7 @@
<string name="poi_vehicle_inspection">معاینه فنی خودرو</string>
<string name="poi_car_wash">کارواش</string>
<string name="poi_fuel">جایگاه سوخت; جایگاه سوخت‌گیری; پمپ بنزین; پمپ گاز</string>
<string name="poi_electricity_combined_charging">ایستگاه شارژ</string>
<string name="poi_electricity_combined_charging">ایستگاه شارژ; ایستگاه شارژ خودروی برقی</string>
<string name="poi_vehicle_ramp">سطح شیب دار خودرو</string>
<string name="poi_compressed_air">هوای فشرده</string>
<string name="poi_parking">پارکینگ</string>
@ -196,7 +196,7 @@
<string name="poi_pier">اسکله</string>
<string name="poi_surveillance">نظارت</string>
<string name="poi_observatory">رصد خانه</string>
<string name="poi_astronomical_observatory">رصدخانه نجوم</string>
<string name="poi_astronomical_observatory">نجومی</string>
<string name="poi_construction">ساخت و ساز</string>
<string name="poi_works">کارگاه</string>
<string name="poi_mineshaft">معدن</string>
@ -317,7 +317,7 @@
<string name="poi_ice_skating">اسکیت روی یخ</string>
<string name="poi_ice_stock">زمین یخ</string>
<string name="poi_korfbal">زمین بسکتبال اسکاتلندی</string>
<string name="poi_sport_motor">پیست موتور سواری</string>
<string name="poi_sport_motor">ورزش موتورسواری</string>
<string name="poi_sport_multi">چندورزشی</string>
<string name="poi_orienteering">ورزش جهت یابی</string>
<string name="poi_paddle_tennis">تنیس پدالی</string>
@ -428,11 +428,11 @@
<string name="poi_club_tourism">باشگاه گردشگری</string>
<string name="poi_club_charity">کلوپ خیریه</string>
<string name="poi_library">کتابخانه</string>
<string name="poi_arts_centre">مرکز هنر</string>
<string name="poi_arts_centre">مرکز هنری</string>
<string name="poi_cinema">سینما</string>
<string name="poi_casino">کازینو</string>
<string name="poi_community_centre">مرکز اجتماع</string>
<string name="poi_social_centre">مرکز سوسیال</string>
<string name="poi_social_centre">مرکز اجتماعی</string>
<string name="poi_theatre">تئاتر</string>
<string name="poi_theatre_genre_circus">سیرک</string>
<string name="poi_dance_floor">رقص</string>
@ -446,7 +446,7 @@
<string name="poi_marina">لنگرگاه تفریحی</string>
<string name="poi_miniature_golf">گلف کوچک</string>
<string name="poi_playground">زمین بازی</string>
<string name="poi_swimming_pool">استخر</string>
<string name="poi_swimming_pool">استخر شنا</string>
<string name="poi_water_park">پارک آبی</string>
<string name="poi_park">پارک</string>
<string name="poi_cafe">کافه</string>
@ -509,7 +509,7 @@
<string name="poi_funeral_directors">قبرکن</string>
<string name="poi_craft_computer">صنایع کامپیوتر</string>
<string name="poi_beauty">سالن زیبایی</string>
<string name="poi_beauty_salon_nails">کاشت ناخن</string>
<string name="poi_beauty_salon_nails">کاشت ناخن; مانیکور</string>
<string name="poi_hairdresser">آرایشگر</string>
<string name="poi_massage">سالن ماساژ</string>
<string name="poi_tattoo">سالن تاتو</string>
@ -519,7 +519,7 @@
<string name="poi_car_sharing">جمعه بازار خودرو</string>
<string name="poi_boat_sharing">جمعه بازار قایق</string>
<string name="poi_dock">بارانداز</string>
<string name="poi_toilets">سرویس بهداشتی</string>
<string name="poi_toilets">سرویس بهداشتی; دستشویی; مستراح</string>
<string name="poi_sauna">سونا</string>
<string name="poi_brothel"/>
<string name="poi_mortuary">سردخانه مردگان</string>
@ -667,7 +667,7 @@
<string name="poi_clock_option">تنظیمات ساعت</string>
<string name="poi_scout_camp">کمپ گردشگری</string>
<string name="poi_backcountry">کمپ بدون امکانات</string>
<string name="poi_piste_grooming">مراقبت از پیست</string>
<string name="poi_piste_grooming">آماده‌سازی پیست</string>
<string name="poi_outdoor_seating">نشستن بیرون</string>
<string name="poi_smoking">دخانیات</string>
<string name="poi_delivery">تحویل</string>
@ -766,7 +766,7 @@
<string name="poi_office">دفتر</string>
<string name="poi_tourism">گردشگری</string>
<string name="poi_sightseeing">دیدنی‌ها</string>
<string name="poi_accomodation">محل اسکان</string>
<string name="poi_accomodation">محل اسکان; اقامت</string>
<string name="poi_internet_access">دسترسی اینترنت</string>
<string name="poi_entertainment">اوقات فراغت</string>
<string name="poi_club">باشگاه</string>
@ -1070,13 +1070,13 @@
<string name="poi_cuisine_soup">سوپ</string>
<string name="poi_tourism_yes">نقطهٔ گردشگری</string>
<string name="poi_internet_access_no">دسترسی اینترنت: ندارد</string>
<string name="poi_internet_access_fee_no">دسترسی اینترنت - رایگان</string>
<string name="poi_internet_access_fee_no">دسترسی اینترنت: رایگان</string>
<string name="poi_fee_no">خیر</string>
<string name="poi_drinking_water_no">خیر</string>
<string name="poi_seasonal_no">خیر</string>
<string name="poi_traffic_signals_sound_no">خیر</string>
<string name="poi_traffic_signals_sound_no">صدا: خیر</string>
<string name="poi_piste_grooming_no">خیر</string>
<string name="poi_historic_quarry">"معدن تاریخی سنگ "</string>
<string name="poi_historic_quarry">معدن تاریخی سنگ</string>
<string name="poi_diet_vegetarian_filter_yes">گیاه‌خواری</string>
<string name="poi_diet_vegetarian_only">فقط گیاه‌خواری</string>
<string name="poi_diet_vegetarian_yes">گیاه‌خواری</string>
@ -1188,7 +1188,7 @@
<string name="poi_internet_access_public">دسترسی اینترنت: عمومی</string>
<string name="poi_internet_access_service">دسترسی اینترنت: با خدمات</string>
<string name="poi_internet_access_yes">دسترسی اینترنت: دارد</string>
<string name="poi_internet_access_fee_yes">دسترسی اینترنت - پولی</string>
<string name="poi_internet_access_fee_yes">دسترسی اینترنت: پولی</string>
<string name="poi_smoking_separated">در اتاق جداگانه</string>
<string name="poi_smoking_isolated">در یک اتاق جدا</string>
<string name="poi_piste_grooming_scooter">اسکوتر</string>
@ -1448,4 +1448,5 @@
<string name="poi_climbing_crag">بله</string>
<string name="poi_protected_area">منطقهٔ حفاظت‌شده</string>
<string name="poi_badminton">بدمینتون</string>
<string name="poi_service_car">خدمات خودرو; مکانیکی</string>
</resources>

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

File diff suppressed because it is too large Load diff

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

@ -4027,4 +4027,10 @@
<string name="shared_string_interval">Intervalle</string>
<string name="track_has_no_altitude">La trace ne contient aucune donnée d\'altitude.</string>
<string name="track_has_no_speed">La trace ne contient aucune donnée de vitesse.</string>
<string name="routing_attr_short_way_description">Itinéraire court optimisé (plus économe en énergie)</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Masquer les limites des réserves naturelles, des zones protégées et des parcs nationaux</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Limites naturelles</string>
<string name="select_segments_description">%1$s contient plus d\'un segment, vous devez sélectionner le tronçon nécessaire à la navigation.</string>
<string name="routing_attr_driving_style_description">Sélectionnez le mode de conduite pour avoir l\'itinéraire le plus court, le plus rapide, ou le plus sûr</string>
<string name="quick_action_coordinates_widget_descr">Appuyer pour afficher ou cacher le widget Coordonnées sur la carte.</string>
</resources>

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

@ -3881,4 +3881,17 @@
<string name="poi_wildlife_crossing_bat_bridge">Ponte para morcegos</string>
<string name="poi_wildlife_crossing">Paso de fauna</string>
<string name="poi_swimming_area">Área de natación</string>
<string name="poi_local_ref">Referencia local</string>
<string name="poi_geodesist">Xeodésico</string>
<string name="poi_conference_centre">Centro de conferencias</string>
<string name="poi_mobile_library">Posición de parada de biblioteca móbil</string>
<string name="poi_summit_register_no">Rexistro do cumio: no</string>
<string name="poi_summit_register_yes">Rexistro do cumio: si</string>
<string name="poi_piste_status_closed">Estado da pista: pechada</string>
<string name="poi_piste_status_open">Estado da pista: aberta</string>
<string name="poi_patrolled_no">Patrullado: non</string>
<string name="poi_patrolled_yes">Patrullado: si</string>
<string name="poi_gladed_yes">Arborado: si</string>
<string name="poi_piste_name">Nome da pista</string>
<string name="poi_piste_ski_jump">Salto de esquí</string>
</resources>

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

@ -2565,10 +2565,9 @@ Lon %2$s</string>
<string name="do_not_send_anonymous_app_usage_desc">O OsmAnd recompila información sobre as lapelas que abres na aplicación. Non estamos a recompilar datos da localización, datos inseridos na aplicación ou datos relacionados coas áreas que ollas, procuras ou baixas.</string>
<string name="do_not_show_startup_messages_desc">Agocha os descontos da aplicación e as mensaxes especiais dos acontecementos locais.</string>
<string name="routing_attr_relief_smoothness_factor_name">Escoller variación da altitude</string>
<string name="rendering_attr_depthContours_description">Amosar curvas e puntos do afundimento.</string>
<string name="rendering_attr_depthContours_name">Curvas do afundimento náuticos</string>
<string name="auto_split_recording_title">División automática das gravacións en intres</string>
<string name="auto_split_recording_title">Dividir gravacións após unha pausa</string>
<string name="auto_split_recording_descr">Comezar novo segmento despois dun intre de 6 min, nova pista despois dun intre de 2 h, ou novo ficheiro despois dun intre máis longo se mudaches a data.</string>
<string name="shared_string_paused">Detido</string>
<string name="save_track_min_distance">Mínimo desprazamento para o rexistro</string>
@ -3696,9 +3695,9 @@ Lon %2$s</string>
<string name="lenght_limit_description">Fornece a lonxitude do teu vehículo. Algunhas restricións de ruta poden ser aplicadas a vehículos longos.</string>
<string name="quick_action_remove_next_destination">Eliminar punto de destino máis preto</string>
<string name="please_provide_point_name_error">Fornece un nome para o punto</string>
<string name="quick_action_remove_next_destination_descr">O punto de destino actual na ruta será eliminado. Se fora o destino, a navegación sería interrompida.</string>
<string name="quick_action_remove_next_destination_descr">Elimina o seguinte destino da ruta. Se é o destino final, a navegación será detida.</string>
<string name="search_download_wikipedia_maps">Baixar mapas da Wikipedia</string>
<string name="plugin_wikipedia_description">Obter información sobre os puntos de interese da Wikipedia. É o teu guía de peto sen conexión - só activar o complemento da Wikipedia e desfrutar dos artigos sobre os elementos ó teu redor.</string>
<string name="plugin_wikipedia_description">Obtén información sobre os puntos de interese da Wikipedia, unha guía de peto sen conexión que inclúe artigos sobre obxectos e destinos.</string>
<string name="app_mode_enduro_motorcycle">Enduro</string>
<string name="app_mode_motor_scooter">Scooter</string>
<string name="app_mode_wheelchair">Cadeira de rodas</string>
@ -3809,11 +3808,11 @@ Lon %2$s</string>
<string name="start_finish_icons">Iconas de inicio e fin</string>
<string name="contour_lines_thanks">Grazas por mercar \'Curvas de nivel\'</string>
<string name="osm_live_payment_desc_hw">A subscrición é cobrada por período escollido. Cancélaa na AppGallery en calquera intre.</string>
<string name="osm_live_payment_subscription_management_hw">O pagamento será cargado na túa conta da AppGallery no mesmo intre da confirmación da compra.
<string name="osm_live_payment_subscription_management_hw">O pagamento será cobrado á túa conta do AppGallery ao confirmar a compra.
\n
\nA subscrición é renovada de xeito automático a menos que sexa cancelada antes da data de renovación. A túa conta será cargada polo período de renovación (mes/trimestre/ano) só na data de renovación.
\nA subscrición é renovada de xeito automático a menos que se cancele antes da data de renovación. A conta será cobrada polo período de renovación (mes/trimestre/ano) só na data de renovación.
\n
\nPodes xestionar e cancelar as túas subscricións indo ós axustes da AppGallery.</string>
\nPodes administrar e desbotar as subscricións nos axustes do AppGallery.</string>
<string name="routing_attr_avoid_footways_description">Evitar sendas peonís, camiños e beirarrúas</string>
<string name="routing_attr_avoid_footways_name">Evitar sendas peonís</string>
<string name="development">Desenvolvemento</string>
@ -4001,4 +4000,58 @@ Lon %2$s</string>
<string name="open_place_reviews">OpenPlaceReviews</string>
<string name="opr_use_dev_url">Empregar test.openplacereviews.org</string>
<string name="login_open_place_reviews">Iniciar sesión ao OpenPlaceReviews</string>
<string name="snap_to_road_descr">A icona da localización actual será axustada á ruta de navegación actual</string>
<string name="map_orientation_threshold_descr">Non xirar a vista do mapa se a velocidade é inferior a un limiar</string>
<string name="restart">Reiniciar</string>
<string name="shared_strings_all_regions">Todas as rexións</string>
<string name="delete_number_files_question">Eliminar %1$d ficheiros\?</string>
<string name="track_recording_stop_without_saving">Deter ser gardar</string>
<string name="track_recording_save_and_stop">Gardar e deter a gravación</string>
<string name="track_recording_title">Gravación da pista detida</string>
<string name="track_recording_description">Deixar de gravar\?
\nTodos os datos non gardados serán perdidos.</string>
<string name="on_pause">Detido</string>
<string name="app_restart_required">É necesario reiniciar a aplicación para aplicar algúns axustes.</string>
<string name="routing_attr_height_obstacles_description">A ruta podería evitar as fortes pendentes.</string>
<string name="quick_action_coordinates_widget_descr">Trocar para amosar ou agochar o trebello de coordenadas no mapa.</string>
<string name="map_widget_distance_by_tap">Distancia ao premer</string>
<string name="latest_openstreetmap_update">Última actualización do OpenStreetMap dispoñíbel:</string>
<string name="updated">Actualizado: %s</string>
<string name="last_time_checked">Última comprobación: %s</string>
<string name="update_frequency">Frecuencia de actualización</string>
<string name="live_update_frequency_week_variant">As actualizacións do mapa serán comprobadas cada semana. A seguinte vez %1$s en %2$s.</string>
<string name="live_update_frequency_day_variant">As actualizacións do mapa serán comprobadas cada día. A seguinte vez %1$s en %2$s.</string>
<string name="delete_updates">Eliminar actualizacións</string>
<string name="live_update_delete_updates_msg">Eliminar todas as actualizacións ao vivo de %s\?</string>
<string name="purchases">Compras</string>
<string name="select_category_descr">Escolle categoría ou engade unha nova</string>
<string name="track_recording_will_be_continued">A gravación continuará.</string>
<string name="copy_poi_name">Copiar nome do PDI</string>
<string name="quick_action_show_hide_title">Amosar/Agochar</string>
<string name="shared_string_interval">Intre</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Espazos naturais</string>
<string name="track_has_no_altitude">A pista non contén datos de altitude.</string>
<string name="track_has_no_speed">A pista non contén datos de velocidade.</string>
<string name="select_another_colorization">Escolle outro tipo de cor.</string>
<string name="live_update_frequency_hour_variant">As actualizacións de mapas serán comprobadas cada hora. A seguinte vez %1$s en %2$s.</string>
<string name="select_segments">Escoller segmentos</string>
<string name="select_segments_description">%1$s contén máis dun segmento, precisas selecionar a parte necesaria para a navegación.</string>
<string name="segments_count">Segmento %1$d</string>
<string name="activity_type_water_name">Auga</string>
<string name="activity_type_winter_name">Inverno</string>
<string name="activity_type_snowmobile_name">Motoneve</string>
<string name="activity_type_riding_name">Equitación</string>
<string name="activity_type_racing_name">Carreira</string>
<string name="activity_type_mountainbike_name">Bicicleta de montaña</string>
<string name="activity_type_cycling_name">Bicicleta</string>
<string name="activity_type_hiking_name">Sendeirismo</string>
<string name="activity_type_running_name">Correndo</string>
<string name="activity_type_walking_name">A pé</string>
<string name="activity_type_offroad_name">Todo terreo</string>
<string name="activity_type_motorbike_name">Motocicleta</string>
<string name="activity_type_car_name">Automóbil</string>
<string name="temporary_conditional_routing_descr">Empregar as restricións de estrada que están activas agora no mapa</string>
<string name="routing_attr_short_way_description">Ruta optimizada máis curta (baixo consumo)</string>
<string name="routing_attr_driving_style_description">Escolle o propósito da condución para obter unha ruta máis curta, máis rápida ou máis segura</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Agochar reservas naturais, áreas protexidas e de parques nacionais</string>
</resources>

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

@ -1161,7 +1161,7 @@
<string name="index_name_italy">Európa – Olaszország</string>
<string name="index_name_gb">Európa – Nagy-Britannia</string>
<string name="calculate_osmand_route_without_internet">OsmAnd útvonalszakasz számítása offline</string>
<string name="gpx_option_calculate_first_last_segment">OsmAnd útvonal számítása az első és utolsó útszakaszra</string>
<string name="gpx_option_calculate_first_last_segment">OsmAnd útvonal számítása az első és az utolsó útszakaszra</string>
<string name="always_center_position_on_map">Pozíció megjelenítése mindig középen</string>
<string name="voice_pref_title">Hang</string>
<string name="misc_pref_title">Egyebek</string>
@ -1366,7 +1366,7 @@
<string name="navigate_point_zone">Zóna</string>
<string name="download_tab_updates">Frissítések</string>
<string name="download_tab_downloads">Letöltés</string>
<string name="download_tab_local">Helyi</string>
<string name="download_tab_local">Telepítve</string>
<string name="no_internet_connection">A letöltés nem lehetséges, ellenőrizze az internetkapcsolatot.</string>
<string name="shared_string_dismiss">Bezárás</string>
<string name="everything_up_to_date">Minden fájl naprakész</string>
@ -1396,7 +1396,7 @@
<string name="settings_privacy">Adatvédelem</string>
<string name="shared_string_gpx_points">Pontok</string>
<string name="shared_string_my_location">Saját pozícióm</string>
<string name="navigation_over_track">Elindítod a navigációt a nyomvonal mentén?</string>
<string name="navigation_over_track">Elindítja a navigációt a nyomvonal mentén\?</string>
<string name="avoid_roads_msg">Elkerülendő utak kijelölésével aktiválhat alternatív útvonalakat</string>
<string name="enable_proxy_title">HTTP proxy engedélyezése</string>
<string name="enable_proxy_descr">HTTP proxy beállítása minden hálózati kéréshez.</string>
@ -1430,7 +1430,7 @@
<string name="share_note">Jegyzet megosztása</string>
<string name="shared_string_export">Exportálás</string>
<string name="plugin_touringview_name">Turistatérkép-nézet</string>
<string name="track_segments">Nyomvonal szakaszok</string>
<string name="track_segments">Nyomvonalszakaszok</string>
<string name="track_points">Nyomvonal pontok</string>
<string name="shared_string_selected">Kijelölve</string>
<string name="rename_failed">Az átnevezés nem sikerült.</string>
@ -2164,11 +2164,10 @@
<string name="shared_string_time">Idő</string>
<string name="total_distance">Teljes táv</string>
<string name="routing_attr_height_obstacles_name">Magasságadatok használata</string>
<string name="rendering_attr_depthContours_description">Mélységvonalak és pontok megjelenítése.</string>
<string name="rendering_attr_depthContours_name">Tengeri mélységvonalak</string>
<string name="auto_split_recording_title">Felvételek automatikus szétvágása szünet után</string>
<string name="auto_split_recording_descr">Új szakasz kezdése 6 perc szünet után, új nyomvonal 2 óra szünet után, vagy új fájl hosszabb szünet után ha a dátum megváltozott.</string>
<string name="auto_split_recording_descr">Új szakasz kezdése 6 perc szünet után, új nyomvonal 2 óra szünet után vagy új fájl hosszabb szünet után ha a dátum megváltozott.</string>
<string name="max_speed">Maximum sebesség</string>
<string name="average_speed">Átlagsebesség</string>
<string name="shared_string_time_moving">Mozgásban töltött idő</string>
@ -2313,7 +2312,7 @@
<string name="mapillary_menu_descr_username">Csak az általa hozzáadott képek megtekintése:</string>
<string name="mapillary_menu_title_username">Felhasználónév</string>
<string name="mapillary_menu_filter_description">A képek szűrése feltöltő, dátum vagy típus szerint. Csak magas nagyítási szinteknél lépnek érvénybe.</string>
<string name="map_widget_ruler_control">Sugaras vonalzó</string>
<string name="map_widget_ruler_control">Sugárirányú vonalzó</string>
<string name="average">Átlag</string>
<string name="of">%1$d / %2$d</string>
<string name="ascent_descent">Emelkedő/Lejtő</string>
@ -2914,8 +2913,8 @@
<string name="osmand_routing_promo">Az ..osmand/routing mappában hozzáadhatja a routing.xml fájl saját módosított verzióját</string>
<string name="app_mode_skiing">Síelés</string>
<string name="base_profile_descr_ski">Síelés</string>
<string name="show_compass_ruler">Iránytűvonalzó megjelenítése</string>
<string name="hide_compass_ruler">Iránytűvonalzó elrejtése</string>
<string name="show_compass_ruler">Iránytű megjelenítése</string>
<string name="hide_compass_ruler">Iránytű elrejtése</string>
<string name="select_icon_profile_dialog_title">Ikon kijelölése</string>
<string name="settings_routing_mode_string">Mód: %s</string>
<string name="settings_derived_routing_mode_string">Felhasználói mód, eredete: %s</string>
@ -3202,7 +3201,7 @@
<string name="added_profiles_descr">Bővítmény által hozzáadott profilok</string>
<string name="shared_string_turn_off">Kikapcsolás</string>
<string name="new_plugin_added">Új bővítmény hozzáadva</string>
<string name="join_segments">Szegmensek összekapcsolása</string>
<string name="join_segments">Szakaszok egyesítése</string>
<string name="save_heading">Irány belefoglalása</string>
<string name="save_heading_descr">Felvételkor az egyes útpontok irányát is menti.</string>
<string name="select_navigation_icon">Pozíció ikon haladás közben</string>
@ -3479,7 +3478,7 @@
<string name="tracker_item">OsmAnd helymegosztás</string>
<string name="mapillary_item">OsmAnd + Mapillary</string>
<string name="quick_action_item">Gyorsművelet</string>
<string name="radius_ruler_item">Sugaras vonalzó</string>
<string name="radius_ruler_item">Sugárirányú vonalzó</string>
<string name="measure_distance_item">Távolságmérés</string>
<string name="travel_item">Utazás (Wikivoyage és Wikipédia)</string>
<string name="map_markers_item">Térképjelölők</string>
@ -3716,7 +3715,7 @@
<string name="save_track_to_gpx">Nyomvonal automatikus felvétele navigáció közben</string>
<string name="monitoring_min_speed_descr_side_effect">Mellékhatás: A nyomvonalból hiányozni fog minden olyan szakasz, ahol a legkisebb sebesség feltétele nem teljesült (pl. egy meredek dombra tolja fel a kerékpárt). Nem lesz információ az állásokról sem, például a pihenőkről. Ez hatással van minden elemzésre és utófeldolgozásra, például amikor megpróbálja meghatározni az utazás teljes hosszát, a mozgásban töltött időt vagy az átlagsebességét.</string>
<string name="one_point_error">Adjon hozzá legalább két pontot.</string>
<string name="attach_to_the_roads">Csatolás az utakhoz</string>
<string name="attach_to_the_roads">Utakhoz igazítás</string>
<string name="marker_save_as_track">Mentés nyomvonalfájlként</string>
<string name="select_another_track">Másik nyomvonal kiválasztása</string>
<string name="open_saved_track">Elmentett nyomvonal megnyitása</string>
@ -3888,7 +3887,7 @@
<string name="app_mode_light_aircraft">Könnyű légi jármű</string>
<string name="plan_route_split_before">Elvágás előtte</string>
<string name="plan_route_split_after">Elvágás utána</string>
<string name="plan_route_join_segments">Szakaszok egyesítése</string>
<string name="plan_route_join_segments">Szakaszok összekapcsolása</string>
<string name="plan_route_add_new_segment">Új szakasz hozzáadása</string>
<string name="release_3_9">• Lehetőség az összes adat exportálására és importálására, beleértve a beállításokat, erőforrásokat és a saját helyeket is
\n
@ -3999,4 +3998,45 @@
<string name="activity_type_offroad_name">Terepjáró</string>
<string name="activity_type_motorbike_name">Motorkerékpár</string>
<string name="activity_type_car_name">Személyautó</string>
<string name="map_widget_distance_by_tap">Távolságmérés koppintással</string>
<string name="shared_string_interval">Intervallum</string>
<string name="update_frequency">Frissítés gyakorisága</string>
<string name="updated">Frissítésve: %s</string>
<string name="last_time_checked">Legutóbb ellenőrizve: %s</string>
<string name="latest_openstreetmap_update">Legutóbbi elérhető OpenStreetMap-frissítés:</string>
<string name="quick_action_coordinates_widget_descr">A térképen lévő koordináta-widgetet megjelenítő vagy elrejtő kapcsoló.</string>
<string name="routing_attr_height_obstacles_description">Az útvonaltervezés elkerülhetné a meredek emelkedőket.</string>
<string name="app_restart_required">Egyes beállítások alkalmazásához újra kell indítani az alkalmazást.</string>
<string name="on_pause">Szüneteltetve</string>
<string name="track_recording_description">Biztosan megszakítja a felvételt\?
\nMinden el nem mentett adat el fog veszni.</string>
<string name="track_recording_title">Nyomvonal felvétele leállítva</string>
<string name="track_recording_save_and_stop">Mentés és felvétel leállítása</string>
<string name="track_recording_stop_without_saving">Leállítás mentés nélkül</string>
<string name="delete_number_files_question">Töröl %1$d fájlt\?</string>
<string name="shared_strings_all_regions">Az összes régió</string>
<string name="restart">Újraindítás</string>
<string name="map_orientation_threshold_descr">Küszöbérték alatti sebességnél ne forogjon a térkép</string>
<string name="snap_to_road_descr">A jelenlegi helyet jelző ikon bepattan az aktuális navigációs útvonalba</string>
<string name="routing_attr_driving_style_description">Vezetési mód kiválasztása rövidebb, gyorsabb vagy biztonságosabb útvonal tervezéséhez</string>
<string name="routing_attr_short_way_description">Optimalizált rövidebb útvonal (energiamegtakarítás)</string>
<string name="temporary_conditional_routing_descr">A térképen jelenleg aktív forgalomkorlátozások figyelembe vétele</string>
<string name="segments_count">%1$d szakasz</string>
<string name="select_segments_description">%1$s több szakaszt is tartalmaz. Válassza ki a navigációhoz szükséges részt.</string>
<string name="select_segments">Szakaszok kijelölése</string>
<string name="delete_updates">Frissítések törlése</string>
<string name="live_update_delete_updates_msg">Biztosan törölni szeretné az összes (%s) élő frissítést\?</string>
<string name="purchases">Vásárlások</string>
<string name="select_category_descr">Kategória kiválasztása vagy új hozzáadása</string>
<string name="track_recording_will_be_continued">A felvétel folytatódni fog.</string>
<string name="copy_poi_name">Érdekes pont nevének másolása</string>
<string name="quick_action_show_hide_title">Megjelenítés / elrejtés</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Természetvédelmi területek, védett területek és nemzeti parkok határainak elrejtése</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Természetvédelmi területek határai</string>
<string name="track_has_no_altitude">A nyomvonal nem tartalmaz magassági adatokat.</string>
<string name="track_has_no_speed">A nyomvonal nem tartalmaz sebességadatokat.</string>
<string name="select_another_colorization">Kérjük, válasszon másik színezést.</string>
<string name="live_update_frequency_week_variant">Az alkalmazás hetente ellenőrzi a térképfrissítéseket. Következő ellenőrzés: %1$s (ennyi idő múlva: %2$s).</string>
<string name="live_update_frequency_day_variant">Az alkalmazás naponta ellenőrzi a térképfrissítéseket. Következő ellenőrzés: %1$s (ennyi idő múlva: %2$s).</string>
<string name="live_update_frequency_hour_variant">Az alkalmazás óránként ellenőrzi a térképfrissítéseket. Következő ellenőrzés: %1$s (ennyi idő múlva: %2$s).</string>
</resources>

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

@ -3893,4 +3893,5 @@
<string name="poi_piste_ski_jump">Skíðastökk</string>
<string name="poi_local_ref">Staðvær tilvísun</string>
<string name="poi_conference_centre">Ráðstefnumiðstöð</string>
<string name="poi_geodesist">Landmælingar</string>
</resources>

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

@ -4035,9 +4035,9 @@
<string name="updated">Uppfært: %s</string>
<string name="last_time_checked">Síðast athugað: %s</string>
<string name="update_frequency">Uppfærslutíðni</string>
<string name="live_update_frequency_week_variant">Uppfærslur korta verða athugaðar í hverri viku. Næsta skipti%1$s eftir %2$s.</string>
<string name="live_update_frequency_day_variant">Uppfærslur korta verða athugaðar á hverjum degi. Næsta skipti%1$s eftir %2$s.</string>
<string name="live_update_frequency_hour_variant">Uppfærslur korta verða athugaðar á klukkustundar fresti. Næsta skipti%1$s eftir %2$s.</string>
<string name="live_update_frequency_week_variant">Uppfærslur korta verða athugaðar í hverri viku. Næsta skipti %1$s eftir %2$s.</string>
<string name="live_update_frequency_day_variant">Uppfærslur korta verða athugaðar á hverjum degi. Næsta skipti %1$s eftir %2$s.</string>
<string name="live_update_frequency_hour_variant">Uppfærslur korta verða athugaðar á klukkustundar fresti. Næsta skipti %1$s eftir %2$s.</string>
<string name="delete_updates">Eyða uppfærslum</string>
<string name="live_update_delete_updates_msg">Ertu viss um að þú viljir eyða öllum %s raunuppfærslum\?</string>
<string name="purchases">Innkaup</string>
@ -4048,4 +4048,6 @@
<string name="track_has_no_altitude">Ferillinn inniheldur ekki hæðargögn.</string>
<string name="track_has_no_speed">Ferillinn inniheldur ekki hraðagögn.</string>
<string name="select_another_colorization">Veldu aðra tegund litunar.</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Fela mörk friðlanda, verndaðra svæða og þjóðgarða</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Mörk náttúru</string>
</resources>

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

@ -4010,9 +4010,9 @@
<string name="updated">עדכון: %s</string>
<string name="last_time_checked">מועד הבדיקה האחרונה: %s</string>
<string name="update_frequency">תדירות עדכון</string>
<string name="live_update_frequency_week_variant">בכל שבוע יתבצע חיפוש לעדכוני מפה. הפעם הבאה%1$s ב־%2$s.</string>
<string name="live_update_frequency_day_variant">בכל יום יתבצע חיפוש לעדכוני מפה. הפעם הבאה%1$s ב־%2$s.</string>
<string name="live_update_frequency_hour_variant">בכל שעה יתבצע חיפוש לעדכוני מפה. הפעם הבאה%1$s ב־%2$s.</string>
<string name="live_update_frequency_week_variant">בכל שבוע יתבצע חיפוש לעדכוני מפה. הפעם הבאה %1$s ב־%2$s.</string>
<string name="live_update_frequency_day_variant">בכל יום יתבצע חיפוש לעדכוני מפה. הפעם הבאה %1$s ב־%2$s.</string>
<string name="live_update_frequency_hour_variant">בכל שעה יתבצע חיפוש לעדכוני מפה. הפעם הבאה %1$s ב־%2$s.</string>
<string name="delete_updates">מחיקת עדכונים</string>
<string name="purchases">רכישות</string>
<string name="select_category_descr">נא לבחור קטגוריה או להוסיף אחת חדשה</string>
@ -4023,4 +4023,28 @@
<string name="track_has_no_altitude">המסלול אינו מכיל נתוני גובה.</string>
<string name="track_has_no_speed">המסלול אינו מכיל מהירות גבוהה.</string>
<string name="select_another_colorization">נא לבחור סוג אחר של צביעה.</string>
<string name="restart">הפעלה מחדש</string>
<string name="shared_strings_all_regions">כל האזורים</string>
<string name="delete_number_files_question">למחוק %1$d קבצים\?</string>
<string name="track_recording_stop_without_saving">לעצור בלי לשמור</string>
<string name="track_recording_save_and_stop">לשמור ולעצור את ההקלטה</string>
<string name="track_recording_title">הקלטת המסלול נעצרה</string>
<string name="track_recording_description">לעצור את ההקלטה\?
\nכל הנתונים שלא יישמרו יאבדו.</string>
<string name="select_segments">נא לבחור מקטעים</string>
<string name="select_segments_description">%1$s מכיל יותר ממקטע אחד, עליך לבחור את החלקים הנחוצים לניווט.</string>
<string name="segments_count">מקטע %1$d</string>
<string name="temporary_conditional_routing_descr">להשתמש במגבלות הגביש שפעילות כעת על המפה</string>
<string name="routing_attr_short_way_description">מסלול מקוצר מרחק (לחסכון באנרגיה)</string>
<string name="routing_attr_driving_style_description">נא לבחור מטרת נסיעה כדי לקבל מסלול מהיר או בטוח יותר</string>
<string name="snap_to_road_descr">סמל המיקום הנוכחי יוצמד למסלול הניווט הנוכחי</string>
<string name="map_orientation_threshold_descr">לא לסובב את המפה אם המהירות קטנה מסף מסוים</string>
<string name="on_pause">בהשהיה</string>
<string name="app_restart_required">צריך להפעיל את היישומון מחדש כדי שכמה מהשינויים יחולו.</string>
<string name="routing_attr_height_obstacles_description">הרכבת המסלול יכולה להימנע מעליות תלולות.</string>
<string name="quick_action_coordinates_widget_descr">מפסק להצגה או הסתרה של וידג׳ט נקודות הציון במפה.</string>
<string name="map_widget_distance_by_tap">מרחק בנגיעה</string>
<string name="latest_openstreetmap_update">קיים עדכון ל־OpenStreetMap:</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">להסתיר גבולות של שמורות טבע, אזורים מוגנים ופארקים ציבוריים</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">גבולות טבעיים</string>
</resources>

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

@ -1622,4 +1622,29 @@
<string name="poi_video_telephone">Video</string>
<string name="poi_volcano_status">Status</string>
<string name="poi_volcano_type">Type</string>
<string name="poi_historic_civilization_greek_egyptian">Sivilisasjon: gresk-egyptisk (332 f.Kr. – 30 f.Kr.)</string>
<string name="poi_historic_civilization_ancient_egyptian">Sivilisasjon: Det gamle Egypt (inntil 332 f.Kr.)</string>
<string name="poi_historic_civilization_imperial_chinese">Sivilisasjon: Det kinesiske keiserriket (221 f.Kr. – 1911 e.Kr.)</string>
<string name="poi_historic_stone">Historisk stein</string>
<string name="poi_historic_era_neolithic">Historisk periode: neolittisk tid</string>
<string name="poi_historic_era_mesolithic">Historisk periode: mesolittisk tid</string>
<string name="poi_historic_era_paleolithic">Historisk periode: paleolittisk tid (2,6 millioner – 10000 år før nåtid)</string>
<string name="poi_historic_period_ptolemaic_egypt">Historisk periode: Det ptolemeiske Egypt (305 f.Kr. – 30 f.Kr.)</string>
<string name="poi_historic_period_hellenistic_greece">Historisk periode: Det hellenistiske Hellas</string>
<string name="poi_historic_period_roman_republic">Historisk periode: Den romerske republikk (508 f.Kr. – 27 f.Kr.)</string>
<string name="poi_historic_civilization_ancient_roman">Sivilisasjon: Den romerske antikken (753 f.Kr. – 284 e.Kr.)</string>
<string name="poi_historic_period_iron_age">Historisk periode: jernalder</string>
<string name="poi_historic_period_archaic_greece">Historisk periode: Det arkaiske Hellas</string>
<string name="poi_historic_period_classical_greece">Historisk periode: Det klassiske Hellas (5. – 4. århundre f.Kr.)</string>
<string name="poi_historic_period_bronze_age">Historisk periode: bronsealder</string>
<string name="poi_historic_period_stone_bronze_undetermined">Historisk periode: steinalder / bronsealder (ubestemt)</string>
<string name="poi_historic_civilization_minoan">Sivilisasjon: minoisk</string>
<string name="poi_historic_civilization_western_roman">Sivilisasjon: vestromersk (285 – 476)</string>
<string name="poi_historic_civilization_celtic">Sivilisasjon: keltisk</string>
<string name="poi_historic_civilization_byzantine">Sivilisasjon: bysantinsk (285 – 1453)</string>
<string name="poi_historic_civilization_roman">Sivilisasjon: romersk</string>
<string name="poi_historic_civilization_ancient_greek">Sivilisasjon: Den greske antikken</string>
<string name="poi_historic_civilization_prehistoric">Sivilisasjon: forhistorisk tid</string>
<string name="poi_historic_manor">Historisk herregård</string>
<string name="poi_historic_yes">Historisk objekt</string>
</resources>

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

@ -699,7 +699,7 @@
<string name="save_global_track_interval">Generelt loggeintervall</string>
<string name="int_hour">t</string>
<string name="duration">Varighet</string>
<string name="distance">Avstand</string>
<string name="distance">Distanse</string>
<string name="index_tours">Turer</string>
<string name="shared_string_all">Alle</string>
<string name="shared_string_more">Mer…</string>
@ -796,7 +796,7 @@
<string name="loading_cities">Laster byer…</string>
<string name="invalid_locations">Ugyldige koordinater</string>
<string name="go_back_to_osmand">Tilbake til kartet</string>
<string name="osb_comment_dialog_success">Kommentar er lagt til</string>
<string name="osb_comment_dialog_success">Kommentar lagt til</string>
<string name="no_buildings_found">Ingen bygninger funnet.</string>
<string name="loading_streets_buildings">Laster gater/bygninger…</string>
<string name="fav_point_dublicate_message">Favorittnavn endret til \"%1$s\" for å unngå duplisering.</string>
@ -924,7 +924,7 @@
<string name="copying_osmand_files">Kopierer OsmAnd-datafiler…</string>
<string name="route_descr_destination">Reisemål</string>
<string name="gpx_file_name">GPX-filnavn</string>
<string name="osmand_distance_planning_plugin_name">Distansekalkulator &amp; planleggingsverktøy</string>
<string name="osmand_distance_planning_plugin_name">Distansekalkulator og planleggingsverktøy</string>
<string name="layer_hillshade">Relieffskyggelag</string>
<string name="download_hillshade_maps">Relieffskygger</string>
<string name="local_indexes_cat_av">Audio/Video-data</string>
@ -1339,7 +1339,7 @@
<string name="osn_comment_dialog_title">Legg til kommentar</string>
<string name="navigation_item_description">Navigeringsoppsett.</string>
<string name="free_downloads_used_description">Viser hvor mange gratis nedlastinger som er igjen.</string>
<string name="route_distance">Avstand:</string>
<string name="route_distance">Distanse:</string>
<string name="route_duration">Tid:</string>
<string name="shared_string_sound">Lyd</string>
<string name="available_maps">Tilgjengelige kart</string>
@ -1878,7 +1878,7 @@
<string name="context_menu_item_add_parking_point">Marker som parkeringsplass</string>
<string name="route_roundabout">Rundkjøring: Ta avkjøring %1$d og fortsett</string>
<string name="support_new_features">Støtt nye funksjoner</string>
<string name="max_speed">Maksimumshastighet</string>
<string name="max_speed">Maksimumsfart</string>
<string name="shared_string_start_time">Starttid</string>
<string name="shared_string_end_time">Sluttid</string>
<string name="shared_string_color">Farge</string>
@ -2945,7 +2945,7 @@
<string name="choose_data_to_share">Velg typen data du vil dele:</string>
<string name="downloaded_maps">Nedlastede kart</string>
<string name="visited_screens">Besøkte skjermer</string>
<string name="collected_data_descr">Definer hvilken data du ønsker å dele med OsmAnd.</string>
<string name="collected_data_descr">Bestem hvilke data OsmAnd kan dele.</string>
<string name="downloaded_maps_collect_descr">Hjelp oss å forstå hvilke land- og regionkart som er mest populære.</string>
<string name="visited_screens_collect_descr">Hjelp oss å forstå hvilke OsmAnd-funksjoner som er mest populære.</string>
<string name="privacy_and_security_change_descr">Trykk \"Tillat\" hvis du er enig med vår %1$s</string>
@ -3832,7 +3832,7 @@
<string name="shared_string_resources">Ressurser</string>
<string name="profile_by_default_description">Velg profilen som skal brukes når programmet starter.</string>
<string name="shared_string_last_used">Sist brukt</string>
<string name="routing_attr_allow_streams_name">Tillat bekker og avløp</string>
<string name="routing_attr_allow_streams_name">Tillat bekker og dreneringsgrøfter</string>
<string name="routing_attr_allow_intermittent_name">Tillat periodiske vannveier</string>
<string name="routing_attr_allow_intermittent_description">Tillat periodiske vannveier</string>
<string name="shared_string_vehicle">Kjøretøy</string>
@ -3854,7 +3854,7 @@
<string name="change_folder">Endre mappe</string>
<string name="select_data_to_export">Velg data å eksportere til filen.</string>
<string name="export_not_enough_space_descr">Din enhet har kun %1$s ledig. Frigjør litt plass eller velg bort noen elementer fra eksporten.</string>
<string name="select_groups_for_import">ffffffffff|</string>
<string name="select_groups_for_import">Velg grupper som skal importeres.</string>
<string name="reverse_all_points">Reverser alle punkter</string>
<string name="routing_engine_vehicle_type_small_truck">Liten lastebil</string>
<string name="routing_engine_vehicle_type_truck">Lastebil</string>
@ -3874,18 +3874,18 @@
<string name="announcement_time_prepare">Forberedelse</string>
<string name="announcement_time_arrive">Ankom målet</string>
<string name="shared_string_turn">Sving</string>
<string name="announcement_time_intervals">Tid og avstansintervaller</string>
<string name="announcement_time_descr">kunngjøringstid for forskjellige stemmeforespørsler avhenger av forespørselstype, nåværende navigasjonshastighet og forvalgt navigasjonshastighet.</string>
<string name="announcement_time_intervals">Tid og avstandsintervaller</string>
<string name="announcement_time_descr">Kunngjøringstid for forskjellige talemeldinger avhenger av meldingstype, gjeldende navigasjonshastighet og standard-navigasjonshastighet.</string>
<string name="routing_engine_vehicle_type_hiking">Turgåing</string>
<string name="routing_engine_vehicle_type_walking">Fotgjengeri</string>
<string name="routing_engine_vehicle_type_walking">Gåing</string>
<string name="shared_string_sec">sek</string>
<string name="announcement_time_title">Kunngjøringstid</string>
<string name="start_recording">Start opptak</string>
<string name="show_track_on_map">Vis spor på kart</string>
<string name="routing_engine_vehicle_type_wheelchair">Rullestol</string>
<string name="routing_engine_vehicle_type_cycling_electric">El-sykkel</string>
<string name="routing_engine_vehicle_type_cycling_mountain">Terrengsykkel</string>
<string name="routing_engine_vehicle_type_racingbike">Temposykkel</string>
<string name="routing_engine_vehicle_type_cycling_mountain">Terrengsykling</string>
<string name="routing_engine_vehicle_type_racingbike">Racersykkel</string>
<string name="routing_engine_vehicle_type_cycling_road">Landeveissykling</string>
<string name="routing_engine_vehicle_type_cycling_regular">Vanlig sykling</string>
<string name="message_server_error">Tjenerfeil: %1$s</string>
@ -3895,7 +3895,7 @@
<string name="routing_engine_vehicle_type_hgv">Stor lastebil</string>
<string name="delete_online_routing_engine">Slett denne nettbaserte rutingsmotoren\?</string>
<string name="context_menu_read_full">Les hele</string>
<string name="delete_waypoints">Slett rutepunkt</string>
<string name="delete_waypoints">Slett rutepunkter</string>
<string name="app_mode_gap">Luke</string>
<string name="login_open_street_map">Logg inn på OpenStreetMap</string>
<string name="user_login">Logg inn</string>
@ -3921,10 +3921,21 @@
<string name="purchases">Kjøp</string>
<string name="select_category_descr">Velg kategori eller legg til en ny</string>
<string name="track_recording_will_be_continued">Opptaket vil fortsette.</string>
<string name="copy_poi_name">Kopier POI-navn</string>
<string name="copy_poi_name">Kopier interessepunktnavn</string>
<string name="quick_action_show_hide_title">Vis/skjul</string>
<string name="shared_string_interval">Intervall</string>
<string name="track_has_no_altitude">Sporet inneholder ikke høydedata.</string>
<string name="track_has_no_speed">Sporet inneholder ikke hastighetsdata.</string>
<string name="select_another_colorization">Velg en annen type fargelegging.</string>
<string name="shared_strings_all_regions">Alle regioner</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Skjul grenser for naturreservat, beskyttede områder og nasjonalparker</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Naturgrenser</string>
<string name="hillshade_slope_contour_lines">Relieffskygge / Bakkehelling / Koter</string>
<string name="activity_type_riding_name">Ridning</string>
<string name="activity_type_hiking_name">Turgåing</string>
<string name="activity_type_running_name">Løping</string>
<string name="activity_type_walking_name">Gåing</string>
<string name="routing_attr_short_way_description">Optimalisert kortere rute (energisparende)</string>
<string name="snap_to_road_descr">Aktuelle posisjonsikon vil bli festet til gjeldende navigeringsrute</string>
<string name="routing_attr_height_obstacles_description">Ruting kan unngå kraftige oppoverbakker.</string>
</resources>

150
OsmAnd/res/values-nl/strings.xml
View file

@ -47,7 +47,7 @@
<string name="south_south_west">zuid-zuidwest</string>
<string name="south_west">zuidwest</string>
<string name="west_south_west">west-zuidwest</string>
<string name="west">west</string>
<string name="west">westen</string>
<string name="west_north_west">west-noordwest</string>
<string name="north_west">noordwest</string>
<string name="front">Rechtuit</string>
@ -495,7 +495,7 @@
<string name="follow">Start route begeleiding</string>
<string name="recalculate_route_to_your_location">Soort vervoer:</string>
<string name="mark_final_location_first">Kies eerst een bestemming</string>
<string name="get_directions">Route</string>
<string name="get_directions">Routebeschrijving</string>
<string name="opening_hours">Openingstijden</string>
<string name="opening_changeset">Wijzigingenset openen…</string>
<string name="closing_changeset">Wijzigingenset sluiten…</string>
@ -1341,7 +1341,7 @@
<string name="proxy_pref_descr">Stel een proxy voor Internetcommunicatie in.</string>
<string name="settings_privacy">Privacy</string>
<string name="shared_string_gpx_points">Punten</string>
<string name="navigation_over_track">Navigatie langs GPX-track starten?</string>
<string name="navigation_over_track">Navigatie langs GPX-track starten\?</string>
<string name="avoid_roads_msg">Je kan een alternatieve route vinden door aan te geven welke wegen niet gebruikt mogen worden</string>
<string name="save_track_to_gpx_globally_headline">GPX-tracks opnemen op aanvraag</string>
<string name="enable_proxy_title">HTTP-proxy aanzetten</string>
@ -1432,7 +1432,7 @@
<string name="shared_string_control_start">Start</string>
<string name="shared_string_control_stop">Stop</string>
<string name="shared_string_import">Importeren</string>
<string name="shared_string_export">Exporteer naar OSM</string>
<string name="shared_string_export">Exporteer</string>
<string name="shared_string_more">Meer…</string>
<string name="shared_string_more_actions">Meer acties</string>
<string name="shared_string_do_not_show_again">Toon niet meer</string>
@ -1912,7 +1912,7 @@
<string name="rendering_value_thin_name">Dun</string>
<string name="rendering_value_medium_name">Gemiddeld</string>
<string name="rendering_value_bold_name">Vet</string>
<string name="map_mode">Dag-Nacht stijl</string>
<string name="map_mode">Dag/Nacht stijl</string>
<string name="access_default_color">Standaardkleur</string>
<string name="access_category_choice">Kies categorie</string>
<string name="access_hint_enter_name">Voer naam in</string>
@ -2173,7 +2173,6 @@
<string name="shared_string_time_moving">Tijd in beweging</string>
<string name="routing_attr_driving_style_name">Rijstijl</string>
<string name="routing_attr_height_obstacles_name">Hoogtegegevens gebruiken</string>
<string name="shared_string_gpx_track">Track</string>
<string name="right_side_navigation">Rechts rijdend</string>
<string name="driving_region_automatic">Automatisch</string>
@ -3138,8 +3137,8 @@
<string name="visited_screens_collect_descr">Help ons begrijpen welke OsmAnd functies het populairst zijn.</string>
<string name="privacy_and_security_change_descr">Toets \"Toestaan\" als u akkoord gaat met onze %1$s</string>
<string name="app_mode_shuttle_bus">Shuttlebus</string>
<string name="show_compass_ruler">Toon kompas wijzer</string>
<string name="hide_compass_ruler">Verberg kompas wijzer</string>
<string name="show_compass_ruler">Toon kompasliniaal</string>
<string name="hide_compass_ruler">Verberg kompasliniaal</string>
<string name="settings_routing_mode_string">Modus: %s</string>
<string name="settings_derived_routing_mode_string">Gebruikers modus, afgeleid van: %s</string>
<string name="select_base_profile_dialog_message">Baseer uw aangepaste profiel op één van de standaard profielen, dit bepaalt de algemene opzet zoals standaard zichtbaarheid van widgets en eenheden van snelheid en afstand. Dit zijn de standaard profielen samen met voorbeelden van aangepaste profielen die uitgebreid kunnen worden:</string>
@ -3359,7 +3358,7 @@
<string name="shared_string_routing">Routering</string>
<string name="shared_string_include_data">Bijkomende gegevens insluiten</string>
<string name="import_profile_dialog_description">Het geïmporteerde profiel bevat aanvullende gegevens. Tik \"Importeren\" om enkel de profielgegevens te importeren of kies aanvullende gegevens om te importeren.</string>
<string name="export_profile_dialog_description">Je kan bijkomende gegevens om mee met het profiel te exporteren.</string>
<string name="export_profile_dialog_description">Je kan bijkomende gegevens toevoegen om mee met het profiel te exporteren.</string>
<string name="shared_string_app_default_w_val">App Standaardwaarde (%s)</string>
<string name="no_recalculation_setting">Niet herberekenen</string>
<string name="route_recalculation_dist_title">Minimale afstand om route te herbereken</string>
@ -3431,7 +3430,7 @@
<string name="routing_attr_length_name">Maximale lengte</string>
<string name="shared_string_bearing">Richting</string>
<string name="item_deleted">%1$s verwijderd</string>
<string name="speed_cameras_restart_descr">Een herstart is noodzakelijk om de gegevens van snelheidscamera’s volledig te verwijderen.</string>
<string name="speed_cameras_restart_descr">Herstart de app om de gegevens van snelheidscamera’s te verwijderen.</string>
<string name="shared_string_uninstall_and_restart">Verwijderen en Herstarten</string>
<string name="speed_cameras_removed_descr">Dit apparaat bevat geen informatie over snelheidscamera’s.</string>
<string name="app_mode_inline_skates">Inline skates</string>
@ -3540,8 +3539,8 @@
<string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
<string name="search_poi_types">POI-types zoeken</string>
<string name="quick_action_transport_descr">Knop om OV-informatie al dan niet te tonen op de kaart.</string>
<string name="add_edit_favorite">Favoriet toevoegen / bewerken</string>
<string name="create_edit_poi">POI toevoegen / bewerken</string>
<string name="add_edit_favorite">Favoriet toevoegen of bewerken</string>
<string name="create_edit_poi">POI toevoegen of bewerken</string>
<string name="parking_positions">Parkeerlocaties</string>
<string name="reset_deafult_order">Standaardvolgorde van de ekementen herstellen</string>
<string name="back_to_editing">Terugkeren naar wijzigen</string>
@ -3562,7 +3561,7 @@
<string name="turn_screen_on_navigation_instructions_descr">Scherm aanzetten bij elke routeaanwijzing.</string>
<string name="turn_screen_on_navigation_instructions">Routeaanwijzingen</string>
<string name="turn_screen_on_power_button_disabled">Uitgeschakeld. De instelling ‘Timeout na wakker worden’ moet ingesteld zijn op ‘Scherm aanlaten’.</string>
<string name="turn_screen_on_power_button_descr">Door op de aan/uit knop te drukken gaat het scherm aan met OsmAnd op de voorgrond van het vergrendelde scherm.</string>
<string name="turn_screen_on_power_button_descr">Door op de aan/uit knop te drukken gaat het scherm aan met OsmAnd op de voorgrond van het vergrendelingsscherm.</string>
<string name="turn_screen_on_power_button">Aan/uit-knop</string>
<string name="turn_screen_on_proximity_sensor">Nabijheidssensor</string>
<string name="turn_screen_on_wake_time_descr">Selecteer de schermtimeout na wakker worden. (Kies “%1$s” om geen timeout te gebruiken.)</string>
@ -3579,7 +3578,7 @@
<string name="storage_format">Opslagformaat</string>
<string name="map_source_zoom_levels">Stel een minimum en maximum zoomniveau in om de online kaart te tonen of te laden.</string>
<string name="shared_string_delete_all_q">Alles wissen\?</string>
<string name="export_import_quick_actions_with_profiles_promo">Sneltoetsen kunnen geëxporteerd of geïmporteerd worden met app-profielen.</string>
<string name="export_import_quick_actions_with_profiles_promo">Snelle acties kunnen geëxporteerd of geïmporteerd worden met app-profielen.</string>
<string name="delete_all_actions_message_q">Weet je zeker dat je %d sneltoetsen onherroepelijk wil verwijderen\?</string>
<string name="speed_cameras_legal_descr">In sommige landen of regio’s is het gebruik van toepassingen om te waarschuwen voor snelheidscamera’s in strijd met de wet.
\n
@ -3608,12 +3607,12 @@
<string name="tiles_storage_descr">Kies hoe gedownloade rasterkaartsegmenten worden opgeslagen.</string>
<string name="profiles_for_action_not_found">Geen overeenkomende profielen gevonden.</string>
<string name="screen_timeout">Time-out van het scherm</string>
<string name="use_volume_buttons_as_zoom_descr">Regel het zoomniveau, van de kaart, met de volumeknop op het apparaat.</string>
<string name="use_volume_buttons_as_zoom_descr">Regel het zoomniveau van de kaart met de volumeknop op het apparaat.</string>
<string name="use_volume_buttons_as_zoom">Gebruik volumeknoppen om in en uit te zoomen</string>
<string name="plugin_wikipedia_description">Verkrijg informatie over POIs uit Wikipedia. Het is je offline reisgidsje - schakel de Wikipedia-plug-in in en geniet van artikelen over de bezienswaardigheden in je omgeving.</string>
<string name="plugin_wikipedia_description">Verkrijg informatie over POIs uit Wikipedia, een offline reisgids met artikelen over de bezienswaardigheden in je omgeving.</string>
<string name="lenght_limit_description">Geef de voertuiglengte op, er zijn mogelijk routebeperkingen voor lange voertuigen.</string>
<string name="quick_action_remove_next_destination_descr">Het volgende routepunt wordt verwijderd. Als dit de eindbestemming was, stopt de navigatie.</string>
<string name="quick_action_remove_next_destination">Het volgende routepunt verwijderen</string>
<string name="quick_action_remove_next_destination_descr">Verwijdert het volgende routepunt. Als dit de eindbestemming was stopt de navigatie.</string>
<string name="quick_action_remove_next_destination">Het dichstbijzijnde routepunt verwijderen</string>
<string name="please_provide_point_name_error">Kies een naam voor het punt</string>
<string name="search_download_wikipedia_maps">Wikipedia-kaarten downloaden</string>
<string name="app_mode_motor_scooter">Motorscooter</string>
@ -3627,15 +3626,15 @@
<string name="gpx_monitoring_stop">Pauzeer track opname</string>
<string name="gpx_monitoring_start">Hervat track opnemen</string>
<string name="street_level_imagery">Beelden op straatniveau</string>
<string name="select_track_width">Selecteer dikte</string>
<string name="select_track_width">Selecteer breedte</string>
<string name="track_show_start_finish_icons">Toon start en aankomst pictogrammen</string>
<string name="gpx_direction_arrows">Richtingaanwijzers</string>
<string name="add_hidden_group_info">Het toegevoegde punt zal niet zichtbaar zijn op de kaart, aangezien de geselecteerde groep verborgen is, je kan het vinden in \"%s\".</string>
<string name="gpx_direction_arrows">Richtingspijlen</string>
<string name="add_hidden_group_info">Het toegevoegde punt zal niet zichtbaar zijn op de kaart omdat de geselecteerde groep verborgen is, je kan het vinden in \"%s\".</string>
<string name="system_default_theme">Standaard</string>
<string name="route_between_points">Route tussen punten</string>
<string name="route_between_points_warning_desc">Vervolgens, zet uw track vast op de dichtstbijzijnde toegestane weg met een van uw navigatieprofielen om deze optie te gebruiken.</string>
<string name="message_need_calculate_route_before_show_graph">%1$s gegevens alleen beschikbaar op wegen, u moet een route berekenen met behulp van \"Route tussen punten\" om deze gegevens te krijgen.</string>
<string name="route_between_points_desc">Selecteer hoe de punten verbonden worden, via een rechte lijn, of een route berekenen tussen de punten zoals hieronder aangegeven.</string>
<string name="message_need_calculate_route_before_show_graph">%1$s gegevens alleen beschikbaar op wegen, u moet een route berekenen met behulp van \"Route tussen punten\" om grafieken te zien.</string>
<string name="route_between_points_desc">Kies hoe de punten verbonden worden: via een rechte lijn, of een route berekenen tussen de punten zoals hieronder aangegeven.</string>
<string name="route_between_points_next_segment_button_desc">Alleen het volgende segment wordt opnieuw berekend met het geselecteerde profiel.</string>
<string name="next_segment">Volgende segment</string>
<string name="all_next_segments">Alle volgende segmenten</string>
@ -3647,11 +3646,11 @@
<string name="save_as_new_track">Bewaar als nieuwe track</string>
<string name="release_3_7">Nieuwe offline pistekaarten
\n
\n • Volledige aanpassing van favorieten en GPX-waypoints - aangepaste kleuren, pictogrammen, vormen
\n • Volledige aanpassingsmogelijkheid van favorieten en GPX-waypoints - aangepaste kleuren, pictogrammen, vormen
\n
\n • Pas de volgorde van items aan in \"Contextmenu\", \"Configureer kaart\" en \"........\"
\n • Mogelijkheid om de volgorde van items aan in \"Contextmenu\", \"Configureer kaart\" en \"Tekenaar\" te veranderen
\n
\n •Wikipedia als een afzonderlijke laag in Kaart configureren, selecteer alleen de benodigde talen
\n • Wikipedia als een afzonderlijke laag in Kaart configureren, selecteer alleen de benodigde talen
\n
\n • Creëer uw eigen POI-filter / kaarten met totale flexibiliteit
\n
@ -3659,27 +3658,27 @@
\n
\n • Volledige GPX-routes van navigatieondersteunende rijstroken en volledige afslaginstructies
\n
\n •Verbeterde UI-formaten op tablets
\n • Verbeterde UI-formaten op tablets
\n
\n •Herstel bugs met RTL
\n • Herstel bugs met RTL
\n
\n</string>
<string name="add_to_a_track">Voeg toe aan een track</string>
<string name="add_segment_to_the_track">Voeg toe aan een trackbestand</string>
<string name="simplified_track">Vereenvoudigde track</string>
<string name="simplified_track_description">Alleen de routelijn wordt opgeslagen, de waypoints worden verwijderd.</string>
<string name="simplified_track_description">Alleen de routetrack wordt opgeslagen, de waypoints worden verwijderd.</string>
<string name="shared_string_done">Bewaar</string>
<string name="reverse_route">Route omkeren</string>
<string name="route_between_points_add_track_desc">Selecteer een track waaraan je een nieuw segment wil toevoegen.</string>
<string name="plan_route_select_track_file_for_open">Selecteer een trackbestand om te openen.</string>
<string name="plan_route_exit_dialog_descr">Weet u zeker dat u alle wijzigingen in de geplande route wilt annuleren door deze te sluiten\?</string>
<string name="plan_route_exit_dialog_descr">Weet u zeker dat u alle wijzigingen in de geplande route wilt annuleren\?</string>
<string name="plan_route_trim_before">Alles wegknippen voor dit punt</string>
<string name="plan_route_trim_after">Alles wegknippen na dit punt</string>
<string name="plan_route_change_route_type_before">Wijzig het routetype voor</string>
<string name="plan_route_change_route_type_after">Wijzig het routetype na</string>
<string name="release_3_8">• Bijgewerkt Plan een route functie: maakt het mogelijk om verschillende navigatietypes per segment te gebruiken en tracks op te nemen
<string name="release_3_8">• Bijgewerkte Plan een route functie: maakt het mogelijk om verschillende navigatietypes per segment te gebruiken en tracks te gebruiken
\n
\n • Nieuw menu voor tracks: selecteer kleur, dikte, weergeven van richtingspijlen, start / finish-pictogrammen.
\n • Nieuw weergavemenu voor tracks: selecteer kleur, dikte, weergeven van richtingspijlen, start / finish-pictogrammen.
\n
\n • Verbeterde zichtbaarheid van fietsknooppunten.
\n
@ -3702,7 +3701,7 @@
<string name="message_graph_will_be_available_after_recalculation">Wacht totdat route herberekend is.
\nNa herberekening is de grafiek zichtbaar.</string>
<string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
<string name="import_track_descr">Kies een trackbestand om te volgen of importeer het, vanaf uw apparaat.</string>
<string name="import_track_descr">Kies een trackbestand om te volgen of importeer het vanaf uw apparaat.</string>
<string name="app_mode_gap">Onderbreking</string>
<string name="shared_string_custom">Aangepast</string>
<string name="perform_oauth_authorization_description">Voer een OAuth-login uit om osm edit functies te gebruiken</string>
@ -3750,7 +3749,7 @@
\n</string>
<string name="what_is_new">Wat is er nieuw</string>
<string name="snowmobile_render_descr">Voor sneeuwscooter, rijden met speciale wegen en tracks.</string>
<string name="set_working_days_to_continue">Stel aantal werkdagen in om door te gaan</string>
<string name="set_working_days_to_continue">Stel werkdagen in om door te gaan</string>
<string name="gpx_split_interval_descr">Selecteer het interval waarmee markeringen met afstand of tijd op de track worden weergegeven.</string>
<string name="gpx_split_interval_none_descr">Selecteer de gewenste splitsingsoptie: op tijd of op afstand.</string>
<string name="track_coloring_solid">Vaste</string>
@ -3769,15 +3768,15 @@
<string name="follow_track_descr">Kies een trackbestand om te volgen</string>
<string name="select_another_track">Selecteer een andere track</string>
<string name="navigate_to_track_descr">Navigeer vanaf mijn positie naar de track</string>
<string name="start_of_the_track">Track starten</string>
<string name="start_of_the_track">Begin van de track</string>
<string name="nearest_point">Dichtstbijzijnde punt</string>
<string name="attach_to_the_roads">Aan wegen koppelen</string>
<string name="delete_address">Adres verwijderen</string>
<string name="add_address">Adres ingeven</string>
<string name="access_hint_enter_address">Adres ingeven</string>
<string name="add_address">Geef adres in</string>
<string name="access_hint_enter_address">Geef adres in</string>
<string name="shared_string_file_name">Bestandsnaam</string>
<string name="number_of_gpx_files_selected_pattern">%s trackbestanden geselecteerd</string>
<string name="disable_recording_once_app_killed_descrp">Zal trackregistratie onderbreken wanneer de app wordt uitgeschakeld (via recente apps). (OsmAnd-achtergrondindicatie verdwijnt uit de Android-berichtenbalk.)</string>
<string name="disable_recording_once_app_killed_descrp">Trackregistratie wordt onderbroken als de app wordt uitgeschakeld (via recente apps). (OsmAnd-achtergrondindicatie verdwijnt uit de Android-berichtenbalk.)</string>
<string name="previous_segment">Vorig segment</string>
<string name="all_previous_segments">Alle voorgaande segmenten</string>
<string name="only_selected_segment_recalc">Alleen het geselecteerde segment wordt opnieuw berekend met het geselecteerde profiel.</string>
@ -3787,7 +3786,7 @@
<string name="one_point_error">Voeg ten minste twee punten toe.</string>
<string name="shared_string_redo">Opnieuw doen</string>
<string name="sort_last_modified">Laatst gewijzigd</string>
<string name="sort_name_descending">Naam: A – Z</string>
<string name="sort_name_descending">Naam: Z - A</string>
<string name="sort_name_ascending">Naam: A – Z</string>
<string name="start_finish_icons">Start/stop iconen</string>
<string name="contour_lines_thanks">Bedankt voor het kopen van \'Contourlijnen\'</string>
@ -3802,7 +3801,7 @@
<string name="development">Ontwikkeling</string>
<string name="use_live_public_transport">OsmAnd Live gegevens</string>
<string name="use_live_routing">OsmAnd Live gegevens</string>
<string name="complex_routing_descr">Twee stappen routeberekening voor autonavigatie.</string>
<string name="complex_routing_descr">Twee-staps routeberekening voor autonavigatie.</string>
<string name="use_native_pt">Eigen ontwikkeling van het openbaar vervoer</string>
<string name="use_native_pt_desc">Schakel over naar Java (veilige) routeberekening voor het openbaar vervoer</string>
<string name="perform_oauth_authorization">Inloggen via OAuth</string>
@ -3898,7 +3897,7 @@
<string name="navigate_point_mgrs">MGRS</string>
<string name="navigate_point_format_mgrs">MGRS</string>
<string name="mgrs_format_descr">OsmAnd gebruikt MGRS, die sterk lijkt op het UTM-NATO-formaat.</string>
<string name="shared_string_resources">Resources</string>
<string name="shared_string_resources">Middelen</string>
<string name="shared_string_search_history">Zoekgeschiedenis</string>
<string name="app_mode_kayak">Kajak</string>
<string name="app_mode_motorboat">Motorboot</string>
@ -3926,7 +3925,7 @@
<string name="routing_attr_allow_intermittent_name">Laat regelmatig droogvallende waterwegen toe</string>
<string name="shared_string_enter_param">Geef een parameter</string>
<string name="keep_it_empty_if_not">Laat leeg indien niet</string>
<string name="analyze_by_intervals">Analyseren met intervallen</string>
<string name="analyze_by_intervals">Analyseer intervallen</string>
<string name="upload_to_openstreetmap">Uploaden naar OpenStreetMap</string>
<string name="edit_track">GPX-track bewerken</string>
<string name="rename_track">GPX-track hernoemen</string>
@ -3938,7 +3937,7 @@
<string name="announcement_time_prepare">Vooraankondiging</string>
<string name="announcement_time_off_route">Afwijking van de route</string>
<string name="announcement_time_arrive">Aankomst op bestemming</string>
<string name="shared_string_turn">Bocht</string>
<string name="shared_string_turn">Afslag</string>
<string name="announcement_time_intervals">Tijd- en afstandsintervallen</string>
<string name="announcement_time_descr">De aankondigingstijd van verschillende aankondigen hangt af van type en huidige snelheid.</string>
<string name="announcement_time_title">Aankondigingstijd</string>
@ -3970,4 +3969,67 @@
<string name="uploading_count">Aan het opladen %1$d van %2$d</string>
<string name="uploaded_count">Opgeladen %1$d van %2$d</string>
<string name="toast_select_edits_for_upload">Selecteer de op te laden wijzigingen</string>
</resources>
<string name="track_recording_description">Weet u zeker dat u de opname wilt stoppen\?
\n(Alle niet opgeslagen gegevens gaan verloren.).</string>
<string name="select_segments">Selecteer segmenten</string>
<string name="select_segments_description">%1$s bevat meer dan één segment, je moet het noodzakelijke deel selecteren om te navigeren.</string>
<string name="segments_count">Segment %1$d</string>
<string name="hillshade_slope_contour_lines">Hillshade / Helling / Contourlijnen</string>
<string name="open_place_reviews_plugin_description">OpenPlaceReviews is een gemeenschaps gestuurd project over openbare plaatsen zoals restaurants, hotels, musea, way-points. Het verzamelt alle openbare informatie over hen, zoals foto\'s, recensies, links naar andere systemen die OpenStreetMap, Wikipedia linken.
\n
\nAlle OpenPlaceReview-gegevens zijn open en voor iedereen beschikbaar: http://openplacereviews.org/data.
\n
\nU kunt meer lezen op: http://openplacereviews.org</string>
<string name="open_place_reviews">OpenPlaceReviews</string>
<string name="opr_use_dev_url">Gebruik test.openplacereviews.org</string>
<string name="login_open_place_reviews">Inloggen op OpenPlaceReviews</string>
<string name="activity_type_water_name">Water</string>
<string name="activity_type_winter_name">Winter</string>
<string name="activity_type_snowmobile_name">Sneeuwscooter</string>
<string name="activity_type_riding_name">Rijden</string>
<string name="activity_type_racing_name">Racen</string>
<string name="activity_type_mountainbike_name">Mountainbike</string>
<string name="activity_type_cycling_name">Fietsen</string>
<string name="activity_type_hiking_name">Trektocht</string>
<string name="activity_type_running_name">Joggen</string>
<string name="activity_type_walking_name">Wandelen</string>
<string name="activity_type_offroad_name">Off-road</string>
<string name="activity_type_motorbike_name">Bromfiets</string>
<string name="activity_type_car_name">Auto\'s</string>
<string name="temporary_conditional_routing_descr">Gebruik de wegen beperkingen die nu actief zijn op de kaart</string>
<string name="routing_attr_short_way_description">Geoptimaliseerde kortere route (energiebesparing)</string>
<string name="routing_attr_driving_style_description">Selecteer een tussenpunt om een kortere, snellere of veiligere route te krijgen</string>
<string name="snap_to_road_descr">Het huidige locatiepictogram wordt vastgeklikt aan de huidige navigatieroute</string>
<string name="map_orientation_threshold_descr">Draai de kaartweergave niet als de snelheid lager is dan een drempelwaarde</string>
<string name="restart">Herstart</string>
<string name="shared_strings_all_regions">Alle regio\'s</string>
<string name="delete_number_files_question">Wis %1$d bestanden\?</string>
<string name="track_recording_stop_without_saving">Stop zonder opslaan</string>
<string name="track_recording_save_and_stop">Bewaar en stop de opname</string>
<string name="track_recording_title">Trackopname gestopt</string>
<string name="on_pause">Pauze</string>
<string name="app_restart_required">Herstarten van de applicatie is vereist om bepaalde instellingen toe te passen.</string>
<string name="routing_attr_height_obstacles_description">Routebepaling kan sterke hellingen vermijden.</string>
<string name="quick_action_coordinates_widget_descr">Een schuifschakelaar om de coördinaten-widget op de kaart weer te geven of te verbergen.</string>
<string name="map_widget_distance_by_tap">Afstand bij het tikken</string>
<string name="latest_openstreetmap_update">Nieuwste OpenStreetMap update beschikbaar:</string>
<string name="updated">Geüpdatet: %s</string>
<string name="last_time_checked">Laatste keer gecontroleerd: %s</string>
<string name="update_frequency">Update frequentie</string>
<string name="live_update_frequency_week_variant">Kaartupdates worden elke week gecontroleerd. Volgende keer %1$s over %2$s.</string>
<string name="live_update_frequency_day_variant">Kaartupdates worden elke dag gecontroleerd. Volgende keer %1$s over %2$s.</string>
<string name="live_update_frequency_hour_variant">Kaartupdates worden elk uur gecontroleerd. Volgende keer %1$s over %2$s.</string>
<string name="delete_updates">Wis alle updates</string>
<string name="live_update_delete_updates_msg">Weet u zeker dat u alle %s live updates wilt verwijderen\?</string>
<string name="purchases">Aankopen</string>
<string name="select_category_descr">Selecteer een categorie of voeg een nieuwe toe</string>
<string name="track_recording_will_be_continued">De opname wordt voortgezet.</string>
<string name="copy_poi_name">Kopieer POI-naam</string>
<string name="quick_action_show_hide_title">Tonen/verbergen</string>
<string name="shared_string_interval">Interval</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Verberg natuurreservaten, beschermde gebieden en grenzen van nationale parken</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Natuurlijke grenzen</string>
<string name="track_has_no_altitude">De track bevat geen hoogtegegevens.</string>
<string name="track_has_no_speed">De track bevat geen snelheidsgegevens.</string>
<string name="select_another_colorization">Selecteer een ander inkleuring.</string>
</resources>

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

@ -3891,4 +3891,7 @@
<string name="poi_gladed_yes">Satisfeito: sim</string>
<string name="poi_piste_name">Nome da pista</string>
<string name="poi_piste_ski_jump">Salto de esqui</string>
<string name="poi_conference_centre">Centro de conferências</string>
<string name="poi_local_ref">Geodesia</string>
<string name="poi_geodesist">Geodesia</string>
</resources>

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

@ -2204,7 +2204,6 @@
<string name="route_altitude">Altitude da rota</string>
<string name="routing_attr_relief_smoothness_factor_name">Selecionar a flutuação de altimetria</string>
<string name="routing_attr_height_obstacles_name">Usar dados altimétricos</string>
<string name="rendering_attr_depthContours_description">Mostrar curvas e pontos batimétricos.</string>
<string name="rendering_attr_depthContours_name">Batimetria náutica</string>
<string name="rendering_attr_contourDensity_description">Densidade das curvas de nível</string>
@ -2802,7 +2801,7 @@
<string name="show_along_the_route">Mostrar ao longo da rota</string>
<string name="simulate_navigation">Simular navegação</string>
<string name="choose_track_file_to_follow">Escolha o arquivo de trilha para seguir</string>
<string name="voice_announcements">Avisos por voz</string>
<string name="voice_announcements">Instruções de voz</string>
<string name="intermediate_destinations">Destinos intermediários</string>
<string name="arrive_at_time">Chega às %1$s</string>
<string name="lang_gn_py">Guarani</string>
@ -3159,7 +3158,7 @@
<string name="shared_string_other">Outros</string>
<string name="voice_announces_info">Anúncios de voz ocorrem apenas durante a navegação.</string>
<string name="voice_announces_descr">Instruções e anúncios de navegação</string>
<string name="voice_announces">Avisos por voz</string>
<string name="voice_announces">Instruções de voz</string>
<string name="route_parameters_descr">Configurar parâmetros de rota</string>
<string name="route_parameters">Parâmetros de rota</string>
<string name="application_profile_changed">Perfil do aplicativo alterado para \"%s\"</string>
@ -4000,4 +3999,45 @@
<string name="activity_type_walking_name">A pé</string>
<string name="activity_type_offroad_name">Fora de estrada</string>
<string name="activity_type_car_name">Carro</string>
<string name="select_segments">Selecionar os segmentos</string>
<string name="select_segments_description">%1$s contém mais de um segmento, você precisa selecionar a parte necessária para a navegação.</string>
<string name="temporary_conditional_routing_descr">Use as restrições de estrada que estão ativas agora no mapa</string>
<string name="routing_attr_short_way_description">Rota mais curta otimizada (economia de energia)</string>
<string name="routing_attr_driving_style_description">Selecione o propósito de condução para obter um trajeto mais curto, mais rápido ou mais seguro</string>
<string name="snap_to_road_descr">O ícone de localização atual será ajustado à rota de navegação atual</string>
<string name="map_orientation_threshold_descr">Não gire a visualização do mapa se a velocidade for inferior a um limite</string>
<string name="restart">Reiniciar</string>
<string name="shared_strings_all_regions">Todas as regiões</string>
<string name="delete_number_files_question">Excluir %1$d arquivos\?</string>
<string name="track_recording_stop_without_saving">Pare sem salvar</string>
<string name="track_recording_save_and_stop">Salvar e parar a gravação</string>
<string name="track_recording_title">Gravação de trilha interrompida</string>
<string name="track_recording_description">Tem certeza de que deseja interromper a gravação\?
\nTodos os dados não salvos serão perdidos.</string>
<string name="on_pause">Em pausa</string>
<string name="app_restart_required">É necessário reiniciar o aplicativo para aplicar algumas configurações.</string>
<string name="routing_attr_height_obstacles_description">O roteamento pode evitar subidas fortes.</string>
<string name="quick_action_coordinates_widget_descr">Uma alternância para mostrar ou ocultar o widget de coordenadas no mapa.</string>
<string name="latest_openstreetmap_update">Última atualização do OpenStreetMap disponível:</string>
<string name="updated">Atualizado: %s</string>
<string name="last_time_checked">Última vez verificado: %s</string>
<string name="update_frequency">Frequência de atualização</string>
<string name="live_update_frequency_week_variant">As atualizações do mapa serão verificadas todas as semanas. Próxima vez %1$s em %2$s.</string>
<string name="live_update_frequency_day_variant">As atualizações do mapa serão verificadas todos os dias. Próxima vez %1$s em %2$s.</string>
<string name="live_update_frequency_hour_variant">As atualizações do mapa serão verificadas a cada hora. Da próxima vez, %1$s em %2$s.</string>
<string name="delete_updates">Apagar atualizações</string>
<string name="live_update_delete_updates_msg">Tem certeza de que deseja excluir todas as atualizações ao vivo de %s\?</string>
<string name="purchases">Compras</string>
<string name="select_category_descr">Selecione a categoria ou adicione uma nova</string>
<string name="track_recording_will_be_continued">A gravação continuará.</string>
<string name="copy_poi_name">Copiar nome de POI</string>
<string name="quick_action_show_hide_title">Mostrar/Ocultar</string>
<string name="shared_string_interval">Intervalo</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Ocultar reserva natural, áreas protegidas e limites de parque nacional</string>
<string name="map_widget_distance_by_tap">Distância por toque</string>
<string name="track_has_no_altitude">A trilha não contém dados de altitude.</string>
<string name="track_has_no_speed">A trilha não contém dados de velocidade.</string>
<string name="select_another_colorization">Selecione outro tipo de colorização.</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Limites naturais</string>
<string name="segments_count">Segmento %1$d</string>
</resources>

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

@ -467,7 +467,7 @@
<string name="poi_information">Информация</string>
<string name="poi_clock">Часы</string>
<string name="poi_travel_agent">Турагентство;Туристическое агентство</string>
<string name="poi_viewpoint">Место с хорошим видом;Обзорная площадка</string>
<string name="poi_viewpoint">Обзорная площадка;Место с хорошим видом</string>
<string name="poi_camp_site">Место для лагеря</string>
<string name="poi_caravan_site">Ночлег</string>
<string name="poi_picnic_site">Место для пикника</string>
@ -1464,7 +1464,7 @@
<string name="poi_memorial_plaque">Доска</string>
<string name="poi_memorial_statue">Статуя</string>
<string name="poi_memorial_stone">Камень</string>
<string name="poi_memorial_stele">Стелла</string>
<string name="poi_memorial_stele">Стела</string>
<string name="poi_memorial_bust">Бюст</string>
<string name="poi_memorial_blue_plaque">Синяя табличка</string>
<string name="poi_memorial_jizo">Дзидзо</string>
@ -2785,7 +2785,7 @@
<string name="poi_organic_no">Отсутствуют</string>
<string name="poi_organic_only">Исключительно</string>
<string name="poi_traffic_mirror">Дорожное зеркало</string>
<string name="poi_diplomatic_filter">Вид</string>
<string name="poi_diplomatic_filter">Дипломатическое учреждение</string>
<string name="poi_diplomatic_consulate">Консульство</string>
<string name="poi_diplomatic_consulate_general">Генеральное консульство</string>
<string name="poi_diplomatic_honorary_consulate">Почётное консульство</string>

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

@ -139,7 +139,6 @@
<string name="routing_attr_driving_style_name">Стиль езды</string>
<string name="routing_attr_relief_smoothness_factor_name">Колебания высоты ландшафта</string>
<string name="routing_attr_height_obstacles_name">Использовать данные о высотах</string>
<string name="quick_action_duplicates">Действие переименовано в %1$s, чтобы избежать дублирования.</string>
<string name="quick_action_duplicate">Обнаружен дубликат имени</string>
<string name="quick_action_showhide_favorites_descr">Переключатель, чтобы показать или скрыть избранные точки на карте.</string>
@ -3438,7 +3437,7 @@
<string name="restore_all_profile_settings">Восстановить все настройки профиля\?</string>
<string name="saving_new_profile">Сохранение нового профиля</string>
<string name="profile_backup_failed">Не удалось создать резервную копию профиля.</string>
<string name="clear_recorded_data_warning">Очистить записанные данные\?</string>
<string name="clear_recorded_data_warning">Вы уверены, что хотите очистить записанные данные\?</string>
<string name="monitoring_min_speed_descr_side_effect">Побочный эффект: в треке будут отсутствовать все участки, где не соблюдён критерий минимальной скорости (например где вы толкаете велосипед вверх по крутому склону). Также не будет информации о периодах покоя, например во время отдыха. Это влияет на любой анализ или последующую обработку, например при попытке определить общую продолжительность поездки, время в движении или среднюю скорость.</string>
<string name="monitoring_min_accuracy_descr_side_effect">Побочный эффект: в результате фильтрации по точности, точки могут быть полностью пропущены, например, под мостами, под деревьями, между высокими зданиями или при определённых погодных условиях.</string>
<string name="monitoring_min_accuracy_descr_remark">Примечание: при включении GPS непосредственно перед записью точность определения первой точки может быть снижена, поэтому мы рассматриваем добавление секундной задержки перед записью точки (либо записи лучшей из трёх последовательных точек и т. д.), но пока это не реализовано.</string>
@ -3725,7 +3724,7 @@
<string name="route_between_points_warning_desc">Далее необходимо выбрать профиль навигации для определения порогового расстояния и привязки маршрута к ближайшей разрешённой дороге.</string>
<string name="route_between_points_desc">Выберите, как соединять точки: прямой линией или строить маршрут по заданному профилю.</string>
<string name="in_case_of_reverse_direction">При обратном направлении</string>
<string name="plan_route_exit_dialog_descr">Все изменения будут утеряны.</string>
<string name="plan_route_exit_dialog_descr">Вы уверены, что хотите отменить все изменения в запланированном маршруте\?</string>
<string name="street_level_imagery">Уличная фотосъёмка</string>
<string name="shared_string_save_as_gpx">Сохранить как новый файл трека</string>
<string name="add_segment_to_the_track">Добавить в файл трека</string>
@ -3903,7 +3902,7 @@
\n
\n• Добавлен OAuth метод аутентификации для OpenStreetMap, улучшен интерфейс диалоговых OSM.
\n
\n • Поддержка пользовательских цветов для избранного и путевых точек трека.
\n• Поддержка пользовательских цветов для избранных и путевых точек.
\n
\n</string>
<string name="copy_address">Скопировать адрес</string>
@ -3999,4 +3998,49 @@
\n
\nВы можете узнать больше на: http://openplacereviews.org</string>
<string name="activity_type_racing_name">Гонки</string>
<string name="app_restart_required">Для применения некоторых настроек необходимо перезапустить приложение.</string>
<string name="map_widget_distance_by_tap">Расстояние по нажатию</string>
<string name="latest_openstreetmap_update">Последнее доступное обновление OpenStreetMap:</string>
<string name="updated">Обновлено: %s</string>
<string name="last_time_checked">Последний раз проверено: %s</string>
<string name="update_frequency">Частота обновления</string>
<string name="live_update_frequency_week_variant">Обновления карт будут проверяться каждую неделю. В следующий раз %1$s в %2$s.</string>
<string name="live_update_frequency_day_variant">Обновления карт будут проверяться каждый день. Следующий раз %1$s в %2$s.</string>
<string name="live_update_frequency_hour_variant">Обновления карт будут проверяться каждый час. Следующий раз %1$s в %2$s.</string>
<string name="delete_updates">Удалить обновления</string>
<string name="live_update_delete_updates_msg">Вы уверены, что хотите удалить все live обновления для %s\?</string>
<string name="purchases">Покупки</string>
<string name="quick_action_show_hide_title">Показать/скрыть</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Природные границы</string>
<string name="track_has_no_altitude">Трек не содержит данных о высоте.</string>
<string name="track_has_no_speed">Трек не содержит данных о скорости.</string>
<string name="select_another_colorization">Выберите другой тип окраски.</string>
<string name="snap_to_road_descr">Значок текущего местоположения будет привязан к маршруту навигации</string>
<string name="track_recording_will_be_continued">Запись будет продолжена.</string>
<string name="select_segments">Выберите сегменты</string>
<string name="select_segments_description">%1$s содержит более одного сегмента, необходимо выбрать нужную часть для навигации.</string>
<string name="segments_count">Сегмент %1$d</string>
<string name="temporary_conditional_routing_descr">Использовать дорожные ограничения, которые сейчас активны на карте</string>
<string name="routing_attr_short_way_description">Оптимизированный более короткий маршрут (экономия топлива/энергии)</string>
<string name="map_orientation_threshold_descr">Не менять ориентацию карты, если скорость меньше порогового значения</string>
<string name="restart">Перезапустить</string>
<string name="shared_strings_all_regions">Все регионы</string>
<string name="track_recording_stop_without_saving">Остановить без сохранения</string>
<string name="track_recording_save_and_stop">Сохранить и остановить запись</string>
<string name="track_recording_title">Запись трека остановлена</string>
<string name="track_recording_description">Вы уверены, что хотите остановить запись\?
\nВсе несохраненные данные будут потеряны.</string>
<string name="on_pause">На паузе</string>
<string name="routing_attr_height_obstacles_description">Позволяет избегать больших подъемов при навигации.</string>
<string name="quick_action_coordinates_widget_descr">Переключатель для отображения или скрытия виджета координат.</string>
<string name="select_category_descr">Выберите категорию или добавьте новую</string>
<string name="copy_poi_name">Копировать имя POI</string>
<string name="shared_string_interval">Интервал</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Скрыть природный заповедник, особо охраняемые природные территории и границы национального парка</string>
<string name="gpx_upload_trackable_visibility_descr">«Отслеживаемый» означает, что трек не будет виден в любых общедоступных списках, но обработанные точки из него будут доступны через public GPS API c временными отметками. Другие пользователи смогут лишь загружать обработанные точки из вашего трека. При этом трек не будет ассоциирован с вами.</string>
<string name="gpx_upload_identifiable_visibility_descr">«Идентифицируемый» означает, что трек будет виден всем в разделе треки пользователя, загрузившего трек и в общем списке треков, доступным на закладке GPS-треки. Другие пользователи смогут загрузить данные трека и в свойствах трека будет указано имя пользователя, загрузившего трек. Отметки времени точек трека доступны через public GPS API.</string>
<string name="gpx_upload_public_visibility_descr">«Общедоступный» означает, что трек будет виден всем в разделе треки пользователя, загрузившего трек и в общем списке треков, доступным на закладке GPS-треки. Отметки времени точек трека не доступны через public GPS API. Однако, другие пользователи по-прежнему могут загрузить файл трека из общего списка треков и данные трека будут иметь все отметки времени.</string>
<string name="gpx_upload_private_visibility_descr">«Частный» означает, что трек не будет виден в любых общедоступных списках, но точки из него будут доступны через public GPS API без отметок времени.</string>
<string name="routing_attr_driving_style_description">Выберите цель, чтобы проложить к ней короткий, быстрый или безопасный маршрут</string>
<string name="delete_number_files_question">Удалить %1$d файлов\?</string>
</resources>

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

@ -3891,4 +3891,7 @@
<string name="poi_gladed_yes">Cun àrbores: eja</string>
<string name="poi_piste_name">Nùmene de sa pista</string>
<string name="poi_piste_ski_jump">Brincu cun sos iscì</string>
<string name="poi_local_ref">Riferimentu locale</string>
<string name="poi_geodesist">Geodesista</string>
<string name="poi_conference_centre">Tzentru pro cunferèntzias</string>
</resources>

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

@ -1370,7 +1370,7 @@
<string name="no_internet_connection">Impossìbile iscarrigare. Pro praghere còmpida sa connessione tua pro sighire.</string>
<string name="download_tab_downloads">Totu sos iscarrigamentos</string>
<string name="download_tab_updates">Agiornamentos</string>
<string name="download_tab_local">Iscarrigadas</string>
<string name="download_tab_local">Installadas</string>
<string name="navigate_point_zone">Zona</string>
<string name="navigate_point_northing">In diretzione Nord</string>
<string name="navigate_point_easting">In diretzione Est</string>
@ -2163,7 +2163,6 @@
<string name="rendering_attr_depthContours_name">Curvas de profondidade nàuticas</string>
<string name="rendering_attr_depthContours_description">Ammustra sas lìnias de profondidade.</string>
<string name="routing_attr_height_obstacles_name">Imprea sos datos de s\'artària</string>
<string name="routing_attr_driving_style_name">Istile de ghia</string>
<string name="route_altitude">Artària de su caminu</string>
<string name="altitude_descent">Falada</string>
@ -3163,7 +3162,7 @@
<string name="vehicle_parameters">Paràmetros de su veìculu</string>
<string name="voice_announces_info">Sos annùntzios vocales benint riproduidos petzi durante sa navigatzione.</string>
<string name="voice_announces_descr">Istrutziones e annùntzios de navigatzione</string>
<string name="voice_announces">Annùntzios vocales</string>
<string name="voice_announces">Indicatziones vocales</string>
<string name="screen_alerts">Avisos in s\'ischermu</string>
<string name="route_parameters_descr">Cunfigura sos paràmetros de s\'àndala</string>
<string name="route_parameters">Paràmetros de s\'àndala</string>
@ -4002,4 +4001,45 @@
<string name="activity_type_offroad_name">Foras de camineras</string>
<string name="activity_type_motorbike_name">Moto</string>
<string name="activity_type_car_name">Màchina</string>
<string name="select_segments">Ischerta sos segmentos</string>
<string name="select_segments_description">%1$s cuntenet prus de unu segmentu. Depes ischertare sa parte chi serbit pro sa navigatzione.</string>
<string name="segments_count">Segmentu %1$d</string>
<string name="temporary_conditional_routing_descr">Imprea sas restritziones de sos caminos chi sunt ativas como in sa mapa</string>
<string name="routing_attr_short_way_description">Àndala prus curtza otimizada (rispàrmiu energèticu)</string>
<string name="routing_attr_driving_style_description">Ischerta sa modalidade pro sa ghia pro otènnere un\'àndala prus curtza, prus lestra o prus segura</string>
<string name="snap_to_road_descr">S\'icona de sa positzione atuale s\'at a ligare a s\'àndala de navigatzione atuale</string>
<string name="map_orientation_threshold_descr">Non rodes sa vista de sa mapa si sa lestresa est in suta de unu lìmite</string>
<string name="restart">Torra a incumintzare</string>
<string name="shared_strings_all_regions">Totu sas regiones</string>
<string name="delete_number_files_question">Iscantzellare %1$d documentos\?</string>
<string name="track_recording_stop_without_saving">Acabba chene sarvare</string>
<string name="track_recording_save_and_stop">Sarva e acabba sa registratzione</string>
<string name="track_recording_title">Registratzione de sa rasta firmada</string>
<string name="track_recording_description">Ses seguru de chèrrere acabbare cun sa registratzione\?
\nTotu sos datos non sarvados s\'ant a pèrdere.</string>
<string name="on_pause">In pàusa</string>
<string name="app_restart_required">Pro aplicare unas cantas impostatziones diat pòdere èssere netzessàriu torrare a allùghere s\'aplicatzione.</string>
<string name="routing_attr_height_obstacles_description">Su càrculu de s\'àndala diat pòdere evitare artziadas mannas.</string>
<string name="quick_action_coordinates_widget_descr">Unu butone pro ammustrare o cuare su widget de sas coordinadas in sa mapa.</string>
<string name="latest_openstreetmap_update">Ùrtimu agiornamentu de OpenStreetMap a disponimentu:</string>
<string name="updated">Agiornadu: %s</string>
<string name="last_time_checked">Ùrtima verìfica: %s</string>
<string name="update_frequency">Frecuèntzia de sos agiornamentos</string>
<string name="live_update_frequency_week_variant">Sos agiornamentos de sa mapa ant a èssere verificados cada chida. Sa borta chi benit: %1$s in %2$s.</string>
<string name="live_update_frequency_day_variant">Sos agiornamentos de sa mapa ant a èssere verificados cada die. Sa borta chi benit: %1$s in %2$s.</string>
<string name="live_update_frequency_hour_variant">Sos agiornamentos de sa mapa ant a èssere verificados cada ora. Sa borta chi benit: %1$s in %2$s.</string>
<string name="delete_updates">Iscantzella sos agiornamentos</string>
<string name="live_update_delete_updates_msg">Ses seguru de chèrrere iscantzellare totu sos %s agiornamentos in direta\?</string>
<string name="select_category_descr">Ischerta una categoria o annanghe·nde una noa</string>
<string name="track_recording_will_be_continued">Sa registratzione at a sighire.</string>
<string name="copy_poi_name">Còpia su nùmene de su PDI</string>
<string name="quick_action_show_hide_title">Ammustra/cua</string>
<string name="shared_string_interval">Intervallu</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Cua sas làcanas de sas riservas naturales, de sas àreas amparadas e de sos parcos natzionales</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Làcanas naturales</string>
<string name="track_has_no_altitude">Sa rasta non cuntenet datos de artària.</string>
<string name="track_has_no_speed">Sa rasta non cuntenet datos de lestresa.</string>
<string name="select_another_colorization">Ischerta un\'àtera casta de coloratzione.</string>
<string name="purchases">Còmporas</string>
<string name="map_widget_distance_by_tap">Distàntzia pro tocu</string>
</resources>

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

@ -29,7 +29,7 @@
<string name="poi_deli">Delikatesy</string>
<string name="poi_farm">Poľnonákup</string>
<string name="poi_greengrocer">Ovocie/Zelenina</string>
<string name="poi_seafood">Ryby</string>
<string name="poi_seafood">Ryby a morské plody</string>
<string name="poi_confectionery">Sladkosti</string>
<string name="poi_ice_cream">Zmrzlina</string>
<string name="poi_supermarket">Supermarket</string>
@ -237,9 +237,9 @@
<string name="poi_government">Vládne orgány</string>
<string name="poi_office_administrative">Lokálne úrady</string>
<string name="poi_customs">Colná správa</string>
<string name="poi_city">Mesto (nad 100 tis.obyv.)</string>
<string name="poi_town">Mesto (10 tis.-100 tis.obyv.)</string>
<string name="poi_village">Obec (200-10 tis.obyv.)</string>
<string name="poi_city">Veľkomesto</string>
<string name="poi_town">Mesto</string>
<string name="poi_village">Obec</string>
<string name="poi_hamlet">Osada</string>
<string name="poi_isolated_dwelling">Samota/kopanica</string>
<string name="poi_suburb">Mestský obvod</string>
@ -269,7 +269,7 @@
<string name="poi_lawyer">Právnik</string>
<string name="poi_office_telecommunication">Telekomunikácie</string>
<string name="poi_ngo">Nezisková organizácia</string>
<string name="poi_townhall">Radnica</string>
<string name="poi_townhall">Radnica/Obecný úrad</string>
<string name="poi_employment_agency">Personálna agentúra</string>
<string name="poi_research">Výskumný ústav</string>
<string name="poi_it">Informačné technológie</string>
@ -2013,7 +2013,7 @@
<string name="poi_ramp_bicycle_no">Rampa pre bicykle: nie</string>
<string name="poi_ramp_luggage_no">Rampa pre batožinu: nie</string>
<string name="poi_defibrillator">Defibrilátor</string>
<string name="poi_site_type_city">Mesto</string>
<string name="poi_site_type_city">Veľkomesto</string>
<string name="poi_prison_camp">Bývalý väzenský tábor</string>
<string name="poi_concentration_camp">Typ: koncentračný tábor</string>
<string name="poi_pow_camp">Typ: tábor vojnových zajatcov</string>
@ -3704,4 +3704,40 @@
<string name="poi_health_specialty_depth_psychology_yes">Hlbinná psychológia</string>
<string name="poi_health_specialty_chiropractic_yes">Chiropraxia</string>
<string name="poi_health_specialty_obstetrics_postnatal_yes">Pôrodníctvo (postnatálne)</string>
<string name="poi_radar_tower">Radarová veža</string>
<string name="poi_parking_layby">Malé odpočívadlo</string>
<string name="poi_parking_sheds">Prístrešky</string>
<string name="poi_parking_rooftop">Na streche</string>
<string name="poi_gpx_point">Bod GPX</string>
<string name="poi_summit_register_no">Vrcholová kniha: nie</string>
<string name="poi_summit_register_yes">Vrcholová kniha: áno</string>
<string name="poi_piste_status_closed">Stav zjazdovky: zatvorená</string>
<string name="poi_piste_status_open">Stav zjazdovky: otvorená</string>
<string name="poi_patrolled_no">Strážené: nie</string>
<string name="poi_patrolled_yes">Strážené: áno</string>
<string name="poi_piste_name">Názov zjazdovky</string>
<string name="poi_piste_ski_jump">Lyžiarsky skok</string>
<string name="poi_wildlife_crossing_bat_tunnel">Netopierí tunel</string>
<string name="poi_wildlife_crossing_bat_bridge">Netopierí most</string>
<string name="poi_wildlife_crossing">Ekodukt</string>
<string name="poi_swimming_area">Plavecká zóna</string>
<string name="poi_lavoir">Miesto na pranie šiat</string>
<string name="poi_waste_transfer_station">Prekladisko odpadu</string>
<string name="poi_ranger_station">Sídlo lesnej správy</string>
<string name="poi_water_source_lake">Jazero</string>
<string name="poi_water_source_river">Rieka</string>
<string name="poi_water_source_well">Studňa</string>
<string name="poi_water_source_powered_pump">Poháňané čerpadlo</string>
<string name="poi_water_source_water_tank">Vodná nádrž</string>
<string name="poi_water_source_tap">Kohútik</string>
<string name="poi_water_source_water_works">Vodáreň</string>
<string name="poi_water_source_tube_well">Potrubná studňa</string>
<string name="poi_vaccination_covid19">Očkovanie: COVID19</string>
<string name="poi_health_specialty_vaccination_yes">Očkovanie</string>
<string name="poi_lifeguard_base">Stanica záchranárov</string>
<string name="poi_siren">Siréna</string>
<string name="poi_local_ref">Číslo nástupišťa</string>
<string name="poi_geodesist">Geodet</string>
<string name="poi_conference_centre">Konferenčné centrum</string>
<string name="poi_couloir">Horský žľab</string>
</resources>

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

@ -1956,7 +1956,7 @@
<string name="move_marker_bottom_sheet_title">Posuňte mapu pre zmenu pozície značky</string>
<!-- string name="lat_lon_pattern">Šírka: %1$.5f Dĺžka: %2$.5f</string -->
<string name="lang_hu_formal">Maďarsky (formálne)</string>
<string name="current_track">Súčasná stopa</string>
<string name="current_track">Aktuálna stopa</string>
<string name="change_markers_position">Zmeniť polohu značky</string>
<string name="lang_es_us">Španielsky (Americká)</string>
<string name="lang_be_by">Bielorusky (Latinka)</string>
@ -2161,7 +2161,6 @@
<string name="rendering_attr_depthContours_description">Zobraziť hĺbkové úrovne a body.</string>
<string name="rendering_attr_depthContours_name">Námorné hĺbkové vrstevnice</string>
<string name="routing_attr_height_obstacles_name">Použiť údaje nadmorskej výšky</string>
<string name="route_altitude">Prevýšenie trasy</string>
<string name="altitude_descent">Klesanie</string>
<string name="altitude_ascent">Stúpanie</string>
@ -4000,4 +3999,45 @@
<string name="activity_type_offroad_name">Jazda mimo cesty</string>
<string name="activity_type_motorbike_name">Motorka</string>
<string name="activity_type_car_name">Auto</string>
<string name="select_segments">Zvoliť úseky</string>
<string name="select_segments_description">%1$s obsahuje viac než jeden segment, pre navigáciu musíte zvoliť potrebnú časť.</string>
<string name="segments_count">Úsek %1$d</string>
<string name="temporary_conditional_routing_descr">Použiť cestné obmedzenia, ktoré sú teraz aktívne na mape</string>
<string name="routing_attr_driving_style_description">Zvoľte účel jazdy pre získanie kratšej, rýchlejšej alebo bezpečnejšej trasy</string>
<string name="map_orientation_threshold_descr">Neotáčať mapu, ak je rýchlosť nižšia ako hranica</string>
<string name="restart">Reštartovať</string>
<string name="shared_strings_all_regions">Všetky regióny</string>
<string name="delete_number_files_question">Zmazať %1$d súborov\?</string>
<string name="track_recording_stop_without_saving">Zastaviť bez uloženia</string>
<string name="track_recording_save_and_stop">Uložiť a zastaviť záznam</string>
<string name="track_recording_title">Záznam stopy zastavený</string>
<string name="track_recording_description">Naozaj chcete zastaviť záznam\?
\nVšetky neuložené údaje budú stratené.</string>
<string name="on_pause">Pri pozastavení</string>
<string name="app_restart_required">Niektoré nastavenia vyžadujú reštart aplikácie.</string>
<string name="quick_action_coordinates_widget_descr">Prepínať na zobrazenie alebo skrytie nástroja Súradnice na mape.</string>
<string name="map_widget_distance_by_tap">Vzdialenosť stlačením</string>
<string name="latest_openstreetmap_update">Najnovšia dostupná aktualizácia OpenStreetMap:</string>
<string name="updated">Aktualizované: %s</string>
<string name="last_time_checked">Posledná kontrola: %s</string>
<string name="update_frequency">Frekvencia aktualizácií</string>
<string name="live_update_frequency_week_variant">Aktualizácie mapy budú kontrolované každý týždeň. Nasledujúca kontrola %1$s o %2$s.</string>
<string name="live_update_frequency_day_variant">Aktualizácie mapy budú kontrolované každý deň. Nasledujúca kontrola %1$s o %2$s.</string>
<string name="live_update_frequency_hour_variant">Aktualizácie mapy budú kontrolované každú hodinu. Nasledujúca kontrola %1$s o %2$s.</string>
<string name="delete_updates">Odstrániť aktualizácie</string>
<string name="live_update_delete_updates_msg">Naozaj chcete zmazať všetky živé aktualizácie (%s)\?</string>
<string name="select_category_descr">Zvoľte kategóriu alebo pridajte novú</string>
<string name="track_recording_will_be_continued">Záznam bude pokračovať.</string>
<string name="copy_poi_name">Kopírovať názov POI</string>
<string name="quick_action_show_hide_title">Zobraziť/skryť</string>
<string name="shared_string_interval">Interval</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Skryť hranice prírodných rezervácií, národných parkov a chránených oblastí</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Hranice prírodných oblastí</string>
<string name="track_has_no_altitude">Stopa neobsahuje údaje o nadmorskej výške.</string>
<string name="track_has_no_speed">Stopa neobsahuje údaje o rýchlosti.</string>
<string name="select_another_colorization">Prosím zvoľte iný typ zafarbenia.</string>
<string name="purchases">Nákupy</string>
<string name="routing_attr_short_way_description">Optimalizovaná kratšia trasa (úspora energie)</string>
<string name="snap_to_road_descr">Ikona aktuálnej polohy bude prichytená k navigačnej trase</string>
<string name="routing_attr_height_obstacles_description">Výpočet trasy sa môže vyhnúť strmým stúpaniam.</string>
</resources>

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

@ -1522,7 +1522,6 @@
<string name="index_item_depth_points_northern_hemisphere">Поморске дубинске тачке северне полулопте</string>
<string name="download_depth_countours">Поморске изобате</string>
<string name="shared_string_color">Боја</string>
<string name="auto_split_recording_title">Самоподели снимке после размака</string>
<string name="auto_split_recording_descr">Почни нови одсечак после размака од 6 минута, нову путању после размака од 2 сата, или нови фајл после дужег размака ако је дан измењен.</string>
<string name="rendering_attr_showMtbRoutes_name">Прикажи путеве планинских бицикли</string>
@ -3903,4 +3902,81 @@
\n • Прилагођене боје за омиљене и путне тачаке стаза
\n
\n</string>
<string name="activity_type_water_name">Вода</string>
<string name="activity_type_winter_name">Зима</string>
<string name="activity_type_snowmobile_name">Моторне санке</string>
<string name="activity_type_riding_name">Јахање</string>
<string name="activity_type_racing_name">Тркање</string>
<string name="activity_type_mountainbike_name">Планинска бицикла</string>
<string name="activity_type_cycling_name">Бицикла</string>
<string name="activity_type_hiking_name">Планинарење</string>
<string name="activity_type_running_name">Трчање</string>
<string name="activity_type_walking_name">Пешачење</string>
<string name="activity_type_motorbike_name">Мотор</string>
<string name="activity_type_car_name">Аутомобил</string>
<string name="map_orientation_threshold_descr">Не ротирај карту ако је брзина испод доње границе</string>
<string name="restart">Рестарт</string>
<string name="shared_strings_all_regions">Све регије</string>
<string name="delete_number_files_question">Обриши %1$d фајлова\?</string>
<string name="track_recording_stop_without_saving">Заустави без снимања</string>
<string name="track_recording_save_and_stop">Сачувај и заустави снимање</string>
<string name="track_recording_title">Снимање путање заустављено</string>
<string name="track_recording_description">Да ли сте сигурни да желите да зауставите снимање\?
\nСве несачувани подаци ће бити изгубљени.</string>
<string name="app_restart_required">Потребан је рестарт апликације да се нека подешавања примене.</string>
<string name="on_pause">Паузирано</string>
<string name="updated">Ажурирано: %s</string>
<string name="last_time_checked">Последње време провере: %s</string>
<string name="update_frequency">Учесталост ажурирања</string>
<string name="live_update_frequency_week_variant">Провера ажурирања карте ће бити сваких недељу дана. Следеће време %1$s за %2$s.</string>
<string name="live_update_frequency_day_variant">Провера ажурирања карте ће бити сваког дана. Следеће време %1$s за %2$s.</string>
<string name="live_update_frequency_hour_variant">Провера ажурирања карте ће бити на сваких сат времена. Следеће време %1$s за %2$s.</string>
<string name="delete_updates">Обриши ажурирања</string>
<string name="live_update_delete_updates_msg">Да ли сте сигурни да желите да обришете %s ажурирања уживо\?</string>
<string name="purchases">Куповине</string>
<string name="select_category_descr">Одаберите категорију или додајте нову</string>
<string name="track_recording_will_be_continued">Снимање ће бити настављено.</string>
<string name="copy_poi_name">Копирај име тачке од интереса</string>
<string name="quick_action_show_hide_title">Прикажи/сакриј</string>
<string name="shared_string_interval">Интервал</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Сакриј резервате природе, заштићена подручја и границе националних паркова</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Природне границе</string>
<string name="track_has_no_altitude">Путања не садржи податке о надморској висини.</string>
<string name="track_has_no_speed">Путања не садржи податке о брзини.</string>
<string name="opr_use_dev_url">Користи test.openplacereviews.org</string>
<string name="temporary_conditional_routing_descr">Користи ограничења на путу тренутно активна на карти</string>
<string name="routing_attr_short_way_description">Оптимизовани краћи пут (уштеда енергије)</string>
<string name="routing_attr_driving_style_description">Одаберите разлог путовања да добијете краћи, бржи или сигурнији пут</string>
<string name="snap_to_road_descr">Иконица тренутне локације ће бити прилепљена за тренутно навођени пут</string>
<string name="routing_attr_height_obstacles_description">Рутирање може да заобиђе велике узбрдице.</string>
<string name="select_another_colorization">Одаберите други тип бојења.</string>
<string name="announcement_time_title">Време објаве</string>
<string name="start_recording">Започни снимање</string>
<string name="show_track_on_map">Прикажи путању на карти</string>
<string name="routing_engine_vehicle_type_wheelchair">Инвалидска колица</string>
<string name="routing_engine_vehicle_type_hiking">Планинарење</string>
<string name="routing_engine_vehicle_type_walking">Пешачење</string>
<string name="routing_engine_vehicle_type_cycling_electric">Екетрични бициклизам</string>
<string name="routing_engine_vehicle_type_cycling_mountain">Планински бициклизам</string>
<string name="routing_engine_vehicle_type_cycling_road">Друмски бициклизам</string>
<string name="routing_engine_vehicle_type_cycling_regular">Стаднардни бициклизам</string>
<string name="routing_engine_vehicle_type_hgv">Теретни камион</string>
<string name="routing_engine_vehicle_type_small_truck">Камионет</string>
<string name="routing_engine_vehicle_type_truck">Камион</string>
<string name="routing_engine_vehicle_type_scooter">Скутер</string>
<string name="routing_engine_vehicle_type_racingbike">Тркачки бицикл</string>
<string name="routing_engine_vehicle_type_mtb">MTB</string>
<string name="message_server_error">Серверска грешка: %1$s</string>
<string name="message_name_is_already_exists">Име већ постоји</string>
<string name="context_menu_read_full">Прочитај у целости</string>
<string name="context_menu_edit_descr">Измени опис</string>
<string name="copy_to_map_favorites">Копирај у омиљене</string>
<string name="upload_photo">Отпремам</string>
<string name="upload_photo_completed">Отпремање завршено</string>
<string name="uploading_count">Отпрема се %1$d од %2$d</string>
<string name="select_segments">Одаберите сегменте</string>
<string name="select_segments_description">%1$s садржи више од једног сегмента, морате одабрати тражени део за навођење.</string>
<string name="segments_count">Сегмент %1$d</string>
<string name="uploaded_count">Отпремљено %1$d од %2$d</string>
<string name="toast_select_edits_for_upload">Одаберите измене за отпремање</string>
</resources>

106
OsmAnd/res/values-sv/phrases.xml
View file

@ -316,7 +316,7 @@
<string name="poi_fuel_electricity">El</string>
<string name="poi_aeroway_fuel">Flygbränsle</string>
<string name="poi_waterway_fuel">Bensinstation för båtar</string>
<string name="poi_electricity_combined_charging">Laddstation</string>
<string name="poi_electricity_combined_charging">Laddstation; Laddningsstation för elfordon; Laddningsstation för el; Elektrisk laddningspunkt; Laddningspunkt; Elektronisk laddstation; Utrustning för elförsörjning av elfordon</string>
<string name="poi_vehicle_ramp">Fordonsramp</string>
<string name="poi_compressed_air">Tryckluft</string>
<string name="poi_parking">Parkering</string>
@ -627,7 +627,7 @@
<string name="poi_horse_racing">Hästkapplöpning</string>
<string name="poi_ice_skating">Skridskoåkning</string>
<string name="poi_ice_stock">Islager</string>
<string name="poi_korfbal">Korfbal</string>
<string name="poi_korfbal">Korfball</string>
<string name="poi_sport_motor">Motorsport</string>
<string name="poi_sport_multi">Multisport</string>
<string name="poi_orienteering">Orientering</string>
@ -780,8 +780,8 @@
<string name="poi_internet_access_service">Tillgång till Internet: service</string>
<string name="poi_internet_access_yes">Tillgång till Internet: ja</string>
<string name="poi_internet_access_no">Tillgång till Internet: nej</string>
<string name="poi_internet_access_fee_yes">Tillgång till Internet - avgift</string>
<string name="poi_internet_access_fee_no">Tillgång till Internet - ingen avgift</string>
<string name="poi_internet_access_fee_yes">Tillgång till internet: avgift</string>
<string name="poi_internet_access_fee_no">Tillgång till internet: ingen avgift</string>
<string name="poi_monastery">Kloster</string>
<string name="poi_religious">Religiöst område</string>
<string name="poi_wayside_cross">Vägkors</string>
@ -1342,7 +1342,7 @@
<string name="poi_pump_no">Ingen pump</string>
<string name="poi_pump_yes">Ja</string>
<string name="poi_water_characteristic_mineral">Mineral</string>
<string name="poi_water_characteristic_mud">Vattenegenskap: lera</string>
<string name="poi_water_characteristic_mud">Lera</string>
<string name="poi_water_characteristic_sulfuric">Svavel</string>
<string name="poi_water_point">Vattenpunkt</string>
<string name="poi_information_guidepost">Vägstolpe</string>
@ -1382,7 +1382,7 @@
<string name="poi_tactile_paving_yes">Ja</string>
<string name="poi_tactile_paving_no">Utan taktil beläggning</string>
<string name="poi_traffic_signals_sound_yes">Ja</string>
<string name="poi_traffic_signals_sound_no">Nej</string>
<string name="poi_traffic_signals_sound_no">Ljud: nej</string>
<string name="poi_traffic_signals_sound_walk">Endast när gång är tillåtet</string>
<string name="poi_rescue_station">Räddningsstation</string>
<string name="poi_services">Serviceområde</string>
@ -1669,13 +1669,13 @@
<string name="poi_service_electrical">Reparation av elektriska fordon</string>
<string name="poi_motorcycle_repair">Mc-reparation</string>
<string name="poi_self_service_yes">Ja</string>
<string name="poi_self_service_no">Ingen självbetjäning</string>
<string name="poi_self_service_no">Nej</string>
<string name="poi_automated_yes">Ja</string>
<string name="poi_automated_no">Inte automatisk</string>
<string name="poi_full_service_yes">Full service</string>
<string name="poi_brushless_yes">Ja</string>
<string name="poi_brushless_no">Borstlös: nej</string>
<string name="poi_car_wash_no">Biltvätt: ingen</string>
<string name="poi_car_wash_no">Nej</string>
<string name="poi_public_bath">Offentligt bad</string>
<string name="poi_male_yes">Hane</string>
<string name="poi_male_no">Förbjudet för män</string>
@ -2055,7 +2055,7 @@
<string name="poi_fuel_100ll">100LL bränsle</string>
<string name="poi_fuel_autogas">Autogas</string>
<string name="poi_fuel_jeta1">Jet A-1 bränsle</string>
<string name="poi_fuel_adblue">AdBlue bränsle</string>
<string name="poi_fuel_adblue">Dieselavgasvätska</string>
<string name="poi_fuel_wood">Bränsle: trä</string>
<string name="poi_fuel_charcoal">Bränsle: träkol</string>
<string name="poi_fuel_coal">Bränsle: kol</string>
@ -3165,4 +3165,92 @@
<string name="poi_surface_artificial_turf">Konstgräs</string>
<string name="poi_surface_decoturf">Hard court</string>
<string name="poi_surface_metal_grid">Metallgitter</string>
<string name="poi_location_overhead">Plats: ovan</string>
<string name="poi_location_overground">Plats: ovan jord</string>
<string name="poi_location_underwater">Plats: under vattnet</string>
<string name="poi_location_underground">Plats: underjordisk</string>
<string name="poi_government_social_security">Social trygghet</string>
<string name="poi_winter_room_no">Vinterrum: nej</string>
<string name="poi_winter_room_yes">Vinterrum: ja</string>
<string name="poi_motorcycle_type_standard">Standard</string>
<string name="poi_motorcycle_type_dualsport">Enduro</string>
<string name="poi_motorcycle_type_offroad">Off-road</string>
<string name="poi_motorcycle_type_chopper">Chopper</string>
<string name="poi_motorcycle_type_sportbike">Sport motorcykel</string>
<string name="poi_motorcycle_type_scooter">Skoter</string>
<string name="poi_motorcycle_clothes_no">Motorcykelkläder: nej</string>
<string name="poi_motorcycle_clothes_yes">Motorcykelkläder</string>
<string name="poi_motorcycle_tyres_no">Däck: nej</string>
<string name="poi_motorcycle_tyres_yes">Däck</string>
<string name="poi_motorcycle_parts_no">Delar: nej</string>
<string name="poi_motorcycle_parts_yes">Delar</string>
<string name="poi_motorcycle_repair_yes">Reparation</string>
<string name="poi_motorcycle_repair_no">Reparation: nej</string>
<string name="poi_motorcycle_rental_no">Uthyrning: nej</string>
<string name="poi_motorcycle_rental_yes">Uthyrning</string>
<string name="poi_motorcycle_sales_yes_used">Försäljning: ja, begagnad</string>
<string name="poi_motorcycle_sales_used">Försäljning: begagnad</string>
<string name="poi_motorcycle_sales_no">Försäljning: nej</string>
<string name="poi_motorcycle_sales_yes">Försäljning</string>
<string name="poi_coworking_space">Samarbetsyta</string>
<string name="poi_cuisine_souvlaki">Souvlaki</string>
<string name="poi_cuisine_piadina">Piadina</string>
<string name="poi_cuisine_savory_pancakes">Salta pannkakor</string>
<string name="poi_cuisine_soba">Soba</string>
<string name="poi_cuisine_buschenschank">Buschenschank</string>
<string name="poi_cuisine_heuriger">Heuriger</string>
<string name="poi_cuisine_gastropub">Gastropub</string>
<string name="poi_cuisine_beef_bowl">Gyudon</string>
<string name="poi_cuisine_ramen">Ramen</string>
<string name="poi_public_bookcase_type_reading_box">Typ: läsruta</string>
<string name="poi_xmas_url">Jul: hemsida</string>
<string name="poi_xmas_location">Jul: plats</string>
<string name="poi_xmas_opening_hours">Jul: öppettider</string>
<string name="poi_xmas_note">Jul: Obs</string>
<string name="poi_xmas_day_date">Xmas: period för evenemanget</string>
<string name="poi_fire_operator">Brandoperatör</string>
<string name="poi_diplomatic_high_commission">Hög provision</string>
<string name="poi_diplomatic_permanent_mission">Permanent representation</string>
<string name="poi_mdf">Huvudfördelningsram</string>
<string name="poi_generator_output_electricity_no">Effekt (el): nej</string>
<string name="poi_atm_yes">ATM: ja</string>
<string name="poi_health_specialty_radiotherapy_yes">Strålbehandling</string>
<string name="poi_denotation">Beteckning</string>
<string name="poi_generator_source_biomass">Energikälla: biomassa</string>
<string name="reddit">Reddit</string>
<string name="poi_historic_tank">Historisk tank</string>
<string name="poi_recycling_small_electrical_appliances">Små elektriska apparater</string>
<string name="poi_diplomatic_services_citizen_services_filter">Medborgartjänster</string>
<string name="poi_diplomatic_services_immigrant_visas_filter">Invandrarvisum</string>
<string name="poi_diplomatic_services_non_immigrant_visas_filter">Visum som inte är invandrare</string>
<string name="poi_liaison_filter">Förbindelse</string>
<string name="poi_consulate_filter">Konsulat</string>
<string name="poi_embassy_filter">Ambasad</string>
<string name="poi_departures_board">Avgångstavlan</string>
<string name="poi_drinking_water_refill">Påfyllning av dricksvatten</string>
<string name="poi_traffic_signals_arrow">Pil</string>
<string name="poi_traffic_signals_vibration">Vibrationer</string>
<string name="poi_fire_hydrant_pressure_filter">Tryck</string>
<string name="poi_video_telephone">Video</string>
<string name="poi_sms">SMS</string>
<string name="poi_volcano_status">Status</string>
<string name="poi_volcano_type">Typ</string>
<string name="poi_bath_open_air">Utomhus</string>
<string name="poi_bath_type">Typ</string>
<string name="poi_cash_withdrawal_bank_card">Kontantuttag</string>
<string name="poi_access_disabled">Tillgänglighet för funktionshindrade</string>
<string name="poi_access_goods">Tillgång för lätta lastbilar</string>
<string name="poi_access_hgv">HGV-åtkomst</string>
<string name="poi_access_mofa">Mofa-åtkomst</string>
<string name="poi_access_moped">Mopedåtkomst</string>
<string name="poi_access_motorcycle">Motorcykelåtkomst</string>
<string name="poi_access_trailer">Släpvangsåtkomst</string>
<string name="poi_access_motorhome">Husbilsåtkomst</string>
<string name="poi_access_caravan">Husvangsåtkomst</string>
<string name="poi_access_bus">Bussåtkomst</string>
<string name="poi_snowmobile_filter">Snöskoteråtkomst</string>
<string name="poi_climbing_crag">Ja</string>
<string name="poi_climbing_crag_filter">Klättring</string>
<string name="poi_rtsa_scale_filter">Svårighetskategori</string>
<string name="poi_park_ride">Parkera och åk</string>
</resources>

245
OsmAnd/res/values-sv/strings.xml
View file

@ -159,7 +159,7 @@
<string name="left">till vänster</string>
<string name="front_left">framåt till vänster</string>
<string name="towards">mot</string>
<string name="altitude">Höjd</string>
<string name="altitude">Höjd över havet</string>
<string name="map_widget_renderer">Kartutseende</string>
<string name="osmand_parking_position_description_add">Att hämta bilen på:</string>
<string name="osmand_parking_pm">em</string>
@ -419,11 +419,11 @@ Nyttjat utrymme är {1} MB.
<string name="preferred_locale">Visningsspråk</string>
<string name="shared_string_next">Nästa</string>
<string name="shared_string_previous">Föregående</string>
<string name="unit_of_length_descr">Ändra enheter för avstånd.</string>
<string name="unit_of_length">Enheter för avstånd</string>
<string name="si_mi_feet">Eng. mil/fot</string>
<string name="si_mi_yard">Eng. mil/yard</string>
<string name="si_km_m">Kilometer/meter</string>
<string name="unit_of_length_descr">Ändra vad avstånd mäts i.</string>
<string name="unit_of_length">Enhet för längd</string>
<string name="si_mi_feet">Miles/fot</string>
<string name="si_mi_yard">Miles/yard</string>
<string name="si_km_m">Kilomter/meter</string>
<string name="yard">yd</string>
<string name="send_location_way_choose_title">Dela platsen med</string>
<string name="send_location_sms_pattern">Plats: %1$s\n%2$s</string>
@ -1326,7 +1326,7 @@ Nyttjat utrymme är {1} MB.
<string name="version_settings">Versioner</string>
<string name="shared_string_gpx_points">Punkter</string>
<string name="shared_string_disabled">Inaktiverad</string>
<string name="shared_string_enabled">Aktiverad</string>
<string name="shared_string_enabled">Aktiverat</string>
<string name="edit_group">Redigera grupp</string>
<string name="plugin_install_needs_network">En Internetuppkoppling krävs för att installera denna modul.</string>
<string name="shared_string_enable">Aktivera</string>
@ -1391,7 +1391,7 @@ Nyttjat utrymme är {1} MB.
<string name="shared_string_control_start">Starta</string>
<string name="shared_string_control_stop">Stoppa</string>
<string name="shared_string_import">Importera</string>
<string name="shared_string_export">Exportera</string>
<string name="shared_string_export">Export</string>
<string name="shared_string_more">Mer…</string>
<string name="shared_string_more_actions">Fler åtgärder</string>
<string name="shared_string_do_not_show_again">Visa inte nästa gång</string>
@ -1403,7 +1403,7 @@ Nyttjat utrymme är {1} MB.
<string name="shared_string_unexpected_error">Ett oväntat fel uppstod</string>
<string name="shared_string_action_template">Åtgärd {0}</string>
<string name="shared_string_close">Stäng</string>
<string name="shared_string_exit">Avsluta</string>
<string name="shared_string_exit">Utgång</string>
<string name="shared_string_show">Visa</string>
<string name="shared_string_show_all">Visa alla</string>
<string name="shared_string_show_on_map">Visa på kartan</string>
@ -1605,12 +1605,12 @@ Long %2$s</string>
<string name="favourites_context_menu_add">Lägg till favorit</string>
<string name="default_speed_system_descr">Ange enhet för hastighet.</string>
<string name="default_speed_system">Enhet för hastighet</string>
<string name="si_nm">Sjömil</string>
<string name="si_kmh">Kilometer i timmen</string>
<string name="si_mph">Engelska mil i timmen</string>
<string name="si_m_s">Meter i sekunden</string>
<string name="si_nm">Distansminuter</string>
<string name="si_kmh">Kilometer per timme</string>
<string name="si_mph">Miles per timme</string>
<string name="si_m_s">Meter per sekund</string>
<string name="si_min_km">Minuter per kilometer</string>
<string name="si_min_m">Minuter per engelsk mil</string>
<string name="si_min_m">Minuter per mile</string>
<string name="si_nm_h">Sjömil i timmen (knop)</string>
<string name="shared_string_trip_recording">Inspelning av resa</string>
<string name="shared_string_navigation">Navigering</string>
@ -1618,9 +1618,9 @@ Long %2$s</string>
<string name="favorite_category_add_new">Lägg till ny</string>
<string name="favorite_category_select">Välj kategori</string>
<string name="count_of_lines">Antal rader</string>
<string name="nm">nmi</string>
<string name="nm">di</string>
<string name="nm_h">nmi/h</string>
<string name="min_mile">min/m</string>
<string name="min_mile">min/mi</string>
<string name="min_km">min/km</string>
<string name="m_s">m/s</string>
<string name="srtm_plugin_disabled">Konturlinjer inaktiverade</string>
@ -1676,7 +1676,7 @@ Long %2$s</string>
<string name="world_map_download_descr">Baskarta över världen (täcker hela världen med låg zoomningsgrad) saknas eller är gammal. Hämta gärna denna karta för en global översikt.</string>
<string name="shared_string_upload">Skicka</string>
<string name="map_legend">Teckenförklaring</string>
<string name="shared_string_update">Uppdatera</string>
<string name="shared_string_update">Uppdatering</string>
<string name="feedback">Återkoppling</string>
<string name="read_more">Läs mer</string>
<string name="whats_new">Nyheter</string>
@ -1728,7 +1728,7 @@ Long %2$s</string>
<string name="action_modify">Åtgärd ändra</string>
<string name="action_delete">Åtgärd ta bort</string>
<string name="shared_string_near">Nära</string>
<string name="shared_string_hide">Dölj</string>
<string name="shared_string_hide">Göm</string>
<string name="av_video_quality_low">Lägsta kvalitet</string>
<string name="av_video_quality_high">Högsta kvalitet</string>
<string name="av_video_quality">Videokvalitet</string>
@ -1940,7 +1940,7 @@ Om du tycker om OsmAnd och OSM och vill stödja dem så är detta ett utmärkt s
<string name="skip_map_downloading">Hoppa över nerladdning av kartor</string>
<string name="search_another_country">Välj en annan region</string>
<string name="osmand_plus_banner_desc">Obegränsade nedladdningar av kartor, uppdateringar och Wikipedia-plugin.</string>
<string name="si_mi_meters">Mil/metrar</string>
<string name="si_mi_meters">Miles/meter</string>
<string name="first_usage_wizard_desc">Låt OsmAnd avgöra din plats och föreslå kartor att hämta för den regionen.</string>
<string name="location_not_found">Platsen hittades inte</string>
<string name="no_inet_connection">Ingen Internetanslutning</string>
@ -2055,7 +2055,7 @@ Vänligen tillhandahåll fullständig kod</string>
<string name="route_altitude">Rutthöjd</string>
<string name="altitude_descent">Sänkning</string>
<string name="altitude_ascent">Stigning</string>
<string name="average_altitude">Genomsnittshöjd</string>
<string name="average_altitude">Genomsnittlig höjd</string>
<string name="shared_string_time">Tid</string>
<string name="total_distance">Total sträcka</string>
<string name="shared_string_time_span">Tidsspann</string>
@ -2064,7 +2064,7 @@ Vänligen tillhandahåll fullständig kod</string>
<string name="shared_string_end_time">Sluttid</string>
<string name="shared_string_color">Färg</string>
<string name="select_gpx_folder">Välj mapp för GPX-filer</string>
<string name="average_speed">Medelhastighet</string>
<string name="average_speed">Genomsnittlig hastighet</string>
<string name="shared_string_time_moving">Tid i rörelse</string>
<string name="max_speed">Högsta hastighet</string>
<string name="lang_sr_latn">Serbiska (latin)</string>
@ -2093,7 +2093,6 @@ Vänligen tillhandahåll fullständig kod</string>
<string name="quick_action_map_overlay_switch">"Kartöverlägget har ändrats till \"%s\"."</string>
<string name="quick_action_btn_tutorial_descr">Tryck länge och dra knappen för att ändra dess position på skärmen.</string>
<string name="routing_attr_height_obstacles_name">Använd höjddata</string>
<string name="rendering_attr_depthContours_description">Visa djupkonturer och punkter.</string>
<string name="shared_string_slope">Sluttning</string>
<string name="altitude_range">Höjdområde</string>
@ -2882,7 +2881,7 @@ Vänligen tillhandahåll fullständig kod</string>
<string name="route_parameters_descr">Konfigurera ruttparametrar</string>
<string name="route_parameters">Ruttparametrar</string>
<string name="application_profile_changed">Appprofil ändrat till \"%s\"</string>
<string name="logcat_buffer">Logcat-buffert</string>
<string name="logcat_buffer">Logcat buffer</string>
<string name="plugins_settings">Tilläggsinställningar</string>
<string name="app_mode_utv">Sida vid sida</string>
<string name="files_copied">%1$d filer kopierades (%2$s).</string>
@ -3069,5 +3068,203 @@ Vänligen tillhandahåll fullständig kod</string>
<string name="routing_attr_avoid_footways_name">Undvik resor till</string>
<string name="search_download_wikipedia_maps">Ladda ner Wikipedia kartor</string>
<string name="plugin_wikipedia_description">Få information om sevärdheter från Wikipedia, en inbunden samling av offline artiklar om ställen och destinationer.</string>
<string name="track_show_start_finish_icons"></string>
<string name="track_show_start_finish_icons">Visa start och mål-ikoner</string>
<string name="logcat_buffer_descr">Kontrollera och dela detaljerade loggar för appen</string>
<string name="osm_edit_closed_note">Stängd OSM not</string>
<string name="set_working_days_to_continue">Ställ in arbetsdagar för att fortsätta</string>
<string name="route_between_points">Rutt mellan punkter</string>
<string name="plan_a_route">Planera en rutt</string>
<string name="add_to_a_track">Lägg till i ett spår</string>
<string name="gpx_split_interval_descr">Välj intervall med vilket markeringar med avstånd eller tid på spåret ska visas.</string>
<string name="gpx_split_interval_none_descr">Välj önskat delningsalternativ: efter tid eller efter avstånd.</string>
<string name="track_coloring_solid">Fast</string>
<string name="plan_route_import_track">Importera spår</string>
<string name="plan_route_open_existing_track">Öppna befintligt spår</string>
<string name="plan_route_create_new_route">Skapa ny rutt</string>
<string name="plan_route_select_track_file_for_open">Välj en spårfil att öppna.</string>
<string name="overwrite_track">Skriv över spår</string>
<string name="save_as_new_track">Spara som nytt spår</string>
<string name="reverse_route">Omvänd rutt</string>
<string name="route_between_points_whole_track_button_desc">Hela spåret beräknas om med den valda profilen.</string>
<string name="route_between_points_next_segment_button_desc">Endast nästa segment beräknas om med den valda profilen.</string>
<string name="route_between_points_desc">Välj hur du ska ansluta punkterna, med en rak linje, eller beräkna en rutt mellan dem enligt nedan.</string>
<string name="whole_track">Hela spåret</string>
<string name="route_between_points_warning_desc">Klicka sedan på ditt spår till närmaste tillåtna väg med en av dina navigationsprofiler för att använda detta alternativ.</string>
<string name="threshold_distance">Tröskelavstånd</string>
<string name="route_between_points_add_track_desc">Välj en spårfil som du vill lägga till det nya segmentet till.</string>
<string name="in_case_of_reverse_direction">Vid omvänd riktning</string>
<string name="shared_string_save_as_gpx">Spara som ny spårfil</string>
<string name="add_segment_to_the_track">Lägg till en spårfil</string>
<string name="shared_string_gpx_files">Spår</string>
<string name="layer_gpx_layer">Spår</string>
<string name="show_gpx">Spår</string>
<string name="save_track_to_gpx_globally">Logga spår till GPX-fil</string>
<string name="shared_string_gpx_route">Spårrutt</string>
<string name="empty_state_my_tracks">Lägg till spårfil</string>
<string name="context_menu_item_add_waypoint">Lägg till spår waypoint</string>
<string name="quick_action_add_gpx">Lägg till spår waypoint</string>
<string name="marker_save_as_track">Spara som spårfil</string>
<string name="follow_track_descr">Välj spårfil att följa</string>
<string name="import_track_descr">Välj spårfil att följa eller importera spåret från din enhet.</string>
<string name="navigate_to_track_descr">Navigera från min position till spåret</string>
<string name="pass_whole_track_descr">Punkt på spåret för att navigera</string>
<string name="attach_to_the_roads">Fäst på vägarna</string>
<string name="disable_recording_once_app_killed_descrp">Spårloggning pausar när appen dödas (via senaste appar). (OsmAnd-bakgrundsindikationen försvinner från Android-meddelandefältet.)</string>
<string name="save_global_track_interval_descr">Ange loggningsintervallet för den allmänna spårinspelningen (aktiverad via widgeten \'Trip recording\' på kartan).</string>
<string name="release_3_8">• Uppdaterad Planera en ruttfunktion: gör det möjligt att använda olika navigeringstyper per segment och inkludera spår
\n
\n • Ny utseendemeny för spår: välj färg, tjocklek, visningspilar, start- och målikoner
\n
\n • Förbättrad synlighet för cykelnoder.
\n
\n • Spår kan nu tappas, har snabbmeny med grundläggande information.
\n
\n • Förbättrade sökalgoritmer
\n
\n • Förbättrade alternativ för följespår i Navigation
\n
\n • Fixade problem med import / export av profilinställningar
\n
\n</string>
<string name="contour_lines_thanks">Tack för att du köpte \"Konturlinjer\"</string>
<string name="osm_live_payment_subscription_management_hw">Ditt AppGallery-konto debiteras vid köpbekräftelsen.
\n
\nAbonnemanget förlängs automatiskt såvida det inte sägs upp före förnyelsedatumet. Ditt konto debiteras för förnyelseperioden (månad / tre månader / år) endast på förnyelsedatumet.
\n
\nDu kan hantera och avbryta dina prenumerationer i dina AppGallery-inställningar.</string>
<string name="use_native_pt">Inbyggd kollektivtrafikutveckling</string>
<string name="use_native_pt_desc">Byt till Java (säker) ruttberäkning för kollektivtrafik</string>
<string name="osm_edits_view_descr">Visa alla dina ändringar som ännu inte har laddats upp eller OSM-buggar i %1$s. Redan uppladdade ändringar visas inte längre.</string>
<string name="open_street_map_login_mode">Du måste logga in för att ladda upp nya eller modifierade ändringar.
\n
\nDu kan logga in med den säkra OAuth-metoden eller använda ditt användarnamn och lösenord.</string>
<string name="gpx_upload_public_visibility_descr">\"Offentligt\" betyder att spårningen visas offentligt i dina GPS-spår, i offentliga GPS-spårningar och i den offentliga spårningslistan med tidsstämplar i råform. Data som visas via API hänvisar inte till din spårningssida. Tracepoint-tidsstämplar är inte tillgängliga via det offentliga GPS-API:et och spårpunkter är inte kronologiskt ordnade.</string>
<string name="add_online_routing_engine">Lägg till online-dirigeringsmotorn</string>
<string name="edit_online_routing_engine">Redigera online-dirigeringsmotorn</string>
<string name="shared_string_subtype">Subtyp</string>
<string name="shared_string_vehicle">Fordon</string>
<string name="shared_string_api_key">API-nyckel</string>
<string name="shared_string_server_url">Sever URL</string>
<string name="shared_string_enter_param">Ange param</string>
<string name="keep_it_empty_if_not">Behåll tom om inte</string>
<string name="online_routing_example_hint">URL med alla parametrar kommer att se ut så här:</string>
<string name="test_route_calculation">Testa ruttberäkning</string>
<string name="routing_engine_vehicle_type_driving">Körning</string>
<string name="routing_engine_vehicle_type_foot">Fot</string>
<string name="routing_engine_vehicle_type_bike">Cykel</string>
<string name="routing_engine_vehicle_type_car">Bil</string>
<string name="copy_address">Kopiera adress</string>
<string name="online_routing_engine">Online-routningsmotor</string>
<string name="online_routing_engines">Online-routningsmotorer</string>
<string name="shared_string_folders">Mappar</string>
<string name="select_folder">Välj mapp</string>
<string name="select_folder_descr">Välj mapp eller lägg till en ny</string>
<string name="shared_string_empty">Tom</string>
<string name="analyze_by_intervals">Analysera delad intervall</string>
<string name="upload_to_openstreetmap">Ladda upp till OpenStreetMap</string>
<string name="edit_track">Redigera spår</string>
<string name="rename_track">Byt namn på spår</string>
<string name="change_folder">Byt mapp</string>
<string name="shared_string_sec">sek</string>
<string name="announcement_time_passing">Passerar</string>
<string name="announcement_time_approach">Närma sig</string>
<string name="announcement_time_prepare_long">Långt förberedan</string>
<string name="announcement_time_prepare">Förbereda</string>
<string name="announcement_time_off_route">Av rutten</string>
<string name="announcement_time_arrive">Anländer till destinationen</string>
<string name="shared_string_turn">Sväng</string>
<string name="announcement_time_intervals">Tid- och avstånds-intervaller</string>
<string name="announcement_time_descr">Meddelandetid för olika röstmeddelanden beror på typ, aktuell navigationshastighet och standardnavigeringshastighet.</string>
<string name="announcement_time_title">Meddelandetid</string>
<string name="start_recording">Starta inspelning</string>
<string name="show_track_on_map">Visa spår på kartan</string>
<string name="routing_engine_vehicle_type_wheelchair">Rullstol</string>
<string name="routing_engine_vehicle_type_hiking">Vandring</string>
<string name="routing_engine_vehicle_type_walking">Gång</string>
<string name="routing_engine_vehicle_type_cycling_electric">Elektrisk cykling</string>
<string name="routing_engine_vehicle_type_cycling_mountain">Bergscykling</string>
<string name="routing_engine_vehicle_type_cycling_road">Vägcyckling</string>
<string name="routing_engine_vehicle_type_cycling_regular">Vanlig cyckling</string>
<string name="routing_engine_vehicle_type_hgv">Lastbil</string>
<string name="routing_engine_vehicle_type_small_truck">Liten lastbil</string>
<string name="routing_engine_vehicle_type_truck">Lastbil</string>
<string name="routing_engine_vehicle_type_scooter">Skoter</string>
<string name="routing_engine_vehicle_type_racingbike">Racercykel</string>
<string name="routing_engine_vehicle_type_mtb">MTB</string>
<string name="message_server_error">Serverfel: %1$s</string>
<string name="message_name_is_already_exists">Namnet finns redan</string>
<string name="delete_online_routing_engine">Ta bort den här online-dirigeringsmodulen\?</string>
<string name="context_menu_read_full">Läs allt</string>
<string name="context_menu_edit_descr">Redigera beskrivning</string>
<string name="delete_waypoints">Ta bort waypoints</string>
<string name="copy_to_map_markers">Kopiera till kartmarkeringar</string>
<string name="copy_to_map_favorites">Kopiera till favoriter</string>
<string name="upload_photo">Uppladdning</string>
<string name="upload_photo_completed">Uppladdning klar</string>
<string name="uploading_count">Laddar upp %1$d av %2$d</string>
<string name="select_segments">Välj segment</string>
<string name="select_segments_description">%1$s innehåller mer än ett segment, du måste välja önskad del för navigering.</string>
<string name="segments_count">Segment %1$d</string>
<string name="open_place_reviews_plugin_description">OpenPlaceReviews är ett community-drivet projekt om offentliga platser som restauranger, hotell, museer, och waypoints. Det samlar all offentlig information om dem så som foton, recensioner, länkar till andra systemlänkar OpenStreetMap, Wikipedia.
\n
\nAll OpenPlaceReview-data är öppen och tillgänglig för alla: http://openplacereviews.org/data.
\n
\nDu kan läsa mer på: http://openplacereviews.org</string>
<string name="uploaded_count">Uppladdat %1$d av %2$d</string>
<string name="toast_select_edits_for_upload">Välj redigeringar för uppladdning</string>
<string name="hillshade_slope_contour_lines">Berg relief/ sluttning / konturlinjer</string>
<string name="open_place_reviews">OpenPlaceReviews</string>
<string name="opr_use_dev_url">Använd test.openplacereviews.org</string>
<string name="login_open_place_reviews">Logga in på OpenPlaCereViews</string>
<string name="activity_type_water_name">Vatten</string>
<string name="activity_type_winter_name">Vinter</string>
<string name="activity_type_snowmobile_name">Snöskoter</string>
<string name="activity_type_riding_name">Ridning</string>
<string name="activity_type_racing_name">Racing</string>
<string name="activity_type_mountainbike_name">Mountainbike</string>
<string name="activity_type_cycling_name">Cyckling</string>
<string name="activity_type_hiking_name">Vandring</string>
<string name="activity_type_running_name">Löpning</string>
<string name="activity_type_walking_name">Gående</string>
<string name="activity_type_offroad_name">Offroad</string>
<string name="activity_type_motorbike_name">Motorcyckel</string>
<string name="activity_type_car_name">Bil</string>
<string name="temporary_conditional_routing_descr">Använd vägbegränsningar som är aktiva nu på kartan</string>
<string name="routing_attr_short_way_description">Optimerad kortare rutt (energibesparing)</string>
<string name="routing_attr_driving_style_description">Välj körsyfte för att få kortare, snabbare eller säkrare rutt</string>
<string name="snap_to_road_descr">Ikonen för aktuell plats snappas till den aktuella navigeringsvägen</string>
<string name="map_orientation_threshold_descr">Rotera inte kartvyn om hastigheten är mindre än en tröskelvärde</string>
<string name="restart">Omstart</string>
<string name="shared_strings_all_regions">Alla regioner</string>
<string name="delete_number_files_question">Ta bort %1$d filer\?</string>
<string name="track_recording_stop_without_saving">Stoppa utan att spara</string>
<string name="track_recording_save_and_stop">Spara och stoppa inspelningen</string>
<string name="track_recording_title">Spårinspelningen stoppades</string>
<string name="track_recording_description">Är du säker på att du vill stoppa inspelningen\?
\nAll osparad data kommer att gå förlorad.</string>
<string name="on_pause">Pausad</string>
<string name="app_restart_required">Omstart av program krävs för att tillämpa vissa inställningar.</string>
<string name="routing_attr_height_obstacles_description">Ruttning kan undvika branta sluttningar.</string>
<string name="quick_action_coordinates_widget_descr">En toggel för att visa eller dölja koordinatwidgeten på kartan.</string>
<string name="map_widget_distance_by_tap">Avståndsmätning genom att trycka</string>
<string name="latest_openstreetmap_update">Senaste tillgängliga OpenStreetMap-uppdateringen:</string>
<string name="updated">Uppdaterad: %s</string>
<string name="last_time_checked">Senast kontrollerad: %s</string>
<string name="update_frequency">Uppdateringsfrekvens</string>
<string name="live_update_frequency_week_variant">Kartuppdateringar kommer att kontrolleras varje vecka. Nästa gång %1$s i %2$s.</string>
<string name="live_update_frequency_day_variant">Kartuppdateringar kommer att kontrolleras varje dag. Nästa gång %1$s i %2$s.</string>
<string name="live_update_frequency_hour_variant">Kartuppdateringar kontrolleras varje timme. Nästa gång %1$s i %2$s.</string>
<string name="delete_updates">Ta bort uppdateringar</string>
<string name="live_update_delete_updates_msg">Är du säker på att du vill ta bort alla %s liveuppdateringar\?</string>
<string name="purchases">Inköp</string>
<string name="select_category_descr">Välj en kategori eller skapa en ny</string>
<string name="track_recording_will_be_continued">Inspelningen kommer fortsätta.</string>
<string name="copy_poi_name">Kopiera POI namn</string>
<string name="quick_action_show_hide_title">Visa/Göm</string>
<string name="shared_string_interval">Intervall</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Dölj naturreservat, skyddade områden och nationalparkgränser</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Naturgränser</string>
<string name="track_has_no_altitude">Spåret innehåller inte höjddata.</string>
<string name="track_has_no_speed">Spåret innehåller inte hastighetsdata.</string>
<string name="select_another_colorization">Välj en annan typ av färgning.</string>
</resources>

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

@ -4028,9 +4028,9 @@
<string name="updated">Оновлено: %s</string>
<string name="last_time_checked">Востаннє перевірено: %s</string>
<string name="update_frequency">Частота оновлень</string>
<string name="live_update_frequency_week_variant">Наявність оновлень мап перевірятиметься щотижня. Наступного разу%1$s в %2$s.</string>
<string name="live_update_frequency_hour_variant">Наявність оновлень мап перевірятиметься щогодини. Наступного разу%1$s в %2$s.</string>
<string name="live_update_frequency_day_variant">Наявність оновлень мап перевірятиметься щодня. Наступного разу%1$s в %2$s.</string>
<string name="live_update_frequency_week_variant">Наявність оновлень мап перевірятиметься щотижня. Наступного разу %1$s в %2$s.</string>
<string name="live_update_frequency_hour_variant">Наявність оновлень мап перевірятиметься щогодини. Наступного разу %1$s в %2$s.</string>
<string name="live_update_frequency_day_variant">Наявність оновлень мап перевірятиметься щодня. Наступного разу %1$s в %2$s.</string>
<string name="delete_updates">Видалити оновлення</string>
<string name="live_update_delete_updates_msg">Ви впевнені, що хочете видалити всі %s поточні оновлення\?</string>
<string name="purchases">Покупки</string>
@ -4042,4 +4042,6 @@
<string name="track_has_no_altitude">Трек не містить даних про висоту.</string>
<string name="track_has_no_speed">Трек не містить даних про швидкість.</string>
<string name="select_another_colorization">Виберіть інший тип забарвлення.</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">Сховати природні заповідники, заповідні території та межі національних парків</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">Межі природи</string>
</resources>

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

@ -149,8 +149,8 @@
<string name="offline_edition">离线编辑</string>
<string name="offline_edition_descr">始终使用离线编辑。</string>
<string name="local_openstreetmap_uploading">正在上传…</string>
<string name="local_openstreetmap_upload">上传修改OSM</string>
<string name="local_openstreetmap_delete">删除修改</string>
<string name="local_openstreetmap_upload">上传编辑到 OSM</string>
<string name="local_openstreetmap_delete">删除编辑</string>
<string name="local_openstreetmap_uploadall">所有上传</string>
<string name="free_version_title">免费版</string>
<string name="index_name_north_america">北美</string>
@ -166,8 +166,8 @@
<string name="index_name_oceania">大洋洲</string>
<string name="index_name_other">全球和专题地图</string>
<string name="index_name_wiki">全球维基百科的POI</string>
<string name="index_name_voice">语音包（录制，功能有限）</string>
<string name="index_name_tts_voice">语音包（TTS合成，优先选用）</string>
<string name="index_name_voice">语音提示（录音，功能有限）</string>
<string name="index_name_tts_voice">语音提示（TTS，首选）</string>
<string name="amenity_type_osmwiki">维基百科（离线）</string>
<string name="amenity_type_user_defined">用户自定义</string>
<string name="settings_preset">用户配置文件</string>
@ -176,7 +176,7 @@
<string name="general_settings">一般</string>
<string name="user_name">你的OSM用户名</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_descr">OsmAnd 在屏幕关闭的情况下在后台运行。</string>
<string name="city_type_suburb">市郊</string>
@ -186,7 +186,7 @@
<string name="city_type_city">城市</string>
<string name="button_upgrade_osmandplus">升级OsmAnd+</string>
<string name="shared_string_rename">重命名</string>
<string name="local_index_upload_gpx_description">上传GPX文件OSM社区。它们将被用于改善地图。</string>
<string name="local_index_upload_gpx_description">将 GPX 文件上传到 OSM 社区，改进地图。</string>
<string name="local_index_mi_upload_gpx">发送到OSM</string>
<string name="favorite_home_category">家</string>
<string name="favorite_friends_category">朋友</string>
@ -195,11 +195,11 @@
<string name="favourites_edit_dialog_category">类别</string>
<string name="shared_string_no_thanks">谢谢，不用了</string>
<string name="trace_rendering">渲染调试信息</string>
<string name="gpx_option_reverse_route">反向GPX方向</string>
<string name="gpx_option_reverse_route">反转轨迹方向</string>
<string name="internet_not_available">在没有连接到互联网的情况下，无法进行操作。</string>
<string name="shared_string_next">下一页</string>
<string name="shared_string_previous">上一页</string>
<string name="unit_of_length_descr">更改长度单位。</string>
<string name="unit_of_length_descr">改变测量的距离。</string>
<string name="unit_of_length">长度单位</string>
<string name="si_mi_feet">英里/英尺</string>
<string name="si_mi_yard">英里/码</string>
@ -251,7 +251,7 @@
<string name="shared_string_import">导入</string>
<string name="send_report">发送报告</string>
<string name="any_poi">任何</string>
<string name="thanks_yandex_traffic">由于Yandex的交通信息。</string>
<string name="thanks_yandex_traffic">感谢 Yandex 提供交通信息。</string>
<string name="layer_yandex_traffic">Yandex的流量</string>
<string name="layer_route">路线</string>
<string name="shared_string_favorites">收藏</string>
@ -269,7 +269,7 @@
<string name="route_head">头</string>
<string name="first_time_continue">后来</string>
<string name="first_time_download">下载区域</string>
<string name="search_poi_location">正在搜索信号…</string>
<string name="search_poi_location">等待信号……</string>
<string name="map_orientation_portrait">竖屏</string>
<string name="map_orientation_landscape">横屏</string>
<string name="map_screen_orientation">屏幕方向</string>
@ -292,9 +292,9 @@
<string name="error_occurred_saving_gpx">无法保存 GPX 文件。</string>
<string name="arrived_at_destination">你已到达。</string>
<string name="invalid_locations">无效的座标</string>
<string name="go_back_to_osmand">回到OsmAnd地图</string>
<string name="go_back_to_osmand">返回地图</string>
<string name="shared_string_close">关闭</string>
<string name="saving_gpx_tracks">将GPX轨迹保存到SD卡…</string>
<string name="saving_gpx_tracks">保存 GPX 文件……</string>
<string name="finished_task">成品</string>
<string name="use_online_routing_descr">使用互联网计算路线。</string>
<string name="use_online_routing">使用在线导航</string>
@ -351,18 +351,18 @@
<string name="about_version">版本：</string>
<string name="shared_string_about">关于</string>
<string name="about_settings_descr">版本信息，许可证，项目成员</string>
<string name="local_index_tile_data_expire">过期(分钟)：%1$s</string>
<string name="local_index_tile_data_expire">到期时间（分钟）： %1$s</string>
<string name="local_index_tile_data_downloadable">可下载：%1$s</string>
<string name="local_index_tile_data_maxzoom">最大显示级别：%1$s</string>
<string name="local_index_tile_data_minzoom">最小显示级别：%1$s</string>
<string name="local_index_tile_data_name">地图瓦片数据：%1$s</string>
<string name="edit_tilesource_successfully">地图瓦片数据源 %1$s 已成功保存</string>
<string name="edit_tilesource_elliptic_tile">椭圆墨卡托</string>
<string name="edit_tilesource_elliptic_tile">椭圆墨卡托投影</string>
<string name="edit_tilesource_maxzoom">最大显示级别</string>
<string name="edit_tilesource_expiration_time">过期(分钟)</string>
<string name="edit_tilesource_expiration_time">到期时间（分钟）</string>
<string name="edit_tilesource_minzoom">最小显示级别</string>
<string name="edit_tilesource_url_to_load">URL</string>
<string name="edit_tilesource_choose_existing">选择已有来源…</string>
<string name="edit_tilesource_choose_existing">选择现有的……</string>
<string name="maps_define_edit">定义/编辑…</string>
<string name="map_widget_fps_info">FPS 调试信息</string>
<string name="driving_region_descr">选择驾驶区域：美国、欧洲、英国、亚洲等。</string>
@ -370,14 +370,14 @@
<string name="driving_region_japan">日本</string>
<string name="driving_region_us">美国</string>
<string name="driving_region_canada">加拿大</string>
<string name="driving_region_europe_asia">欧洲、亚洲、拉丁美洲及相似地区</string>
<string name="driving_region_uk">英国、印度、澳大利亚及其他</string>
<string name="driving_region_europe_asia">欧洲、亚洲、拉丁美洲和类似地区</string>
<string name="driving_region_uk">英国、印度和类似地区</string>
<string name="speak_title">播报…</string>
<string name="speak_descr">设置街道名称、交通警告（强制停车、减速带）、测速仪警告、限速等公告。</string>
<string name="speak_speed_limit">播报限速</string>
<string name="speak_cameras">播报测速电子眼</string>
<string name="speak_traffic_warnings">播报交通信息</string>
<string name="osb_author_or_password_not_specified">请在设置中指定OSM用户名和密码</string>
<string name="osb_author_or_password_not_specified">请在“设置”中指定 OSM 用户和密码</string>
<string name="context_menu_item_directions_to">设为终点</string>
<string name="context_menu_item_directions_from">设为起点</string>
<string name="route_descr_map_location">地图： </string>
@ -387,7 +387,7 @@
<string name="route_from">起点：</string>
<string name="destination_point">终点 %1$s</string>
<string name="context_menu_item_destination_point">设为终点</string>
<string name="please_select_address">先选择城市或街道</string>
<string name="please_select_address">首先设置城市或街道</string>
<string name="search_street_in_neighborhood_cities">在相邻城市搜索街道</string>
<string name="local_osm_changes_backup_successful">OSM 修改文件已成功生成 %1$s</string>
<string name="local_osm_changes_backup_failed">无法备份 OSM 更改。</string>
@ -402,7 +402,7 @@
<string name="distance_measurement_start_editing">开始编辑</string>
<string name="distance_measurement_finish_editing">完成编辑</string>
<string name="distance_measurement_clear_route">清除所有点</string>
<string name="distance_measurement_load_gpx">打开已有 GPX</string>
<string name="distance_measurement_load_gpx">打开现有的 GPX 文件</string>
<string name="wait_current_task_finished">请等待当前任务完成</string>
<string name="install_paid">完整版本</string>
<string name="cancel_navigation">停止导航</string>
@ -438,7 +438,7 @@
<string name="av_use_external_camera_descr">使用系统应用拍照。</string>
<string name="av_settings_descr">设置音频和视频设置。</string>
<string name="av_settings">音频/视频设置 </string>
<string name="recording_error">录制时发生错误 </string>
<string name="recording_error">录制失败</string>
<string name="recording_camera_not_available">摄像头不可用</string>
<string name="recording_is_recorded">音频/视频正在记录，要停止请点击AV窗体。</string>
<string name="recording_open_external_player">打开外部播放器</string>
@ -510,7 +510,7 @@
<string name="map_online_data_descr">使用在线地图（在储存卡上下载并缓存瓦片）。</string>
<string name="shared_string_online_maps">在线地图</string>
<string name="online_map_settings_descr">配置在线或缓存瓦片地图来源。</string>
<string name="osmand_accessibility_description">显示特殊可用性功能的设置。</string>
<string name="osmand_accessibility_description"></string>
<string name="vector_maps_may_display_faster_on_some_devices">矢量地图很可能显示更快速。但在某些设备上不能正常工作。</string>
<string name="test_voice_prompts">测试语音提示</string>
<string name="switch_to_raster_map_to_see">这个位置没有离线矢量地图。您可以从设置(数据管理)中下载，或者切换到在线地图。</string>
@ -530,7 +530,7 @@
<string name="local_openstreetmap_descr_title">异步 OSM 编辑：</string>
<string name="local_openstreetmap_settings">OSM兴趣点/注记已在设备上保存</string>
<string name="show_current_gpx_title">显示当前轨迹</string>
<string name="free_version_message">此 OsmAnd 免费版本最多支持下载 %1$s 套数据，并且不支持离线维基百科文章。</string>
<string name="free_version_message">你可以下载或更新 %1$s 地图。</string>
<string name="poi_context_menu_showdescription">显示 POI 描述。</string>
<string name="fav_export_confirmation">已存在上次导出的收藏夹文件。是否要替换它？</string>
<string name="routing_settings_descr">指定导航选项。</string>
@ -552,30 +552,32 @@
<string name="delete_confirmation_msg">删除 %1$s？</string>
<string name="animate_route_off">停止模拟导航</string>
<string name="animate_route">开始模拟导航</string>
<string name="file_can_not_be_renamed">文件无法重命名。</string>
<string name="file_with_name_already_exists">同名文件已存在。</string>
<string name="poi_query_by_name_matches_categories">找到了几个相关的 POI 类别。</string>
<string name="data_to_search_poi_not_available">用于搜索POI的本地数据不存在。</string>
<string name="file_can_not_be_renamed">无法重命名文件。</string>
<string name="file_with_name_already_exists">已经有一个同名的文件存在。</string>
<string name="poi_query_by_name_matches_categories">找到了几个相关的兴趣点类别。</string>
<string name="data_to_search_poi_not_available">下载离线数据以搜索兴趣点。</string>
<string name="poi_filter_by_name">按名称搜索</string>
<string name="old_poi_file_should_be_deleted">兴趣点数据文件 \'%1$s\' 是多余的，可以删除。</string>
<string name="update_poi_file_not_found">用于维护 POI 改动的本地文件不存在，且无法创建。</string>
<string name="map_version_changed_info">服务器包含与您当前应用版本不兼容的地图文件。要下载并使用这些文件，请将应用程序升级至新版本。</string>
<string name="map_version_changed_info">下载新版本的应用程序，以便能够使用新的地图文件。</string>
<string name="search_position_current_location_search">搜索位置…</string>
<string name="search_position_current_location_found">我的位置（已找到）</string>
<string name="search_position_address">地址…</string>
<string name="search_position_favorites">收藏夹…</string>
<string name="shared_string_undefined">未定义</string>
<string name="search_position_map_view">上次地图显示位置</string>
<string name="route_successfully_saved_at">路线已成功保存为 \'%1$s\'。</string>
<string name="route_successfully_saved_at">路线保存为“%1$s”。</string>
<string name="filename_input">文件名： </string>
<string name="file_with_name_already_exist">同名文件已存在。</string>
<string name="shared_string_save">保存</string>
<string name="local_index_items_uploaded">%2$d 个项目中的 %1$d 个已成功上传。</string>
<string name="show_more_map_detail">显示更多地图细节</string>
<string name="favourites_delete_multiple_succesful">收藏点已成功删除。</string>
<string name="favourites_delete_multiple_succesful">收藏点已删除。</string>
<string name="favorite_delete_multiple">您将要删除 %1$d 个收藏点和 %2$d 个收藏组。是否确认？</string>
<string name="basemap_missing">基础世界地图(小比例尺下覆盖整个世界)丢失。请考虑下载 World_basemap_x.obf 以确保应用运行环境完整。</string>
<string name="local_index_gpx_info_show">\n\n长按进入选项</string>
<string name="local_index_gpx_info_show">"
\n
\n长按选项"</string>
<string name="local_index_installed">本地版本</string>
<string name="local_index_descr_title">管理地图文件。</string>
<string name="shared_string_download">下载</string>
@ -583,8 +585,8 @@
<string name="local_index_address_data">地址数据</string>
<string name="local_index_transport_data">交通设施数据</string>
<string name="local_index_map_data">地图数据</string>
<string name="local_indexes_cat_tts">语音数据(TTS)</string>
<string name="local_indexes_cat_voice">语音数据(录制)</string>
<string name="local_indexes_cat_tts">语音提示（TTS）</string>
<string name="local_indexes_cat_voice">语音提示（录音）</string>
<string name="local_indexes_cat_poi">兴趣点数据</string>
<string name="ttsvoice">TTS语音</string>
<string name="search_offline_clear_search">新搜索</string>
@ -592,18 +594,18 @@
<string name="map_text_size">地图字体大小</string>
<string name="trace_rendering_descr">显示渲染性能。</string>
<string name="installing_new_resources">解包新数据…</string>
<string name="internet_connection_required_for_online_route">已选择在线导航服务，但网络连接不可用。</string>
<string name="internet_connection_required_for_online_route">在线导航不能离线工作。</string>
<string name="tts_language_not_supported_title">不支持的语言</string>
<string name="tts_missing_language_data_title">数据丢失</string>
<string name="gpx_option_destination_point">使用当前终点</string>
<string name="voice_stream_notification">提醒语音音频</string>
<string name="voice_stream_music">媒体/音乐音频</string>
<string name="voice_stream_music">媒体/导航音频</string>
<string name="warning_tile_layer_not_downloadable">应用程序无法下载地图图层 %1$s，请尝试重新安装。</string>
<string name="overlay_transparency_descr">调整叠加层透明度。</string>
<string name="overlay_transparency">叠加层透明度</string>
<string name="map_transparency_descr">调整基本地图透明度。</string>
<string name="map_transparency">基础地图透明度</string>
<string name="layer_underlay">背景层地图…</string>
<string name="layer_underlay">背景层地图……</string>
<string name="map_underlay">背景层地图</string>
<string name="map_underlay_descr">选择背景层地图</string>
<string name="layer_overlay">叠加层地图…</string>
@ -635,7 +637,7 @@
<string name="application_dir">存储目录</string>
<string name="gps_status_app_not_found">GPS 状态应用未安装。是否转到应用市场中搜索？</string>
<string name="voice_is_not_available_msg">语音指引不可用。请到“设置”→“常规设置”→“语音指引”中选择想要的语音数据包并下载。</string>
<string name="voice_is_not_available_title">未选择引导语音</string>
<string name="voice_is_not_available_title">选择一个语音提示包</string>
<string name="daynight_descr">调整夜间和白天模式之间的切换。</string>
<string name="download_files_question">是否下载 {0} 个文件({1} MB)？</string>
<string name="items_were_selected">已选择 {0} 个项目</string>
@ -646,11 +648,11 @@
<string name="shared_string_download_map">下载地图</string>
<string name="maps_could_not_be_downloaded">此地图无法下载</string>
<string name="rendering_exception">无法绘制所选区域。</string>
<string name="show_point_options">使用位置 …</string>
<string name="renderer_load_sucess">渲染器已成功加载</string>
<string name="show_point_options">使用位置……</string>
<string name="renderer_load_sucess">已加载渲染器</string>
<string name="renderer_load_exception">无法加载渲染器。</string>
<string name="renderers">矢量渲染器</string>
<string name="renderers_descr">选择渲染器外观</string>
<string name="renderers_descr">选择渲染外观</string>
<string name="poi_context_menu_website">显示POI网址</string>
<string name="poi_context_menu_call">显示POI电话</string>
<string name="context_menu_item_search_transport">搜索交通设施</string>
@ -659,17 +661,18 @@
<string name="vector_data">离线矢量地图</string>
<string name="poi_context_menu_modify">修改 POI</string>
<string name="poi_context_menu_delete">删除 POI</string>
<string name="rotate_map_none_opt">保持地图正北朝上</string>
<string name="rotate_map_none_opt">不旋转（正北永远朝上）</string>
<string name="rotate_map_to_bearing_descr">地图对齐方式：</string>
<string name="rotate_map_to_bearing">地图朝向</string>
<string name="show_route">路线详情</string>
<string name="fav_imported_sucessfully">收藏夹已成功导入</string>
<string name="fav_imported_sucessfully">收藏已导入</string>
<string name="av_photo_play_sound_descr">选择是否有拍照声。</string>
<string name="av_photo_play_sound">拍照时播放声音</string>
<string name="av_photo_play_sound">播放相机快门声</string>
<string name="voice_data_not_supported">语音数据版本不支持</string>
<string name="voice_data_corrupted">指定的语音数据已损坏</string>
<string name="voice_data_unavailable">选择的语音数据不可用</string>
<string name="sd_unmounted">SD卡无法访问。\n您将无法查看地图和进行搜索。</string>
<string name="voice_data_unavailable">所选语音提示包不可用</string>
<string name="sd_unmounted">无法访问存储卡。
\n你将无法看到地图或查找内容。</string>
<string name="sd_mounted_ro">SD卡处于只读状态。\n您将只能查看已有地图，无法从互联网下载。</string>
<string name="unzipping_file">正在解压缩文件…</string>
<string name="search_near_map">在上一次地图中心附近搜索</string>
@ -679,14 +682,14 @@
<string name="add_new_rule">添加新规则</string>
<string name="show_transport_over_map_description">在地图上显示公共交通站点。</string>
<string name="show_transport_over_map">显示公共交通站点</string>
<string name="hello">导航应用 OsmAnd</string>
<string name="hello">OsmAnd 导航应用</string>
<string name="update_poi_success">POI 数据已成功更新 ({0} 已载入)</string>
<string name="update_poi_error_local">无法更新本地兴趣点列表。</string>
<string name="update_poi_error_loading">无法从服务器加载数据。</string>
<string name="update_poi_no_offline_poi_index">此区域没有可用的离线 POI 数据</string>
<string name="update_poi_is_not_available_for_zoom">小比例尺下更新 POI 功能不可用</string>
<string name="context_menu_item_update_poi">更新 POI</string>
<string name="context_menu_item_update_map_confirm">是否要通过互联网更新本地数据？</string>
<string name="context_menu_item_update_map_confirm">从互联网更新本地数据？</string>
<string name="search_history_city">城市：{0}</string>
<string name="search_history_street">街道：{0}，{1}</string>
<string name="search_history_int_streets">交叉路口：{0} x {1} 在 {2}</string>
@ -705,7 +708,7 @@
<string name="route_general_information">总距离 %1$s，行驶时间 %2$d 时 %3$d 分。</string>
<string name="router_service_descr">在线或离线导航服务。</string>
<string name="router_service">导航服务</string>
<string name="sd_dir_not_accessible">SD卡上的数据存储目录无法访问！</string>
<string name="sd_dir_not_accessible">存储卡上的存储文件夹无法访问！</string>
<string name="download_question">是否下载 {0} - {1}？</string>
<string name="download_question_exist">{0} 的离线数据已经存在({1})。是否要更新它({2})？</string>
<string name="address">地址</string>
@ -713,7 +716,7 @@
<string name="downloading_list_indexes">正在下载可用区域的列表…</string>
<string name="list_index_files_was_not_loaded">区域列表未能从 osmand.net 获取。</string>
<string name="fav_points_edited">收藏点已被编辑</string>
<string name="mark_final_location_first">请首先选择目的地</string>
<string name="mark_final_location_first">请先设置目的地</string>
<string name="opening_hours">营业时间</string>
<string name="opening_changeset">正在打开修改集…</string>
<string name="closing_changeset">正在关闭修改集…</string>
@ -739,23 +742,23 @@
<string name="update_tile">更新地图</string>
<string name="reload_tile">重新载入地图瓦片</string>
<string name="mark_point">目标</string>
<string name="shared_string_add_to_favorites">加入收藏夹</string>
<string name="shared_string_add_to_favorites">添加到“收藏”</string>
<string name="use_english_names_descr">在当地名称和英文名称之间选择。</string>
<string name="use_english_names">在地图中使用英文名称</string>
<string name="app_settings">应用程序设置</string>
<string name="use_english_names">在地图上使用英文名称</string>
<string name="app_settings">应用设置</string>
<string name="search_address">搜索地址</string>
<string name="choose_building">选择建筑物</string>
<string name="choose_street">选择街道</string>
<string name="choose_city">选择城市</string>
<string name="ChooseCountry">选择国家</string>
<string name="show_poi_over_map_description">显示上一次使用的兴趣点叠加层。</string>
<string name="show_poi_over_map">显示POI</string>
<string name="show_poi_over_map">显示兴趣点叠加</string>
<string name="map_tile_source_descr">选择在线或缓存地图瓦片的来源。</string>
<string name="map_tile_source">瓦片地图来源</string>
<string name="map_source">地图来源</string>
<string name="show_location">显示位置</string>
<string name="use_internet_to_download_tile">使用互联网下载丢失的地图瓦片</string>
<string name="app_description">导航应用程序</string>
<string name="app_description">导航应用</string>
<string name="searchpoi_activity">选择POI</string>
<string name="search_POI_level_btn">搜索更多</string>
<string name="choose_available_region">从列表中选择区域</string>
@ -785,13 +788,13 @@
<string name="poi_remove_success">已删除</string>
<string name="poi_action_add">添加</string>
<string name="poi_action_change">修改</string>
<string name="poi_action_succeded_template">动作 {0} 已成功完成。</string>
<string name="poi_error_unexpected_template">执行动作 {0} 时发生意外的错误。</string>
<string name="poi_action_succeded_template">动作 {0} 已完成。</string>
<string name="poi_error_unexpected_template">无法执行动作 {0}。</string>
<string name="poi_error_io_error_template">执行动作 {0} 时发生 I/O 错误。</string>
<string name="poi_error_info_not_loaded">节点的信息未能加载</string>
<string name="poi_dialog_other_tags_message">所有其他标记都已保留</string>
<string name="edit_filter_delete_dialog_title">是否删除选中的过滤器？</string>
<string name="edit_filter_delete_message">过滤器 %1$s 已被删除</string>
<string name="edit_filter_delete_dialog_title">删除此筛选规则？</string>
<string name="edit_filter_delete_message">筛选规则“%1$s”已被删除</string>
<string name="edit_filter_create_message">过滤器 %1$s 已创建</string>
<string name="av_camera_focus_auto">自动对焦</string>
<string name="clear_intermediate_points">清除中途点</string>
@ -819,11 +822,11 @@
<string name="shared_string_topbar">顶栏</string>
<string name="full_report">完整报告</string>
<string name="recalculate_route">重新计算路线</string>
<string name="open_street_map_login_and_pass">OpenStreetMap 登录名和密码</string>
<string name="open_street_map_login_and_pass">OSM 用户名和密码</string>
<string name="donations">捐赠</string>
<string name="number_of_recipients">接收者数量</string>
<string name="osm_user_stat">编辑数 %1$s，排名 %2$s，总计编辑 %3$s</string>
<string name="osm_editors_ranking">OSM 编辑排名</string>
<string name="osm_editors_ranking">OSM 编辑者排名</string>
<string name="osm_live_subscribe_btn">订阅</string>
<string name="osm_live_subscription">OsmAnd 实时订阅</string>
<string name="osm_live_user_public_name">公开名称</string>
@ -849,16 +852,16 @@
<string name="shared_string_toolbar">工具栏</string>
<string name="shared_string_widgets">小工具</string>
<string name="shared_string_add_to_map_markers">添加地图标记</string>
<string name="add_points_to_map_markers_q">您确定要添加所有地点到地图标记？</string>
<string name="add_points_to_map_markers_q">将所有点添加为地图标记？</string>
<string name="select_map_markers">选择地图标记</string>
<string name="shared_string_reverse_order">反向顺序</string>
<string name="show_map_markers_description">激活地图标记功能。</string>
<string name="clear_active_markers_q">您要移除所有有效标记？</string>
<string name="clear_markers_history_q">您要清除历史地图标记？</string>
<string name="clear_active_markers_q">删除所有的活动标记？</string>
<string name="clear_markers_history_q">清除地图标记历史记录？</string>
<string name="active_markers">激活标记</string>
<string name="map_markers">地图标记</string>
<string name="map_marker">地图标记</string>
<string name="rendering_attr_showMtbRoutes_name">显示 MTB 路线</string>
<string name="rendering_attr_showMtbRoutes_name">显示山地自行车道</string>
<string name="show_polygons">显示多边形</string>
<string name="shared_string_email_address">电子邮件地址</string>
<string name="rendering_attr_hideUnderground_name">隐藏地下物体</string>
@ -948,7 +951,7 @@
<string name="si_m_s">米/秒</string>
<string name="si_min_km">分钟每千米</string>
<string name="si_min_m">分钟/英里</string>
<string name="si_nm_h">海里/小时 (节)</string>
<string name="si_nm_h">海里每小时（节）</string>
<string name="nm_h">节</string>
<string name="min_mile">分钟每米</string>
<string name="min_km">分/千米</string>
@ -1005,7 +1008,7 @@
<string name="lang_et">爱沙尼亚语</string>
<string name="lang_ceb">宿务语</string>
<string name="disable_recording_once_app_killed">避免独立日志</string>
<string name="gps_network_not_enabled">位置服务未启用。您确定要开启？</string>
<string name="gps_network_not_enabled">位置服务已关闭。要开启吗？</string>
<string name="download_wikipedia_files">下载额外的维基百科数据 (%1$s MB) 吗？</string>
<string name="shared_string_import2osmand">导入到 OsmAnd</string>
<string name="read_full_article">阅读完整文章（在线）</string>
@ -1016,10 +1019,10 @@
<string name="rendering_value_disabled_name">已禁用</string>
<string name="shared_string_logoff">退出</string>
<string name="rendering_attr_hideHouseNumbers_name">隐藏门牌号码</string>
<string name="copying_osmand_file_failed">复制文件失败</string>
<string name="copying_osmand_file_failed">移动文件失败</string>
<string name="storage_directory_external">外部存储</string>
<string name="storage_directory_multiuser">多用户存储</string>
<string name="storage_directory_internal_app">内部应用存储</string>
<string name="storage_directory_internal_app">内部存储</string>
<string name="storage_directory_manual">手动指定</string>
<string name="storage_directory_default">内部存储</string>
<string name="storage_directory">地图存储</string>
@ -1076,11 +1079,11 @@
<string name="shared_string_more">更多…</string>
<string name="upload_osm_note_description">匿名上传您的 OSM 注记，或者使用您的 OpenStreetMap.org 账号。</string>
<string name="wiki_around">附近的维基百科文章</string>
<string name="search_map_hint">搜索城市或地区</string>
<string name="search_map_hint">城市或地区</string>
<string name="upload_poi">上传兴趣点</string>
<string name="route_calculation">路线计算</string>
<string name="gpx_no_tracks_title">您暂时没有轨迹</string>
<string name="gpx_no_tracks_title_folder">您也可以将轨迹添加到文件夹下</string>
<string name="gpx_no_tracks_title">你还没有任何轨迹文件</string>
<string name="gpx_no_tracks_title_folder">你也可以将轨迹文件添加到文件夹</string>
<string name="shared_string_continue">继续</string>
<string name="shared_string_pause">暂停</string>
<string name="gpx_logging_no_data">无数据</string>
@ -1088,7 +1091,7 @@
<string name="save_track_min_speed_descr">筛选器：不记录低于该速度的点。</string>
<string name="shared_string_notifications">通知</string>
<string name="christmas_poi">圣诞兴趣点</string>
<string name="christmas_desc_q">显示圣诞兴趣点？</string>
<string name="christmas_desc_q">显示圣诞假期兴趣点？</string>
<string name="search_hint">输入城市、地址、兴趣点名称</string>
<string name="create_custom_poi">创建自定义过滤器</string>
<string name="custom_search">自定义搜索</string>
@ -1184,7 +1187,7 @@
<string name="rendering_value_germanRoadAtlas_name">德国道路地图</string>
<string name="rendering_value_highContrastRoads_name">高对比度道路</string>
<string name="rendering_value_americanRoadAtlas_name">美国道路地图</string>
<string name="layer_poi">兴趣点…</string>
<string name="layer_poi">兴趣点叠加层……</string>
<string name="layer_map">地图来源…</string>
<string name="quick_action_map_source">改变地图来源</string>
<string name="quick_action_map_source_action">添加地图来源</string>
@ -1212,7 +1215,7 @@
<string name="speed_limit_exceed">速度限制容忍程度</string>
<string name="rendering_category_others">其他地图属性</string>
<string name="print_route">显示路线</string>
<string name="search_osm_offline">搜索地理位置</string>
<string name="search_osm_offline">按地理位置搜索</string>
<string name="srtm_color_scheme">颜色方案</string>
<string name="change_color">改变颜色</string>
<string name="edit_name">编辑名称</string>
@ -1332,7 +1335,7 @@
<string name="quick_action_showhide_osmbugs_descr">轻点动作按钮会在地图上显示或隐藏 OSM 注记。</string>
<string name="sorted_by_distance">按距离排序</string>
<string name="search_favorites">在我的收藏中搜索</string>
<string name="hillshade_menu_download_descr">要在地图上看到起伏的山坡，您需要下载这个地区的地形阴影层地图。</string>
<string name="hillshade_menu_download_descr">下载“山体阴影”叠加层地图以显示垂直阴影。</string>
<string name="hillshade_purchase_header">安装“等高线”插件以显示渐变的垂直区域。</string>
<string name="hide_from_zoom_level">基于缩放级别开始隐藏</string>
<string name="srtm_menu_download_descr">下载本地区使用的“等高线”地图。</string>
@ -1341,7 +1344,7 @@
<string name="show_from_zoom_level">从缩放级别开始显示</string>
<string name="favorite_group_name">组名称</string>
<string name="animate_my_location">动画处理我的位置</string>
<string name="animate_my_location_desc">在导航过程中打开\"我的位置\"的动画地图平移。</string>
<string name="animate_my_location_desc">在导航过程中开启“我的位置”的动画地图平移。</string>
<string name="quick_action_add_destination_desc">轻点按钮将在屏幕中心位置添加一个目的地。以前设定的目的地成为最后的中转点。</string>
<string name="quick_action_replace_destination_desc">使画面居中的新航线目的地的按钮，取代之前选择的目的地（如果有的话）。</string>
<string name="quick_action_add_first_intermediate_desc">使屏幕居中的按钮，是第一中间目的。</string>
@ -1351,8 +1354,8 @@
<string name="depth_contour_descr">海洋等深线和航海点。</string>
<string name="sea_depth_thanks">感谢你购买“航海等深线”</string>
<string name="index_item_depth_contours_osmand_ext">航海等深线</string>
<string name="index_item_depth_points_southern_hemisphere">南半球航海等深线</string>
<string name="index_item_depth_points_northern_hemisphere">北半球航海等深线</string>
<string name="index_item_depth_points_southern_hemisphere">南半球航海深度点</string>
<string name="index_item_depth_points_northern_hemisphere">北半球航海深度点</string>
<string name="download_depth_countours">航海等深线</string>
<string name="nautical_maps">航海地图</string>
<string name="analyze_on_map">在地图上分析</string>
@ -1366,7 +1369,7 @@
<string name="shared_string_slope">坡度</string>
<string name="add_new_folder">添加新文件夹</string>
<string name="route_points_category_name">转到这条路线上</string>
<string name="track_points_category_name">在这条路线的突出点</string>
<string name="track_points_category_name">航点、兴趣点、命名的特征</string>
<string name="shared_string_gpx_track">轨迹</string>
<string name="shared_string_time_moving">移动的时间</string>
<string name="shared_string_time_span">时间跨度</string>
@ -1379,7 +1382,6 @@
<string name="average_altitude">平均海拔</string>
<string name="routing_attr_relief_smoothness_factor_name">选择海拔波动</string>
<string name="routing_attr_height_obstacles_name">使用标高数据</string>
<string name="rendering_attr_depthContours_description">显示等深线和标记。</string>
<string name="rendering_attr_depthContours_name">航海等深线</string>
<string name="auto_split_recording_title">自动拆分录音后的间隙</string>
@ -1413,7 +1415,7 @@
<string name="translit_name_if_miss">如果 %1$s 的名称缺失则音译</string>
<string name="translit_names">音译名称</string>
<string name="new_filter_desc">请输入新筛选器的名称，该名称将添加到你的\"类别\"选项卡中。</string>
<string name="osm_live_payment_desc">每个月会收取认购费用。您可以在 Google Play 随时取消您的订购。</string>
<string name="osm_live_payment_desc">订阅按选定的时间段收费。可随时在 Google Play 上取消。</string>
<string name="donation_to_osm_desc">你的部分捐款将发送给 OSM 捐助者。订阅费用保持不变。</string>
<string name="osm_live_subscription_desc">启用认购可每小时、每天、每周的更新以及世界各地所有的地图无限制的下载。</string>
<string name="get_it">获得</string>
@ -1467,7 +1469,7 @@
<string name="access_direction_haptic_feedback">触觉方向</string>
<string name="access_direction_haptic_feedback_descr">由振动指示目标点方向。</string>
<string name="use_osm_live_routing_description">启用导航时由 OsmAnd 实时服务提供的更新。</string>
<string name="access_no_destination">未设置目的地</string>
<string name="access_no_destination">辅助功能插件：没有设置目的地</string>
<string name="map_widget_magnetic_bearing">磁方位</string>
<string name="map_widget_bearing">相对方位</string>
<string name="access_disable_offroute_recalc">当您离开道路时不重新计算路线</string>
@ -1931,7 +1933,7 @@
<string name="show_warnings_descr">设置交通警告（限速、强制停车、减速带、隧道）、测速摄像头警告和车道信息。</string>
<string name="use_compass_navigation_descr">没有检测到朝向的时候使用罗盘。</string>
<string name="auto_zoom_map_descr">根据你的速度（地图与当前的位置同步）自动缩放地图。</string>
<string name="snap_to_road_descr">在导航过程中对齐道路的位置。</string>
<string name="snap_to_road_descr">当前位置的图标将被锁定在当前导航路线上</string>
<string name="osmand_long_description_1000_chars">OsmAnd(OSM自动导航方向)
\n
\n OsmAnd是一款开源软件导航应用，可以访问各种全球OSM数据。所有的地图数据（矢量图或磁贴图）都可以存储在手机存储卡上，供离线使用。还提供离线和在线路线功能，包括逐个转弯的语音引导。
@ -2175,7 +2177,7 @@
<string name="local_index_mi_backup">停用</string>
<string name="local_indexes_cat_backup">已停用</string>
<string name="tts_language_not_supported">安装的 Android TTS（文本到语音）引擎不支持所选语言，将使用其预设的 TTS 语言。在市场上寻找其他 TTS 引擎？</string>
<string name="tts_missing_language_data">安装所选语言没有数据。你想要去市场安装吗？</string>
<string name="tts_missing_language_data">去应用市场下载选定的语言？</string>
<string name="gpx_option_from_start_point">沿着整条轨迹</string>
<string name="switch_to_vector_map_to_see">指定以脱机矢量地图显示
\n
@ -2192,7 +2194,7 @@
<string name="osmand_net_previously_installed">有前一版的 OsmAnd 存在，所有的脱机数据将被新版引用。但我的收藏内的标点须以旧版程序导出后再用新版程序导入。</string>
<string name="build_installed">生成 {0} 成功安裝({1})。</string>
<string name="downloading_build">正在下载编译…</string>
<string name="install_selected_build">你想要安装 OsmAnd - {0} 之中的 {1} {2} MB 吗？</string>
<string name="install_selected_build">安装 OsmAnd - {0} 之中的 {1} {2} MB 吗？</string>
<string name="loading_builds_failed">获取 OsmAnd 的生成列表失败</string>
<string name="loading_builds">正在加载 OsmAnd 编译…</string>
<string name="select_build_to_install">选择要安装的 OsmAnd 版本</string>
@ -2215,9 +2217,9 @@
<string name="no_fav_to_save">没有我的收藏标点要保存</string>
<string name="share_fav_subject">通过 OsmAnd 分享我的收藏夹</string>
<string name="none_region_found">在 SD 卡上找到的区域没有离线数据。从互联网下载区域数据。</string>
<string name="poi_namefinder_query_empty">输入搜索条件来查找 POI</string>
<string name="poi_namefinder_query_empty">输入查找兴趣点</string>
<string name="menu_layers">地图图层</string>
<string name="context_menu_item_search_poi">POI 搜索</string>
<string name="context_menu_item_search_poi">搜索兴趣点</string>
<string name="use_trackball_descr">使用轨迹球设备来移动地图。</string>
<string name="use_trackball">使用轨迹球</string>
<string name="background_service_wait_int_descr">设置每个背景位置固定所允许的最高等待时间。</string>
@ -2266,7 +2268,7 @@
<string name="plugin_install_needs_network">你需要互联网连接来安装这个插件。</string>
<string name="get_plugin">获取</string>
<string name="use_fast_recalculation">路线智能重新规划</string>
<string name="use_fast_recalculation_desc">只有在长途旅行路线的初始部分重新规划。</string>
<string name="use_fast_recalculation_desc">只重新计算路线的初始部分，对长途旅行很有用。</string>
<string name="do_you_like_osmand">你喜欢 OsmAnd 吗？</string>
<string name="we_really_care_about_your_opinion">我们很在乎您的意见，并且听到您的反映对我们来说是很重要的。</string>
<string name="rate_this_app">评价此应用程序</string>
@ -2421,14 +2423,14 @@
<string name="shared_string_reload">重新载入</string>
<string name="shared_string_reset">重置</string>
<string name="store_tracks_in_monthly_directories">按月将记录的轨迹存放在文件夹中</string>
<string name="store_tracks_in_monthly_directories_descrp">按照月份将记录的轨迹存储在子文件夹中（例如 2017-01）。</string>
<string name="store_tracks_in_monthly_directories_descrp">按照月份将记录的轨迹存储在子文件夹中（例如 2018-01）。</string>
<string name="mapillary_menu_descr_tile_cache">重新加载区片以查看最新的数据。</string>
<string name="mapillary_menu_title_tile_cache">区片缓存</string>
<string name="average">平均</string>
<string name="ascent_descent">升序/降序</string>
<string name="max_min">最大/最小</string>
<string name="of">%2$d 中的 %1$d</string>
<string name="moving_time">移动时间</string>
<string name="moving_time">运动时间</string>
<string name="min_max">最小/最大</string>
<string name="quick_action_resume_pause_navigation">暂停/继续导航</string>
<string name="quick_action_resume_pause_navigation_descr">暂停或恢复导航的按钮。</string>
@ -2479,8 +2481,8 @@
<string name="one_tap_active_descr">点击地图上的标记将其移动到活动标记的顶端, 而不打开上下文菜单。</string>
<string name="one_tap_active">\'一个点击\'激活</string>
<string name="empty_state_av_notes">做注记!</string>
<string name="empty_state_av_notes_desc">使用小部件或上下文菜单, 在地图上的每个点添加音频、视频或照片注释。</string>
<string name="notes_by_date">按日期说明</string>
<string name="empty_state_av_notes_desc">通过使用小部件或上下文菜单将音频、视频或照片注记添加到地图上的任何点。</string>
<string name="notes_by_date">按日期排序的视频或音频注记</string>
<string name="by_date">按日期</string>
<string name="by_type">按类型</string>
<string name="looking_for_tracks_with_waypoints">用航路点寻找轨迹</string>
@ -2502,7 +2504,7 @@
<string name="show_guide_line_descr">显示从你的位置到活动标记位置的方向线。</string>
<string name="show_arrows_descr">显示一个或两个箭头指示方向到活动标记。</string>
<string name="distance_indication_descr">选择如何显示到活动标记的距离。</string>
<string name="active_markers_descr">选择想显示多少的方向指标。</string>
<string name="active_markers_descr">指定方向指示器的数量。</string>
<string name="digits_quantity">小数位数</string>
<string name="shared_string_right">右方</string>
<string name="shared_string_left">左方</string>
@ -2515,7 +2517,7 @@
<string name="will_open_tomorrow_at">明日开始营业时间</string>
<string name="rendering_attr_hidePOILabels_name">兴趣点（POI）标签</string>
<string name="show_number_pad">显示数字盘</string>
<string name="switch_osm_notes_visibility_desc">在地图上显示/隐藏 OSM 注记。</string>
<string name="switch_osm_notes_visibility_desc">在地图上显示或隐藏 OSM 注记。</string>
<string name="gpx_file_desc">GPX - 适合导出到 JOSM 或其它 OSM 编辑器。</string>
<string name="osc_file_desc">OSC - 适合导出到 OSM。</string>
<string name="shared_string_gpx_file">GPX 文件</string>
@ -2668,7 +2670,7 @@
<string name="quick_action_switch_night_mode">夜间模式</string>
<string name="quick_action_day_night_switch_mode">切换日间/夜间模式</string>
<string name="download_wiki_region_placeholder">此地区</string>
<string name="quick_action_edit_actions">编辑活动</string>
<string name="quick_action_edit_actions">编辑动作</string>
<string name="coord_input_save_as_track_descr">你增加了%1$s 个目标。输入文件名后点击\"保存\"。</string>
<string name="ask_for_location_permission">请在允许OsmAnd获取定位信息后继续。</string>
<string name="routeInfo_smoothness_name">平顺度</string>
@ -2725,7 +2727,7 @@
<string name="step_by_step">逐步</string>
<string name="routeInfo_road_types_name">道路类型</string>
<string name="exit_at">退出于</string>
<string name="quick_action_show_hide_gpx_tracks_descr">在地图中显示或隐藏已选中的GPX轨迹的按钮。</string>
<string name="quick_action_show_hide_gpx_tracks_descr">在地图上显示或隐藏所选轨迹的按钮。</string>
<string name="add_destination_query">请先设置目的地</string>
<string name="use_osm_live_public_transport_description">为OsmAnd Live启用公共交通的变更情况。</string>
<string name="add_start_and_end_points">添加出发地和目的地</string>
@ -2904,7 +2906,7 @@
<string name="search_poi_types">搜索兴趣点类型</string>
<string name="radius_ruler_item">半径尺</string>
<string name="subscription_osmandlive_item">订阅 - OsmAnd Live</string>
<string name="create_edit_poi">创建/编辑兴趣点</string>
<string name="create_edit_poi">创建或编辑兴趣点</string>
<string name="edit_online_source">编辑在线资源</string>
<string name="mercator_projection">正轴等角圆柱投影</string>
<string name="storage_format">储存格式</string>
@ -2925,14 +2927,14 @@
<string name="use_volume_buttons_as_zoom">音量键用于缩放</string>
<string name="please_provide_point_name_error">请提供该点的名称</string>
<string name="app_mode_wheelchair">轮椅</string>
<string name="set_working_days_to_continue">您需要设置工作日以继续</string>
<string name="set_working_days_to_continue">设置工作日以继续</string>
<string name="route_between_points">两点间路线</string>
<string name="plan_a_route">规划路线</string>
<string name="photo_notes">图片注记</string>
<string name="video_notes">视频注记</string>
<string name="multimedia_notes_view_descr">你的OSM注记在 %1$s。</string>
<string name="show_closed_notes">显示关闭的注记</string>
<string name="osm_edit_closed_note">关闭的OSM注记</string>
<string name="osm_edit_closed_note">已关闭的 OSM 注记</string>
<string name="add_online_source">添加在线资源</string>
<string name="rendering_attr_highway_class_bridleway_name">驮道</string>
<string name="rendering_attr_surface_gravel_name">砾石</string>
@ -3134,7 +3136,7 @@
<string name="shared_string_bearing">方向</string>
<string name="app_mode_wheelchair_forward">轮椅向前</string>
<string name="add_to_a_track">添加到轨迹</string>
<string name="track_show_start_finish_icons">显示开始于结束图标</string>
<string name="track_show_start_finish_icons">显示开始和完成图标</string>
<string name="select_track_width">选择宽度</string>
<string name="screen_timeout">屏幕超时</string>
<string name="app_mode_enduro_motorcycle">耐力赛摩托车</string>
@ -3170,19 +3172,19 @@
<string name="speed_cameras_restart_descr">重启需要删除全部的测速相机数据。</string>
<string name="speed_cameras_removed_descr">该设备没有测速相机。</string>
<string name="app_mode_inline_skates">直排轮滑鞋</string>
<string name="quick_action_remove_next_destination_descr">路线上的当前目的地点将被删除。如果它是目的地，导航将会停止。</string>
<string name="quick_action_remove_next_destination_descr">删除路线上的下一个目的地。如果该目的地是最终目的地，导航将停止。</string>
<string name="search_download_wikipedia_maps">下载维基百科地图</string>
<string name="plugin_wikipedia_description">从维基百科获取有关兴趣点的信息。这是你的口袋离线指南-只需启用维基百科插件便可以享受有关你周围物品的文章。</string>
<string name="plugin_wikipedia_description">从维基百科上获取关于兴趣点的信息，这是一个袖珍的离线指南，提供关于地点和目的地的文章。</string>
<string name="add_hidden_group_info">添加的点在地图上不可见，因为选定的组是隐藏的，您可以在\"%s\"中找到它。</string>
<string name="gpx_split_interval_descr">选择显示轨迹上带有距离或时间标记的间隔。</string>
<string name="gpx_split_interval_none_descr">选择所需的拆分选项：“按时间”或“按距离”。</string>
<string name="route_between_points_next_segment_button_desc">新的配置文件将在下一段路线计算时生效。</string>
<string name="route_between_points_next_segment_button_desc">仅使用选定的配置文件重新计算下一个部分。</string>
<string name="whole_track">整个轨迹</string>
<string name="plan_route_last_edited">最后更改</string>
<string name="plan_route_import_track">导入轨迹</string>
<string name="plan_route_open_existing_track">打开一个存在的轨迹</string>
<string name="plan_route_create_new_route">创建新的路线</string>
<string name="plan_route_select_track_file_for_open">打开一个轨迹文件。</string>
<string name="plan_route_select_track_file_for_open">选择要打开的轨迹文件。</string>
<string name="shared_string_done">完成</string>
<string name="overwrite_track">覆盖轨迹</string>
<string name="save_as_new_track">保存为新的轨迹</string>
@ -3363,23 +3365,23 @@
<string name="add_to_opr">添加到 OpenPlaceReviews</string>
<string name="use_dev_url_descr">改用 dev.openstreetmap.org 而不是 openstreetmap.org 来测试上传 OSM 注记 / 兴趣点 / GPX。</string>
<string name="use_dev_url">使用 dev.openstreetmap.org</string>
<string name="add_photos_descr">OsmAnd显示来自多个来源的照片。
\nOpenPlaceReviews--POI照片。
\nMapillary - 街道级图像。
\n网络/维基媒体--根据OpenStreetMap数据的POI照片。</string>
<string name="add_photos_descr">OsmAnd显示来自多个来源的照片：
\nOpenPlaceReviews - POI照片；
\nMapillary - 街道级图像；
\n网络/维基媒体 - 根据OpenStreetMap数据的POI照片。</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="app_mode_light_aircraft">轻型飞机</string>
<string name="plan_route_split_before">拆分前</string>
<string name="plan_route_split_after">拆分后</string>
<string name="profile_type_osmand_string">OsmAnd 配置文件</string>
<string name="profile_type_user_string">用户配置文件</string>
<string name="release_3_9">- 增加了导出和导入所有数据的选项，包括设置、资源、我的地方。
<string name="release_3_9">• 添加了用于导出和导入所有数据的选项，包括设置，资源，我的位置
\n
\n - 规划路线：带有路线的轨道段的图形，并增加了创建和编辑多个轨道段的功能。
\n• 规划路线：具有路线的路段的图形，并添加了创建和编辑多个路段的功能
\n
\n - 为OpenStreetMap增加了OAuth认证方法，改进了OSM对话框的用户界面。
\n• 为 OpenStreetMap 添加了 OAuth 身份验证方法，改进了 OSM 对话框的 UI
\n
\n - 支持自定义颜色的收藏夹和跟踪航点。
\n• 支持收藏夹和航路点的自定义颜色
\n
\n</string>
<string name="reverse_all_points">反转所有点</string>
@ -3447,4 +3449,184 @@
<string name="gpx_parse_error">OsmAnd GPX 格式不正确，请联系支持团队进一步调查。</string>
<string name="simplified_track_description">只有路线线会被保存，航点会被删除。</string>
<string name="shared_string_file_name">文件名</string>
<string name="months_3">三个月</string>
<string name="not_support_file_type_with_ext">选择一个支持的 %1$s 扩展文件。</string>
<string name="logcat_buffer_descr">检查并共享应用程序的详细日志</string>
<string name="import_profile_dialog_description">导入的配置文件包含附加数据。单击 \"导入\"，只导入配置文件数据，或选择其他数据。</string>
<string name="shared_string_include_data">包括补充数据</string>
<string name="access_intermediate_arrival_time">中间到达时间</string>
<string name="transport_nearby_routes_within">附近的路线</string>
<string name="updated">已更新：%s</string>
<string name="shared_string_save_as_gpx">保存为新的轨迹文件</string>
<string name="empty_state_my_tracks_desc">导入或录制轨迹文件</string>
<string name="map_widget_monitoring">行程录制</string>
<string name="follow_track_descr">选择要跟随的轨迹文件</string>
<string name="select_another_track">选择另一轨迹</string>
<string name="nearest_point">最近的点</string>
<string name="attach_to_the_roads">依附于道路</string>
<string name="simplified_track">简化轨迹</string>
<string name="system_default_theme">系统默认值</string>
<string name="all_previous_segments">以前的所有部分</string>
<string name="release_3_8">• 更新计划路线功能：允许每个航段使用不同的导航类型和包含轨道
\n
\n• 轨道的新外观菜单：选择颜色、厚度、显示方向箭头、开始和完成图标
\n
\n•提高自行车节点的能见度。
\n
\n•轨道现在可上用，有上下文菜单与基本信息。
\n
\n• 改进的搜索算法
\n
\n• 改进了导航中的跟踪选项
\n
\n• 配置文件设置导入/导出的固定问题
\n
\n</string>
<string name="osm_live_payment_subscription_management_hw">购买确认后，将向您的 AppGallery 帐户收费。
\n
\n除非在更新日期之前取消订阅，否则订阅将自动延长。仅在续订日期，您的帐户才需要支付续订期（月/三个月/年）。
\n
\n您可以在 AppGallery 设置中管理和取消订阅。</string>
<string name="development">开发</string>
<string name="icon_group_symbols">符号</string>
<string name="icon_group_travel">旅行</string>
<string name="message_you_need_add_two_points_to_show_graphs">添加至少两个点</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="osm_edits_view_descr">在 %1$s 中查看所有尚未上传的编辑或 OSM 错误。已经上传的修改将不会再显示。</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">点击按钮，在 Google Play 上设置付款方式以修复订阅。</string>
<string name="markers_history">标记历史</string>
<string name="routing_attr_prefer_hiking_routes_name">偏好徒步路线</string>
<string name="routing_attr_allow_streams_name">允许溪流和水沟</string>
<string name="routing_attr_allow_intermittent_description">允许间歇性水路</string>
<string name="routing_attr_allow_intermittent_name">允许间歇性水路</string>
<string name="analyze_by_intervals">分析分割区间</string>
<string name="activity_type_car_name">汽车</string>
<string name="temporary_conditional_routing_descr">在地图上使用现在有效的道路限制</string>
<string name="routing_attr_short_way_description">优化的更短路线（节能）</string>
<string name="routing_attr_driving_style_description">选择驾驶目的，以获得更短、更快或更安全的路线</string>
<string name="map_orientation_threshold_descr">如果速度低于阈值，不要旋转地图视图</string>
<string name="restart">重新启动</string>
<string name="shared_strings_all_regions">所有区域</string>
<string name="delete_number_files_question">删除 %1$d 文件？</string>
<string name="track_recording_stop_without_saving">停止而不保存</string>
<string name="track_recording_save_and_stop">保存并停止录制</string>
<string name="track_recording_description">你确定要停止录制吗？
\n所有未保存的数据都将丢失。</string>
<string name="on_pause">暂停</string>
<string name="app_restart_required">应用某些设置时需要重新启动应用程序。</string>
<string name="routing_attr_height_obstacles_description">路线可以避开强势上坡。</string>
<string name="quick_action_coordinates_widget_descr">显示或隐藏地图上的坐标小部件。</string>
<string name="map_widget_distance_by_tap">点击距离</string>
<string name="latest_openstreetmap_update">最新的 OpenStreetMap 更新可用：</string>
<string name="last_time_checked">上次检查： %s</string>
<string name="update_frequency">更新频率</string>
<string name="live_update_frequency_week_variant">地图更新将每周检查一次。下次 %1$s 在 %2$s 。</string>
<string name="live_update_frequency_day_variant">地图更新将每天检查。下次 %1$s 在 %2$s 。</string>
<string name="live_update_frequency_hour_variant">地图更新将每小时检查一次。下次 %1$s 在 %2$s 。</string>
<string name="purchases">购买</string>
<string name="select_category_descr">选择类别或添加新类别</string>
<string name="track_recording_will_be_continued">录制将继续。</string>
<string name="copy_poi_name">复制兴趣点名称</string>
<string name="quick_action_show_hide_title">显示/隐藏</string>
<string name="shared_string_interval">间隔</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">隐藏自然保护区、保护区和国家公园的边界</string>
<string name="track_has_no_altitude">轨迹不包含高度数据。</string>
<string name="track_has_no_speed">轨迹不包含速度数据。</string>
<string name="select_another_colorization">请选择另一种颜色。</string>
<string name="delete_updates">删除更新</string>
<string name="live_update_delete_updates_msg">您确认想要删除所有 %s 实时更新吗？</string>
<string name="keep_both_desc">导入的项目将添加前缀</string>
<string name="replace_all">全部替换</string>
<string name="recalc_angle_dialog_title">我的位置和路线之间的最小角度</string>
<string name="profile_type_custom_string">自定义配置文件</string>
<string name="shared_string_import_complete">导入完成</string>
<string name="items_added">已添加项目</string>
<string name="profile_backup_failed">无法备份配置文件。</string>
<string name="restore_all_profile_settings">恢复所有的配置文件设置？</string>
<string name="clear_recorded_data_warning">是否确定要清除录制的数据？</string>
<string name="shared_string_drawer">抽屉</string>
<string name="context_menu_actions">上下文菜单操作</string>
<string name="divider_descr">该点以下的元素用分隔线隔开。</string>
<string name="hidden_items_descr">这些项目从菜单中被隐藏，但所代表的选项或插件将继续工作。</string>
<string name="reset_items_descr">隐藏设置会将其重置为原始状态。</string>
<string name="main_actions_descr">只有四个按钮。</string>
<string name="main_actions">主要动作</string>
<string name="app_mode_ski_touring">滑雪旅游</string>
<string name="custom_osmand_plugin">自定义 OsmAnd 插件</string>
<string name="settings_item_read_error">无法从 \'%1$s\' 中读取。</string>
<string name="settings_item_write_error">无法写到 \'%1$s\'。</string>
<string name="settings_item_import_error">无法从 \'%1$s\' 导入。</string>
<string name="select_track_file">选择轨迹文件</string>
<string name="wiki_menu_download_descr">需要其他地图才能在地图上查看维基百科兴趣点。</string>
<string name="quick_action_switch_profile_descr">操作按钮在选定的配置文件之间切换。</string>
<string name="sett_parrot_ext_input">Parrot</string>
<string name="sett_wunderlinq_ext_input">WunderLINQ</string>
<string name="external_input_device">外部输入设备</string>
<string name="sort_by_category">按类别排序</string>
<string name="navigate_point_mgrs">MGRS</string>
<string name="lang_oc">奥克西坦语</string>
<string name="simulate_your_location_gpx_descr">使用录制的 GPX 轨迹模拟你的位置。</string>
<string name="osm_recipient_stat">编辑 %1$s，总计 %2$s mBTC</string>
<string name="choose_navigation_type">选择导航配置文件</string>
<string name="keep_showing_on_map">继续在地图上显示</string>
<string name="show_direction">距离指示</string>
<string name="passed">最后使用：%1$s</string>
<string name="show_arrows_on_the_map">在地图上显示箭头</string>
<string name="show_guide_line">显示方向线</string>
<string name="move_to_history">移动到历史</string>
<string name="plan_route_no_markers_toast">你必须至少添加一个标记才能使用此功能。</string>
<string name="import_as_favorites">导入为收藏</string>
<string name="first_intermediate_dest_description">添加始发站</string>
<string name="waypoints_removed_from_map_markers">从地图标记中删除的航点</string>
<string name="use_two_digits_longitude">使用两位数的经度</string>
<string name="wikivoyage_search_hint">搜索国家、城市或省份</string>
<string name="delete_search_history">删除搜索历史记录</string>
<string name="online_webpage_warning">页面仅在线提供。在网页浏览器中打开？</string>
<string name="select_travel_book">选择一本旅游书籍</string>
<string name="shared_string_wifi_only">仅在 Wi-Fi 上</string>
<string name="shared_string_only_with_wifi">仅在 Wi-Fi 上</string>
<string name="purchase_dialog_subtitle">选择合适的项目</string>
<string name="purchase_dialog_travel_description">购买以下其中一项，即可获得离线旅游指南功能：</string>
<string name="unlock_all_features">解锁所有 OsmAnd 功能</string>
<string name="contour_lines_hillshade_maps">等高线和山体阴影地图</string>
<string name="daily_map_updates">每小时更新地图</string>
<string name="monthly_map_updates">每月更新地图</string>
<string name="welcome_to_open_beta">欢迎使用公开测试版</string>
<string name="start_editing_card_image_text">任何人都可以编辑的自由的全球旅游指南。</string>
<string name="travel_card_download_descr">下载 Wikivoyage 旅行指南，在没有连接到互联网的情况下查看世界各地的文章。</string>
<string name="mapnik_render_descr">旧的默认 \'Mapnik\' 风格。与 \'Mapnik\' 颜色相似。</string>
<string name="keep_passed_markers">在地图上保留已通过的标记</string>
<string name="choose_track_file_to_follow">选择要跟随的轨迹文件</string>
<string name="rendering_attr_highway_class_state_road_name">国道</string>
<string name="application_profiles_descr">选择要在应用程序中可见的配置文件。</string>
<string name="routing_profile_broutrer">BRouter（离线）</string>
<string name="base_profile_descr_boat">船、划船、帆船</string>
<string name="base_profile_descr_pedestrian">散步、徒步、跑步</string>
<string name="base_profile_descr_bicycle">山地自行车、轻便摩托车、马</string>
<string name="base_profile_descr_car">汽车、卡车、摩托车</string>
<string name="select_nav_profile_dialog_title">选择导航类型</string>
<string name="select_base_profile_dialog_message">基于你的自定义配置文件的默认应用程序配置文件之一，这定义了基本的设置，如部件的默认可见性和速度和距离的单位。这些是默认的应用程序配置文件，以及它们可以扩展到的自定义配置文件的例子：</string>
<string name="select_base_profile_dialog_title">选择用以开始的配置文件</string>
<string name="profile_alert_delete_msg">是否确定要删除“%s”配置文件</string>
<string name="profile_alert_need_save_msg">首先保存配置文件的更改</string>
<string name="profile_alert_cant_delete_base">你不能删除 OsmAnd 的基本配置文件</string>
<string name="profile_alert_duplicate_name_msg">已经有该名称的配置文件</string>
<string name="profile_alert_need_profile_name_msg">你必须先指定一个配置文件名称。</string>
<string name="profile_alert_need_profile_name_title">输入配置文件名称</string>
<string name="profile_alert_need_routing_type_msg">请为新应用配置文件选择导航类型</string>
<string name="profile_alert_need_routing_type_title">选择导航类型</string>
<string name="settings_derived_routing_mode_string">用户模式，派生自： %s</string>
<string name="show_compass_ruler">显示指南针标尺</string>
<string name="settings_privacy_and_security_desc">选择你分享的数据</string>
<string name="privacy_and_security_change_descr">如果同意我们的%1$s，请点击“允许”</string>
<string name="visited_screens_collect_descr">帮助我们了解 OsmAnd 功能的受欢迎程度。</string>
<string name="downloaded_maps_collect_descr">帮助我们了解国家和地区地图的受欢迎程度。</string>
<string name="collected_data_descr">定义允许 OsmAnd 分享哪些数据。</string>
<string name="choose_data_to_share">选择要分享的数据类型：</string>
</resources>

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

@ -4036,4 +4036,6 @@
<string name="track_has_no_altitude">軌跡不包含海拔資料。</string>
<string name="track_has_no_speed">軌跡不包含速度資料。</string>
<string name="select_another_colorization">請選擇另一種顏色。</string>
<string name="rendering_attr_noNatureReserveBoundaries_description">隱藏自然保留區、保護區與國家公園界線</string>
<string name="rendering_attr_noNatureReserveBoundaries_name">自然界線</string>
</resources>

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

@ -25,9 +25,9 @@
<string name="purchases">Purchases</string>
<string name="live_update_delete_updates_msg">Are you sure you want to delete all %s live updates?</string>
<string name="delete_updates">Delete updates</string>
<string name="live_update_frequency_hour_variant">Map updates will be checked every hour. Next time%1$s in %2$s.</string>
<string name="live_update_frequency_day_variant">Map updates will be checked every day. Next time%1$s in %2$s.</string>
<string name="live_update_frequency_week_variant">Map updates will be checked every week. Next time%1$s in %2$s.</string>
<string name="live_update_frequency_hour_variant">Map updates will be checked every hour. Next time %1$s in %2$s.</string>
<string name="live_update_frequency_day_variant">Map updates will be checked every day. Next time %1$s in %2$s.</string>
<string name="live_update_frequency_week_variant">Map updates will be checked every week. Next time %1$s in %2$s.</string>
<string name="update_frequency">Update frequency</string>
<string name="last_time_checked">Last time checked: %s</string>
<string name="updated">Updated: %s</string>

69
OsmAnd/src-amazon/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java Normal file
View file

@ -0,0 +1,69 @@
package net.osmand.plus.inapp;
import android.app.Activity;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import net.osmand.plus.OsmandApplication;
import java.lang.ref.WeakReference;
public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
public InAppPurchaseHelperImpl(OsmandApplication ctx) {
super(ctx);
purchases = new InAppPurchasesImpl(ctx);
}
@Override
public void isInAppPurchaseSupported(@NonNull Activity activity, @Nullable InAppPurchaseInitCallback callback) {
}
@Override
protected void execImpl(@NonNull InAppPurchaseTaskType taskType, @NonNull InAppCommand command) {
}
@Override
public void purchaseFullVersion(@NonNull Activity activity) throws UnsupportedOperationException {
}
@Override
public void purchaseDepthContours(@NonNull Activity activity) throws UnsupportedOperationException {
}
@Override
public void purchaseContourLines(@NonNull Activity activity) throws UnsupportedOperationException {
}
@Override
public void manageSubscription(@NonNull Context ctx, @Nullable String sku) {
}
@Override
protected InAppCommand getPurchaseLiveUpdatesCommand(WeakReference<Activity> activity, String sku, String userInfo) throws UnsupportedOperationException {
return null;
}
@Override
protected InAppCommand getRequestInventoryCommand() throws UnsupportedOperationException {
return null;
}
@Override
protected boolean isBillingManagerExists() {
return false;
}
@Override
protected void destroyBillingManager() {
}
}

39
OsmAnd/src-amazon/net/osmand/plus/inapp/InAppPurchasesImpl.java Normal file
View file

@ -0,0 +1,39 @@
package net.osmand.plus.inapp;
import net.osmand.plus.OsmandApplication;
public class InAppPurchasesImpl extends InAppPurchases {
public InAppPurchasesImpl(OsmandApplication ctx) {
super(ctx);
inAppPurchases = new InAppPurchase[] {};
liveUpdates = new EmptyLiveUpdatesList();
}
@Override
public boolean isFullVersion(String sku) {
return false;
}
@Override
public boolean isDepthContours(String sku) {
return false;
}
@Override
public boolean isContourLines(String sku) {
return false;
}
@Override
public boolean isLiveUpdates(String sku) {
return false;
}
private static class EmptyLiveUpdatesList extends InAppSubscriptionList {
public EmptyLiveUpdatesList() {
super(new InAppSubscription[] {});
}
}
}

17
OsmAnd/src-huawei/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
View file

@ -31,7 +31,6 @@ import net.osmand.plus.inapp.InAppPurchases.InAppSubscription;
import net.osmand.plus.inapp.InAppPurchases.InAppSubscriptionIntroductoryInfo;
import net.osmand.plus.inapp.InAppPurchasesImpl.InAppPurchaseLiveUpdatesOldSubscription;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.settings.backend.OsmandPreference;
import net.osmand.util.Algorithms;
import java.lang.ref.WeakReference;
@ -268,7 +267,7 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
InAppSubscription s = (InAppSubscription) inAppPurchase;
try {
s.setIntroductoryInfo(new InAppSubscriptionIntroductoryInfo(s, introductoryPrice,
introductoryPriceAmountMicros, introductoryPricePeriod, String.valueOf(introductoryPriceCycles)));
introductoryPriceAmountMicros, introductoryPricePeriod, introductoryPriceCycles));
} catch (ParseException e) {
LOG.error(e);
}
@ -542,20 +541,12 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
}
}
}
OsmandPreference<Long> subscriptionCancelledTime = ctx.getSettings().LIVE_UPDATES_PURCHASE_CANCELLED_TIME;
if (!subscribedToLiveUpdates && ctx.getSettings().LIVE_UPDATES_PURCHASED.get()) {
if (subscriptionCancelledTime.get() == 0) {
subscriptionCancelledTime.set(System.currentTimeMillis());
ctx.getSettings().LIVE_UPDATES_PURCHASE_CANCELLED_FIRST_DLG_SHOWN.set(false);
ctx.getSettings().LIVE_UPDATES_PURCHASE_CANCELLED_SECOND_DLG_SHOWN.set(false);
} else if (System.currentTimeMillis() - subscriptionCancelledTime.get() > SUBSCRIPTION_HOLDING_TIME_MSEC) {
ctx.getSettings().LIVE_UPDATES_PURCHASED.set(false);
if (!isDepthContoursPurchased(ctx)) {
ctx.getSettings().getCustomRenderBooleanProperty("depthContours").set(false);
}
ctx.getSettings().LIVE_UPDATES_PURCHASED.set(false);
if (!isDepthContoursPurchased(ctx)) {
ctx.getSettings().getCustomRenderBooleanProperty("depthContours").set(false);
}
} else if (subscribedToLiveUpdates) {
subscriptionCancelledTime.set(0L);
ctx.getSettings().LIVE_UPDATES_PURCHASED.set(true);
}

2
OsmAnd/src/net/osmand/plus/Version.java
View file

@ -23,7 +23,7 @@ public class Version {
return getBuildFlavor().contains("huawei");
}
private static boolean isAmazon() {
public static boolean isAmazon() {
return getBuildFlavor().contains("amazon");
}

3
OsmAnd/src/net/osmand/plus/activities/PluginInfoFragment.java
View file

@ -31,6 +31,7 @@ import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.base.BaseOsmAndFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.dialogs.PluginInstalledBottomSheetDialog.PluginStateListener;
import net.osmand.plus.settings.fragments.BaseSettingsFragment;
import net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType;
@ -168,7 +169,7 @@ public class PluginInfoFragment extends BaseOsmAndFragment implements PluginStat
if (plugin instanceof SRTMPlugin) {
FragmentManager fragmentManager = getActivity().getSupportFragmentManager();
if (fragmentManager != null) {
ChoosePlanDialogFragment.showHillshadeSrtmPluginInstance(fragmentManager);
ChoosePlanDialogFragment.showDialogInstance(app, fragmentManager, ChoosePlanDialogType.HILLSHADE_SRTM_PLUGIN);
}
} else {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(plugin.getInstallURL())));

85
OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java
View file

@ -5,6 +5,8 @@ import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
@ -27,6 +29,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
@ -34,7 +37,6 @@ import net.osmand.AndroidUtils;
import net.osmand.PlatformUtil;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.Version;
@ -48,6 +50,7 @@ import net.osmand.plus.inapp.InAppPurchases.InAppPurchase;
import net.osmand.plus.inapp.InAppPurchases.InAppSubscription;
import net.osmand.plus.inapp.InAppPurchases.InAppSubscriptionIntroductoryInfo;
import net.osmand.plus.liveupdates.SubscriptionFragment;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.srtmplugin.SRTMPlugin;
import net.osmand.plus.widgets.TextViewEx;
import net.osmand.util.Algorithms;
@ -709,57 +712,41 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
}
}
public static void showFreeVersionInstance(@NonNull FragmentManager fm) {
try {
ChoosePlanFreeBannerDialogFragment fragment = new ChoosePlanFreeBannerDialogFragment();
fragment.show(fm, ChoosePlanFreeBannerDialogFragment.TAG);
} catch (RuntimeException e) {
LOG.error("showFreeVersionInstance", e);
public enum ChoosePlanDialogType {
FREE_VERSION("showFreeVersionInstance", ChoosePlanFreeBannerDialogFragment.TAG, ChoosePlanFreeBannerDialogFragment.class),
WIKIPEDIA("showWikipediaInstance", ChoosePlanWikipediaDialogFragment.TAG, ChoosePlanWikipediaDialogFragment.class),
WIKIVOYAGE("showWikivoyageInstance", ChoosePlanWikivoyageDialogFragment.TAG, ChoosePlanWikivoyageDialogFragment.class),
SEA_DEPTH_MAPS("showSeaDepthMapsInstance", ChoosePlanSeaDepthMapsDialogFragment.TAG, ChoosePlanSeaDepthMapsDialogFragment.class),
HILLSHADE_SRTM_PLUGIN("showHillshadeSrtmPluginInstance", ChoosePlanHillshadeSrtmDialogFragment.TAG, ChoosePlanHillshadeSrtmDialogFragment.class),
OSM_LIVE("showOsmLiveInstance", ChoosePlanOsmLiveBannerDialogFragment.TAG, ChoosePlanOsmLiveBannerDialogFragment.class);
private final String tag;
private final String errorName;
private final Class<? extends ChoosePlanDialogFragment> fragmentClass;
ChoosePlanDialogType(String errorName, String tag, Class<? extends ChoosePlanDialogFragment> fragmentClass) {
this.tag = tag;
this.errorName = errorName;
this.fragmentClass = fragmentClass;
}
}
public static void showWikipediaInstance(@NonNull FragmentManager fm) {
try {
ChoosePlanWikipediaDialogFragment fragment = new ChoosePlanWikipediaDialogFragment();
fragment.show(fm, ChoosePlanWikipediaDialogFragment.TAG);
} catch (RuntimeException e) {
LOG.error("showWikipediaInstance", e);
}
}
public static void showWikivoyageInstance(@NonNull FragmentManager fm) {
try {
ChoosePlanWikivoyageDialogFragment fragment = new ChoosePlanWikivoyageDialogFragment();
fragment.show(fm, ChoosePlanWikivoyageDialogFragment.TAG);
} catch (RuntimeException e) {
LOG.error("showWikivoyageInstance", e);
}
}
public static void showSeaDepthMapsInstance(@NonNull FragmentManager fm) {
try {
ChoosePlanSeaDepthMapsDialogFragment fragment = new ChoosePlanSeaDepthMapsDialogFragment();
fragment.show(fm, ChoosePlanSeaDepthMapsDialogFragment.TAG);
} catch (RuntimeException e) {
LOG.error("showSeaDepthMapsInstance", e);
}
}
public static void showHillshadeSrtmPluginInstance(@NonNull FragmentManager fm) {
try {
ChoosePlanHillshadeSrtmDialogFragment fragment = new ChoosePlanHillshadeSrtmDialogFragment();
fragment.show(fm, ChoosePlanHillshadeSrtmDialogFragment.TAG);
} catch (RuntimeException e) {
LOG.error("showHillshadeSrtmPluginInstance", e);
}
}
public static void showOsmLiveInstance(@NonNull FragmentManager fm) {
try {
ChoosePlanOsmLiveBannerDialogFragment fragment = new ChoosePlanOsmLiveBannerDialogFragment();
fragment.show(fm, ChoosePlanOsmLiveBannerDialogFragment.TAG);
} catch (RuntimeException e) {
LOG.error("showOsmLiveInstance", e);
public static void showDialogInstance(@NonNull OsmandApplication app, @NonNull FragmentManager manager,
@NonNull ChoosePlanDialogType dialogType) {
if (Version.isAmazon()) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(Version.getUrlWithUtmRef(app, "net.osmand.plus")));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
if (AndroidUtils.isIntentSafe(app, intent)) {
app.startActivity(intent);
}
} else {
try {
ChoosePlanDialogFragment fragment = (ChoosePlanDialogFragment) Fragment.instantiate(app, dialogType.fragmentClass.getName());
fragment.show(manager, dialogType.tag);
} catch (RuntimeException e) {
LOG.error(dialogType.errorName, e);
}
}
}
}

3
OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveGoneDialog.java
View file

@ -28,6 +28,7 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.BaseOsmAndDialogFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.OsmAndFeature;
import net.osmand.plus.inapp.InAppPurchaseHelper;
import net.osmand.plus.inapp.InAppPurchases.InAppSubscription;
@ -235,7 +236,7 @@ public abstract class OsmLiveGoneDialog extends BaseOsmAndDialogFragment {
dismiss();
FragmentActivity activity = getActivity();
if (activity != null) {
ChoosePlanDialogFragment.showOsmLiveInstance(activity.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(app, activity.getSupportFragmentManager(), ChoosePlanDialogType.OSM_LIVE);
}
}
});

3
OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
View file

@ -21,6 +21,7 @@ import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R;
import net.osmand.plus.activities.PluginsFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.dashboard.tools.DashFragmentData;
import net.osmand.plus.development.OsmandDevelopmentPlugin;
import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
@ -55,7 +56,7 @@ public class DashPluginsFragment extends DashBaseFragment {
if (plugin instanceof SRTMPlugin) {
FragmentManager fragmentManager = getFragmentManager();
if (fragmentManager != null) {
ChoosePlanDialogFragment.showHillshadeSrtmPluginInstance(fragmentManager);
ChoosePlanDialogFragment.showDialogInstance(getMyApplication(), fragmentManager, ChoosePlanDialogType.HILLSHADE_SRTM_PLUGIN);
}
} else {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(plugin.getInstallURL())));

9
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -22,8 +22,6 @@ import android.widget.ProgressBar;
import android.widget.Space;
import android.widget.TextView;
import com.ibm.icu.impl.IllegalIcuArgumentException;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
@ -35,6 +33,8 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.viewpager.widget.ViewPager;
import com.ibm.icu.impl.IllegalIcuArgumentException;
import net.osmand.AndroidUtils;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
@ -52,7 +52,9 @@ import net.osmand.plus.activities.TabActivity;
import net.osmand.plus.base.BasicProgressAsyncTask;
import net.osmand.plus.base.BottomSheetDialogFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents;
import net.osmand.plus.download.ReloadIndexesTask.ReloadIndexesListener;
import net.osmand.plus.download.ui.ActiveDownloadsDialogFragment;
import net.osmand.plus.download.ui.DownloadResourceGroupFragment;
import net.osmand.plus.download.ui.LocalIndexesFragment;
@ -63,7 +65,6 @@ import net.osmand.plus.inapp.InAppPurchaseHelper;
import net.osmand.plus.inapp.InAppPurchaseHelper.InAppPurchaseTaskType;
import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.download.ReloadIndexesTask.ReloadIndexesListener;
import net.osmand.plus.srtmplugin.SRTMPlugin;
import net.osmand.plus.views.controls.PagerSlidingTabStrip;
import net.osmand.util.Algorithms;
@ -407,7 +408,7 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
collapseBanner();
} else {
ctx.getMyApplication().logEvent("click_free_dialog");
ChoosePlanDialogFragment.showFreeVersionInstance(ctx.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(ctx.getMyApplication(), ctx.getSupportFragmentManager(), ChoosePlanDialogType.FREE_VERSION);
}
}
};

7
OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java
View file

@ -32,6 +32,7 @@ import net.osmand.plus.activities.LocalIndexInfo;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.PluginsFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.download.CityItem;
import net.osmand.plus.download.CustomIndexItem;
import net.osmand.plus.download.DownloadItem;
@ -353,10 +354,10 @@ public class ItemViewHolder {
switch (clickAction) {
case ASK_FOR_FULL_VERSION_PURCHASE:
context.getMyApplication().logEvent("in_app_purchase_show_from_wiki_context_menu");
ChoosePlanDialogFragment.showWikipediaInstance(context.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(context.getMyApplication(), context.getSupportFragmentManager(), ChoosePlanDialogType.WIKIPEDIA);
break;
case ASK_FOR_DEPTH_CONTOURS_PURCHASE:
ChoosePlanDialogFragment.showSeaDepthMapsInstance(context.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(context.getMyApplication(), context.getSupportFragmentManager(), ChoosePlanDialogType.SEA_DEPTH_MAPS);
break;
case ASK_FOR_SEAMARKS_PLUGIN:
showPluginsScreen();
@ -364,7 +365,7 @@ public class ItemViewHolder {
context.getString(R.string.activate_seamarks_plugin), Toast.LENGTH_SHORT).show();
break;
case ASK_FOR_SRTM_PLUGIN_PURCHASE:
ChoosePlanDialogFragment.showHillshadeSrtmPluginInstance(context.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(context.getMyApplication(), context.getSupportFragmentManager(), ChoosePlanDialogType.HILLSHADE_SRTM_PLUGIN);
break;
case ASK_FOR_SRTM_PLUGIN_ENABLE:
showPluginsScreen();

4
OsmAnd/src/net/osmand/plus/download/ui/UpdatesIndexFragment.java
View file

@ -42,6 +42,7 @@ import net.osmand.plus.liveupdates.LiveUpdatesClearDialogFragment.RefreshLiveUpd
import net.osmand.plus.liveupdates.LiveUpdatesFragmentNew;
import net.osmand.plus.liveupdates.LoadLiveMapsTask;
import net.osmand.plus.liveupdates.LoadLiveMapsTask.LocalIndexInfoAdapter;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.base.OsmAndListFragment;
@ -369,7 +370,8 @@ public class UpdatesIndexFragment extends OsmAndListFragment implements Download
cardView.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
ChoosePlanDialogFragment.showOsmLiveInstance(getMyActivity().getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(getMyApplication(),
getMyActivity().getSupportFragmentManager(), ChoosePlanDialogType.OSM_LIVE);
}
});
} else {

15
OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java
View file

@ -28,6 +28,7 @@ import net.osmand.osm.PoiType;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.activities.OsmandInAppPurchaseActivity;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.Version;
@ -322,7 +323,7 @@ public class DiscountHelper {
} else {
for (InAppPurchase p : purchaseHelper.getLiveUpdates().getAllSubscriptions()) {
if (url.contains(p.getSku())) {
ChoosePlanDialogFragment.showOsmLiveInstance(mapActivity.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(app, mapActivity.getSupportFragmentManager(), ChoosePlanDialogType.OSM_LIVE);
break;
}
}
@ -367,17 +368,17 @@ public class DiscountHelper {
} else if (url.startsWith(SHOW_CHOOSE_PLAN_PREFIX)) {
String planType = url.substring(SHOW_CHOOSE_PLAN_PREFIX.length()).trim();
if (CHOOSE_PLAN_TYPE_FREE.equals(planType)) {
ChoosePlanDialogFragment.showFreeVersionInstance(mapActivity.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(mapActivity.getMyApplication(), mapActivity.getSupportFragmentManager(), ChoosePlanDialogType.FREE_VERSION);
} else if (CHOOSE_PLAN_TYPE_LIVE.equals(planType)) {
ChoosePlanDialogFragment.showOsmLiveInstance(mapActivity.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(mapActivity.getMyApplication(), mapActivity.getSupportFragmentManager(), ChoosePlanDialogType.OSM_LIVE);
} else if (CHOOSE_PLAN_TYPE_SEA_DEPTH.equals(planType)) {
ChoosePlanDialogFragment.showSeaDepthMapsInstance(mapActivity.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(mapActivity.getMyApplication(), mapActivity.getSupportFragmentManager(), ChoosePlanDialogType.SEA_DEPTH_MAPS);
} else if (CHOOSE_PLAN_TYPE_HILLSHADE.equals(planType)) {
ChoosePlanDialogFragment.showHillshadeSrtmPluginInstance(mapActivity.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(mapActivity.getMyApplication(), mapActivity.getSupportFragmentManager(), ChoosePlanDialogType.HILLSHADE_SRTM_PLUGIN);
} else if (CHOOSE_PLAN_TYPE_WIKIPEDIA.equals(planType)) {
ChoosePlanDialogFragment.showWikipediaInstance(mapActivity.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(mapActivity.getMyApplication(), mapActivity.getSupportFragmentManager(), ChoosePlanDialogType.WIKIPEDIA);
} else if (CHOOSE_PLAN_TYPE_WIKIVOYAGE.equals(planType)) {
ChoosePlanDialogFragment.showWikivoyageInstance(mapActivity.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(mapActivity.getMyApplication(), mapActivity.getSupportFragmentManager(), ChoosePlanDialogType.WIKIVOYAGE);
}
} else {
Intent intent = new Intent(Intent.ACTION_VIEW);

5
OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
View file

@ -32,6 +32,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.settings.backend.CommonPreference;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
@ -210,7 +211,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
subscriptionsButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ChoosePlanDialogFragment.showOsmLiveInstance(getActivity().getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(app, getActivity().getSupportFragmentManager(), ChoosePlanDialogType.OSM_LIVE);
}
});
if (isDonationSupported()) {
@ -246,7 +247,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
public void onClick(View v) {
FragmentActivity activity = getActivity();
if (activity != null) {
ChoosePlanDialogFragment.showOsmLiveInstance(activity.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(app, activity.getSupportFragmentManager(), ChoosePlanDialogType.OSM_LIVE);
}
}
});

3
OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
View file

@ -19,6 +19,7 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogListener;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.download.AbstractDownloadActivity;
import net.osmand.plus.inapp.InAppPurchaseHelper;
@ -79,7 +80,7 @@ public class OsmLiveActivity extends AbstractDownloadActivity implements ChooseP
protected void onResume() {
super.onResume();
if (!InAppPurchaseHelper.isSubscribedToLiveUpdates(getMyApplication()) && showSettingOnly) {
ChoosePlanDialogFragment.showOsmLiveInstance(getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(getMyApplication(), getSupportFragmentManager(), ChoosePlanDialogType.OSM_LIVE);
}
}

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

@ -8,6 +8,7 @@ import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.ScrollView;
import androidx.activity.OnBackPressedCallback;
import androidx.annotation.NonNull;
@ -175,6 +176,18 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
calculateGpxApproximation(true);
final ScrollView profileView = (ScrollView) getBottomScrollView();
profileView.postDelayed(new Runnable() {
@Override
public void run() {
View view = profileView.findViewWithTag(snapToRoadAppMode.getStringKey());
if (view != null) {
int headerHeight = getResources().getDimensionPixelSize(R.dimen.measurement_tool_button_height);
profileView.scrollTo(0, view.getTop() + headerHeight);
}
}
}, 100);
return mainView;
}

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

@ -11,7 +11,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.ImageView;
@ -20,6 +19,18 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import androidx.activity.OnBackPressedCallback;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.core.content.ContextCompat;
import androidx.core.widget.TextViewCompat;
import androidx.fragment.app.FragmentManager;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
import com.github.ksoichiro.android.observablescrollview.ScrollUtils;
import com.google.android.material.snackbar.Snackbar;
import net.osmand.AndroidUtils;
@ -85,17 +96,6 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
import androidx.activity.OnBackPressedCallback;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.core.content.ContextCompat;
import androidx.core.widget.TextViewCompat;
import androidx.fragment.app.FragmentManager;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
import static net.osmand.IndexConstants.GPX_FILE_EXT;
import static net.osmand.IndexConstants.GPX_INDEX_DIR;
import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationMode;
@ -135,6 +135,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
private ImageView mainIcon;
private String fileName;
private OnBackPressedCallback onBackPressedCallback;
private boolean showSnapWarning;
private InfoType currentInfoType;
@ -238,6 +239,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
if (mapActivity == null) {
return null;
}
final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
final OsmandApplication app = mapActivity.getMyApplication();
@ -303,9 +305,9 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
} else {
cardsContainer = mapActivity.findViewById(R.id.left_side_menu);
bottomMapControls = mapActivity.findViewById(R.id.bottom_controls_container);
mainView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
ScrollUtils.addOnGlobalLayoutListener(mainView, new Runnable() {
@Override
public void onGlobalLayout() {
public void run() {
updateCardContainerSize();
}
});
@ -362,7 +364,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
}
});
View applyPointBeforeAfterButton = mainView.findViewById(R.id.apply_point_before_after_point_button);
UiUtilities.setupDialogButton(nightMode, applyPointBeforeAfterButton,
UiUtilities.DialogButtonType.PRIMARY, R.string.shared_string_apply);
@ -567,11 +568,10 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
});
initMeasurementMode(gpxData, savedInstanceState == null);
if (savedInstanceState == null) {
if (fileName != null) {
addNewGpxData(getGpxFile(fileName));
} else if (editingCtx.isApproximationNeeded() && isFollowTrackMode()) {
} else if (editingCtx.isApproximationNeeded() && isFollowTrackMode() && isShowSnapWarning()) {
enterApproximationMode(mapActivity);
}
} else {
@ -676,19 +676,36 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
}
private void updateCardContainerSize() {
if (portrait) {
return;
}
View measureModeControls = mainView.findViewById(R.id.measure_mode_controls);
int width = mainView.getWidth() - measureModeControls.getWidth();
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(width, -1);
int bottomMargin = measureModeControls.getHeight();
bottomMargin = progressBarVisible ? bottomMargin + mainView.findViewById(R.id.snap_to_road_progress_bar).getHeight() : bottomMargin;
params.setMargins(0, 0, 0, bottomMargin);
cardsContainer.setLayoutParams(params);
if (mainView.getParent() instanceof FrameLayout) {
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(width, -1);
params.setMargins(0, 0, 0, bottomMargin);
cardsContainer.setLayoutParams(params);
} else if (mainView.getParent() instanceof LinearLayout) {
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(width, -1);
params.setMargins(0, 0, 0, bottomMargin);
cardsContainer.setLayoutParams(params);
}
}
private void shiftBottomMapControls(boolean toInitialPosition) {
if (portrait) {
return;
}
int leftMargin = toInitialPosition ? 0 : cardsContainer.getWidth();
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) bottomMapControls.getLayoutParams();
params.setMargins(leftMargin, 0, 0, 0);
if (bottomMapControls.getParent() instanceof LinearLayout) {
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) bottomMapControls.getLayoutParams();
params.setMargins(leftMargin, 0, 0, 0);
} else if (bottomMapControls.getParent() instanceof FrameLayout) {
FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) bottomMapControls.getLayoutParams();
params.setMargins(leftMargin, 0, 0, 0);
}
}
public boolean isInEditMode() {
@ -699,6 +716,15 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
this.fileName = fileName;
}
public boolean isShowSnapWarning() {
return this.showSnapWarning;
}
public void setShowSnapWarning(boolean showSnapWarning) {
this.showSnapWarning = showSnapWarning;
}
public MeasurementEditingContext getEditingCtx() {
return editingCtx;
}
@ -1991,10 +2017,11 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
}
public static boolean showInstance(FragmentManager fragmentManager, MeasurementEditingContext editingCtx,
boolean followTrackMode) {
boolean followTrackMode, boolean showSnapWarning) {
MeasurementToolFragment fragment = new MeasurementToolFragment();
fragment.setEditingCtx(editingCtx);
fragment.setMode(FOLLOW_TRACK_MODE, followTrackMode);
fragment.setShowSnapWarning(showSnapWarning);
return showFragment(fragment, fragmentManager);
}
@ -2162,4 +2189,5 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
public interface OnUpdateInfoListener {
void onUpdateInfo();
}
}

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

@ -57,8 +57,8 @@ import net.osmand.plus.routepreparationmenu.cards.ReverseTrackCard;
import net.osmand.plus.routepreparationmenu.cards.SelectTrackCard;
import net.osmand.plus.routepreparationmenu.cards.TrackEditCard;
import net.osmand.plus.routepreparationmenu.cards.TracksToFollowCard;
import net.osmand.plus.routing.IRouteInformationListener;
import net.osmand.plus.routing.GPXRouteParams.GPXRouteParamsBuilder;
import net.osmand.plus.routing.IRouteInformationListener;
import net.osmand.plus.routing.RouteService;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.settings.backend.ApplicationMode;
@ -446,8 +446,11 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
if (mapActivity != null) {
if (card instanceof ImportTrackCard) {
importTrack();
} else if (card instanceof TrackEditCard || card instanceof AttachTrackToRoadsCard) {
openPlanRoute();
} else if (card instanceof AttachTrackToRoadsCard) {
openPlanRoute(true);
close();
} else if (card instanceof TrackEditCard) {
openPlanRoute(false);
close();
} else if (card instanceof SelectTrackCard) {
updateSelectionMode(true);
@ -574,7 +577,7 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
}
}
public void openPlanRoute() {
public void openPlanRoute(boolean showSnapWarning) {
MapActivity mapActivity = getMapActivity();
if (mapActivity != null && gpxFile != null) {
editingTrack = true;
@ -583,7 +586,7 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
editingContext.setGpxData(gpxData);
editingContext.setAppMode(app.getRoutingHelper().getAppMode());
editingContext.setSelectedSegment(app.getSettings().GPX_ROUTE_SEGMENT.get());
MeasurementToolFragment.showInstance(mapActivity.getSupportFragmentManager(), editingContext, true);
MeasurementToolFragment.showInstance(mapActivity.getSupportFragmentManager(), editingContext, true, showSnapWarning);
}
}

14
OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java
View file

@ -245,10 +245,16 @@ public class RoutingOptionsHelper {
TargetPoint pointToStart = tg.getPointToStart();
TargetPoint pointToNavigate = tg.getPointToNavigate();
if (rp.getFile().hasRoute()) {
tg.clearStartPoint(false);
Location finishLoc = ps.get(ps.size() - 1);
tg.navigateToPoint(new LatLon(finishLoc.getLatitude(), finishLoc.getLongitude()),
false, -1, pointToNavigate != null ? pointToNavigate.getOriginalPointDescription() : null);
TargetPoint endPoint = selected ? pointToStart : null;
Location lastLoc = ps.get(ps.size() - 1);
Location firstLoc = ps.get(0);
LatLon firstLatLon = new LatLon(firstLoc.getLatitude(), firstLoc.getLongitude());
LatLon endLocation = endPoint != null ? endPoint.point : new LatLon(lastLoc.getLatitude(), lastLoc.getLongitude());
LatLon startLocation = selected ? firstLatLon : (pointToNavigate != null ? pointToNavigate.point : firstLatLon);
tg.navigateToPoint(endLocation, false, -1);
if (pointToStart != null) {
tg.setStartPoint(startLocation, false, null);
}
tg.updateRouteAndRefresh(true);
} else {
Location first = ps.get(0);

7
OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
View file

@ -33,7 +33,9 @@ import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
import net.osmand.plus.helpers.GpxUiHelper;
import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
import net.osmand.plus.search.listitems.QuickSearchBannerListItem;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.mapcontextmenu.MenuController;
import net.osmand.plus.search.listitems.QuickSearchBannerListItem;
import net.osmand.plus.search.listitems.QuickSearchHeaderListItem;
import net.osmand.plus.search.listitems.QuickSearchListItem;
import net.osmand.plus.search.listitems.QuickSearchListItemType;
@ -51,9 +53,9 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import static net.osmand.plus.search.listitems.QuickSearchBannerListItem.ButtonItem;
import static net.osmand.plus.search.listitems.QuickSearchBannerListItem.INVALID_ID;
import static net.osmand.search.core.ObjectType.POI_TYPE;
import static net.osmand.plus.search.listitems.QuickSearchBannerListItem.ButtonItem;
public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
@ -286,8 +288,7 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
btnGet.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ChoosePlanDialogFragment.showWikipediaInstance(
activity.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(app, activity.getSupportFragmentManager(), ChoosePlanDialogType.WIKIPEDIA);
}
});
}

4
OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesMenu.java
View file

@ -8,6 +8,7 @@ import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuItem;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.settings.backend.CommonPreference;
import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R;
@ -139,7 +140,8 @@ public class ContourLinesMenu {
}
});
} else if (itemId == R.string.srtm_plugin_name) {
ChoosePlanDialogFragment.showHillshadeSrtmPluginInstance(mapActivity.getSupportFragmentManager());
ChoosePlanDialogFragment.showDialogInstance(mapActivity.getMyApplication(),
mapActivity.getSupportFragmentManager(), ChoosePlanDialogType.HILLSHADE_SRTM_PLUGIN);
closeDashboard(mapActivity);
} else if (contourWidthProp != null && itemId == contourWidthName.hashCode()) {
plugin.selectPropertyValue(mapActivity, contourWidthProp, widthPref, new Runnable() {

36
OsmAnd/src/net/osmand/plus/track/GpxBlockStatisticsBuilder.java
View file

@ -8,15 +8,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.ColorInt;
import androidx.annotation.ColorRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import net.osmand.AndroidUtils;
import net.osmand.GPXUtilities.GPXFile;
import net.osmand.GPXUtilities.GPXTrackAnalysis;
@ -39,6 +30,15 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import androidx.annotation.ColorInt;
import androidx.annotation.ColorRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
public class GpxBlockStatisticsBuilder {
private static final Log log = PlatformUtil.getLog(GpxBlockStatisticsBuilder.class);
@ -116,12 +116,22 @@ public class GpxBlockStatisticsBuilder {
public void initItems() {
GPXFile gpxFile = getGPXFile();
GpxDisplayItem gpxDisplayItem = getDisplayItem(gpxFile);
if (app == null || gpxFile == null) {
return;
}
GPXTrackAnalysis analysis = null;
boolean withoutGaps = true;
if (gpxDisplayItem != null) {
analysis = gpxDisplayItem.analysis;
withoutGaps = !selectedGpxFile.isJoinSegments() && gpxDisplayItem.isGeneralTrack();
if (gpxFile.equals(app.getSavingTrackHelper().getCurrentGpx())) {
GPXFile currentGpx = app.getSavingTrackHelper().getCurrentTrack().getGpxFile();
analysis = currentGpx.getAnalysis(0);
withoutGaps = !selectedGpxFile.isJoinSegments()
&& (Algorithms.isEmpty(currentGpx.tracks) || currentGpx.tracks.get(0).generalTrack);
} else {
GpxDisplayItem gpxDisplayItem = getDisplayItem(gpxFile);
if (gpxDisplayItem != null) {
analysis = gpxDisplayItem.analysis;
withoutGaps = !selectedGpxFile.isJoinSegments() && gpxDisplayItem.isGeneralTrack();
}
}
if (analysis != null) {
float totalDistance = withoutGaps ? analysis.totalDistanceWithoutGaps : analysis.totalDistance;

8
OsmAnd/src/net/osmand/plus/track/TrackPointsCard.java
View file

@ -184,7 +184,13 @@ public class TrackPointsCard extends BaseCard implements OnChildClickListener, O
}
private List<GpxDisplayGroup> getDisplayGroups() {
return selectedGroup != null ? Collections.singletonList(selectedGroup) : getOriginalGroups();
if (selectedGroup != null) {
List<GpxDisplayGroup> res = new ArrayList<>();
res.add(selectedGroup);
return res;
} else {
return getOriginalGroups();
}
}
@Override

4
OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
View file

@ -927,7 +927,11 @@ public class GPXLayer extends OsmandMapLayer implements IContextMenuProvider, IM
}
}
@Nullable
public static Pair<WptPt, WptPt> findPointsNearSegment(RotatedTileBox tb, List<WptPt> points, int r, int mx, int my) {
if (Algorithms.isEmpty(points)) {
return null;
}
WptPt prevPoint = points.get(0);
int ppx = (int) tb.getPixXFromLatLon(prevPoint.lat, prevPoint.lon);
int ppy = (int) tb.getPixYFromLatLon(prevPoint.lat, prevPoint.lon);

36
OsmAnd/src/net/osmand/plus/views/layers/geometry/GpxGeometryWay.java
View file

@ -2,13 +2,14 @@ package net.osmand.plus.views.layers.geometry;
import android.graphics.Bitmap;
import androidx.annotation.NonNull;
import net.osmand.AndroidUtils;
import net.osmand.GPXUtilities.WptPt;
import net.osmand.data.RotatedTileBox;
import java.util.List;
import androidx.annotation.NonNull;
public class GpxGeometryWay extends GeometryWay<GpxGeometryWayContext, GeometryWayDrawer<GpxGeometryWayContext>> {
private List<WptPt> points;
@ -76,16 +77,25 @@ public class GpxGeometryWay extends GeometryWay<GpxGeometryWayContext, GeometryW
public static class GeometryArrowsStyle extends GeometryWayStyle<GpxGeometryWayContext> {
private static final double DIRECTION_ARROW_DISTANCE_MULTIPLIER = 10.0;
private static final float TRACK_WIDTH_THRESHOLD_DP = 8f;
private static final float ARROW_DISTANCE_MULTIPLIER = 1.5f;
private static final float SPECIAL_ARROW_DISTANCE_MULTIPLIER = 10f;
private final float TRACK_WIDTH_THRESHOLD_PIX;
private Bitmap arrowBitmap;
public static final int OUTER_CIRCLE_COLOR = 0x33000000;
protected int pointColor;
protected int trackColor;
protected float trackWidth;
private float outerCircleRadius;
private float innerCircleRadius;
GeometryArrowsStyle(GpxGeometryWayContext context, int arrowColor, int trackColor, float trackWidth) {
this(context, null, arrowColor, trackColor, trackWidth);
outerCircleRadius = AndroidUtils.dpToPx(context.getCtx(), 8);
innerCircleRadius = AndroidUtils.dpToPx(context.getCtx(), 7);
}
GeometryArrowsStyle(GpxGeometryWayContext context, Bitmap arrowBitmap, int arrowColor, int trackColor, float trackWidth) {
@ -94,6 +104,7 @@ public class GpxGeometryWay extends GeometryWay<GpxGeometryWayContext, GeometryW
this.pointColor = arrowColor;
this.trackColor = trackColor;
this.trackWidth = trackWidth;
TRACK_WIDTH_THRESHOLD_PIX = AndroidUtils.dpToPx(context.getCtx(), TRACK_WIDTH_THRESHOLD_DP);
}
@Override
@ -114,6 +125,9 @@ public class GpxGeometryWay extends GeometryWay<GpxGeometryWayContext, GeometryW
@Override
public Bitmap getPointBitmap() {
if (useSpecialArrow()) {
return getContext().getSpecialArrowBitmap();
}
return arrowBitmap != null ? arrowBitmap : getContext().getArrowBitmap();
}
@ -130,9 +144,23 @@ public class GpxGeometryWay extends GeometryWay<GpxGeometryWayContext, GeometryW
return trackWidth;
}
public float getOuterCircleRadius() {
return outerCircleRadius;
}
public float getInnerCircleRadius() {
return innerCircleRadius;
}
public boolean useSpecialArrow() {
return trackWidth <= TRACK_WIDTH_THRESHOLD_PIX;
}
@Override
public double getPointStepPx(double zoomCoef) {
return getPointBitmap().getHeight() + trackWidth * 1.5f;
return useSpecialArrow() ?
getPointBitmap().getHeight() * SPECIAL_ARROW_DISTANCE_MULTIPLIER :
getPointBitmap().getHeight() + trackWidth * ARROW_DISTANCE_MULTIPLIER;
}
}
}

26
OsmAnd/src/net/osmand/plus/views/layers/geometry/GpxGeometryWayContext.java
View file

@ -1,20 +1,46 @@
package net.osmand.plus.views.layers.geometry;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Paint;
import net.osmand.AndroidUtils;
import net.osmand.plus.R;
import androidx.core.content.ContextCompat;
public class GpxGeometryWayContext extends GeometryWayContext {
private Paint circlePaint;
private final Bitmap specialArrowBitmap;
public GpxGeometryWayContext(Context ctx, float density) {
super(ctx, density);
Paint paint = getPaintIcon();
paint.setStrokeCap(Paint.Cap.ROUND);
setupCirclePaint();
specialArrowBitmap = AndroidUtils.drawableToBitmap(ContextCompat.getDrawable(ctx, R.drawable.mm_special_arrow_up));
}
@Override
protected int getArrowBitmapResId() {
return R.drawable.ic_action_direction_arrow;
}
public Bitmap getSpecialArrowBitmap() {
return specialArrowBitmap;
}
public Paint getCirclePaint() {
return circlePaint;
}
private void setupCirclePaint() {
circlePaint = new Paint();
circlePaint.setDither(true);
circlePaint.setAntiAlias(true);
circlePaint.setStyle(Paint.Style.FILL);
circlePaint.setColor(0x33000000);
}
}

21
OsmAnd/src/net/osmand/plus/views/layers/geometry/GpxGeometryWayDrawer.java
View file

@ -1,5 +1,6 @@
package net.osmand.plus.views.layers.geometry;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Matrix;
@ -7,6 +8,7 @@ import android.graphics.Paint;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import net.osmand.AndroidUtils;
import net.osmand.plus.views.layers.geometry.GpxGeometryWay.GeometryArrowsStyle;
public class GpxGeometryWayDrawer extends GeometryWayDrawer<GpxGeometryWayContext> {
@ -29,24 +31,39 @@ public class GpxGeometryWayDrawer extends GeometryWayDrawer<GpxGeometryWayContex
@Override
void draw(Canvas canvas, GeometryWayContext context) {
if (style instanceof GeometryArrowsStyle) {
Context ctx = style.getCtx();
GeometryArrowsStyle arrowsWayStyle = (GeometryArrowsStyle) style;
Bitmap bitmap = style.getPointBitmap();
boolean useSpecialArrow = arrowsWayStyle.useSpecialArrow();
float newWidth = arrowsWayStyle.getTrackWidth() / 2f;
float newWidth = useSpecialArrow ? AndroidUtils.dpToPx(ctx, 12) : arrowsWayStyle.getTrackWidth() / 2f;
float paintH2 = bitmap.getHeight() / 2f;
float paintW2 = newWidth / 2f;
Matrix matrix = getMatrix();
matrix.reset();
matrix.postScale(newWidth / bitmap.getWidth(), 1);
float sy = useSpecialArrow ? newWidth / bitmap.getHeight() : 1;
matrix.postScale(newWidth / bitmap.getWidth(), sy);
matrix.postRotate((float) angle, paintW2, paintH2);
matrix.postTranslate(x - paintW2, y - paintH2);
if (useSpecialArrow) {
drawCircle(canvas, arrowsWayStyle);
}
Paint paint = context.getPaintIconCustom();
Integer pointColor = style.getPointColor();
paint.setColorFilter(new PorterDuffColorFilter(pointColor, PorterDuff.Mode.SRC_IN));
canvas.drawBitmap(bitmap, matrix, paint);
}
}
private void drawCircle(Canvas canvas, GeometryArrowsStyle style) {
Paint paint = style.getContext().getCirclePaint();
paint.setColor(GeometryArrowsStyle.OUTER_CIRCLE_COLOR);
canvas.drawCircle(x, y, style.getOuterCircleRadius(), paint);
paint.setColor(style.getTrackColor());
canvas.drawCircle(x, y, style.getInnerCircleRadius(), paint);
}
}
}

3
OsmAnd/src/net/osmand/plus/wikipedia/WikipediaArticleWikiLinkFragment.java
View file

@ -16,6 +16,7 @@ import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerHalfItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleDividerItem;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.wikivoyage.article.WikivoyageArticleWikiLinkFragment;
@ -78,7 +79,7 @@ public class WikipediaArticleWikiLinkFragment extends MenuBottomSheetDialogFragm
public void onClick(View v) {
FragmentManager fm = getFragmentManager();
if (fm != null) {
ChoosePlanDialogFragment.showWikivoyageInstance(fm);
ChoosePlanDialogFragment.showDialogInstance(getMyApplication(), fm, ChoosePlanDialogType.WIKIVOYAGE);
}
dismiss();
}

2
OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreRvAdapter.java
View file

@ -159,7 +159,7 @@ public class ExploreRvAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
if (isCardExists(getNeededMapsCardPosition(), TravelNeededMapsCard.TYPE)) {
updateNeededMapsCard(false);
} else if (addItem(getNeededMapsCardPosition(), card)) {
notifyDataSetChanged();
notifyItemInserted(getNeededMapsCardPosition());
}
}

22
OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java
View file

@ -22,6 +22,7 @@ import net.osmand.plus.R;
import net.osmand.plus.Version;
import net.osmand.plus.base.BaseOsmAndFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment.ChoosePlanDialogType;
import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.download.DownloadIndexesThread;
import net.osmand.plus.download.DownloadIndexesThread.DownloadEvents;
@ -146,8 +147,15 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadEv
@Override
public void savedArticlesUpdated() {
if (isAdded()) {
adapter.notifyDataSetChanged();
OsmandApplication app = getMyApplication();
if (app != null) {
DownloadIndexesThread downloadThread = app.getDownloadThread();
if (!downloadThread.getIndexes().isDownloadedFromInternet) {
waitForIndexes = true;
downloadThread.runReloadIndexFilesSilent();
} else {
checkDownloadIndexes();
}
}
}
@ -300,7 +308,7 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadEv
|| item.getType() == DownloadActivityType.TRAVEL_FILE) && !Version.isPaidVersion(app)) {
FragmentManager fm = getFragmentManager();
if (fm != null) {
ChoosePlanDialogFragment.showWikipediaInstance(fm);
ChoosePlanDialogFragment.showDialogInstance(app, fm, ChoosePlanDialogType.WIKIPEDIA);
}
} else {
DownloadIndexesThread downloadThread = app.getDownloadThread();
@ -356,7 +364,7 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadEv
|| item.getType() == DownloadActivityType.TRAVEL_FILE) && !Version.isPaidVersion(app)) {
FragmentManager fm = getFragmentManager();
if (fm != null) {
ChoosePlanDialogFragment.showWikipediaInstance(fm);
ChoosePlanDialogFragment.showDialogInstance(app, fm, ChoosePlanDialogType.WIKIPEDIA);
}
} else {
DownloadIndexesThread downloadThread = app.getDownloadThread();
@ -442,8 +450,12 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadEv
@Override
protected void onPostExecute(Pair<List<IndexItem>, List<IndexItem>> res) {
ExploreTabFragment fragment = weakFragment.get();
if (res != null && fragment != null && fragment.isResumed()) {
if (res != null && fragment != null && fragment.isAdded()) {
fragment.addIndexItemCards(res.first, res.second);
fragment.removeRedundantCards();
if (!fragment.isResumed()) {
fragment.invalidateAdapter();
}
}
}
}

8
OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageExploreActivity.java
View file

@ -373,7 +373,13 @@ public class WikivoyageExploreActivity extends TabActivity implements DownloadEv
@Override
public void savedArticlesUpdated() {
updateFragments();
ExploreTabFragment exploreTabFragment = getExploreTabFragment();
SavedArticlesTabFragment savedArticlesTabFragment = getSavedArticlesTabFragment();
if (exploreTabFragment != null && savedArticlesTabFragment != null
&& exploreTabFragment.isAdded() && savedArticlesTabFragment.isAdded()) {
exploreTabFragment.savedArticlesUpdated();
savedArticlesTabFragment.savedArticlesUpdated();
}
}
public static class LoadWikivoyageData extends AsyncTask<Void, Void, Void> {

1
README.md
View file

@ -124,4 +124,3 @@ Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Ugan
Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA),
Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara,
Yemen, Zambia, Zimbabwe.
</p>

2
build.gradle
View file

@ -14,7 +14,7 @@ buildscript {
classpath 'com.google.gms:google-services:3.0.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
if (gradle.startParameter.taskNames.toString().contains("huawei")) {
if (gradle.startParameter.taskNames.toString().toLowerCase().contains("huawei")) {
classpath 'com.huawei.agconnect:agcp:1.4.1.300'
}
}