Merge branch 'master' of github.com:osmandapp/OsmAnd-iOS

Resources/Images.xcassets/Icons/ic_custom_wifi_off.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_custom_wifi_off.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Resources/Images.xcassets/Icons/logos/ic_custom_logo_osmand 1.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_custom_logo_osmand.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Resources/Localizations/af.lproj/Localizable.strings

@@ -1936,7 +1936,7 @@
 "try_again" = "Try again";
 "searching" = "Besig om te soek…";
 "search_location" = "Searching location…";
-"search_map" = "Searching map…";
+"search_map" = "Searching map";
 "search_another_country" = "Select another region";
 "skip_map_downloading" = "Skip downloading maps";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/an.lproj/Localizable.strings

@@ -1937,7 +1937,7 @@
 "try_again" = "Try again";
 "searching" = "Searching…";
 "search_location" = "Searching location…";
-"search_map" = "Searching map…";
+"search_map" = "Searching map";
 "search_another_country" = "Select another region";
 "skip_map_downloading" = "Skip downloading maps";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/ar.lproj/Localizable.strings

@@ -681,7 +681,7 @@
 "no_inet_connection_desc_map" = "مطلوب اتصال لتحميل الخرائط.";
 "try_again" = "أعد المحاولة";
 "search_location" = "البحث عن الموقع…";
-"search_map" = "البحث في الخرائط…";
+"search_map" = "البحث في الخرائط";
 "search_another_country" = "حدد منطقة أخرى";
 "skip_map_downloading" = "تخط تنزيل الخرائط";
 "skip_map_downloading_desc_ios" = "ليس لديك خريطة مثبتة في وضع عدم الاتصال. يمكنك اختيار خريطة من القائمة أو تنزيل الخرائط لاحقًا عبر القائمة - إدارة ملفات الخرائط";

Resources/Localizations/ars.lproj/Localizable.strings

@@ -1951,7 +1951,7 @@
 "try_again" = "أعد المحاولة";
 "searching" = "جار البحث…";
 "search_location" = "البحث عن الموقع…";
-"search_map" = "البحث في الخرائط…";
+"search_map" = "البحث في الخرائط";
 "search_another_country" = "حدد منطقة أخرى";
 "skip_map_downloading" = "تخط تنزيل الخرائط";
 "skip_map_downloading_desc_ios" = "ليس لديك خريطة مثبتة في وضع عدم الاتصال. يمكنك اختيار خريطة من القائمة أو تنزيل الخرائط لاحقًا عبر القائمة - إدارة ملفات الخرائط";

Resources/Localizations/ast.lproj/Localizable.strings

@@ -1753,7 +1753,7 @@
 "try_again" = "Try again";
 "searching" = "Buscando…";
 "search_location" = "Searching for location…";
-"search_map" = "Buscando mapes…";
+"search_map" = "Buscando mapes";
 "search_another_country" = "Esbillar otra rexón";
 "skip_map_downloading" = "Skip downloading maps";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/az.lproj/Localizable.strings

@@ -1753,7 +1753,7 @@
 "try_again" = "Təkrar cəhd";
 "searching" = "Axtarılır…";
 "search_location" = "Məkan axtarılır…";
-"search_map" = "Xəritələr axtarılır…";
+"search_map" = "Xəritələr axtarılır";
 "search_another_country" = "Başqa region seç";
 "skip_map_downloading" = "Xəritələri endirməyi keç";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/be.lproj/Localizable.strings

@@ -487,7 +487,7 @@
 "show_region_on_map_go" = "Перайсці да мапы";
 "gpx_edit_mode" = "Рэжым рэдагавання";
 "go_to_map" = "Паказаць мапу";
-"search_map" = "Пошук мапаў…";
+"search_map" = "Пошук мапаў";
 "search_categories" = "Катэгорыі";
 "items_selected" = "%d абрана";
 "shared_string_select_all" = "Абраць усё";

Resources/Localizations/bg.lproj/Localizable.strings

@@ -1753,7 +1753,7 @@
 "try_again" = "Нов опит";
 "searching" = "Търсене…";
 "search_location" = "Определяне местоположение…";
-"search_map" = "Търсене на карти …";
+"search_map" = "Търсене на карти";
 "search_another_country" = "Изберете друг регион";
 "skip_map_downloading" = "Пропускане на картите";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/bn.lproj/Localizable.strings

@@ -1937,7 +1937,7 @@
 "try_again" = "Try again";
 "searching" = "Searching…";
 "search_location" = "Searching location…";
-"search_map" = "Searching map…";
+"search_map" = "Searching map";
 "search_another_country" = "Select another region";
 "skip_map_downloading" = "Skip downloading maps";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/br.lproj/Localizable.strings

@@ -1937,7 +1937,7 @@
 "try_again" = "Try again";
 "searching" = "Searching…";
 "search_location" = "Searching location…";
-"search_map" = "Searching map…";
+"search_map" = "Searching map";
 "search_another_country" = "Select another region";
 "skip_map_downloading" = "Skip downloading maps";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/bs.lproj/Localizable.strings

@@ -1937,7 +1937,7 @@
 "try_again" = "Try again";
 "searching" = "Searching…";
 "search_location" = "Searching location…";
-"search_map" = "Searching map…";
+"search_map" = "Searching map";
 "search_another_country" = "Select another region";
 "skip_map_downloading" = "Skip downloading maps";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/ca.lproj/Localizable.strings

@@ -414,7 +414,7 @@
 "no_inet_connection_desc_map" = "És necessari per baixar mapes.";
 "try_again" = "Torneu-ho a provar";
 "search_location" = "Cercant la localització…";
-"search_map" = "Cercant mapes…";
+"search_map" = "Cercant mapes";
 "search_another_country" = "Selecciona un altre país";
 "skip_map_downloading" = "Omet els mapes en procés de baixada";
 "skip_map_downloading_desc_ios" = "No teniu cap mapa instal·lat per consultar sense internet. En podeu triar un de la llista o baixar-ne més tard via Menú - Gestiona fitxers de mapes";

Resources/Localizations/ckb.lproj/Localizable.strings

@@ -1893,7 +1893,7 @@
 "try_again" = "Try again";
 "searching" = "Searching…";
 "search_location" = "Searching location…";
-"search_map" = "Searching map…";
+"search_map" = "Searching map";
 "search_another_country" = "Select another region";
 "skip_map_downloading" = "Skip downloading maps";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/cs.lproj/Localizable.strings

@@ -681,7 +681,7 @@
 "no_inet_connection_desc_map" = "Vyžadováno pro stažení map.";
 "try_again" = "Zkusit znovu";
 "search_location" = "Hledání polohy…";
-"search_map" = "Hledání map…";
+"search_map" = "Hledání map";
 "search_another_country" = "Vybrat jinou oblast";
 "skip_map_downloading" = "Přeskočit stahování map";
 "skip_map_downloading_desc_ios" = "Nemáte nainstalovanou žádnou offline mapu. Můžete vybrat mapu ze seznamu, nebo stáhnout mapy později přes Menu - Spravovat mapové soubory";

Resources/Localizations/cy.lproj/Localizable.strings

@@ -1753,7 +1753,7 @@
 "try_again" = "Ceisio eto";
 "searching" = "Yn chwilio…";
 "search_location" = "Wrthi\'n chwilio am leoliad…";
-"search_map" = "Yn chwilio mapiau…";
+"search_map" = "Yn chwilio mapiau";
 "search_another_country" = "Dewis ardal arall";
 "skip_map_downloading" = "Neidio lawrlwytho mapiau";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/da.lproj/Localizable.strings

@@ -413,7 +413,7 @@
 "no_inet_connection_desc_map" = "Nødvendig for at hente kort.";
 "try_again" = "Prøv igen";
 "search_location" = "Søger efter placering…";
-"search_map" = "Søger på kort…";
+"search_map" = "Søger på kort";
 "search_another_country" = "Vælg et andet område";
 "skip_map_downloading" = "Spring over hentning af kort";
 "skip_map_downloading_desc_ios" = "Der er ingen offline kort installeret. Vælg et kort fra listen eller hent et kort senere via Menu - Administrer kort";

Resources/Localizations/de.lproj/Localizable.strings

@@ -415,7 +415,7 @@
 "no_inet_connection_desc_map" = "Erforderlich, um Karten herunterzuladen.";
 "try_again" = "Erneut versuchen";
 "search_location" = "Standort wird gesucht…";
-"search_map" = "Karten werden gesucht…";
+"search_map" = "Karten werden gesucht";
 "search_another_country" = "Eine andere Region auswählen";
 "skip_map_downloading" = "Herunterladen der Kartenüberspringen";
 "skip_map_downloading_desc_ios" = "Sie haben keine Offline Karten installiert. Sie können jetzt eine Karte auswählen oder später Karten über “Menü - Kartenverwaltung“ herunterladen";

Resources/Localizations/el.lproj/Localizable.strings

@@ -1511,7 +1511,7 @@
 "dialogs_and_notifications_descr" = "Έλεγχος αναδύσεων, διαλόγων και ειδοποιήσεων.";
 "intermediate_point_too_far" = "Ο ενδιάμεσος προορισμός %@ είναι πολύ μακριά από τον πλησιέστερο δρόμο.";
 "icon_group_travel" = "Ταξίδι";
-"search_map" = "Αναζήτηση χαρτών…";
+"search_map" = "Αναζήτηση χαρτών";
 "ltr_or_rtl_combine_via_slash" = "%@/%@";
 "icon_group_symbols" = "Σύμβολα";
 "change_folder" = "Αλλαγή φακέλου";

Resources/Localizations/en-GB.lproj/Localizable.strings

@@ -1754,7 +1754,7 @@
 "try_again" = "Try again";
 "searching" = "Searching…";
 "search_location" = "Searching location…";
-"search_map" = "Searching map…";
+"search_map" = "Searching map";
 "search_another_country" = "Select another region";
 "skip_map_downloading" = "Skip downloading maps";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/en.lproj/Localizable.strings

@@ -2418,7 +2418,7 @@
 
 "searching" = "Searching…";
 "search_location" = "Searching for location…";
-"search_map" = "Searching maps…";
+"search_map" = "Searching maps";
 "search_another_country" = "Select another region";
 
 "skip_map_downloading" = "Skip downloading maps";
@@ -3648,4 +3648,8 @@
 "osmand_cloud_deletion_secondary_devices_warning" = "Secondary devices will be logged off from OsmAnd Cloud and lose access to paid features.";
 "osmand_cloud_deletion_subscriptions_warning" = "This will not cancel your OsmAnd Pro subscription.";
 "osmand_cloud_deleting_account_descr" = "In few moments all your data and account will be deleted from OsmAnd Cloud.\n\nAll data on the device remain untouched.";
-"osmand_cloud_deleted_account_descr" = "Account and all data was deleted from OsmAnd Cloud.";
+
+"osmand_cloud_deleted_account_descr" = "Account and all data was deleted from OsmAnd Cloud.";
+
+"skip_download" = "Skip download";
+"determine_location" = "Allow us to determine your location";

Resources/Localizations/eo.lproj/Localizable.strings

@@ -1752,7 +1752,7 @@
 "try_again" = "Reprovi";
 "searching" = "Serĉado…";
 "search_location" = "Determinado de pozicio…";
-"search_map" = "Serĉado de mapoj…";
+"search_map" = "Serĉado de mapoj";
 "search_another_country" = "Elekti alian regionon";
 "skip_map_downloading" = "Transsalti elŝuton de mapoj";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/es-AR.lproj/Localizable.strings

@@ -1753,7 +1753,7 @@
 "try_again" = "Prueba de nuevo";
 "searching" = "Buscando…";
 "search_location" = "Buscando la ubicación…";
-"search_map" = "Buscando mapas…";
+"search_map" = "Buscando mapas";
 "search_another_country" = "Elegir otra región";
 "skip_map_downloading" = "Omitir descargas de mapas";
 "skip_map_downloading_desc_ios" = "Sin mapas descargados. Puedes elegir uno de la lista o descargarlos luego desde el menú «Gestionar mapas»";

Resources/Localizations/es-US.lproj/Localizable.strings

@@ -1753,7 +1753,7 @@
 "try_again" = "Prueba de nuevo";
 "searching" = "Buscando…";
 "search_location" = "Buscando la ubicación…";
-"search_map" = "Buscando mapas…";
+"search_map" = "Buscando mapas";
 "search_another_country" = "Elegir otra región";
 "skip_map_downloading" = "Omitir descargas de mapas";
 "skip_map_downloading_desc_ios" = "Sin mapas descargados. Puedes elegir uno de la lista o descargarlos luego desde el menú «Gestionar mapas»";

Resources/Localizations/es.lproj/Localizable.strings

@@ -418,7 +418,7 @@
 "no_inet_connection_desc_map" = "Necesario para descargar mapas.";
 "try_again" = "Prueba de nuevo";
 "search_location" = "Buscando la ubicación…";
-"search_map" = "Buscando mapas…";
+"search_map" = "Buscando mapas";
 "search_another_country" = "Elegir otra región";
 "skip_map_downloading" = "Omitir descargas de mapas";
 "skip_map_downloading_desc_ios" = "Sin mapas descargados. Puedes elegir uno de la lista o descargarlos luego desde el menú «Gestionar mapas»";

Resources/Localizations/et.lproj/Localizable.strings

@@ -1096,7 +1096,7 @@
 "no_inet_connection_desc_map" = "Vajalik kaartide allalaadimiseks.";
 "try_again" = "Proovi uuesti";
 "search_location" = "Asukoha otsing…";
-"search_map" = "Kaartide otsing…";
+"search_map" = "Kaartide otsing";
 "search_another_country" = "Vali mõni teine piirkond";
 "skip_map_downloading" = "Jäta kaartide allalaadimine vahele";
 "skip_map_downloading_desc_ios" = "Sul ei ole ühtegi võrguühenduseta kaarti paigaldatud. Võid valida kaardi nimekirjast või laadida kaarte hiljem alla: Menüü - Halda kaardifaile";

Resources/Localizations/eu.lproj/Localizable.strings

@@ -1753,7 +1753,7 @@
 "try_again" = "Saiatu berriro";
 "searching" = "Bilatzen…";
 "search_location" = "Kokalekua bilatzen…";
-"search_map" = "Mapak bilatzen…";
+"search_map" = "Mapak bilatzen";
 "search_another_country" = "Bilatu beste eskualde bat";
 "skip_map_downloading" = "Saltatu mapen deskarga";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/fa.lproj/Localizable.strings

@@ -647,7 +647,7 @@
 "no_inet_connection_desc_map" = "برای بارگیری نقشه‌ها لازم است.";
 "try_again" = "تلاش مجدد";
 "search_location" = "در حال جست‌وجوی مکان…";
-"search_map" = "در حال جست‌وجوی نقشه‌ها…";
+"search_map" = "در حال جست‌وجوی نقشه‌ها";
 "search_another_country" = "منطقهٔ دیگری را انتخاب کنید";
 "skip_map_downloading" = "صرف‌نظر از بارگیری نقشه‌ها";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/fi.lproj/Localizable.strings

@@ -1540,7 +1540,7 @@
 "try_again" = "Yritä uudelleen";
 "searching" = "Etsitään…";
 "search_location" = "Etsitään sijaintia…";
-"search_map" = "Etsitään karttoja…";
+"search_map" = "Etsitään karttoja";
 "search_another_country" = "Valitse toinen alue";
 "skip_map_downloading" = "Ohita karttojen lataus";
 "skip_map_downloading_desc_ios" = "Sinulla ei ole yhtään offline-karttaa asennettuna. Voit valita kartan luettelosta tai ladata kartat myöhemmin valikosta Valikko - Karttatiedostojen hallinta";

Resources/Localizations/fr.lproj/Localizable.strings

@@ -592,7 +592,7 @@
 "route_roundabout_short" = "Prenez la sortie %d";
 "driving_region_europe_asia" = "Europe, Asie, Amérique latine et équivalent";
 "shared_string_history" = "Historique";
-"search_map" = "Recherche des cartes…";
+"search_map" = "Recherche des cartes";
 "skip_map_downloading_desc_ios" = "Aucune carte hors-ligne n'est installée. Vous pouvez sélectionner une carte dans la liste ou télécharger ultérieurement une carte depuis le menu « Gérer les fichiers de cartes »";
 "map_widget_battery" = "Niveau de batterie";
 "map_widget_plain_time" = "Heure actuelle";

Resources/Localizations/gl.lproj/Localizable.strings

@@ -725,7 +725,7 @@
 "no_inet_connection_desc_map" = "Obrigatorio para baixar mapas.";
 "try_again" = "Tentar de novo";
 "search_location" = "Estase a procurar a localización…";
-"search_map" = "Estase a procurar mapas…";
+"search_map" = "Estase a procurar mapas";
 "search_another_country" = "Escoller outra rexión";
 "skip_map_downloading" = "Rexeitar a descarga dos mapas";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/he.lproj/Localizable.strings

@@ -1753,7 +1753,7 @@
 "try_again" = "ניסיון חוזר";
 "searching" = "מתבצע חיפוש…";
 "search_location" = "מתבצע חיפוש אחר המיקום…";
-"search_map" = "מתבצע חיפוש במפות…";
+"search_map" = "מתבצע חיפוש במפות";
 "search_another_country" = "נא לבחור באזור אחר";
 "skip_map_downloading" = "דילוג על הורדת המפות";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";

Resources/Localizations/hi.lproj/Localizable.strings

@@ -1952,7 +1952,7 @@
 "try_again" = "Try again";
 "searching" = "Searching…";
 "search_location" = "Searching location…";
-"search_map" = "Searching map…";
+"search_map" = "Searching map";
 "search_another_country" = "Select another region";
 "skip_map_downloading" = "Skip downloading maps";
 "skip_map_downloading_desc_ios" = "You have no offline map installed. You may choose a map from the list or download maps later via Menu - Manage map files";