Merge branch 'organicmaps:master' into master

2021-06-26 09:32:20 +02:00 · 2021-06-26 09:32:20 +02:00 · c96cfbcb9d
commit c96cfbcb9d
parent 042cd053b4 b32493f0ba
172 changed files with 8254 additions and 1620 deletions
--- a/.github/workflows/android-beta.yaml
+++ b/.github/workflows/android-beta.yaml
@ -4,7 +4,9 @@ on:
    branches:
      - master
    paths-ignore:
-    - .github/workflows/android*
+    - .github/workflows/android-release*
+    - .github/workflows/android-check*
+    - .github/workflows/android-monkey*
    - .github/workflows/linux*
    - '**/*_tests/**'
    - '**/CMakeLists.txt'
--- a/.github/workflows/android-monkey.yaml
+++ b/.github/workflows/android-monkey.yaml
@ -0,0 +1,91 @@
+name: Android Monkey
+on:
+  workflow_dispatch: # Manual trigger
+  push: # Please don't change to pull_request because it can expose secrets
+    branches:
+      - master
+    paths-ignore:
+    - .github/workflows/android-release*
+    - .github/workflows/android-check*
+    - .github/workflows/android-beta*
+    - .github/workflows/linux*
+    - '**/*_tests/**'
+    - '**/CMakeLists.txt'
+    - CONTRIBUTORS
+    - LICENSE
+    - NOTICE
+    - README.md
+    - iphone/**
+    - xcode/**
+    - docs/**
+    - generator/**
+    - packaging/**
+    - pyhelpers/**
+    - qt*/**
+    - skin_generator/**
+    - track_generator/**
+
+jobs:
+  android-google-debug:
+    name: Android Google Debug
+    runs-on: ubuntu-latest
+    environment: beta
+    steps:
+      - name: Install build tools and dependencies
+        shell: bash
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y ninja-build
+
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Install Google SDK
+        uses: google-github-actions/setup-gcloud@master
+
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Parallel submodules checkout
+        shell: bash
+        run: git submodule update --init --recursive --jobs=$(($(nproc) * 2))
+
+      - name: Checkout private keys
+        uses: actions/checkout@v2
+        with:
+          repository: ${{ secrets.PRIVATE_REPO }}
+          ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
+          ref: master
+          path: private.git
+
+      - name: Configure repo with private keys
+        shell: bash
+        run: |
+          ./configure.sh ./private.git
+          rm -rf ./private.git
+
+      - name: Set up SDK
+        shell: bash
+        run: (cd tools/android; ./set_up_android.py --sdk $ANDROID_SDK_ROOT)
+
+      - name: Compile
+        shell: bash
+        working-directory: android
+        run: |
+          cmake --version
+          ninja --version
+          ./gradlew -Parm64 -Parm32 -Pfirebase assembleGoogleDebug
+
+      - name: Run monkey
+        run: |
+          gcloud auth activate-service-account --key-file android/firebase-test-lab.json
+          gcloud config set project omapsapp
+          gcloud firebase test android run --app ./android/build/outputs/apk/google/debug/OrganicMaps-*-google-debug.apk \
+            --device model=redfin,version=30 \
+            --device model=a10,version=29 \
+            --device model=dipper,version=28 \
+            --device model=OnePlus3T,version=26 \
+            --device model=flo,version=21,orientation=landscape \
+            --timeout 15m
--- a/.gitignore
+++ b/.gitignore
@ -138,6 +138,7 @@ android/libnotify.properties
 android/google-services.json
 android/google-play.json
 android/firebase-app-distribution.json
+android/firebase-test-lab.json
 android/huawei-appgallery.json
 android/res/xml/network_security_config.xml
 server
--- a/README.md
+++ b/README.md
@ -2,12 +2,10 @@

 <a name="install"/>

-[Organic Maps](https://organicmaps.app) is a better fork of MAPS.ME, an Android & iOS offline maps app
-for travelers, tourists, hikers, and cyclists based on top of crowd-sourced
-**OpenStreetMap** data and curated with love by **MAPS.ME** founders.
+[Organic Maps](https://organicmaps.app) is an Android & iOS offline maps app for travelers, tourists, hikers, and cyclists based on top of crowd-sourced OpenStreetMap data and curated with love by **MapsWithMe** founders. No ads, no tracking, no data collection, no crapware. 

 <p float="left">
-  <a href="https://testflight.apple.com/join/lrKCl08I">
+  <a href="https://apps.apple.com/app/organic-maps/id1567437057">
    <img src="docs/badges/apple-appstore.png" width="180">
  </a>
  <a href="https://play.google.com/store/apps/details?id=app.organicmaps">
@ -104,7 +102,7 @@ See [CONTRIBUTING](docs/CONTRIBUTING.md).
 Please join our beta program, suggest your features, and report bugs:

 - [iOS Beta (TestFlight)](https://testflight.apple.com/join/lrKCl08I)
- [Android Beta (Firebase)](https://appdistribution.firebase.google.com/pub/i/4fa64e2439ca20ff)
+- [Android Beta (Firebase)](https://appdistribution.firebase.dev/i/3c5fcf9cd72f775f)

 ## Feedback

@ -114,6 +112,7 @@ Please join our beta program, suggest your features, and report bugs:
 - [Discuss](https://github.com/organicmaps/organicmaps/discussions/categories/ideas) ideas or propose feature requests.
 - Subscribe to our [Telegram Channel](https://t.me/OrganicMapsApp) for updates.
 - Join our [Telegram Group](https://t.me/OrganicMaps) to discuss with other users.
+- Присоединяйтесь к нашей [русскоязычной группе в Telegram](https://t.me/OrganicMapsRu) для обратной связи и помощи.
 - Contact us by [email](mailto:hello@organicmaps.app).

 The Organic Maps community abides by the CNCF code of conduct.
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@ -175,32 +175,52 @@
      <intent-filter>
        <action android:name="android.intent.action.VIEW"/>
        <category android:name="android.intent.category.DEFAULT"/>
-        <data
-          android:host="*"
-          android:mimeType="*/*"
-          android:pathPattern=".*\\.kmz"
-          android:scheme="file"/>
+        <data android:scheme="content"/>
+        <data android:scheme="file"/>
+        <data android:scheme="data"/>
+        <data android:host="*"/>
+        <data android:mimeType="*/*"/>
+        <!-- See http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i -->
+        <data android:pathPattern="*.kmz"/>
+        <data android:pathPattern=".*\\.kmz" />
+        <data android:pathPattern=".*\\..*\\.kmz" />
+        <data android:pathPattern=".*\\..*\\..*\\.kmz" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kmz" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmz" />
      </intent-filter>

      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-        <data
-          android:host="*"
-          android:mimeType="*/*"
-          android:pathPattern=".*\\.kml"
-          android:scheme="file"/>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="content"/>
+        <data android:scheme="file"/>
+        <data android:scheme="data"/>
+        <data android:host="*"/>
+        <data android:mimeType="*/*"/>
+        <data android:pathPattern="*.kml"/>
+        <data android:pathPattern=".*\\.kml" />
+        <data android:pathPattern=".*\\..*\\.kml" />
+        <data android:pathPattern=".*\\..*\\..*\\.kml" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kml" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml" />
      </intent-filter>

      <!-- Old MAPS.ME binary format //-->
      <intent-filter>
        <action android:name="android.intent.action.VIEW"/>
        <category android:name="android.intent.category.DEFAULT"/>
-        <data
-            android:host="*"
-            android:mimeType="*/*"
-            android:pathPattern=".*\\.kmb"
-            android:scheme="file"/>
+        <data android:scheme="content"/>
+        <data android:scheme="file"/>
+        <data android:scheme="data"/>
+        <data android:host="*"/>
+        <data android:mimeType="*/*"/>
+        <data android:pathPattern="*.kmb"/>
+        <data android:pathPattern=".*\\.kmb" />
+        <data android:pathPattern=".*\\..*\\.kmb" />
+        <data android:pathPattern=".*\\..*\\..*\\.kmb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kmb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmb" />
      </intent-filter>
    </activity>

--- a/android/build.gradle
+++ b/android/build.gradle
@ -343,6 +343,12 @@ android {
          abiFilters.add('x86') // for emulator
        }
      }
+
+      if (googleFirebaseServicesEnabled) {
+        firebaseCrashlytics {
+          nativeSymbolUploadEnabled true
+        }
+      }
    }

    release {
--- a/android/jni/com/mapswithme/maps/DownloaderAdapter.cpp
+++ b/android/jni/com/mapswithme/maps/DownloaderAdapter.cpp
@ -95,6 +95,8 @@ void BackgroundDownloaderAdapter::Download(QueuedCountry && queuedCountry)

  auto const countryId = queuedCountry.GetCountryId();
  auto urls = MakeUrlList(queuedCountry.GetRelativeUrl());
+  // Get urls order from worst to best.
+  std::reverse(urls.begin(), urls.end());
  auto const path = queuedCountry.GetFileDownloadPath();

  // For safety reasons, add to the queue first and notify start downloading then,
--- a/android/res/drawable-v23/splash.xml
+++ b/android/res/drawable-v23/splash.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-            android:opacity="opaque">
-  <item android:drawable="?attr/colorPrimary"/>
-  <item android:drawable="@drawable/ic_splash" android:gravity="center"/>
-</layer-list>
--- a/android/res/drawable/splash.xml
+++ b/android/res/drawable/splash.xml
@ -2,7 +2,5 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
            android:opacity="opaque">
  <item android:drawable="?attr/colorPrimary"/>
-  <item>
-    <bitmap android:src="@drawable/ic_splash" android:gravity="center"/>
-  </item>
+  <item android:drawable="@drawable/ic_splash" android:gravity="center"/>
 </layer-list>
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@ -200,15 +200,15 @@
 	<string name="appStore_message">نأمل أن تكون قد استمتعت باستخدام Organic Maps! إذا كان الأمر كذلك، الرجاء تقييم التطبيق في App Store. يستغرق ذلك أقل من دقيقة لكنه يفيدنا بالفعل. شكرا لك على دعمك!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">لا، شكرا</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">هاي، تفقد الدبوس الخاص بي على Organic Maps! %1$s أو %2$s. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">هاي، تفقد الموقع الخاص بي على Organic Maps! %1$s أو %2$s. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">هاي، تفقد الدبوس الخاص بي على Organic Maps! %1$s أو %2$s. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">هاي، تفقد الموقع الخاص بي على Organic Maps! %1$s أو %2$s. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">هاي، تفقد الدبوس الخاص بي على خريطة Organic Maps!</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">يا هلا، تحقق من موقعي الحالي على خريطة Organic Maps!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">مرحبا،\n\nأنا هنا الآن: %1$s. انقر على هذا الرابط %2$s أو ذلك الرابط %3$s لمشاهدة المكان على الخريطة.\n\nشكرا لك.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">مشاركة بواسطة رسالة</string>
@ -599,7 +599,8 @@
 	<string name="p2p_to_here">الطريق إلى</string>
 	<string name="p2p_only_from_current">تتوافر إمكانية التنقل فقط من خلال موقعك الحالي. هل تريد أن نخطط لك طريقاً بديلاً؟</string>
 	<string name="p2p_reroute_from_current">هل ترغب في أن نرسم مسار لك من موقعك الحالي؟</string>
-	<string name="whats_new_next_button">التالي</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">التالي</string>
 	<string name="editor_time_add">إضافة جدول</string>
 	<string name="editor_time_delete">حذف جدول</string>
 	<!-- Text for allday switch. -->
@ -1068,7 +1069,7 @@
 	<string name="place_description_title">وصف المكان</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">محمل الخريطة</string>
-	<string name="share_bookmarks_email_body_link">مرحبًا!\n\nللوصول إلى التطبيق: https://organicmaps.app/get?kmzهذا هو الرابط الذي يمكنك من خلاله تنزيل إشاراتك المرجعية: %s. افتح القائمة عبر Organic Maps واستمتع برحلتك!\n\n</string>
+	<string name="share_bookmarks_email_body_link">مرحبًا!\n\nللوصول إلى التطبيق: https://omaps.app/get?kmzهذا هو الرابط الذي يمكنك من خلاله تنزيل إشاراتك المرجعية: %s. افتح القائمة عبر Organic Maps واستمتع برحلتك!\n\n</string>
 	<string name="warning_speedcams_title">سوف يحذرك المستكشف من الكاميرات عندما تتجاوز الحد الأقصى للسرعة %d كم / س</string>
 	<string name="warning_speedcams_subtitle">يرجى مراعاة قواعد القيادة في البلد الذي تنوي السفر إليه.</string>
 	<string name="speedcams_notice_message">السيارات- تحذير على الرادارات إذا كان هناك خطر تجاوز الحد الأقصى للسرعة\nدائما - احذر دائما من كاميرات السرعة\nمطلقا - أبدا تحذير من كاميرات السرعة</string>
@ -1211,8 +1212,16 @@
 	<string name="downloader_loading_ios">جار التحميل</string>
 	<string name="key_information_title">معلومات رئيسية</string>
 	<string name="enable_screen_sleep">اسمح للشاشة بالنوم</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">عند التمكين ، سيتم السماح للشاشة بالنوم بعد فترة من عدم النشاط.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">قم بتحديث الخرائط التي قمت بنتزيلها</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">تحديث الخرائط والاحتفاظ بالمعلومات حول الكائنات محدثة</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">تحديث (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">تحديث يدوياً في وقت لاحق</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">محطة تلفريك</string>
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@ -196,15 +196,15 @@
 	<string name="appStore_message">Doufáme, že se vám používání Organic Maps líbí! Je-li tomu tak, ohodnoťte, prosím, naši aplikaci nebo na ni napište recenzi v obchodu s aplikacemi. Nezabere to ani minutu, ale opravdu nám tím pomůžete. Děkujeme za vaši podporu!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Ne, díky</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="bookmark_share_sms">Koukni na mou značku na mapě. Otevři odkaz: %1$s nebo %2$s</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="my_position_share_sms">Koukni kde jsem. Otevři odkaz: %1$s nebo %2$s</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Koukni na moji značku na mapě v Organic Maps</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Podívej se na mou aktuální polohu na mapě na Organic Maps</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Ahoj,\n\nPrávě jsem tady: %1$s. Klepni na jeden z těchto odkazů %2$s, %3$s a uvidíš toto místo na mapě.\n\nDíky.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Sdílet pomocí zprávy</string>
@ -595,7 +595,8 @@
 	<string name="p2p_to_here">Trasa do</string>
 	<string name="p2p_only_from_current">Navigovat lze pouze z současného umístění.</string>
 	<string name="p2p_reroute_from_current">Máme naplánovat trasu z vašeho současného umístění?</string>
-	<string name="whats_new_next_button">Další</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Další</string>
 	<string name="editor_time_add">Přidat rozvrh</string>
 	<string name="editor_time_delete">Smazat rozvrh</string>
 	<!-- Text for allday switch. -->
@ -1066,7 +1067,7 @@
 	<string name="place_description_title">Popis místa</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Nahrávání map</string>
-	<string name="share_bookmarks_email_body_link">Dobrý den!\n\nVaše značky můžete stáhnout zde: %s. Otevírejte seznam s pomocí Organic Maps a užívejte si cesty!\n\nStáhnout aplikaci: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Dobrý den!\n\nVaše značky můžete stáhnout zde: %s. Otevírejte seznam s pomocí Organic Maps a užívejte si cesty!\n\nStáhnout aplikaci: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Navigátor vás při překročení rychlosti o %d km/h upozorní na všechny radary</string>
 	<string name="warning_speedcams_subtitle">Nezapomeňte se seznámit s dopravními předpisy země, do které cestujete.</string>
 	<string name="speedcams_notice_message">Automaticky - Upozorňovat na rychlostní radary, pokud hrozí riziko překročení rychlosti\nVždy - Vždy upozorňovat na rychlostní radary\nNikdy - Nikdy neupozorňovat na rychlostní radary</string>
@ -1209,8 +1210,16 @@
 	<string name="downloader_loading_ios">Probíhá stahování</string>
 	<string name="key_information_title">Klíčové informace</string>
 	<string name="enable_screen_sleep">Nechte obrazovku spát</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Je-li tato možnost povolena, bude obrazovka po určité době nečinnosti umožněna usnout.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Aktualizujte své stažené mapy</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Aktualizace map zajišťuje aktuální informace o objektech</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Aktualizace (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Aktualizovat ručně později</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Stanice lanové dráhy</string>
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@ -198,15 +198,15 @@
 	<string name="appStore_message">Vi håber du er glad for at bruge Organic Maps! Hvis du er, vil du så overveje at bedømme og måske skrive en anmeldelse på App Store? Det tager under et minut, men det kan virkelig hjælpe os. Tak for din hjælp!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Nej, tak</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Hey, tjek min knappenål på Organic Maps ud! %1$s or %2$s Har du ikke offline kort? Download her: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Hey, tjek min nuværende lokation ud på Organic Maps! %1$s or %2$s. Har du ikke offline kort? Download her: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Hey, tjek min knappenål på Organic Maps ud! %1$s or %2$s Har du ikke offline kort? Download her: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Hey, tjek min nuværende lokation ud på Organic Maps! %1$s or %2$s. Har du ikke offline kort? Download her: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Hey, tjek min knappenål på Organic Maps kortet ud!</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Hey, tjek min nuværende lokation ud på Organic Maps kortet!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Hey, her er jeg nu: %1$s. Tryk på dette link %2$s eller dette %3$s for at se stedet på kortet. Tak.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Del via besked</string>
@ -597,7 +597,8 @@
 	<string name="p2p_to_here">Rute til</string>
 	<string name="p2p_only_from_current">Navigation er kun tilgængelig fra din nuværende lokalitet.</string>
 	<string name="p2p_reroute_from_current">Ønsker du, at vi planlægger en rute fra din nuværende placering?</string>
-	<string name="whats_new_next_button">Næste</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Næste</string>
 	<string name="editor_time_add">Tilføj tidsplan</string>
 	<string name="editor_time_delete">Slet tidsplan</string>
 	<!-- Text for allday switch. -->
@ -1067,7 +1068,7 @@
 	<string name="place_description_title">Beskrivelse af sted</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Korthenter</string>
-	<string name="share_bookmarks_email_body_link">Hej!\n\nHer er et link, hvor du kan hente dine bogmærker: %s. Åben listen via Organic Maps og nyd turen!\n\nHent applikation: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Hej!\n\nHer er et link, hvor du kan hente dine bogmærker: %s. Åben listen via Organic Maps og nyd turen!\n\nHent applikation: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Navigator advarer dig om kameraer, når du overskrider hastighedsgrænsen på %d km/t</string>
 	<string name="warning_speedcams_subtitle">Vær opmærksom på færdselsreglerne i det land, du rejser til.</string>
 	<string name="speedcams_notice_message">Auto - Advar om fartkameraer, hvis der er en risiko for, at hastighedsgrænsen overskrides\nAltid - Advar altid om fartkameraer\nAldrig - Advar aldrig om fartkameraer</string>
@ -1210,8 +1211,16 @@
 	<string name="downloader_loading_ios">Downloader</string>
 	<string name="key_information_title">Central information</string>
 	<string name="enable_screen_sleep">Lad skærmen sove</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Når den er aktiveret, får skærmen lov til at sove efter en periode med inaktivitet.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Opdater dine downloadede kort</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Opdatering af kort sikrer, at oplysningerne om objekter er aktuel</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Opdater (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Opdater manuelt senere</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Kabelbanestation</string>
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@ -200,15 +200,15 @@
 	<string name="appStore_message">Wir hoffen, dass Ihnen die Verwendung von Organic Maps Freude bereitet! Wenn ja, geben Sie bitte eine Bewertung oder einen Bericht für die App im App Store ab. Es dauert weniger als eine Minute, kann uns aber wirklich helfen. Danke für Ihre Unterstützung!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Nein danke</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Siehe meine Markierung auf Organic Maps an. %1$s oder %2$s - Keine Offline-Karten installiert? Hier herunterladen: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Schau wo ich gerade bin. Klicke auf den Link %1$s oder %2$s - Keine Offline-Karten installiert? Hier herunterladen: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Siehe meine Markierung auf Organic Maps an. %1$s oder %2$s - Keine Offline-Karten installiert? Hier herunterladen: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Schau wo ich gerade bin. Klicke auf den Link %1$s oder %2$s - Keine Offline-Karten installiert? Hier herunterladen: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Schau dir meine Stecknadel auf der Organic Maps-Karte an</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Sieh dir meinen aktuellen Standort auf der Organic Maps-Karte an</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Hi,\n\nich bin gerade hier: %1$s. Klicke den Link %2$s oder %3$s, um den Ort auf der Karte anzuzeigen.\n\nVielen Dank.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Als Nachricht teilen</string>
@ -365,7 +365,7 @@
 	<string name="downloader_near_me_subtitle">In meiner Nähe</string>
 	<string name="downloader_status_maps">Karten</string>
 	<string name="downloader_download_all_button">Alle herunterladen</string>
-	<string name="downloader_downloading">Gerade wird heruntergeladen:</string>
+	<string name="downloader_downloading">Wird heruntergeladen:</string>
 	<string name="downloader_search_results">Gefunden</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Beim Erstellen von Routen mit der Organic Maps-App sollten Sie Folgendes beachten:\n\n  - Vorgeschlagenen Routen können nur als Empfehlungen angesehen werden.\n - Straßenbedingungen, Verkehrsregeln und Schilder haben höhere Priorität als Navigationsratschläge.\n - Die Karte kann falsch oder veraltet sein und Routen könnten somit nicht auf die bestmögliche Weise erstellt worden sein.\n\n  Bleiben Sie auf der Straße sicher und achten Sie auf sich selbst!</string>
@ -601,7 +601,8 @@
 	<string name="p2p_to_here">Nach</string>
 	<string name="p2p_only_from_current">Die Navigation ist nur von Ihrem aktuellen Standort verfügbar.</string>
 	<string name="p2p_reroute_from_current">Soll eine Route von Ihrem aktuellen Standort aus berechnet werden?</string>
-	<string name="whats_new_next_button">Weiter</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Weiter</string>
 	<string name="editor_time_add">Zeitplan hinzufügen</string>
 	<string name="editor_time_delete">Zeitplan löschen</string>
 	<!-- Text for allday switch. -->
@ -1071,7 +1072,7 @@
 	<string name="place_description_title">Ortsbeschreibung</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Karten werden geladen</string>
-	<string name="share_bookmarks_email_body_link">Guten Tag!\n\nIhre Markierungen stehen unter folgendem Link zum Download bereit: %s. Öffnen Sie die Liste mit Organic Maps und genießen Sie die Reise!\n\nApp downloaden: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Guten Tag!\n\nIhre Markierungen stehen unter folgendem Link zum Download bereit: %s. Öffnen Sie die Liste mit Organic Maps und genießen Sie die Reise!\n\nApp downloaden: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Der Navigator wird Sie über Geschwindigkeitskameras bei Geschwindigkeitsüberschreitung von %d km/h informieren</string>
 	<string name="warning_speedcams_subtitle">Vergessen Sie nicht sich mit den Verkehrsregeln im Reisezielland vertraut zu machen.</string>
 	<string name="speedcams_notice_message">Auto - Über Geschwindigkeitskameras bei Risiko einer Geschwindigkeitsüberschreitung informieren\nImmer - Immer über Geschwindigkeitskameras informieren\nNiemals - Nie über Geschwindigkeitskameras informieren</string>
@ -1214,8 +1215,16 @@
 	<string name="downloader_loading_ios">Download</string>
 	<string name="key_information_title">Wichtige Informationen</string>
 	<string name="enable_screen_sleep">Bildschirm schlafen lassen</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Wenn diese Option aktiviert ist, kann der Bildschirm nach einer gewissen Zeit der Inaktivität in den Ruhezustand versetzt werden.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Aktualisieren Sie Ihre heruntergeladenen Karten</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Das Aktualisieren der Karten sorgt dafür, dass die Objektinformationen stets auf dem neuesten Stand sind</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Aktualisieren (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Später manuell aktualisieren</string>

 	<!-- SECTION:  Partners  -->
 	<string name="sponsored_partner2_action">Rabatt</string>
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@ -166,15 +166,15 @@
 	<string name="cant_change_this_setting">Λυπούμαστε, η αποθήκευση του χάρτη είναι προς το παρόν απενεργοποιημένη.</string>
 	<!-- Alert message that downloading is in progress. -->
 	<string name="downloading_is_active">Λήψη χάρτη σε εξέλιξη.</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Έλεγξε τις τοποθεσίες που έχω καρφιτσώσει στο Organic Maps! %1$s ή %2$s εάν δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Έλεγξε την τρέχουσα τοποθεσία μου στο Organic Maps! %1$s ή %2$s στην περίπτωση που δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Έλεγξε τις τοποθεσίες που έχω καρφιτσώσει στο Organic Maps! %1$s ή %2$s εάν δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Έλεγξε την τρέχουσα τοποθεσία μου στο Organic Maps! %1$s ή %2$s στην περίπτωση που δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Έλεγξε τις τοποθεσίες που έχω καρφιτσώσει στο Organic Maps!</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Έλεγξε την τρέχουσα τοποθεσία μου στο χάρτη Organic Maps!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Γεια,\n\nείμαι εδώ τώρα: %1$s. Κάνε κλικ σε αυτό το σύνδεσμο %2$s ή σε αυτόν %3$s για να δεις την τοποθεσία στο χάρτη.\n\nΕυχαριστώ.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Κοινοποίηση μέσω μηνύματος</string>
@ -470,7 +470,8 @@
 	<string name="p2p_to_here">Διαδρομή στο</string>
 	<string name="p2p_only_from_current">Η πλοήγηση είναι διαθέσιμη μόνο από την τρέχουσα τοποθεσία σας.</string>
 	<string name="p2p_reroute_from_current">Θέλετε να σχεδιάσουμε μια διαδρομή από την τρέχουσα θέση σας;</string>
-	<string name="whats_new_next_button">Επόμενη</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Επόμενη</string>
 	<string name="editor_time_add">Προσθέσετε χρονοδιάγραμμα</string>
 	<string name="editor_time_delete">Διαγραφή χρονοδιαγράμματος</string>
 	<!-- Text for allday switch. -->
@ -865,7 +866,7 @@
 	<string name="place_description_title">Περιγραφή μέρους</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Κατέβασμα χαρτών</string>
-	<string name="share_bookmarks_email_body_link">Γεια!\n\nΕδώ είναι ο σύνδεσμος που μπορείς να κατεβάσεις τους σελιδοδείκτες σου: %s. Ανοίξτε τη λίστα μέσω Organic Maps και απολαύστε το ταξίδι σας!\n\nΚατεβάστε την εφαρμογή: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Γεια!\n\nΕδώ είναι ο σύνδεσμος που μπορείς να κατεβάσεις τους σελιδοδείκτες σου: %s. Ανοίξτε τη λίστα μέσω Organic Maps και απολαύστε το ταξίδι σας!\n\nΚατεβάστε την εφαρμογή: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Ο πλοηγός θα σας ειδοποιεί για κάμερες όταν υπερβαίνετε το όριο ταχύτητας των %d km/h</string>
 	<string name="warning_speedcams_subtitle">Παρακαλώ να προσέχετε τους κανόνες οδήγησης της χώρας στην οποία ταξιδεύετε.</string>
 	<string name="speedcams_notice_message">Αυτόματο- Να ειδοποιούμαι για κάμερες αν υπάρχει κίνδυνος να υπερβώ το όριο ταχύτητας\nΠάντα- Πάντα να ειδοποιούμαι για κάμερες\nΠοτέ- Ποτέ να μην ειδοποιούμαι για κάμερες</string>
@ -1008,8 +1009,16 @@
 	<string name="downloader_loading_ios">Φόρτωση</string>
 	<string name="key_information_title">Βασικές πληροφορίες</string>
 	<string name="enable_screen_sleep">Αφήστε την οθόνη να κοιμηθεί</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Όταν είναι ενεργοποιημένη, η οθόνη θα αφεθεί να κοιμηθεί μετά από περίοδο αδράνειας.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Θα πρέπει να ενημερώστε τους χάρτες που έχετε κατεβάσει</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Η ενημέρωση των χαρτών διατηρεί τις πληροφορίες των στοιχείων επικαιροποιημένες</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Ενημέρωση (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Χειροκίνητη ενημέρωση αργότερα</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Σταθμός αερομεταφοράς</string>
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@ -188,15 +188,15 @@
 	<string name="appStore_message">¡Ojalá disfrute mucho con Organic Maps! Si le gusta, le agradeceremos que puntúe nuestra aplicación en el App Store. Es menos de un minuto y nos sería de gran ayuda. ¡Gracias por su apoyo!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">No, gracias</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="bookmark_share_sms">Ve mi alfiler en mapa. Abre %1$s o %2$s</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="my_position_share_sms">Mira dónde estoy. Abre %1$s o %2$s</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Mira mi alfiler en el mapa de Organic Maps</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Mira mi ubicación actual en el mapa en Organic Maps</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Hola:\n\nAhora estoy aquí: %1$s. Haz clic en este enlace %2$s o esta %3$s para verlo en el mapa.\n\nGracias.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Compartir por mensaje</string>
@ -587,7 +587,8 @@
 	<string name="p2p_to_here">Ruta hacia</string>
 	<string name="p2p_only_from_current">La navegación solo está disponible desde tu ubicación actual.</string>
 	<string name="p2p_reroute_from_current">¿Quieres que planeemos un ruta desde tu ubicación actual?</string>
-	<string name="whats_new_next_button">Siguiente</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Siguiente</string>
 	<string name="editor_time_add">Añadir horario</string>
 	<string name="editor_time_delete">Eliminar horario</string>
 	<!-- Text for allday switch. -->
@ -1057,7 +1058,7 @@
 	<string name="place_description_title">Descripción del lugar</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Cargando mapas</string>
-	<string name="share_bookmarks_email_body_link">Hola!\n\nSus etiquetas se pueden descargar desde el enlace: %s. Abra la lista con la ayuda de Organic Maps y disfrute del viaje!\n\nDescargar la aplicación: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Hola!\n\nSus etiquetas se pueden descargar desde el enlace: %s. Abra la lista con la ayuda de Organic Maps y disfrute del viaje!\n\nDescargar la aplicación: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">El navegador le notificará de las cámaras cuando se exceda el límite de velocidad en %d km/h</string>
 	<string name="warning_speedcams_subtitle">No de olvide de leer las reglas de carretera en el país de viaje.</string>
 	<string name="speedcams_notice_message">Auto - advierte sobre las cámaras de velocidad si existe el riesgo de exceder el límite de velocidad\nSiempre - siempre alerta sobre las cámaras\nNunca - nunca advierte acerca de las cámaras</string>
@ -1200,8 +1201,16 @@
 	<string name="downloader_loading_ios">Cargando</string>
 	<string name="key_information_title">Información clave</string>
 	<string name="enable_screen_sleep">Permitir que la pantalla duerma</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Cuando está habilitado, la pantalla podrá dormir después de un período de inactividad.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Actualice sus mapas descargados</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">La actualización de mapas mantiene actualizada la información sobre objetos</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Actualizar (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Actualizar más tarde de forma manual</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Estación de teleférico</string>
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@ -575,7 +575,8 @@
 	<string name="p2p_to_here">مسیر به</string>
 	<string name="p2p_only_from_current">مسیر یابی فقط از موقعیت کنونی شما قابل انجام است.</string>
 	<string name="p2p_reroute_from_current">ایا می خواهید یک مسیر را از موقعیت فعلیتان برنامه ریزی کنیم؟</string>
-	<string name="whats_new_next_button">بعدی</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">بعدی</string>
 	<string name="editor_time_add">اضافه کردن برنامه ریزی</string>
 	<string name="editor_time_delete">حذف کردن برنامه ریزی</string>
 	<!-- Text for allday switch. -->
@ -1048,7 +1049,7 @@
 	<string name="place_description_title">توضیحات محل</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">دانلود کننده نقشه</string>
-	<string name="share_bookmarks_email_body_link">سلام!\n\nاین لینکی است که شما می توانید نشان شده های خود را از آن دانلود نمایید: %s. لیست را از طریق Organic Maps باز کرده و از سفر خود لذت ببرید!\n\nدریافت برنامه: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">سلام!\n\nاین لینکی است که شما می توانید نشان شده های خود را از آن دانلود نمایید: %s. لیست را از طریق Organic Maps باز کرده و از سفر خود لذت ببرید!\n\nدریافت برنامه: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">هدایتگر هنگامی که از محدوده سرعت %d کیلومتر بر ساعت تجاوز نمایید، در مورد دوربین هشدار می دهد</string>
 	<string name="warning_speedcams_subtitle">لطفا قوانین رانندگی کشوری که به آن سفر می کنید، را رعایت کنید.</string>
 	<string name="speedcams_notice_message">خودکار- در صورتی که خطر تجاوز از سرعت مجاز وجود داشت، نسبت به دوربین های کنترل سرعت هشدار دهد\nهمیشه-همیشه درباره دوربین های کنترل سرعت هشدار دهد\nهرگز-هرگز درباره دوربین های کنترل سرعت هشدار ندهد</string>
@ -1191,8 +1192,16 @@
 	<string name="downloader_loading_ios">در حال دانلود</string>
 	<string name="key_information_title">اطلاعات کلیدی</string>
 	<string name="enable_screen_sleep">اجازه دهید صفحه نمایش بخوابد</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">درصورت فعال بودن ، بعد از یک دوره عدم فعالیت به صفحه اجازه خواب داده می شود.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">نقشه های دانلود شده خود را به روز کنید</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">به روز رسانی نقشه ها اطلاعات مربوط به اشیا را به روز نگه می دارد</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">بروزرسانی (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">بعدا به صورت دستی به روزرسانی کنید</string>

 	<!-- SECTION: Types -->
 	<string name="type.aeroway.aerodrome">فرودگاه</string>
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@ -194,15 +194,15 @@
 	<string name="appStore_message">Toivottavasti nautit Organic Maps -sovelluksen käyttämisestä! Olisimme tyytyväisiä, jos voisit arvioida sovelluksen App Storessa. Se kesää alle minuutin, ja auttaa meitä todella paljon. Kiitos tuestasi!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Ei kiitos</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Hei, katso merkintäni Organic Maps-sovelluksessa! %1$s tai %2$s Eikö sinulla ole offline-karttoja? Lataa ne täältä: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Hei, katso sijaintini Organic Maps-sovelluksessa! %1$s tai %2$s Eikö sinulla ole vielä offline-karttoja? Lataa ne täältä: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Hei, katso merkintäni Organic Maps-sovelluksessa! %1$s tai %2$s Eikö sinulla ole offline-karttoja? Lataa ne täältä: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Hei, katso sijaintini Organic Maps-sovelluksessa! %1$s tai %2$s Eikö sinulla ole vielä offline-karttoja? Lataa ne täältä: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Hei, katso merkintäni Organic Maps-kartalla</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Hei, kurkkaa tämänhetkinen sijaintini Organic Maps:n kartalla!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Hei,n\nOlen nyt täällä: %1$s. Klikkaa linkkiä %2$s tai %3$s nähdäksesi paikan kartalla. Kiitos.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Jaa viestillä</string>
@ -587,7 +587,8 @@
 	<string name="p2p_to_here">Reitin loppupiste</string>
 	<string name="p2p_only_from_current">Navigointi onnistuu vain nykyisestä sijainnistasi.</string>
 	<string name="p2p_reroute_from_current">Haluatko valita vaihtoehtoisen reitin?</string>
-	<string name="whats_new_next_button">Seuraava</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Seuraava</string>
 	<string name="editor_time_add">Lisää aikataulu</string>
 	<string name="editor_time_delete">Poista aikataulu</string>
 	<!-- Text for allday switch. -->
@ -1057,7 +1058,7 @@
 	<string name="place_description_title">Paikan kuvaus</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Karttojen lataaminen</string>
-	<string name="share_bookmarks_email_body_link">Hei!\n\nMerkkinne voi ladata linkistä: %s. Avaa luettelo Organic Maps: llä ja nauti matkasta!\n\nLataa sovellus: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Hei!\n\nMerkkinne voi ladata linkistä: %s. Avaa luettelo Organic Maps: llä ja nauti matkasta!\n\nLataa sovellus: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Navigaattori ilmoittaa sinulle kameroista, kun nopeusraja ylittyy %d km/t</string>
 	<string name="warning_speedcams_subtitle">Muista tutustua matkustusmaan liikennesääntöihin.</string>
 	<string name="speedcams_notice_message">Auto - Varoita nopeuskameroista, jos tuntuu siltä, että nopeusrajan ylitys on mahdollista\nAina - Varoita kameroista aina\nEi koskaan - älä koskaan varoita kameroista</string>
@ -1200,8 +1201,16 @@
 	<string name="downloader_loading_ios">Lataus</string>
 	<string name="key_information_title">Avaintietoa</string>
 	<string name="enable_screen_sleep">Anna näytön nukkua</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Kun tämä asetus on käytössä, näytön annetaan nukkua käyttämättömyyden jälkeen.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Päivitä ladatut kartat</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Karttojen päivittäminen pitää kohteita koskevat tiedot ajan tasalla</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Päivitä (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Päivitä manuaalisesti myöhemmin</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Köysirata-asema</string>
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@ -200,15 +200,15 @@
 	<string name="appStore_message">Nous espérons que vous appréciez l\'utilisation de Organic Maps ! Si oui, veuillez évaluer l\'appli ou laisser une critique sur l\'App Store. Cela prend moins d\'une minute, mais peut vraiment nous aider. Merci pour votre soutien !</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Non, merci</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Hé, regarde mon épingle sur Organic Maps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Hé, regarde ma position actuelle sur Organic Maps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Hé, regarde mon épingle sur Organic Maps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Hé, regarde ma position actuelle sur Organic Maps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Hé, regarde mon épingle sur la carte Organic Maps !</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Hé, regarde ma position actuelle sur la carte Organic Maps !</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Bonjour,\n\nJe suis actuellement ici : %1$s. Clique sur ce lien %2$s ou sur celui-ci %3$s pour voir l\'endroit sur la carte.\n\nMerci.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Partager par message</string>
@ -605,7 +605,8 @@
 	<string name="p2p_to_here">Itinéraire vers</string>
 	<string name="p2p_only_from_current">La navigation est uniquement disponible à partir de votre emplacement actuel.</string>
 	<string name="p2p_reroute_from_current">Souhaitez-vous que nous planifiions un itinéraire à partir de votre emplacement actuel ?</string>
-	<string name="whats_new_next_button">Suivant</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Suivant</string>
 	<string name="editor_time_add">Ajouter au planning</string>
 	<string name="editor_time_delete">Supprimer du planning</string>
 	<!-- Text for allday switch. -->
@ -1081,7 +1082,7 @@
 	<string name="place_description_title">Description d\'endroit</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Téléchargeur carte</string>
-	<string name="share_bookmarks_email_body_link">Bonjour !\n\nVoici le lien où vous pouvez télécharger vos signets : %s. Ouvrez la liste via Organic Maps et profitez de votre voyage !\n\nInstaller l\'application : https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Bonjour !\n\nVoici le lien où vous pouvez télécharger vos signets : %s. Ouvrez la liste via Organic Maps et profitez de votre voyage !\n\nInstaller l\'application : https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Navigator vous avertira des caméras lorsque vous dépassez la limite de vitesse de %d km/h</string>
 	<string name="warning_speedcams_subtitle">Veuillez respecter les réglementations de conduite du pays dans lequel vous vous rendez.</string>
 	<string name="speedcams_notice_message">Auto - Alerte sur les radars en cas de risque de dépassement de la limite de vitesse\nToujours - Toujours avertir des radars\nJamais - Jamais avertir à propos des radars</string>
@ -1224,8 +1225,16 @@
 	<string name="downloader_loading_ios">Téléchargement</string>
 	<string name="key_information_title">Informations clés</string>
 	<string name="enable_screen_sleep">Autoriser l\'écran à dormir</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Lorsqu\'il est activé, l\'écran sera autorisé à dormir après une période d\'inactivité.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Mettez à jour vos cartes téléchargées</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Actualiser les cartes permet d\'actualiser également les informations sur les objets</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Mettre à jour (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Mettre à jour manuellement plus tard</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Remontées mécaniques</string>
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@ -196,15 +196,15 @@
 	<string name="appStore_message">Reméljük élvezi a Organic Maps használatát. Ha igen, kérjük írjon ajánlást az App Store-ban! Kevesebb mint egy perc, és valóban segít nekünk. Köszönjük!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Köszönöm, nem</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Nézd meg a Organic Maps jelzőt! %1$s vagy %2$s A program letöltése: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Nézd meg a Organic Maps helyzetemet! %1$s vagy %2$s A program letöltése: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Nézd meg a Organic Maps jelzőt! %1$s vagy %2$s A program letöltése: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Nézd meg a Organic Maps helyzetemet! %1$s vagy %2$s A program letöltése: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Nézze meg a Organic Maps jelzőmet</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Nézze meg a helyzetemet a Organic Maps térképen!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Üdvözlöm!\n\nJelenleg itt vagyok: %1$s Kattintson erre a hivatkozásra %2$s vagy erre %3$s, hogy lássa a helyet a térképen.\n\nKöszönöm.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Megosztás üzenetben</string>
@ -595,7 +595,8 @@
 	<string name="p2p_to_here">Ide</string>
 	<string name="p2p_only_from_current">A navigáció csak a jelenlegi helyzetéből érhető el.</string>
 	<string name="p2p_reroute_from_current">Szeretne útvonaltervet készíttetni a jelenlegi pozíciójától?</string>
-	<string name="whats_new_next_button">Következő</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Következő</string>
 	<string name="editor_time_add">Időrend felvitele</string>
 	<string name="editor_time_delete">Időrend törlése</string>
 	<!-- Text for allday switch. -->
@ -1064,7 +1065,7 @@
 	<string name="place_description_title">A hely ismertetése</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Kártyák letöltése</string>
-	<string name="share_bookmarks_email_body_link">Üdvözlöm!\n\nA jeleit le lehet tölteni ezzel a linkkel: %s. Nyíssa meg a listát Organic Maps segítségével és élvezze az utazását!\n\nAlkalmazás letöltése: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Üdvözlöm!\n\nA jeleit le lehet tölteni ezzel a linkkel: %s. Nyíssa meg a listát Organic Maps segítségével és élvezze az utazását!\n\nAlkalmazás letöltése: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Navigátor értesít a kamerákról sebességkorlátozás megsértésénél %d km/óra-ra</string>
 	<string name="warning_speedcams_subtitle">Ne felejtse el megismerkedni a cél ország közlekedési szabályaival.</string>
 	<string name="speedcams_notice_message">Autó - Figyelmeztetés a sebesség kamerákról, ha van kockázat a sebesség korlátozás megsértéséről\nMindig - Mindig figyelmeztet a kamerákról\nSoha - Soha ne figyelmezet a kamerákról</string>
@ -1207,8 +1208,16 @@
 	<string name="downloader_loading_ios">Letöltés</string>
 	<string name="key_information_title">Kulcs információ</string>
 	<string name="enable_screen_sleep">Hagyja aludni a képernyőt</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Ha engedélyezve van, akkor a képernyő inaktivitás után alszik.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Frissítse a letöltött térképeit</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">A térképek frissítésével naprakészen tarthatja az objektumokra vonatkozó adatokat</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Frissítés (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Kézi frissítés később</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Felvonóállomás</string>
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@ -194,15 +194,15 @@
 	<string name="appStore_message">Kami harap Anda senang menggunakan Organic Maps! Jika ya, mohon beri nilai atau ulasan untuk aplikasi ini di App Store. Hanya memakan waktu kurang dari satu menit tetapi hal itu dapat benar-benar membantu kami. Terima kasih atas dukungan Anda!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Tidak, terima kasih</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Hei, lihat pinku di Organic Maps! %1$s atau %2$s belum memiliki peta offline? Unduh di sini: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Hei, lihat lokasiku saat ini di Organic Maps! %1$s atau %2$s belum memiliki peta offline? Unduh di sini: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Hei, lihat pinku di Organic Maps! %1$s atau %2$s belum memiliki peta offline? Unduh di sini: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Hei, lihat lokasiku saat ini di Organic Maps! %1$s atau %2$s belum memiliki peta offline? Unduh di sini: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Hei, lihat pinku di peta Organic Maps</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Hei, lihat lokasiku saat ini di peta Organic Maps!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Hai,\n\nSekarang saya ada di sini: %1$s. Klik tautan ini %2$s atau yang ini %3$s untuk melihat tempatnya di peta.\n\nTerima kasih.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Bagikan menggunakan pesan</string>
@ -586,7 +586,8 @@
 	<string name="p2p_to_here">Rute ke</string>
 	<string name="p2p_only_from_current">Navigasi tersedia hanya dari lokasi Anda saat ini.</string>
 	<string name="p2p_reroute_from_current">Apakah Anda ingin kami merencanakan sebuah rute dari lokasi Anda saat ini?</string>
-	<string name="whats_new_next_button">Berikut</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Berikut</string>
 	<string name="editor_time_add">Tambah Jadwal</string>
 	<string name="editor_time_delete">Hapus Jadwal</string>
 	<!-- Text for allday switch. -->
@ -1056,7 +1057,7 @@
 	<string name="place_description_title">Deskripsi Tempat</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Pengunduh peta</string>
-	<string name="share_bookmarks_email_body_link">Halo!\n\nBerikut tautan untuk mengunduh bookmark Anda: %s. Buka daftar melalui Organic Maps dan nikmati perjalanan Anda!\n\nDapatkan aplikasi: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Halo!\n\nBerikut tautan untuk mengunduh bookmark Anda: %s. Buka daftar melalui Organic Maps dan nikmati perjalanan Anda!\n\nDapatkan aplikasi: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Navigator akan memberi Anda peringatan tentang adanya kamera saat Anda melebihi batas kecepatan %d km/jam</string>
 	<string name="warning_speedcams_subtitle">Harap perhatikan aturan berkendara di negara tempat Anda bepergian.</string>
 	<string name="speedcams_notice_message">Auto - Peringatkan tentang kamera kecepatan saat terdapat risiko melebihi batas kecepatan\nSelalu - Selalu peringatkan tentang kamera kecepatan\nTidak pernah - Jangan pernah peringatkan tentang kamera kecepatan</string>
@ -1199,8 +1200,16 @@
 	<string name="downloader_loading_ios">Mengunduh</string>
 	<string name="key_information_title">Informasi kunci</string>
 	<string name="enable_screen_sleep">Izinkan layar untuk tidur</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Jika diaktifkan, layar akan diizinkan untuk tidur setelah beberapa saat tidak aktif.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Perbarui peta yang sudah Anda unduh</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Memperbarui peta membuat informasi tentang objek tetap terkini</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Pembaruan (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Perbarui secara manual nanti</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Stasiun kereta gantung</string>
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@ -194,15 +194,15 @@
 	<string name="appStore_message">Confidiamo nel fatto che sia piacevole utilizzare Organic Maps! In caso positivo, ti preghiamo di valutare o recensire l\'app all\'interno dell\'app store. Ti porterà via meno di un minuto e la cosa ci aiuterebbe tantissimo. Grazie per il tuo sostegno!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">No, grazie</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="bookmark_share_sms">Vedi pin sulla mappa. Apri %1$s o %2$s</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="my_position_share_sms">Vedi dove sono ora. Apri %1$s o %2$s</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Dai uno sguardo al mio pin sulla mappa di Organic Maps</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Guarda dove mi trovo attualmente sulla mappa Organic Maps</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Ciao,\n\nSono qui adesso: %1$s. Clicca su questo link %2$s oppure su questo %3$s per vedere il posto sulla mappa.\n\nGrazie.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Condividi con un messaggio</string>
@ -593,7 +593,8 @@
 	<string name="p2p_to_here">Percorso per</string>
 	<string name="p2p_only_from_current">La navigazione è disponibile solo dalla tua posizione attuale.</string>
 	<string name="p2p_reroute_from_current">Vuoi che impostiamo il percorso dalla tua posizione corrente?</string>
-	<string name="whats_new_next_button">Avanti</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Avanti</string>
 	<string name="editor_time_add">Aggiungi orari</string>
 	<string name="editor_time_delete">Elimina orari</string>
 	<!-- Text for allday switch. -->
@ -1063,7 +1064,7 @@
 	<string name="place_description_title">Descrizione luogo</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Caricamento mappe</string>
-	<string name="share_bookmarks_email_body_link">Ciao,\n\npuoi scaricare i tag dal seguente link: %s. Aprire elenco tramite Organic Maps e godersi viaggio!\n\nScaricare l\'App: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Ciao,\n\npuoi scaricare i tag dal seguente link: %s. Aprire elenco tramite Organic Maps e godersi viaggio!\n\nScaricare l\'App: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Il navigatore avvisa della presenza della telecamere in caso di eccesso velocità di %d km/o</string>
 	<string name="warning_speedcams_subtitle">Ricorda di informarti sul Codice della Strada del paese che visiti.</string>
 	<string name="speedcams_notice_message">Auto - Avvisare di autovelox in caso di rischio eccesso velocità\nSempre - avvisare sempre di autovelox\nMai - Non avvisare mai di autovelox</string>
@ -1206,8 +1207,16 @@
 	<string name="downloader_loading_ios">Caricamento</string>
 	<string name="key_information_title">Informazioni importanti</string>
 	<string name="enable_screen_sleep">Consenti allo schermo di dormire</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Quando abilitato, lo schermo potrà dormire dopo un periodo di inattività.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Aggiorna le mappe scaricate</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Aggiornamento mappe mantiene aggiornate le informazioni sugli oggetti</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Aggiorna (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Aggiorna manualmente più tardi</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Funivia</string>
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@ -194,15 +194,15 @@
 	<string name="appStore_message">Organic Mapsの使い心地はいかがでしょうか。もしよろしければ、App Storeでレビューや評価をお知らせください。皆様からいただく一言が開発の励みになります。ご支援をよろしくお願いいたします！</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">いいえ</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="bookmark_share_sms">私のピン情報はこの位置です。リンク: %1$s, %2$s</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="my_position_share_sms">私は今ここにいます。リンク: %1$s, %2$s</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Organic Mapsでピン情報を確認</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Organic Mapsで現在地を確認</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">私は今ここにいます: %1$s\n\nリンクをクリックすると詳細がマップに表示されます。\n\n%2$s\n\n%3$s</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">メッセージで共有</string>
@ -587,7 +587,8 @@
 	<string name="p2p_to_here">目的地</string>
 	<string name="p2p_only_from_current">ナビゲーションは現在位置からのみ利用できます。</string>
 	<string name="p2p_reroute_from_current">現在位置からのルートを作成しますか？</string>
-	<string name="whats_new_next_button">次へ</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">次へ</string>
 	<string name="editor_time_add">スケジュール追加</string>
 	<string name="editor_time_delete">スケジュール削除</string>
 	<!-- Text for allday switch. -->
@ -1056,7 +1057,7 @@
 	<string name="place_description_title">場所の説明</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">マップダウンローダー</string>
-	<string name="share_bookmarks_email_body_link">こんにちは!\n\nこれはあなたのブックマークをダウンロードできるリンクです:%s。Organic Mapsを通じてリストを開いて旅をお楽しみください!\n\nアプリの入手: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">こんにちは!\n\nこれはあなたのブックマークをダウンロードできるリンクです:%s。Organic Mapsを通じてリストを開いて旅をお楽しみください!\n\nアプリの入手: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">%d km/hの速度制限を超えているときナビゲーターが自動速度違反取締装置について警告します</string>
 	<string name="warning_speedcams_subtitle">旅行先の国の道路交通法を考慮してください。</string>
 	<string name="speedcams_notice_message">自動－速度制限超過の危険性がある場合には、自動速度違反取締装置について警告します\n常時－自動速度違反取締装置について常に警告します\n無効－自動速度違反取締装置を警告しません</string>
@ -1199,8 +1200,16 @@
 	<string name="downloader_loading_ios">ダウンロード中</string>
 	<string name="key_information_title">重要情報</string>
 	<string name="enable_screen_sleep">画面をスリープ状態にする</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">有効にすると、画面は一定時間非アクティブになった後もスリープ状態になります。</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">ダウンロード済みのマップを更新してください</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">地図を更新することで物件情報を最新の状態に保ちます</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">更新 (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">あとで手動で更新</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway">索道</string>
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@ -196,15 +196,15 @@
 	<string name="appStore_message">Organic Maps로 즐거운 시간을 보내시기 바랍니다! Organic Maps가 마음에 드신다면 앱스토어에서 평가를 남겨 주시기 바랍니다. 평가하는 데는 1분이 채 걸리지 않지만 저희에게 큰 도움이 됩니다. 성원해 주셔서 감사합니다!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">평가하지 않겠습니다</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="bookmark_share_sms">지도에서 내 PIN을 참조하십시오. %1$s 또는 %2$s 열기</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="my_position_share_sms">현재 위치를 알아 보십시오. %1$s 또는 %2$s 열기</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Organic Maps 지도에서 내 핀 보기</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Organic Maps 지도에서 제 현재 위치를 살펴 보시기 바랍니다</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">안녕하세요.\n\n지금 다음 위치에 있습니다: %1$s. %2$s 또는 %3$s 링크를 클릭하여 지도상에서 해당 장소를 살펴보시기 바랍니다.\n\n감사합니다.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">메시지로 공유</string>
@ -589,7 +589,8 @@
 	<string name="p2p_to_here">목적지</string>
 	<string name="p2p_only_from_current">현재 위치에서만 네비게이션을 사용할 수 있습니다.</string>
 	<string name="p2p_reroute_from_current">현재 위치에서 경로를 계획하시겠습니까?</string>
-	<string name="whats_new_next_button">다음</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">다음</string>
 	<string name="editor_time_add">스케줄 추가</string>
 	<string name="editor_time_delete">스케줄 삭제</string>
 	<!-- Text for allday switch. -->
@ -1058,7 +1059,7 @@
 	<string name="place_description_title">장소 묘사</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">맵 다운로더</string>
-	<string name="share_bookmarks_email_body_link">안녕하세요!\n\n여기 즐겨찾기들을 다운로드 받을 수 있는 링크입니다: %s. Organic Maps 를 통해 리스트를 열고 당신의 여행을 즐기세요!\n\n어플리케이션을 받으세요: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">안녕하세요!\n\n여기 즐겨찾기들을 다운로드 받을 수 있는 링크입니다: %s. Organic Maps 를 통해 리스트를 열고 당신의 여행을 즐기세요!\n\n어플리케이션을 받으세요: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">네비게이터가 %d km/h의 속도 제한을 초과시 카메라에 대해 경고 할 것입니다</string>
 	<string name="warning_speedcams_subtitle">여행하시는 나라의 운전 법규를 준수하시길 바랍니다.</string>
 	<string name="speedcams_notice_message">자동 - 속도 제한 초과 위험이 있을때 스피드캠에 대해 경고하기\n항상 - 스피드캠에 대해 항상 경고하기\n절대 아님 - 스피드캠에 대해 경고하지 않기</string>
@ -1201,8 +1202,16 @@
 	<string name="downloader_loading_ios">다운로드 중</string>
 	<string name="key_information_title">핵심 정보</string>
 	<string name="enable_screen_sleep">화면 절전 모드 허용</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">활성화되면 일정 시간 동안 활동이 없으면 화면이 절전 모드로 전환됩니다.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">다운로드한 지도를 업데이트해야 합니다</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">지도를 업데이트하면 개체에 대한 정보가 최신 상태로 유지됩니다.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">업데이트(%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">나중에 수동으로 업데이트</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">케이블카 역</string>
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@ -194,15 +194,15 @@
 	<string name="appStore_message">Håper du liker å bruke Organic Maps! Hvis du gjør det er det flott om du rangerer eller vurderer appen på App Store. Det tar deg mindre enn ett minutt, men kan virkelig hjelpe oss. Takk for støtten!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Nei takk</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Hei, se merket mitt på Organic Maps! %1$s eller %2$s Har du ikke installert offline-kart? Last dem ned her: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Hei, se posisjonen min på Organic Maps! %1$s eller %2$s Har du ikke offline-kart? Last dem ned her: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Hei, se merket mitt på Organic Maps! %1$s eller %2$s Har du ikke installert offline-kart? Last dem ned her: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Hei, se posisjonen min på Organic Maps! %1$s eller %2$s Har du ikke offline-kart? Last dem ned her: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Hei, se merket mitt på Organic Maps-kartet</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Hei, se posisjonen min på Organic Maps-kartet!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Hei,Jeg er her nå: %1$s. Klikk på denne koblingen %2$s eller denne %3$s for å se stedet på kartet.\n\nTakk.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Del med melding</string>
@ -587,7 +587,8 @@
 	<string name="p2p_to_here">Rute til</string>
 	<string name="p2p_only_from_current">Navigering er kun tilgjengelig fra din nåværende beliggenhet.</string>
 	<string name="p2p_reroute_from_current">Vil du vi skal planlegge en rute fra din nåværende posisjon?</string>
-	<string name="whats_new_next_button">Neste</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Neste</string>
 	<string name="editor_time_add">Legg til tidsrom</string>
 	<string name="editor_time_delete">Slett tidsrom</string>
 	<!-- Text for allday switch. -->
@ -1008,7 +1009,7 @@
 	<string name="place_description_title">Plasser beskrivelse</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Nedlast kart</string>
-	<string name="share_bookmarks_email_body_link">Hei!\n\nHer er lenken der du kan laste ned bokmerkene dine: %s. Åpne listen via Organic Maps og nyt reisen!\n\nFå tak i app: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Hei!\n\nHer er lenken der du kan laste ned bokmerkene dine: %s. Åpne listen via Organic Maps og nyt reisen!\n\nFå tak i app: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Navigatøren vil advare deg om kameraer når du overskrider fartsgrensen på %d km/t</string>
 	<string name="warning_speedcams_subtitle">Vær oppmerksom på kjøreregler for landet du reiser til.</string>
 	<string name="speedcams_notice_message">Auto - Advarsel om fartskamera hvis det er fare for å overskride fartsgrensen\nAlltid - Advar alltid om farskameraer\nAldri - Advar aldri om fartskameraer</string>
@ -1151,8 +1152,16 @@
 	<string name="downloader_loading_ios">Nedlasting</string>
 	<string name="key_information_title">Nøkkelinformasjon</string>
 	<string name="enable_screen_sleep">La skjermen sove</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Når den er aktivert, får skjermen lov til å sove etter en periode med inaktivitet.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Oppdater dine nedlastede kart</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Ved å oppdatere kart holder du også informasjonen om ulike elementer oppdatert</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Oppdater (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Oppdater manuelt senere</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Kabelbanestasjon</string>
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@ -195,15 +195,15 @@
 	<string name="appStore_message">Ik hoop dat u veel plezier hebt met Organic Maps! Zo ja, geef de app dan een cijfer in de App Store of schrijf een recensie. Dit duurt minder dan een minuut, maar kan ons echt helpen. Bedankt voor uw steun!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Nee, bedankt</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="bookmark_share_sms">Bekijk mijn pin op de kaart. Open %1$s of %2$s</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="my_position_share_sms">Kijk waar ik nu ben. Open %1$s of %2$s</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Kijk naar mijn pin op Organic Maps kaart</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Kijk naar mijn huidige locatie op Organic Maps kaart</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Hoi,\n\nMomenteel ben ik hier: %1$s. Klik op deze %2$s of deze %3$s om de plaats op de kaart te zien.\n\nBedankt.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Delen via bericht</string>
@ -594,7 +594,8 @@
 	<string name="p2p_to_here">Route naar</string>
 	<string name="p2p_only_from_current">Navigatie is uitsluitend beschikbaar vanuit uw huidige locatie.</string>
 	<string name="p2p_reroute_from_current">Wilt u dat wij een route plannen vanaf uw huidige locatie?</string>
-	<string name="whats_new_next_button">Volgende</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Volgende</string>
 	<string name="editor_time_add">Schema toevoegen</string>
 	<string name="editor_time_delete">Schema verwijderen</string>
 	<!-- Text for allday switch. -->
@ -1064,7 +1065,7 @@
 	<string name="place_description_title">Plaats Beschrijving</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Kaart downloader</string>
-	<string name="share_bookmarks_email_body_link">Hello!\n\nHier is de link waar u uw bladwijzers kunt downloaden: %s. Open de lijst via Organic Maps en geniet van uw reis!\n\nHaal de applicatie op: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Hello!\n\nHier is de link waar u uw bladwijzers kunt downloaden: %s. Open de lijst via Organic Maps en geniet van uw reis!\n\nHaal de applicatie op: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Navigator waarschuwt u over camera\'s wanneer u de maximumsnelheid van %d km/h overschrijdt</string>
 	<string name="warning_speedcams_subtitle">Let op de rijvoorschriften van het land waar u naartoe reist.</string>
 	<string name="speedcams_notice_message">Auto - Waarschuw voor speedcams als er een risico bestaat dat de snelheidslimiet wordt overschreden\nAltijd - Waarschuw altijd voor flitspalen\nNooit - Waarschuw nooit over flitspalen</string>
@ -1207,8 +1208,16 @@
 	<string name="downloader_loading_ios">Downloaden</string>
 	<string name="key_information_title">Belangrijke informatie</string>
 	<string name="enable_screen_sleep">Laat het scherm slapen</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Indien ingeschakeld, mag het scherm slapen na een periode van inactiviteit.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Werk uw gedownloade kaarten bij</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Kaarten bijwerken houdt de informatie over objecten actueel</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Bijwerken (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Later handmatig bijwerken</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Kabelwagenstation</string>
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@ -198,15 +198,15 @@
 	<string name="appStore_message">Mamy nadzieję, że podoba ci się aplikacja Organic Maps! Jeśli tak to proszę oceń ją lub napisz recenzję w AppStore. To zajmie mniej niż minutę, a bardzo nam pomoże. Dziękujemy za wsparcie!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Nie, dziękuję</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="bookmark_share_sms">Mój znacznik w Organic Maps %1$s i %2$s</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="my_position_share_sms">Zobacz gdzie jestem. Link %1$s lub %2$s</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Obejrzyj mój znacznik na mapie w Organic Maps</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Zobacz moją aktualną lokalizację na mapie przy użyciu Organic Maps</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Cześć,\n\nJestem teraz tutaj: %1$s. Naciśnij na ten link %2$s lub ten %3$s, aby zobaczyć to miejsce na mapie.\n\nDziękuję.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Udostępnij przez wiadomość</string>
@ -603,7 +603,8 @@
 	<string name="p2p_to_here">Droga do</string>
 	<string name="p2p_only_from_current">Nawigacja jest dostępna tylko od twojej bieżącej lokalizacji.</string>
 	<string name="p2p_reroute_from_current">Czy chcesz, byśmy zaplanowali trasę z Twojej bieżącej lokalizacji?</string>
-	<string name="whats_new_next_button">Dalej</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Dalej</string>
 	<string name="editor_time_add">Dodaj harmonogram</string>
 	<string name="editor_time_delete">Usuń harmonogram</string>
 	<!-- Text for allday switch. -->
@ -1074,7 +1075,7 @@
 	<string name="place_description_title">Opis miejsca</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Pobieranie map</string>
-	<string name="share_bookmarks_email_body_link">Witaj!\n\nTwoje znaczniki można pobrać, używając link: %s. Otwórz listę, używając Organic Maps i ciesz się podrożą!\n\nPobierz aplikację: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Witaj!\n\nTwoje znaczniki można pobrać, używając link: %s. Otwórz listę, używając Organic Maps i ciesz się podrożą!\n\nPobierz aplikację: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Nawigator powiadomi Cibie o kamerach, gdy przekrocz prędkość na %d km/h</string>
 	<string name="warning_speedcams_subtitle">Nie zapomnij zapoznać się z zasadami ruchu drogowego w kraju podróży.</string>
 	<string name="speedcams_notice_message">Auto – Ostrzegać o kamerach, jeśli istnieje ryzyko przekroczenia ograniczenia prędkości\nZawsze – Zawsze ostrzegaj o kamerach\nNigdy – Nigdy nie ostrzegaj o kamerach</string>
@ -1217,8 +1218,16 @@
 	<string name="downloader_loading_ios">Pobieranie</string>
 	<string name="key_information_title">Kluczowe informacje</string>
 	<string name="enable_screen_sleep">Pozwól ekranowi spać</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Po włączeniu ekran będzie mógł spać po okresie bezczynności.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Zaktualizuj pobrane mapy</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Aktualizacja map umożliwia uzyskanie bieżących informacji o obiektach</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Zaktualizuj (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Zaktualizuj ręcznie później</string>

 	<!-- SECTION:  Partners  -->
 	<string name="sponsored_partner1_action">Wyprzedaże</string>
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@ -196,15 +196,15 @@
 	<string name="appStore_message">Esperamos que esteja a disfrutar da utilização do Organic Maps! Se assim for, por favor classifique ou dê a sua opinião sobre a app na App Store. Vai demorar menos de um minuto mas pode mesmo ajudar-nos. Obrigado pelo seu apoio!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Não, obrigado</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="bookmark_share_sms">Veja o meu marcador no mapa do Organic Maps. Abra a hiperligação: %1$s ou %2$s</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="my_position_share_sms">Veja onde estou agora. Abra a hiperligação: %1$s ou %2$s</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Veja o meu marcador no mapa do Organic Maps.</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Veja a minha localização atual no mapa Organic Maps!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Olá,\n\nEstou aqui agora: %1$s. Clique nesta ligação %2$s ou nesta %3$s para ver o local no mapa.\n\nObrigado.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Partilhar por mensagem</string>
@ -597,7 +597,8 @@
 	<string name="p2p_to_here">Itinerário para</string>
 	<string name="p2p_only_from_current">Só é possível navegar a partir da sua localização actual.</string>
 	<string name="p2p_reroute_from_current">Deseja planejar uma rota a partir da sua localização actual?</string>
-	<string name="whats_new_next_button">Próxima</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Próxima</string>
 	<string name="editor_time_add">Adicionar Horário</string>
 	<string name="editor_time_delete">Eliminar Horário</string>
 	<!-- Text for allday switch. -->
@ -1067,7 +1068,7 @@
 	<string name="place_description_title">Descrição do local</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">A carregar mapas</string>
-	<string name="share_bookmarks_email_body_link">Olá!\n\nSeus rótulos podem ser baixado aqui: %s. Abra a lista usando Organic Maps e desfrute do passeio!\n\nBaixar aplicação: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Olá!\n\nSeus rótulos podem ser baixado aqui: %s. Abra a lista usando Organic Maps e desfrute do passeio!\n\nBaixar aplicação: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">O navegador irá notificá-lo sobre as câmeras quando o limite de velocidade for excedido em %d km/h</string>
 	<string name="warning_speedcams_subtitle">Não esqueça de ler as regras da estrada no país de viagem.</string>
 	<string name="speedcams_notice_message">Auto - Avisa sobre radares de velocidade se houver risco de exceder o limite de velocidade\nSempre - Sempre alerta sobre câmeras\nNunca - nunca avisar sobre câmeras</string>
@ -1210,8 +1211,16 @@
 	<string name="downloader_loading_ios">Carregamento</string>
 	<string name="key_information_title">Informações principais</string>
 	<string name="enable_screen_sleep">Permitir que a tela hiberne</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Quando ativada, a tela poderá hibernar após um período de inatividade.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Atualize seus mapas transferidos</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Atualizar os mapas mantém atualizada a informação sobre objetos</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Atualização (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Atualizar manualmente mais tarde</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Estação de teleférico</string>
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@ -194,15 +194,15 @@
 	<string name="appStore_message">Sperăm că vă place Organic Maps! Dacă da, vă rugăm să o votați sau să scrieți o recenzie în App Store. Durează mai puțin de un minut, dar pe noi ne ajută foarte mult. Vă mulțumim pentru susținere!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Nu, mulțumesc</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Hei, poți vedea care este poziția mea pe Organic Maps! %1$s sau %2$s Nu ai instalate hărțile offline? Descarcă de aici: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Hei, îmi poți vedea poziția actuală pe Organic Maps! %1$s sau %2$s Nu ai hărțile offline? Descarcă de aici: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Hei, poți vedea care este poziția mea pe Organic Maps! %1$s sau %2$s Nu ai instalate hărțile offline? Descarcă de aici: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Hei, îmi poți vedea poziția actuală pe Organic Maps! %1$s sau %2$s Nu ai hărțile offline? Descarcă de aici: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Hei, poți vedea care este poziția mea pe harta Organic Maps!</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Hei, îmi poți vedea poziția actuală pe harta Organic Maps!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Chào,\n\nTôi hiện đang ở đây: %1$s. Hãy nhấn vào liên kết này %2$s hoặc liên kết này %3$s để xem địa điểm trên bản đồ.\n\nCám ơn.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Partajare ca mesaj</string>
@ -584,7 +584,8 @@
 	<string name="p2p_to_here">Ruta la</string>
 	<string name="p2p_only_from_current">Navigația este disponibilă doar având ca punct de pornire locațiacctuală.</string>
 	<string name="p2p_reroute_from_current">Doriți să vă planificăm o rută având ca punct de pornire locația actuală?</string>
-	<string name="whats_new_next_button">Următoarea</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Următoarea</string>
 	<string name="editor_time_add">Adăugare planificare</string>
 	<string name="editor_time_delete">Eliminare planificare</string>
 	<!-- Text for allday switch. -->
@ -1053,7 +1054,7 @@
 	<string name="place_description_title">Descrierea locului</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Încărcarea hărților</string>
-	<string name="share_bookmarks_email_body_link">Bună ziua!\n\nEtichetele dvs. le puteți descărca de pe linki-ul: %s. Deschideți lista cu ajutorul Organic Maps și primiți plăcere de la călătorie!\n\nDescărcați aplicația: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Bună ziua!\n\nEtichetele dvs. le puteți descărca de pe linki-ul: %s. Deschideți lista cu ajutorul Organic Maps și primiți plăcere de la călătorie!\n\nDescărcați aplicația: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Navigatorul o să avertizeze despre camerele video în cazul depășirii limitei de viteză cu %d km/h</string>
 	<string name="warning_speedcams_subtitle">Nu uitați să faceți cunoștință cu regulele de circulație în țara unde călătoriți.</string>
 	<string name="speedcams_notice_message">Auto - De avertizat despre camerele video de înregistrare a vitezei, dacă există riscul depășirii limitei de viteză\nMereu - De avertizat întotdeauna despre camerele video\nNiciodată - De nu avertizat niciodată despre camerele video</string>
@ -1196,8 +1197,16 @@
 	<string name="downloader_loading_ios">Încărcare</string>
 	<string name="key_information_title">Informații cheie</string>
 	<string name="enable_screen_sleep">Permiteți ecranului să doarmă</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Când este activat, ecranul va fi lăsat să doarmă după o perioadă de inactivitate.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Actualizați hărțile descărcate</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Actualizarea hărților vă ajută să păstrați actualizate informațiile despre obiecte</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Actualizare (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Actualizare manuală mai târziu</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Stație de teleferic</string>
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@ -179,7 +179,7 @@
 	<string name="share_by_email">Послать по email</string>
 	<!-- Email Subject when sharing bookmarks category -->
 	<string name="share_bookmarks_email_subject">С вами поделились метками Organic Maps</string>
-	<string name="share_bookmarks_email_body">Здравствуйте!\n\nВ прикрепленном файле мои метки из офлайновых карт Organic Maps. Для того чтобы открыть этот файл, вам потребуется приложение Organic Maps, которое можно установить по ссылке: https://organicmaps.app/get?kmz\n\nСпасибо!</string>
+	<string name="share_bookmarks_email_body">Здравствуйте!\n\nВ прикрепленном файле мои метки из офлайновых карт Organic Maps. Для того чтобы открыть этот файл, вам потребуется приложение Organic Maps, которое можно установить по ссылке: https://omaps.app/get?kmz\n\nСпасибо!</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Загрузка меток</string>
 	<!-- Kmz file successful loading -->
@ -202,15 +202,15 @@
 	<string name="appStore_message">Надеемся, вам нравится пользоваться Organic Maps! Если так, то оставьте, пожалуйста, отзыв в магазине приложений. Это занимает меньше минуты, но может нам реально помочь. Спасибо вам за поддержку!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Нет, спасибо</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="bookmark_share_sms">Моя метка на карте. Жми %1$s или %2$s</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="my_position_share_sms">Смотри где я сейчас. Жми %1$s или %2$s</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Смотри мою метку на карте Organic Maps</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Посмотри на карте Organic Maps, где я сейчас нахожусь</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Привет!\n\nЯ сейчас здесь: %1$s. Чтобы увидеть это место на карте Organic Maps, открой эту ссылку %2$s или эту %3$s\n\nСпасибо.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Отправить сообщением</string>
@ -607,7 +607,8 @@
 	<string name="p2p_to_here">Сюда</string>
 	<string name="p2p_only_from_current">Навигация возможна только из текущего местоположения.</string>
 	<string name="p2p_reroute_from_current">Хотите перестроить маршрут от вашего местоположения?</string>
-	<string name="whats_new_next_button">Далее</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Далее</string>
 	<string name="editor_time_add">Добавить расписание</string>
 	<string name="editor_time_delete">Удалить расписание</string>
 	<!-- Text for allday switch. -->
@ -1109,7 +1110,7 @@
 	<string name="place_description_title">Описание места</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Загрузка карт</string>
-	<string name="share_bookmarks_email_body_link">Здравствуйте!\n\nМетки можно скачать по ссылке: %s. Открывайте список с помощью Organic Maps и наслаждайтесь поездкой!\n\nСкачать приложение: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Здравствуйте!\n\nМетки можно скачать по ссылке: %s. Открывайте список с помощью Organic Maps и наслаждайтесь поездкой!\n\nСкачать приложение: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Навигатор оповестит вас о камерах при превышении скоростного лимита на %d км/ч</string>
 	<string name="warning_speedcams_subtitle">Не забудьте ознакомиться с правилами дорожного движения в стране путешествия.</string>
 	<string name="speedcams_notice_message">Авто - Предупреждать о камерах скорости, если есть риск превышения скоростного лимита\nВсегда - Всегда предупреждать о камерах\nНикогда - Никогда не предупреждать о камерах</string>
@ -1256,8 +1257,16 @@
 	<string name="connection_failure">Ошибка подключения</string>
 	<string name="disconnect_usb_cable_title">Отсоедините USB кабель</string>
 	<string name="enable_screen_sleep">Разрешить экрану спать</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">При включении экран может переходить в спящий режим после периода бездействия.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Обновите ваши загруженные карты</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Обновление карт поддерживает информацию об объектах в актуальном состоянии</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Обновить (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Обновить вручную позже</string>

 	<!-- SECTION:  Partners  -->
 	<string name="sponsored_partner1_action">Аутлеты</string>
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@ -194,15 +194,15 @@
 	<string name="appStore_message">Dúfame, že sa vám používánie Organic Maps páči! Ak to je tak, ohodnoťte prosím našu aplikáciu alebo napíšte na ňu recenziu v Obchode s aplikáciami. Nezaberie vám to ani minútu času, ale nám s tým môžete veľmi pomôoť. Ďakujeme vám za vašu podporu!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Nie, ďakujem</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="bookmark_share_sms">Pozrite na moju značku na mape. Otvoriť odkaz: %1$s alebo %2$s</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="my_position_share_sms">Pozri kde som. Otvor odkaz: %1$s alebo %2$s</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Pozri na moju značku na mape Organic Maps</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Pozrite si moju aktuálnu polohu na mape Organic Maps</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Ahoj,\n\nPráve som tu: %1$s. Stlačte jeden z týchto odkazov %2$s, %3$s a uvidíte toto miesto na mape.\n\nVďaka</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Zdielať pomocou správy</string>
@ -591,7 +591,8 @@
 	<string name="p2p_to_here">Cesta do</string>
 	<string name="p2p_only_from_current">Navigácia je dostupná iba z vašej aktuálnej polohy.</string>
 	<string name="p2p_reroute_from_current">Doriți să vă planificăm o rută având ca punct de pornire locația actuală?</string>
-	<string name="whats_new_next_button">Nasledujúca</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Nasledujúca</string>
 	<string name="editor_time_add">Pridať rozvrh</string>
 	<string name="editor_time_delete">Zmazať rozvrh</string>
 	<!-- Text for allday switch. -->
@ -1062,7 +1063,7 @@
 	<string name="place_description_title">Popis miesta</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Sťahovač máp</string>
-	<string name="share_bookmarks_email_body_link">Dobrý deň!\n\nTu je odkaz, kde si môžete stiahnuť svoje záložky: %s. Otvorte zoznam prostredníctvom služby Organic Maps a užite si výlet!\n\nZískajte aplikáciu: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Dobrý deň!\n\nTu je odkaz, kde si môžete stiahnuť svoje záložky: %s. Otvorte zoznam prostredníctvom služby Organic Maps a užite si výlet!\n\nZískajte aplikáciu: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Navigátor vás upozorní na kamery, keď prekročíte rýchlostný limit %d km/h</string>
 	<string name="warning_speedcams_subtitle">Dodržujte pravidlá cestnej premávky v krajine, do ktorej cestujete.</string>
 	<string name="speedcams_notice_message">Automaticky - Upozornenie na rýchlostné kamery, ak existuje riziko prekročenia rýchlostného limitu\nVždy - Vždy upozorniť na rýchlostné kamery\nNikdy - Nikdy neupozorňovať na rýchlostné kamery</string>
@ -1205,8 +1206,16 @@
 	<string name="downloader_loading_ios">Sťahovanie</string>
 	<string name="key_information_title">Kľúčová informácia</string>
 	<string name="enable_screen_sleep">Nechajte obrazovku spať</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Ak je táto možnosť povolená, obrazovka bude môcť po určitej dobe nečinnosti spať.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Aktualizujte svoje stiahnuté mapy</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Vďaka aktualizácii máp budú informácie o objektoch na mape aktualizované</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Aktualizovať (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Manuálne aktualizovať neskôr</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Lanovka</string>
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@ -196,15 +196,15 @@
 	<string name="appStore_message">Hoppas du gillar att använda Organic Maps! I så fall, skriv en recension eller ge ett betyg på App Store. Det tar mindre än en minut men kan verkligen hjälpa oss. Tack för din hjälp!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Nej, tack</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Hej, kolla på min pin på Organic Maps! %1$s eller %2$s Har du inte offline-kartor installerat? Ladda ner här: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Hej, kolla på min nuvarande position på Organic Maps! %1$s eller %2$s Har du inte offline-kartor? Ladda ner här: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Hej, kolla på min pin på Organic Maps! %1$s eller %2$s Har du inte offline-kartor installerat? Ladda ner här: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Hej, kolla på min nuvarande position på Organic Maps! %1$s eller %2$s Har du inte offline-kartor? Ladda ner här: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Hej, kolla på min pin på Organic Maps kartan</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Hej, kolla på min nuvarande position på Organic Maps kartan!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Hej,\n\nJag är här nu: %1$s. Klicka på denna länk %2$s eller denna %3$s för att se platsen på kartan.\n\nTack.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Dela via meddelande</string>
@ -593,7 +593,8 @@
 	<string name="p2p_to_here">Rutt till</string>
 	<string name="p2p_only_from_current">Navigering är endast tillgänglig från din aktuella plats.</string>
 	<string name="p2p_reroute_from_current">Vill du att vi planerar en färdväg från din nuvarande plats?</string>
-	<string name="whats_new_next_button">Nästa</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Nästa</string>
 	<string name="editor_time_add">Lägg till schema</string>
 	<string name="editor_time_delete">Ta bort schema</string>
 	<!-- Text for allday switch. -->
@ -1063,7 +1064,7 @@
 	<string name="place_description_title">Beskrivning av platsen</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Kartladdning</string>
-	<string name="share_bookmarks_email_body_link">Hej!\n\nDina etiketter kan laddas ner från länken: %s. Öppna listan med hjälp av Organic Maps och njut av resan!\n\nLadda ner appen: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Hej!\n\nDina etiketter kan laddas ner från länken: %s. Öppna listan med hjälp av Organic Maps och njut av resan!\n\nLadda ner appen: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Navigatören ska meddela dig om kameror när hastighetsgränsen överskrids med %d km/h</string>
 	<string name="warning_speedcams_subtitle">Glöm inte att bekanta sig med trafikregler i landet av resan.</string>
 	<string name="speedcams_notice_message">Auto - Varna om fartkameror om det finns risk att överskrida hastighetsgränsen\nAlltid - Varna alltid om kameror\nAldrig - Varna aldrig om kameror</string>
@ -1206,8 +1207,16 @@
 	<string name="downloader_loading_ios">Nedladdning</string>
 	<string name="key_information_title">Nyckelinformation</string>
 	<string name="enable_screen_sleep">Låt skärmen sova</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">När den är aktiverad får skärmen sova efter en period av inaktivitet.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Uppdatera dina nedladdade kartor</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Uppdatering av kartor håller information om objekt uppdaterade</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Uppdatera (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Uppdatera senare manuellt</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Linbanestation</string>
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@ -200,15 +200,15 @@
 	<string name="appStore_message">หวังว่าคุณจะสนุกกับการใช้ Organic Maps! หากเป็นเช่นนั้น โปรดให้คะแนนหรือวิจารณ์แอปได้ที่แอปสโตร์ (App Store) มันจะใช้เวลาไม่เกินหนึ่งนาทีแต่สามารถช่วยเหลือเราได้ ขอบคุณสำหรับการสนับสนุนของคุณ!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">ไม่ ขอบคุณ</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="bookmark_share_sms">เฮ้ ตรวจสอบหมุดของฉันที่ Organic Maps! %1$s หรือ %2$s</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">เฮ้อ ตรวจสอบตำแหน่งที่ตั้งปัจจุบันของฉันที่ Organic Maps! %1$s หรือ %2$s ไม่มีการติดตั้งแผนที่แบบออฟไลน์? ดาวน์โหลดที่นี่: https://organicmaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">เฮ้อ ตรวจสอบตำแหน่งที่ตั้งปัจจุบันของฉันที่ Organic Maps! %1$s หรือ %2$s ไม่มีการติดตั้งแผนที่แบบออฟไลน์? ดาวน์โหลดที่นี่: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">เฮ้ ตรวจสอบหมุดของฉันที่ แผนที่ Organic Maps!</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">นี่ มาดูตำแหน่งปัจจุบันของฉันที่แผนที่ Organic Maps สิ!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">หวัดดี\n\nฉันอยู่ที่นี่ตอนนี้: %1$s. คลิกลิงก์นี้ %2$s หรือลิงก์นี้ %3$s เพื่อดูสถานที่บนแผนที่\n\nขอบคุณ</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">แชร์จากข้อความ</string>
@ -599,7 +599,8 @@
 	<string name="p2p_to_here">เส้นทางถึง</string>
 	<string name="p2p_only_from_current">สามารถใช้การนำทางได้เฉพาะจากตำแหน่งที่ตั้งปัจจุบันของคุณเท่านั้น</string>
 	<string name="p2p_reroute_from_current">คุณต้องการให้เราาวงแผนเส้นทางจากสถานที่ตั้งปัจจุบันของคุณหรือไม่?</string>
-	<string name="whats_new_next_button">ถัดไป</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">ถัดไป</string>
 	<string name="editor_time_add">เพิ่มวัน</string>
 	<string name="editor_time_delete">ลบวัน</string>
 	<!-- Text for allday switch. -->
@ -1068,7 +1069,7 @@
 	<string name="place_description_title">รายละเอียดของสถานที่</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">ตัวดาวน์โหลดแผนที่</string>
-	<string name="share_bookmarks_email_body_link">สวัสดี!\n\nนี่คือลิงค์ที่คุณสามารถดาวน์โหลดบุ๊คมาร์คของคุณ: %s เปิดรายการผ่าน Organic Maps และเพลิดเพลินไปกับการเดินทางของคุณ!\n\nรับแอพพลิเคชัน: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">สวัสดี!\n\nนี่คือลิงค์ที่คุณสามารถดาวน์โหลดบุ๊คมาร์คของคุณ: %s เปิดรายการผ่าน Organic Maps และเพลิดเพลินไปกับการเดินทางของคุณ!\n\nรับแอพพลิเคชัน: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">เนวิเกเตอร์จะเตือนคุณเกี่ยวกับกล้องถ่ายรูปเมื่อคุณขับเร็วเกินกำหนดโดยอยู่ที่ %d กม./ชม</string>
 	<string name="warning_speedcams_subtitle">โปรดปฏิบัติตามกฎหมายการขับขี่รถยนต์ของประเทศที่คุณกำลังเดินทางไป</string>
 	<string name="speedcams_notice_message">อัตโนมัติ - เตือนเกี่ยวกับกล้องตรวจจับความเร็วหากมีความเป็นได้ว่าจะขับเร็วเกิดกำหนด\nทุกครั้ง - เตือนเกี่ยวกับกล้องตรวจจับความเร็วเสมอ\nไม่ต้องเตือน - ไม่เคยเตือนเกี่ยวกับกล้องตรวจจับความเร็ว</string>
@ -1211,8 +1212,16 @@
 	<string name="downloader_loading_ios">การดาวน์โหลด</string>
 	<string name="key_information_title">ข้อมูลหลัก</string>
 	<string name="enable_screen_sleep">อนุญาตให้หน้าจอเข้าสู่โหมดสลีป</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">เมื่อเปิดใช้งานหน้าจอจะได้รับอนุญาตให้เข้าสู่โหมดสลีปหลังจากไม่มีการใช้งานเป็นระยะเวลาหนึ่ง</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">อัปเดตแผนที่ที่คุณดาวน์โหลดมา</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">การอัปเดตแผนที่จะคงข้อมูลเกี่ยวกับจุดหมายต่าง ๆ ให้ล่าสุดอยู่เสมอ</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">อัปเดต (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">อัปเดตด้วยตนเองภายหลัง</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">สถานีกระเช้าลอยฟ้า</string>
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@ -200,15 +200,15 @@
 	<string name="appStore_message">Organic Maps kullanmaktan keyif aldığınızı umuyoruz! Öyleyse, lütfen App Store’da uygulamaya puan verin veya uygulama hakkında yorum yapın. Bir dakikadan daha kısa sürer ama bize gerçekten yardımcı olabilir. Desteğiniz için teşekkürler!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Hayır, teşekkürler</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Hey, Organic Maps’de pinimi incele! %1$s veya %2$s Çevrimiçi haritalar sende yüklü değil mi? Buradan indir: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Hey, Organic Maps’de geçerli konumumu incele! %1$s veya %2$s Çevrimiçi haritalar sende yok mu? Buradan indir: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Hey, Organic Maps’de pinimi incele! %1$s veya %2$s Çevrimiçi haritalar sende yüklü değil mi? Buradan indir: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Hey, Organic Maps’de geçerli konumumu incele! %1$s veya %2$s Çevrimiçi haritalar sende yok mu? Buradan indir: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Hey, Organic Maps haritasında pinimi incele!</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Hey, Organic Maps’de geçerli konumumu incele!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Merhaba,\n\nŞu anda bulunduğum yer: %1$s. Yeri haritada görmek için bu bağlantıya %2$s veya şuna %3$s tıkla.\n\nTeşekkürler.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Mesajla paylaş</string>
@ -599,7 +599,8 @@
 	<string name="p2p_to_here">Varış yeri:</string>
 	<string name="p2p_only_from_current">Navigasyon sadece şu anki konumunuzdan mevcut.</string>
 	<string name="p2p_reroute_from_current">Mevcut konumunuzdan bir rota planlamamızı ister misiniz?</string>
-	<string name="whats_new_next_button">Sonraki</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Sonraki</string>
 	<string name="editor_time_add">Plan Ekle</string>
 	<string name="editor_time_delete">Planı Sil</string>
 	<!-- Text for allday switch. -->
@ -1068,7 +1069,7 @@
 	<string name="place_description_title">Yer Açıklaması</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Harita indiricisi</string>
-	<string name="share_bookmarks_email_body_link">Merhaba!\n\nİşte yer işaretlerinizi indirebileceğiniz bağlantı: %s. Organic Maps ile listeyi açın ve yolculuğunuzun tadını çıkarın!\n\nUygulamayı indir: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Merhaba!\n\nİşte yer işaretlerinizi indirebileceğiniz bağlantı: %s. Organic Maps ile listeyi açın ve yolculuğunuzun tadını çıkarın!\n\nUygulamayı indir: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">%d km/sa hız limitini aştığınızda navigasyon, kameralar hakkında sizi uyaracak</string>
 	<string name="warning_speedcams_subtitle">Lütfen bulunduğunuz ülkenin trafik kurallarına dikkat edin.</string>
 	<string name="speedcams_notice_message">Otomatik - Hız sınırını aşma riski varsa hız kameraları hakkında uyar\nHer zaman - Hız kameraları hakkında her zaman uyar\nAsla - Hız kameraları hakkında hiçbir zaman uyarma</string>
@ -1211,8 +1212,16 @@
 	<string name="downloader_loading_ios">İndir</string>
 	<string name="key_information_title">Anahtar bilgisi</string>
 	<string name="enable_screen_sleep">Ekranın uyumasına izin ver</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Etkinleştirildiğinde ekranın bir süre hareketsiz kaldıktan sonra uykuya geçmesine izin verilir.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">İndirdiğiniz haritaları güncelleyin</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Haritaları güncellemek, nesnelerle ilgili bilgilerin güncel kalmasını sağlar</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Güncelle (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Daha sonra manüel olarak güncelle</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Remontées mécaniques</string>
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@ -201,15 +201,15 @@
 	<string name="appStore_message">Сподіваємося, що вам сподобалося користуватися Organic Maps! Якщо так, будь ласка, надайте оцінку програмі або залиште свій відгук на app store. Витративши менше хвилини, ви дійсно нам допоможете. Дякуємо за вашу підтримку!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Ні, дякую</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="bookmark_share_sms">Моя мітка на карті. Іди %1$s або %2$s</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="my_position_share_sms">Глянь де я зараз. Іди %1$s або %2$s</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Поглянь на мою мiтку на карті Organic Maps</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Поглянь на моє поточне місцезнаходження на карті Organic Maps</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Привіт,\n\nЯ зараз тут: %1$s. Натисни на це посилання %2$s або на це посилання %3$s щоб побачити місце на карті.\n\nДякую.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Подiлитися за допомогою повідомлення</string>
@ -600,7 +600,8 @@
 	<string name="p2p_to_here">Сюди</string>
 	<string name="p2p_only_from_current">Маршрут можна прокласти лише з поточного місцезнаходження.</string>
 	<string name="p2p_reroute_from_current">Хочете спланувати маршрут із поточного місцезнаходження?</string>
-	<string name="whats_new_next_button">Далі</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Далі</string>
 	<string name="editor_time_add">Додати розклад</string>
 	<string name="editor_time_delete">Видалити розклад</string>
 	<!-- Text for allday switch. -->
@ -1071,7 +1072,7 @@
 	<string name="place_description_title">Опис місця</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Завантаження мап</string>
-	<string name="share_bookmarks_email_body_link">Вітаємо!\n\nВаші мітки можна завантажити за посиланням: %s. Відкривайте список за допомогою Organic Maps та насолоджуйтесь подорожжю!\n\nЗавантажити додаток: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Вітаємо!\n\nВаші мітки можна завантажити за посиланням: %s. Відкривайте список за допомогою Organic Maps та насолоджуйтесь подорожжю!\n\nЗавантажити додаток: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Навігатор вас попередить про камери при перевищенні швидкісного режиму на %d км/г</string>
 	<string name="warning_speedcams_subtitle">Не забудьте ознайомитися з правилами дорожнього руху у країні подорожі.</string>
 	<string name="speedcams_notice_message">Авто - Попереджати про камери швидкості, якщо є ризик перевищення швидкісного ліміту\nЗавжди - Завжди попереджати про камери\nНіколи - Ніколи не попереджати про камери</string>
@ -1214,8 +1215,16 @@
 	<string name="downloader_loading_ios">Завантаження</string>
 	<string name="key_information_title">Ключова інформація</string>
 	<string name="enable_screen_sleep">Allow screen to sleep</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">When enabled the screen will be allowed to sleep after a period of inactivity.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Оновити завантажені карти</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Оновлення карт дозволяє підтримувати інформацію про об\'єкти в актуальному стані</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Оновити (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Оновити вручну пізніше</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Канатна дорога</string>
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@ -194,15 +194,15 @@
 	<string name="appStore_message">Hi vọng bạn thích sử dụng Organic Maps! Nếu vậy, bạn vui lòng cho điểm hoặc đánh giá ứng dụng trên App Store. Việc này chỉ tốn dưới một phút và sẽ giúp chúng tôi rất nhiều. Cảm ơn bạn đã ủng hộ!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Không, cảm ơn</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Này, hãy xem ghim của tôi tại Organic Maps! %1$s hoặc %2$s Bạn chưa cài đặt bản đồ ngoại tuyến? Tải xuống tại đây: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Này, hãy xem vị trí hiện tại của tôi tại Organic Maps! %1$s hoặc %2$s Bạn không có bản đồ ngoại tuyến? Tải xuống tại đây: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Này, hãy xem ghim của tôi tại Organic Maps! %1$s hoặc %2$s Bạn chưa cài đặt bản đồ ngoại tuyến? Tải xuống tại đây: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Này, hãy xem vị trí hiện tại của tôi tại Organic Maps! %1$s hoặc %2$s Bạn không có bản đồ ngoại tuyến? Tải xuống tại đây: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Này, hãy xem ghim của tôi tại Organic Maps map</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Này, hãy xem vị trí hiện tại của tôi tại Organic Maps map!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Chào,\n\nTôi hiện đang ở đây: %1$s. Hãy nhấn vào liên kết này %2$s hoặc liên kết này %3$s để xem địa điểm trên bản đồ.\n\nCám ơn.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Chia sẻ bằng tin nhắn</string>
@ -587,7 +587,8 @@
 	<string name="p2p_to_here">Tuyến đến</string>
 	<string name="p2p_only_from_current">Chức năng tìm đường chỉ có sẵn từ vị trí hiện tại của bạn.</string>
 	<string name="p2p_reroute_from_current">Bạn có muốn chúng tôi vạch đường từ vị trí hiện tại của bạn không?</string>
-	<string name="whats_new_next_button">Tiếp theo</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Tiếp theo</string>
 	<string name="editor_time_add">Thêm lịch biểu</string>
 	<string name="editor_time_delete">Xóa lịch biểu</string>
 	<!-- Text for allday switch. -->
@ -1053,7 +1054,7 @@
 	<string name="place_description_title">Mô tả Địa điểm</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Trình tải xuống bản đồ</string>
-	<string name="share_bookmarks_email_body_link">Xin chào!\n\nĐây là liên kết nơi bạn có thể tải xuống dấu trang của mình: %s. Mở danh sách qua Organic Maps và tận hưởng chuyến đi của bạn!\n\nNhận đơn đăng ký: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Xin chào!\n\nĐây là liên kết nơi bạn có thể tải xuống dấu trang của mình: %s. Mở danh sách qua Organic Maps và tận hưởng chuyến đi của bạn!\n\nNhận đơn đăng ký: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Thanh điều hướng sẽ cảnh báo bạn về máy ảnh khi bạn vượt quá giới hạn tốc độ %d km/h</string>
 	<string name="warning_speedcams_subtitle">Hãy nhớ lái xe quy định của đất nước bạn đang đi du lịch đến.</string>
 	<string name="speedcams_notice_message">Tự động - Cảnh báo về speedcam nếu có nguy cơ vượt quá giới hạn tốc độ\nLuôn luôn - Luôn cảnh báo về speedcams\nKhông bao giờ - Không bao giờ cảnh báo về speedcams</string>
@ -1196,8 +1197,16 @@
 	<string name="downloader_loading_ios">Tải xuống</string>
 	<string name="key_information_title">Thông tin chìa khóa</string>
 	<string name="enable_screen_sleep">Cho phép màn hình ở chế độ ngủ</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Khi được bật, màn hình sẽ được phép ở chế độ ngủ sau một thời gian không hoạt động.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Cập nhật các bản đồ đã tải về của bạn</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Cập nhật bản đồ để cập nhật thông tin về các đối tượng trên đó</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Cập nhật (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Cập nhật thủ công sau</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">Trạm Cáp Treo</string>
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@ -196,15 +196,15 @@
 	<string name="appStore_message">祝您使用 Organic Maps 愉快！ 方便的話，請到 App Store 幫我們評分或寫寫評論。在這短短的時間當中卻能夠真正的協助我們改善，再次感謝您的支持！</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">不，謝了</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">嘿，看看我在 Organic Maps 標記的圖釘吧！ %1$s 或%2$s 沒安裝離線地圖？在此下載: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">嘿，在 Organic Maps 查看我的目前位置吧！ %1$s 或%2$s 沒安裝離線地圖？在此下載: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">嘿，看看我在 Organic Maps 標記的圖釘吧！ %1$s 或%2$s 沒安裝離線地圖？在此下載: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">嘿，在 Organic Maps 查看我的目前位置吧！ %1$s 或%2$s 沒安裝離線地圖？在此下載: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">嘿，看看我在 Organic Maps 地圖上的圖釘！</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">嗨，到 Organic Maps 地圖查看我的目前位置！</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">嗨，\n\n我現在在這：%1$s。點擊此連結 %2$s 或此連結 %3$s 來查看在地圖上的位置。\n\n謝謝。</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">透過訊息分享</string>
@ -597,7 +597,8 @@
 	<string name="p2p_to_here">路線終點</string>
 	<string name="p2p_only_from_current">導航只能從您目前的位置開始。</string>
 	<string name="p2p_reroute_from_current">你是否想要規劃目前位置的路線？</string>
-	<string name="whats_new_next_button">下一頁</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">下一頁</string>
 	<string name="editor_time_add">新增排程</string>
 	<string name="editor_time_delete">刪除排程</string>
 	<!-- Text for allday switch. -->
@ -1066,7 +1067,7 @@
 	<string name="place_description_title">地點說明</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">加載地圖</string>
-	<string name="share_bookmarks_email_body_link">您好！\n\n您的標籤可以從鏈接下載：%s.使用Organic Maps打開列表並享受旅行!\n\n下載應用程序：https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">您好！\n\n您的標籤可以從鏈接下載：%s.使用Organic Maps打開列表並享受旅行!\n\n下載應用程序：https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">當速度限制超過%d km / h時，導航會通知您的攝像機</string>
 	<string name="warning_speedcams_subtitle">請不要忘記閱讀旅行國的道路規則。</string>
 	<string name="speedcams_notice_message">自動 - 如果存在超出速度限制的風險，則對速度攝像頭髮出警告\n總是 - 始終提醒攝像頭\n從不 - 永遠不會對攝像頭發出警告</string>
@ -1209,8 +1210,16 @@
 	<string name="downloader_loading_ios">加載</string>
 	<string name="key_information_title">關鍵信息</string>
 	<string name="enable_screen_sleep">允许屏幕进入休眠状态</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">启用后，屏幕将在一段时间不活动后进入休眠状态。</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">更新您下載的地圖</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">更新地圖以讓物件資訊保持在最新狀態</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">更新 (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">稍後手動更新</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">纜車站</string>
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@ -196,15 +196,15 @@
 	<string name="appStore_message">希望您喜欢使用 Organic Maps! 若确实喜欢, 请在应用商店对此应用进行打分和点评。这 花不了一分钟但却可以实在地帮助我们。感 谢您的支持!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">不,谢谢</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">嘿,在 Organic Maps 上查看我标注的图钉吧! %1$s 或%2$s 未安装离线地图?在此下 载: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">嘿,在 Organic Maps 上查看我目前的位置 吧!%1$s 或%2$s 未安装离线地图?在此 下载: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">嘿,在 Organic Maps 上查看我标注的图钉吧! %1$s 或%2$s 未安装离线地图?在此下 载: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">嘿,在 Organic Maps 上查看我目前的位置 吧!%1$s 或%2$s 未安装离线地图?在此 下载: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">嘿,在 Organic Maps 上查看我标注的图钉吧!</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">嗨，到 Organic Maps 查看我的当前位置！</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">嗨,\n\n我现在在这:%1$s。点击此链 接%2$s或此链接 %3$s来查看在地图上的 位置。\n\n谢谢。</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">通过消息分享</string>
@ -593,7 +593,8 @@
 	<string name="p2p_to_here">发送至</string>
 	<string name="p2p_only_from_current">导航只能从您目前的位置开始。</string>
 	<string name="p2p_reroute_from_current">你是否想要规划当前位置的路线？</string>
-	<string name="whats_new_next_button">下一页</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">下一页</string>
 	<string name="editor_time_add">添加计划</string>
 	<string name="editor_time_delete">删除计划</string>
 	<!-- Text for allday switch. -->
@ -1062,7 +1063,7 @@
 	<string name="place_description_title">地点说明</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">加载地图</string>
-	<string name="share_bookmarks_email_body_link">您好！\n\n您的标签可以从链接下载：%s.使用Organic Maps打开列表并享受旅行!\n\n下载程序：https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">您好！\n\n您的标签可以从链接下载：%s.使用Organic Maps打开列表并享受旅行!\n\n下载程序：https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">当速度限制超过%d km / h时，导航会通知您的摄像机</string>
 	<string name="warning_speedcams_subtitle">请不要忘记阅读旅行国的道路规则。</string>
 	<string name="speedcams_notice_message">自动 - 如果存在超出速度限制的风险，则对速度摄像头发出警告\n总是 - 始终提醒摄像头\n从不 - 永远不会对摄像头发出警告</string>
@ -1205,8 +1206,16 @@
 	<string name="downloader_loading_ios">加载</string>
 	<string name="key_information_title">关键信息</string>
 	<string name="enable_screen_sleep">允许屏幕进入休眠状态</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">启用后，屏幕将在一段时间不活动后进入休眠状态。</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">更新已下载的地图</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">更新地图可以让对象的信息保持最新状态</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">更新 (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">稍后手动更新</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway.station">缆车车站</string>
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@ -179,7 +179,7 @@
 	<string name="share_by_email">Share by email</string>
 	<!-- Email Subject when sharing bookmarks category -->
 	<string name="share_bookmarks_email_subject">Organic Maps bookmarks were shared with you</string>
-	<string name="share_bookmarks_email_body">Hello!\n\nAttached are my bookmarks from Organic Maps offline maps. Please open them if you have Organic Maps installed. Or, if you don\'t, download the app for your iOS or Android device by following this link: https://organicmaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!</string>
+	<string name="share_bookmarks_email_body">Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don\'t, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Loading Bookmarks</string>
 	<!-- Kmz file successful loading -->
@ -202,15 +202,15 @@
 	<string name="appStore_message">Hope you enjoy using Organic Maps! If so, please rate or review the app at the App Store. It takes less than a minute but can really help us. Thanks for your support!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">No, thanks</string>
-	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="bookmark_share_sms">Hey, check out my pin at Organic Maps! %1$s or %2$s Don\'t have offline maps installed? Download here: https://organicmaps.app/get</string>
-	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Hey, check out my current location in Organic Maps! %1$s or %2$s Don\'t have offline maps? Download here: https://organicmaps.app/get</string>
+	<!-- Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="bookmark_share_sms">Hey, check out my pin at Organic Maps! %1$s or %2$s Don\'t have offline maps installed? Download here: https://omaps.app/get</string>
+	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+	<string name="my_position_share_sms">Hey, check out my current location in Organic Maps! %1$s or %2$s Don\'t have offline maps? Download here: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Hey, check out my pin in Organic Maps!</string>
 	<!-- Subject for emailed position -->
 	<string name="my_position_share_email_subject">Hey, check out my current location on the Organic Maps map!</string>
-	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME -->
+	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Hi,\n\nI\'m here now: %1$s. Click this link %2$s or this one %3$s to see the place on the map.\n\nThanks.</string>
 	<!-- Android share by Message/SMS button text (including SMS) -->
 	<string name="share_by_message">Share by message</string>
@ -621,7 +621,8 @@
 	<string name="p2p_to_here">Route to</string>
 	<string name="p2p_only_from_current">Navigation is available only from your current location.</string>
 	<string name="p2p_reroute_from_current">Do you want us to plan a route from your current location?</string>
-	<string name="whats_new_next_button">Next</string>
+	<!-- Edit open hours/set time and minutes dialog -->
+	<string name="next_button">Next</string>
 	<string name="editor_time_add">Add Schedule</string>
 	<string name="editor_time_delete">Delete Schedule</string>
 	<!-- Text for allday switch. -->
@ -1121,7 +1122,7 @@
 	<string name="place_description_title">Place Description</string>
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Map downloader</string>
-	<string name="share_bookmarks_email_body_link">Hello!\n\nHere is the link where you can download bookmarks: %s. Open the list in Organic Maps and enjoy your trip!\n\nGet application: https://organicmaps.app/get?kmz</string>
+	<string name="share_bookmarks_email_body_link">Hello!\n\nHere is the link where you can download bookmarks: %s. Open the list in Organic Maps and enjoy your trip!\n\nGet application: https://omaps.app/get?kmz</string>
 	<string name="warning_speedcams_title">Navigator will warn you about cameras when you exceed the speed limit of %d km/h</string>
 	<string name="warning_speedcams_subtitle">Please mind driving regulations of the country you are travelling to.</string>
 	<string name="speedcams_notice_message">Auto - Warn about speedcams if there is a risk of exceeding the speed limit\nAlways - Always warn about speedcams\nNever - Never warn about speedcams</string>
@ -1268,8 +1269,16 @@
 	<string name="connection_failure">Connection failure</string>
 	<string name="disconnect_usb_cable_title">Disconnect USB cable</string>
 	<string name="enable_screen_sleep">Allow screen to sleep</string>
-	<!--  -->
+	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">When enabled the screen will be allowed to sleep after a period of inactivity.</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_title">Update your downloaded maps</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_message">Updating maps keeps the information about objects up to date</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_size">Update (%s)</string>
+	<!-- Autoupdate dialog on start -->
+	<string name="whats_new_auto_update_button_later">Manually update later</string>

 	<!-- SECTION:  Partners  -->
 	<string name="sponsored_partner1_action">Outlets</string>
--- a/android/res/xml/file_paths.xml
+++ b/android/res/xml/file_paths.xml
@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
-  <external-path name="external_files" path="." />
+  <external-path name="external" path="." />
+  <external-files-path name="external_files" path="." />
+  <cache-path name="cache" path="." />
+  <files-path name="files" path="." />
 </paths>
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
@ -123,6 +123,7 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
  {
    super.onStart();
    BookmarkManager.INSTANCE.addLoadingListener(this);
+    BookmarkManager.INSTANCE.addSharingListener(this);
  }
  
  @Override
@ -130,6 +131,7 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
  {
    super.onStop();
    BookmarkManager.INSTANCE.removeLoadingListener(this);
+    BookmarkManager.INSTANCE.removeSharingListener(this);
  }

  @Override
--- a/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java
+++ b/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java
@ -202,7 +202,7 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
    if (mSelectedTab == TAB_FROM)
    {
      hoursMinutes = mFrom;
-      okBtnRes = R.string.whats_new_next_button;
+      okBtnRes = R.string.next_button;
    }
    else
    {
--- a/android/src/com/mapswithme/maps/settings/StoragePathManager.java
+++ b/android/src/com/mapswithme/maps/settings/StoragePathManager.java
@ -153,17 +153,36 @@ public class StoragePathManager
    // External storages (SD cards and other).
    for (File dir : application.getExternalFilesDirs(null))
    {
+      // There was an evidence that `dir` can be null on some Samsungs.
+      // https://github.com/organicmaps/organicmaps/issues/632
+      if (dir == null)
+        continue;
+
      //
      // If the contents of emulated storage devices are backed by a private user data partition,
      // then there is little benefit to apps storing data here instead of the private directories
      // returned by Context#getFilesDir(), etc.
      //
-      if (!Environment.isExternalStorageEmulated(dir))
+      boolean isStorageEmulated;
+      try
+      {
+        isStorageEmulated = Environment.isExternalStorageEmulated(dir);
+      }
+      catch (IllegalArgumentException e)
+      {
+        // isExternalStorageEmulated may throw IllegalArgumentException
+        // https://github.com/organicmaps/organicmaps/issues/538
+        isStorageEmulated = false;
+      }
+      if (!isStorageEmulated)
        candidates.add(dir);
    }

-    // Internal storage (always exists).
-    candidates.add(application.getFilesDir());
+    // Internal storage must always exists, but Android is unpredictable.
+    // https://github.com/organicmaps/organicmaps/issues/632
+    File internalDir = application.getFilesDir();
+    if (internalDir != null)
+      candidates.add(internalDir);

    // Configured path.
    String configDir = Config.getStoragePath();
@ -213,7 +232,7 @@ public class StoragePathManager
    }
  }

-  private static StorageItem buildStorageItem(File dir)
+  private static StorageItem buildStorageItem(@NonNull File dir)
  {
    String path = dir.getAbsolutePath();
    LOGGER.d(TAG, "Check storage : " + path);
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@ -981,7 +981,8 @@ public class PlacePageView extends NestedScrollViewClickFixed
  {
    if (mMapObject == null)
    {
-      LOGGER.e(TAG, "A location cannot be refreshed, mMapObject is null!");
+      // TODO: This method is constantly called even when nothing is selected on the map.
+      //LOGGER.e(TAG, "A location cannot be refreshed, mMapObject is null!");
      return;
    }

--- a/android/src/com/mapswithme/util/Constants.java
+++ b/android/src/com/mapswithme/util/Constants.java
@ -14,7 +14,7 @@ public final class Constants
  public static class Url
  {
    public static final String SHORT_SHARE_PREFIX = "om://";
-    public static final String HTTP_SHARE_PREFIX = "http://omaps.app/";
+    public static final String HTTP_SHARE_PREFIX = "https://omaps.app/";

    public static final String MAILTO_SCHEME = "mailto:";
    public static final String MAIL_SUBJECT = "?subject=";
--- a/android/src/com/mapswithme/util/HttpClient.java
+++ b/android/src/com/mapswithme/util/HttpClient.java
@ -24,7 +24,6 @@

 package com.mapswithme.util;

-import android.os.Build;
 import android.text.TextUtils;

 import androidx.annotation.NonNull;
@ -50,17 +49,11 @@ import java.util.Map;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.InflaterInputStream;

-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSocketFactory;
-
 public final class HttpClient
 {
  public static final String HEADER_USER_AGENT = "User-Agent";
  public static final String HEADER_AUTHORIZATION = "Authorization";
  public static final String HEADER_BEARER_PREFFIX = "Bearer ";
-  public static final String HEADER_BUNDLE_TIERS = "X-Mapsme-Bundle-Tiers";
-  public static final String HEADER_THEME_KEY = "x-mapsme-theme";
-  public static final String HEADER_THEME_DARK = "dark";
  private final static String TAG = HttpClient.class.getSimpleName();
  // TODO(AlexZ): tune for larger files
  private final static int STREAM_BUFFER_SIZE = 1024 * 64;
@ -78,7 +71,6 @@ public final class HttpClient
    try
    {
      connection = (HttpURLConnection) new URL(p.url).openConnection();
-      setupTLSForPreLollipop(connection);

      // NullPointerException, MalformedUrlException, IOException
      // Redirects from http to https or vice versa are not supported by Android implementation.
@ -106,9 +98,7 @@ public final class HttpClient
        connection.setRequestProperty("Cookie", p.cookies);

      for (KeyValue header : p.headers)
-      {
        connection.setRequestProperty(header.getKey(), header.getValue());
-      }

      if (!TextUtils.isEmpty(p.inputFilePath) || p.data != null)
      {
@ -181,26 +171,32 @@ public final class HttpClient
          p.headers.add(new KeyValue("Set-Cookie", TextUtils.join(", ", cookies)));
      }

-      OutputStream ostream;
-      if (!TextUtils.isEmpty(p.outputFilePath))
-        ostream = new BufferedOutputStream(new FileOutputStream(p.outputFilePath), STREAM_BUFFER_SIZE);
-      else
-        ostream = new ByteArrayOutputStream(STREAM_BUFFER_SIZE);
-      // TODO(AlexZ): Add HTTP resume support in the future for partially downloaded files
-      final BufferedInputStream istream = new BufferedInputStream(getInputStream(connection), STREAM_BUFFER_SIZE);
-      final byte[] buffer = new byte[STREAM_BUFFER_SIZE];
-      // gzip encoding is transparently enabled and we can't use Content-Length for
-      // body reading if server has gzipped it.
-      int bytesRead;
-      while ((bytesRead = istream.read(buffer, 0, STREAM_BUFFER_SIZE)) > 0)
+      try
      {
-        // Read everything if Content-Length is not known in advance.
-        ostream.write(buffer, 0, bytesRead);
+        OutputStream ostream;
+        if (!TextUtils.isEmpty(p.outputFilePath))
+          ostream = new BufferedOutputStream(new FileOutputStream(p.outputFilePath), STREAM_BUFFER_SIZE);
+        else
+          ostream = new ByteArrayOutputStream(STREAM_BUFFER_SIZE);
+        // TODO(AlexZ): Add HTTP resume support in the future for partially downloaded files
+        final BufferedInputStream istream = new BufferedInputStream(getInputStream(connection), STREAM_BUFFER_SIZE);
+        final byte[] buffer = new byte[STREAM_BUFFER_SIZE];
+        // gzip encoding is transparently enabled and we can't use Content-Length for
+        // body reading if server has gzipped it.
+        int bytesRead;
+        while ((bytesRead = istream.read(buffer, 0, STREAM_BUFFER_SIZE)) > 0) {
+          // Read everything if Content-Length is not known in advance.
+          ostream.write(buffer, 0, bytesRead);
+        }
+        istream.close(); // IOException
+        ostream.close(); // IOException
+        if (ostream instanceof ByteArrayOutputStream)
+          p.data = ((ByteArrayOutputStream) ostream).toByteArray();
+      }
+      catch (IOException ex)
+      {
+        // Exception here means that there is no body in the response.
      }
-      istream.close(); // IOException
-      ostream.close(); // IOException
-      if (ostream instanceof ByteArrayOutputStream)
-        p.data = ((ByteArrayOutputStream) ostream).toByteArray();
    }
    finally
    {
@ -210,21 +206,6 @@ public final class HttpClient
    return p;
  }

-  private static void setupTLSForPreLollipop(@NonNull HttpURLConnection connection)
-  {
-    // On PreLollipop devices we use the custom ssl factory which enables TLSv1.2 forcibly, because
-    // TLS of the mentioned version is not enabled by default on PreLollipop devices, but some of
-    // used by us APIs (as Viator) requires TLSv1.2. For more info see
-    // https://developer.android.com/reference/javax/net/ssl/SSLEngine.html.
-    if ((connection instanceof HttpsURLConnection)
-        && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
-    {
-      HttpsURLConnection sslConnection = (HttpsURLConnection) connection;
-      SSLSocketFactory factory = sslConnection.getSSLSocketFactory();
-      sslConnection.setSSLSocketFactory(new PreLollipopSSLSocketFactory(factory));
-    }
-  }
-
  @NonNull
  private static InputStream getInputStream(@NonNull HttpURLConnection connection) throws IOException
  {
--- a/android/src/com/mapswithme/util/SharingUtils.java
+++ b/android/src/com/mapswithme/util/SharingUtils.java
@ -1,5 +1,6 @@
 package com.mapswithme.util;

+import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
 import android.location.Location;
@ -95,7 +96,6 @@ public class SharingUtils
  public static void shareBookmarkFile(Context context, String fileName)
  {
    Intent intent = new Intent(Intent.ACTION_SEND);
-    intent.setType(KMZ_MIME_TYPE);

    final String subject = context.getString(R.string.share_bookmarks_email_subject);
    intent.putExtra(Intent.EXTRA_SUBJECT, subject);
@ -103,8 +103,16 @@ public class SharingUtils
    final String text = context.getString(R.string.share_bookmarks_email_body);
    intent.putExtra(Intent.EXTRA_TEXT, text.toString());

-    Uri fileUri = StorageUtils.getUriForFilePath(context, fileName);
+    final Uri fileUri = StorageUtils.getUriForFilePath(context, fileName);
    intent.putExtra(android.content.Intent.EXTRA_STREAM, fileUri);
+    // Properly set permissions for intent, see
+    // https://developer.android.com/reference/androidx/core/content/FileProvider#include-the-permission-in-an-intent
+    intent.setDataAndType(fileUri, KMZ_MIME_TYPE);
+    intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+    if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.LOLLIPOP_MR1) {
+      intent.setClipData(ClipData.newRawUri("", fileUri));
+      intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+    }

    context.startActivity(Intent.createChooser(intent, context.getString(R.string.share)));
  }
--- a/android/src/com/mapswithme/util/StorageUtils.java
+++ b/android/src/com/mapswithme/util/StorageUtils.java
@ -145,10 +145,6 @@ public class StorageUtils
  @NonNull
  public static String getTempPath(@NonNull Application application)
  {
-    final File cacheDir = application.getExternalCacheDir();
-    if (cacheDir != null)
-      return addTrailingSeparator(cacheDir.getAbsolutePath());
-
    return addTrailingSeparator(application.getCacheDir().getAbsolutePath());
  }

--- a/android/src/com/mapswithme/util/Utils.java
+++ b/android/src/com/mapswithme/util/Utils.java
@ -791,6 +791,14 @@ public class Utils
          {
            Uri uri = StorageUtils.getUriForFilePath(activity, logsZipFile);
            intent.putExtra(Intent.EXTRA_STREAM, uri);
+            // Properly set permissions for intent, see
+            // https://developer.android.com/reference/androidx/core/content/FileProvider#include-the-permission-in-an-intent
+            intent.setData(uri);
+            intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.LOLLIPOP_MR1) {
+              intent.setClipData(ClipData.newRawUri("", uri));
+              intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+            }
          }
        }
        // Do this so some email clients don't complain about empty body.
--- a/data/categories.txt
+++ b/data/categories.txt
@ -1800,7 +1800,7 @@ fi:Kioski
 fr:Kiosque
 de:Kiosk
 hu:Trafik
-it:Chiosco
+it:Chiosco|Edicola|Giornalaio
 ja:1キオスク|売店
 ko:키오스크
 pl:Kiosk|gazety|prasa
@ -8917,7 +8917,7 @@ fi:Lehtikioski
 fr:Kiosque à journaux
 hu:Újságárus
 id:Kios Surat Kabar
-it:Edicola
+it:Edicola|Giornalaio
 ja:新聞販売店
 ko:신문 가판대
 nb:Aviskiosk
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
--- a/data/drules_proto_clear.bin
+++ b/data/drules_proto_clear.bin
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
--- a/data/drules_proto_dark.bin
+++ b/data/drules_proto_dark.bin
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
--- a/data/drules_proto_vehicle_clear.bin
+++ b/data/drules_proto_vehicle_clear.bin
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
--- a/data/drules_proto_vehicle_dark.bin
+++ b/data/drules_proto_vehicle_dark.bin
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
--- a/data/faq.html
+++ b/data/faq.html
@ -230,18 +230,13 @@
 <dd 
 	lang="ru">
 	<p>В Organic Maps мы делаем само приложение и сложные алгоритмы. Наш источник данных – 
-    <a href="https://www.openstreetmap.org/">OpenStreetMap</a> (OSM), это открытый проект, как Википедия, только для карт. 
-    Также в приложении доступны отели из базы Booking.com.</p>
+    <a href="https://www.openstreetmap.org/">OpenStreetMap</a> (OSM), это открытый проект, как Википедия, только для карт.</p>

 	<p>Если вы заметили неточности или увидели, что отсутствуют какие-либо детали, вы можете 
 	<a href="https://www.openstreetmap.org/note/new">сообщить об этом</a> редакторам OSM или 
 	<a href="https://www.openstreetmap.org/user/new">зарегистрироваться</a> на сайте OpenStreetMap и 
 	отредактировать карту.</p>

-	<p>Если ошибка связана с неправильным местоположением или информацией об отеле Booking.com (их можно узнать по кнопке 
-	"Забронировать" в странице места), свяжитесь с администрацией отеля, чтобы они могли исправить ошибки на сайте 
-	Booking.com.</p>
-
 	<p>Чем больше небезразличных людей, тем точнее будут карты для всех нас. Мы в команде считаем, что 
 	подробные карты всей нашей планеты – это всего лишь вопрос времени.</p>

--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@ -3252,8 +3252,8 @@
    sk = Zdielané záložky Organic Maps

  [share_bookmarks_email_body]
-    en = Hello!\n\nAttached are my bookmarks from Organic Maps offline maps. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://organicmaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!
-    ru = Здравствуйте!\n\nВ прикрепленном файле мои метки из офлайновых карт Organic Maps. Для того чтобы открыть этот файл, вам потребуется приложение Organic Maps, которое можно установить по ссылке: https://organicmaps.app/get?kmz\n\nСпасибо!
+    en = Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!
+    ru = Здравствуйте!\n\nВ прикрепленном файле мои метки из офлайновых карт Organic Maps. Для того чтобы открыть этот файл, вам потребуется приложение Organic Maps, которое можно установить по ссылке: https://omaps.app/get?kmz\n\nСпасибо!

  [load_kmz_title]
    comment = message title of loading file
@ -3633,70 +3633,70 @@
    fa = نه ,متشکرم

  [bookmark_share_sms]
-    comment = Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ http://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140.
+    comment = Share one specific bookmark using SMS, %1$@ contains om:// and %2$@ https://omaps.app link. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140.
    tags = ios,android
-    en = Hey, check out my pin at Organic Maps! %1$@ or %2$@ Don't have offline maps installed? Download here: https://organicmaps.app/get
+    en = Hey, check out my pin at Organic Maps! %1$@ or %2$@ Don't have offline maps installed? Download here: https://omaps.app/get
    ru = Моя метка на карте. Жми %1$@ или %2$@
-    ar = هاي، تفقد الدبوس الخاص بي على Organic Maps! %1$@ أو %2$@. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: https://organicmaps.app/get
+    ar = هاي، تفقد الدبوس الخاص بي على Organic Maps! %1$@ أو %2$@. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: https://omaps.app/get
    cs = Koukni na mou značku na mapě. Otevři odkaz: %1$@ nebo %2$@
-    da = Hey, tjek min knappenål på Organic Maps ud! %1$@ or %2$@ Har du ikke offline kort? Download her: https://organicmaps.app/get
+    da = Hey, tjek min knappenål på Organic Maps ud! %1$@ or %2$@ Har du ikke offline kort? Download her: https://omaps.app/get
    nl = Bekijk mijn pin op de kaart. Open %1$@ of %2$@
-    fi = Hei, katso merkintäni Organic Maps-sovelluksessa! %1$@ tai %2$@ Eikö sinulla ole offline-karttoja? Lataa ne täältä: https://organicmaps.app/get
-    fr = Hé, regarde mon épingle sur Organic Maps ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://organicmaps.app/get
-    de = Siehe meine Markierung auf Organic Maps an. %1$@ oder %2$@ - Keine Offline-Karten installiert? Hier herunterladen: https://organicmaps.app/get
-    hu = Nézd meg a Organic Maps jelzőt! %1$@ vagy %2$@ A program letöltése: https://organicmaps.app/get
-    id = Hei, lihat pinku di Organic Maps! %1$@ atau %2$@ belum memiliki peta offline? Unduh di sini: https://organicmaps.app/get
+    fi = Hei, katso merkintäni Organic Maps-sovelluksessa! %1$@ tai %2$@ Eikö sinulla ole offline-karttoja? Lataa ne täältä: https://omaps.app/get
+    fr = Hé, regarde mon épingle sur Organic Maps ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://omaps.app/get
+    de = Siehe meine Markierung auf Organic Maps an. %1$@ oder %2$@ - Keine Offline-Karten installiert? Hier herunterladen: https://omaps.app/get
+    hu = Nézd meg a Organic Maps jelzőt! %1$@ vagy %2$@ A program letöltése: https://omaps.app/get
+    id = Hei, lihat pinku di Organic Maps! %1$@ atau %2$@ belum memiliki peta offline? Unduh di sini: https://omaps.app/get
    it = Vedi pin sulla mappa. Apri %1$@ o %2$@
    ja = 私のピン情報はこの位置です。リンク: %1$@, %2$@
    ko = 지도에서 내 PIN을 참조하십시오. %1$@ 또는 %2$@ 열기
-    nb = Hei, se merket mitt på Organic Maps! %1$@ eller %2$@ Har du ikke installert offline-kart? Last dem ned her: https://organicmaps.app/get
+    nb = Hei, se merket mitt på Organic Maps! %1$@ eller %2$@ Har du ikke installert offline-kart? Last dem ned her: https://omaps.app/get
    pl = Mój znacznik w Organic Maps %1$@ i %2$@
    pt = Veja o meu marcador no mapa do Organic Maps. Abra a hiperligação: %1$@ ou %2$@
-    pt-BR = Veja o meu marcador no mapa do Organic Maps. Abra o link: %1$@ ou %2$@ Não tem um mapa offline instalado? Baixe aqui: https://organicmaps.app/get
-    ro = Hei, poți vedea care este poziția mea pe Organic Maps! %1$@ sau %2$@ Nu ai instalate hărțile offline? Descarcă de aici: https://organicmaps.app/get
+    pt-BR = Veja o meu marcador no mapa do Organic Maps. Abra o link: %1$@ ou %2$@ Não tem um mapa offline instalado? Baixe aqui: https://omaps.app/get
+    ro = Hei, poți vedea care este poziția mea pe Organic Maps! %1$@ sau %2$@ Nu ai instalate hărțile offline? Descarcă de aici: https://omaps.app/get
    es = Ve mi alfiler en mapa. Abre %1$@ o %2$@
-    sv = Hej, kolla på min pin på Organic Maps! %1$@ eller %2$@ Har du inte offline-kartor installerat? Ladda ner här: https://organicmaps.app/get
+    sv = Hej, kolla på min pin på Organic Maps! %1$@ eller %2$@ Har du inte offline-kartor installerat? Ladda ner här: https://omaps.app/get
    th = เฮ้ ตรวจสอบหมุดของฉันที่ Organic Maps! %1$@ หรือ %2$@
-    tr = Hey, Organic Maps’de pinimi incele! %1$@ veya %2$@ Çevrimiçi haritalar sende yüklü değil mi? Buradan indir: https://organicmaps.app/get
+    tr = Hey, Organic Maps’de pinimi incele! %1$@ veya %2$@ Çevrimiçi haritalar sende yüklü değil mi? Buradan indir: https://omaps.app/get
    uk = Моя мітка на карті. Іди %1$@ або %2$@
-    vi = Này, hãy xem ghim của tôi tại Organic Maps! %1$@ hoặc %2$@ Bạn chưa cài đặt bản đồ ngoại tuyến? Tải xuống tại đây: https://organicmaps.app/get
-    zh-Hans = 嘿,在 Organic Maps 上查看我标注的图钉吧! %1$@ 或%2$@ 未安装离线地图?在此下 载: https://organicmaps.app/get
-    zh-Hant = 嘿，看看我在 Organic Maps 標記的圖釘吧！ %1$@ 或%2$@ 沒安裝離線地圖？在此下載: https://organicmaps.app/get
-    el = Έλεγξε τις τοποθεσίες που έχω καρφιτσώσει στο Organic Maps! %1$@ ή %2$@ εάν δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://organicmaps.app/get
+    vi = Này, hãy xem ghim của tôi tại Organic Maps! %1$@ hoặc %2$@ Bạn chưa cài đặt bản đồ ngoại tuyến? Tải xuống tại đây: https://omaps.app/get
+    zh-Hans = 嘿,在 Organic Maps 上查看我标注的图钉吧! %1$@ 或%2$@ 未安装离线地图?在此下 载: https://omaps.app/get
+    zh-Hant = 嘿，看看我在 Organic Maps 標記的圖釘吧！ %1$@ 或%2$@ 沒安裝離線地圖？在此下載: https://omaps.app/get
+    el = Έλεγξε τις τοποθεσίες που έχω καρφιτσώσει στο Organic Maps! %1$@ ή %2$@ εάν δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://omaps.app/get
    sk = Pozrite na moju značku na mape. Otvoriť odkaz: %1$@ alebo %2$@

  [my_position_share_sms]
-    comment = Share my position using SMS, %1$@ contains om:// and %2$@ http://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140.
+    comment = Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140.
    tags = ios,android
-    en = Hey, check out my current location in Organic Maps! %1$@ or %2$@ Don't have offline maps? Download here: https://organicmaps.app/get
+    en = Hey, check out my current location in Organic Maps! %1$@ or %2$@ Don't have offline maps? Download here: https://omaps.app/get
    ru = Смотри где я сейчас. Жми %1$@ или %2$@
-    ar = هاي، تفقد الموقع الخاص بي على Organic Maps! %1$@ أو %2$@. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: https://organicmaps.app/get
+    ar = هاي، تفقد الموقع الخاص بي على Organic Maps! %1$@ أو %2$@. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: https://omaps.app/get
    cs = Koukni kde jsem. Otevři odkaz: %1$@ nebo %2$@
-    da = Hey, tjek min nuværende lokation ud på Organic Maps! %1$@ or %2$@. Har du ikke offline kort? Download her: https://organicmaps.app/get
+    da = Hey, tjek min nuværende lokation ud på Organic Maps! %1$@ or %2$@. Har du ikke offline kort? Download her: https://omaps.app/get
    nl = Kijk waar ik nu ben. Open %1$@ of %2$@
-    fi = Hei, katso sijaintini Organic Maps-sovelluksessa! %1$@ tai %2$@ Eikö sinulla ole vielä offline-karttoja? Lataa ne täältä: https://organicmaps.app/get
-    fr = Hé, regarde ma position actuelle sur Organic Maps ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://organicmaps.app/get
-    de = Schau wo ich gerade bin. Klicke auf den Link %1$@ oder %2$@ - Keine Offline-Karten installiert? Hier herunterladen: https://organicmaps.app/get
-    hu = Nézd meg a Organic Maps helyzetemet! %1$@ vagy %2$@ A program letöltése: https://organicmaps.app/get
-    id = Hei, lihat lokasiku saat ini di Organic Maps! %1$@ atau %2$@ belum memiliki peta offline? Unduh di sini: https://organicmaps.app/get
+    fi = Hei, katso sijaintini Organic Maps-sovelluksessa! %1$@ tai %2$@ Eikö sinulla ole vielä offline-karttoja? Lataa ne täältä: https://omaps.app/get
+    fr = Hé, regarde ma position actuelle sur Organic Maps ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://omaps.app/get
+    de = Schau wo ich gerade bin. Klicke auf den Link %1$@ oder %2$@ - Keine Offline-Karten installiert? Hier herunterladen: https://omaps.app/get
+    hu = Nézd meg a Organic Maps helyzetemet! %1$@ vagy %2$@ A program letöltése: https://omaps.app/get
+    id = Hei, lihat lokasiku saat ini di Organic Maps! %1$@ atau %2$@ belum memiliki peta offline? Unduh di sini: https://omaps.app/get
    it = Vedi dove sono ora. Apri %1$@ o %2$@
    ja = 私は今ここにいます。リンク: %1$@, %2$@
    ko = 현재 위치를 알아 보십시오. %1$@ 또는 %2$@ 열기
-    nb = Hei, se posisjonen min på Organic Maps! %1$@ eller %2$@ Har du ikke offline-kart? Last dem ned her: https://organicmaps.app/get
+    nb = Hei, se posisjonen min på Organic Maps! %1$@ eller %2$@ Har du ikke offline-kart? Last dem ned her: https://omaps.app/get
    pl = Zobacz gdzie jestem. Link %1$@ lub %2$@
    pt = Veja onde estou agora. Abra a hiperligação: %1$@ ou %2$@
-    pt-BR = Veja onde estou agora. Abra o link: %1$@ ou %2$@ Não tem um aplicativo de mapa offline? Baixe aqui: https://organicmaps.app/get
-    ro = Hei, îmi poți vedea poziția actuală pe Organic Maps! %1$@ sau %2$@ Nu ai hărțile offline? Descarcă de aici: https://organicmaps.app/get
+    pt-BR = Veja onde estou agora. Abra o link: %1$@ ou %2$@ Não tem um aplicativo de mapa offline? Baixe aqui: https://omaps.app/get
+    ro = Hei, îmi poți vedea poziția actuală pe Organic Maps! %1$@ sau %2$@ Nu ai hărțile offline? Descarcă de aici: https://omaps.app/get
    es = Mira dónde estoy. Abre %1$@ o %2$@
-    sv = Hej, kolla på min nuvarande position på Organic Maps! %1$@ eller %2$@ Har du inte offline-kartor? Ladda ner här: https://organicmaps.app/get
-    th = เฮ้อ ตรวจสอบตำแหน่งที่ตั้งปัจจุบันของฉันที่ Organic Maps! %1$@ หรือ %2$@ ไม่มีการติดตั้งแผนที่แบบออฟไลน์? ดาวน์โหลดที่นี่: https://organicmaps.app/get
-    tr = Hey, Organic Maps’de geçerli konumumu incele! %1$@ veya %2$@ Çevrimiçi haritalar sende yok mu? Buradan indir: https://organicmaps.app/get
+    sv = Hej, kolla på min nuvarande position på Organic Maps! %1$@ eller %2$@ Har du inte offline-kartor? Ladda ner här: https://omaps.app/get
+    th = เฮ้อ ตรวจสอบตำแหน่งที่ตั้งปัจจุบันของฉันที่ Organic Maps! %1$@ หรือ %2$@ ไม่มีการติดตั้งแผนที่แบบออฟไลน์? ดาวน์โหลดที่นี่: https://omaps.app/get
+    tr = Hey, Organic Maps’de geçerli konumumu incele! %1$@ veya %2$@ Çevrimiçi haritalar sende yok mu? Buradan indir: https://omaps.app/get
    uk = Глянь де я зараз. Іди %1$@ або %2$@
-    vi = Này, hãy xem vị trí hiện tại của tôi tại Organic Maps! %1$@ hoặc %2$@ Bạn không có bản đồ ngoại tuyến? Tải xuống tại đây: https://organicmaps.app/get
-    zh-Hans = 嘿,在 Organic Maps 上查看我目前的位置 吧!%1$@ 或%2$@ 未安装离线地图?在此 下载: https://organicmaps.app/get
-    zh-Hant = 嘿，在 Organic Maps 查看我的目前位置吧！ %1$@ 或%2$@ 沒安裝離線地圖？在此下載: https://organicmaps.app/get
-    el = Έλεγξε την τρέχουσα τοποθεσία μου στο Organic Maps! %1$@ ή %2$@ στην περίπτωση που δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://organicmaps.app/get
-    he = . אין ברשותך מפות לא מקוונות? הורד Organic Maps! %1$@ or %2$@ הי, בדוק את מיקומי הנוכחי ב. https://organicmaps.app/get הורד אותן מ:
+    vi = Này, hãy xem vị trí hiện tại của tôi tại Organic Maps! %1$@ hoặc %2$@ Bạn không có bản đồ ngoại tuyến? Tải xuống tại đây: https://omaps.app/get
+    zh-Hans = 嘿,在 Organic Maps 上查看我目前的位置 吧!%1$@ 或%2$@ 未安装离线地图?在此 下载: https://omaps.app/get
+    zh-Hant = 嘿，在 Organic Maps 查看我的目前位置吧！ %1$@ 或%2$@ 沒安裝離線地圖？在此下載: https://omaps.app/get
+    el = Έλεγξε την τρέχουσα τοποθεσία μου στο Organic Maps! %1$@ ή %2$@ στην περίπτωση που δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://omaps.app/get
+    he = . אין ברשותך מפות לא מקוונות? הורד Organic Maps! %1$@ or %2$@ הי, בדוק את מיקומי הנוכחי ב. https://omaps.app/get הורד אותן מ:
    sk = Pozri kde som. Otvor odkaz: %1$@ alebo %2$@

  [bookmark_share_email_subject]
@ -3768,7 +3768,7 @@
    sk = Pozrite si moju aktuálnu polohu na mape Organic Maps

  [my_position_share_email]
-    comment = Share my position using EMail, %1$@ is om:// and %2$@ is http://omaps.app link WITHOUT NAME
+    comment = Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME
    tags = ios,android
    en = Hi,\n\nI'm here now: %1$@. Click this link %2$@ or this one %3$@ to see the place on the map.\n\nThanks.
    ru = Привет!\n\nЯ сейчас здесь: %1$@. Чтобы увидеть это место на карте Organic Maps, открой эту ссылку %2$@ или эту %3$@\n\nСпасибо.
@ -6865,7 +6865,7 @@
    nl = Aan het downloaden:
    fi = Ladataan:
    fr = Téléchargement en cours :
-    de = Gerade wird heruntergeladen:
+    de = Wird heruntergeladen:
    hu = Letöltés:
    id = Mengunduh:
    it = In scaricamento:
@ -12042,8 +12042,9 @@
    sk = Doriți să vă planificăm o rută având ca punct de pornire locația actuală?
    fa = ایا می خواهید یک مسیر را از موقعیت فعلیتان برنامه ریزی کنیم؟

-  [whats_new_next_button]
-    tags = ios
+  [next_button]
+    comment = Edit open hours/set time and minutes dialog
+    tags = android
    en = Next
    ru = Далее
    ar = التالي
@ -25772,38 +25773,38 @@
    fa = دانلود کننده نقشه

  [share_bookmarks_email_body_link]
-    en = Hello!\n\nHere is the link where you can download bookmarks: %s. Open the list in Organic Maps and enjoy your trip!\n\nGet application: https://organicmaps.app/get?kmz
-    ru = Здравствуйте!\n\nМетки можно скачать по ссылке: %s. Открывайте список с помощью Organic Maps и наслаждайтесь поездкой!\n\nСкачать приложение: https://organicmaps.app/get?kmz
-    ar = مرحبًا!\n\nللوصول إلى التطبيق: https://organicmaps.app/get?kmzهذا هو الرابط الذي يمكنك من خلاله تنزيل إشاراتك المرجعية: %s. افتح القائمة عبر Organic Maps واستمتع برحلتك!\n\n
-    cs = Dobrý den!\n\nVaše značky můžete stáhnout zde: %s. Otevírejte seznam s pomocí Organic Maps a užívejte si cesty!\n\nStáhnout aplikaci: https://organicmaps.app/get?kmz
-    da = Hej!\n\nHer er et link, hvor du kan hente dine bogmærker: %s. Åben listen via Organic Maps og nyd turen!\n\nHent applikation: https://organicmaps.app/get?kmz
-    nl = Hello!\n\nHier is de link waar u uw bladwijzers kunt downloaden: %s. Open de lijst via Organic Maps en geniet van uw reis!\n\nHaal de applicatie op: https://organicmaps.app/get?kmz
-    fi = Hei!\n\nMerkkinne voi ladata linkistä: %s. Avaa luettelo Organic Maps: llä ja nauti matkasta!\n\nLataa sovellus: https://organicmaps.app/get?kmz
-    fr = Bonjour !\n\nVoici le lien où vous pouvez télécharger vos signets : %s. Ouvrez la liste via Organic Maps et profitez de votre voyage !\n\nInstaller l'application : https://organicmaps.app/get?kmz
-    de = Guten Tag!\n\nIhre Markierungen stehen unter folgendem Link zum Download bereit: %s. Öffnen Sie die Liste mit Organic Maps und genießen Sie die Reise!\n\nApp downloaden: https://organicmaps.app/get?kmz
-    hu = Üdvözlöm!\n\nA jeleit le lehet tölteni ezzel a linkkel: %s. Nyíssa meg a listát Organic Maps segítségével és élvezze az utazását!\n\nAlkalmazás letöltése: https://organicmaps.app/get?kmz
-    id = Halo!\n\nBerikut tautan untuk mengunduh bookmark Anda: %s. Buka daftar melalui Organic Maps dan nikmati perjalanan Anda!\n\nDapatkan aplikasi: https://organicmaps.app/get?kmz
-    it = Ciao,\n\npuoi scaricare i tag dal seguente link: %s. Aprire elenco tramite Organic Maps e godersi viaggio!\n\nScaricare l'App: https://organicmaps.app/get?kmz
-    ja = こんにちは!\n\nこれはあなたのブックマークをダウンロードできるリンクです:%s。Organic Mapsを通じてリストを開いて旅をお楽しみください!\n\nアプリの入手: https://organicmaps.app/get?kmz
-    ko = 안녕하세요!\n\n여기 즐겨찾기들을 다운로드 받을 수 있는 링크입니다: %s. Organic Maps 를 통해 리스트를 열고 당신의 여행을 즐기세요!\n\n어플리케이션을 받으세요: https://organicmaps.app/get?kmz
-    nb = Hei!\n\nHer er lenken der du kan laste ned bokmerkene dine: %s. Åpne listen via Organic Maps og nyt reisen!\n\nFå tak i app: https://organicmaps.app/get?kmz
-    pl = Witaj!\n\nTwoje znaczniki można pobrać, używając link: %s. Otwórz listę, używając Organic Maps i ciesz się podrożą!\n\nPobierz aplikację: https://organicmaps.app/get?kmz
-    pt = Olá!\n\nSeus rótulos podem ser baixado aqui: %s. Abra a lista usando Organic Maps e desfrute do passeio!\n\nBaixar aplicação: https://organicmaps.app/get?kmz
-    pt-BR = Olá!\n\nAqui está o link para baixar seus marcas: %s. Abra a lista através do Organic Maps e curta sua viagem!\n\nBaixe o aplicativo: https://organicmaps.app/get?kmz
-    ro = Bună ziua!\n\nEtichetele dvs. le puteți descărca de pe linki-ul: %s. Deschideți lista cu ajutorul Organic Maps și primiți plăcere de la călătorie!\n\nDescărcați aplicația: https://organicmaps.app/get?kmz
-    es = Hola!\n\nSus etiquetas se pueden descargar desde el enlace: %s. Abra la lista con la ayuda de Organic Maps y disfrute del viaje!\n\nDescargar la aplicación: https://organicmaps.app/get?kmz
-    es-MX = ¡Hola!\n\nAquí esta el enlace donde puede descargar sus marcadores: %s. Abra la lista a través de Organic Maps y disfrute su viaje!\n\nObtenga la aplicación: https://organicmaps.app/get?kmz
-    sv = Hej!\n\nDina etiketter kan laddas ner från länken: %s. Öppna listan med hjälp av Organic Maps och njut av resan!\n\nLadda ner appen: https://organicmaps.app/get?kmz
-    th = สวัสดี!\n\nนี่คือลิงค์ที่คุณสามารถดาวน์โหลดบุ๊คมาร์คของคุณ: %s เปิดรายการผ่าน Organic Maps และเพลิดเพลินไปกับการเดินทางของคุณ!\n\nรับแอพพลิเคชัน: https://organicmaps.app/get?kmz
-    tr = Merhaba!\n\nİşte yer işaretlerinizi indirebileceğiniz bağlantı: %s. Organic Maps ile listeyi açın ve yolculuğunuzun tadını çıkarın!\n\nUygulamayı indir: https://organicmaps.app/get?kmz
-    uk = Вітаємо!\n\nВаші мітки можна завантажити за посиланням: %s. Відкривайте список за допомогою Organic Maps та насолоджуйтесь подорожжю!\n\nЗавантажити додаток: https://organicmaps.app/get?kmz
-    vi = Xin chào!\n\nĐây là liên kết nơi bạn có thể tải xuống dấu trang của mình: %s. Mở danh sách qua Organic Maps và tận hưởng chuyến đi của bạn!\n\nNhận đơn đăng ký: https://organicmaps.app/get?kmz
-    el = Γεια!\n\nΕδώ είναι ο σύνδεσμος που μπορείς να κατεβάσεις τους σελιδοδείκτες σου: %s. Ανοίξτε τη λίστα μέσω Organic Maps και απολαύστε το ταξίδι σας!\n\nΚατεβάστε την εφαρμογή: https://organicmaps.app/get?kmz
-    sk = Dobrý deň!\n\nTu je odkaz, kde si môžete stiahnuť svoje záložky: %s. Otvorte zoznam prostredníctvom služby Organic Maps a užite si výlet!\n\nZískajte aplikáciu: https://organicmaps.app/get?kmz
-    sw = Aise!\n\nKiunganishi hiki hapa ambapo unaweza kupakua vialamisho vyako: %s. Funua orodha kupitia Organic Maps na ufurahie safari zako!\n\nPata programu-tumizi: https://organicmaps.app/get?kmz
-    zh-Hans = 您好！\n\n您的标签可以从链接下载：%s.使用Organic Maps打开列表并享受旅行!\n\n下载程序：https://organicmaps.app/get?kmz
-    zh-Hant = 您好！\n\n您的標籤可以從鏈接下載：%s.使用Organic Maps打開列表並享受旅行!\n\n下載應用程序：https://organicmaps.app/get?kmz
-    fa = سلام!\n\nاین لینکی است که شما می توانید نشان شده های خود را از آن دانلود نمایید: %s. لیست را از طریق Organic Maps باز کرده و از سفر خود لذت ببرید!\n\nدریافت برنامه: https://organicmaps.app/get?kmz
+    en = Hello!\n\nHere is the link where you can download bookmarks: %s. Open the list in Organic Maps and enjoy your trip!\n\nGet application: https://omaps.app/get?kmz
+    ru = Здравствуйте!\n\nМетки можно скачать по ссылке: %s. Открывайте список с помощью Organic Maps и наслаждайтесь поездкой!\n\nСкачать приложение: https://omaps.app/get?kmz
+    ar = مرحبًا!\n\nللوصول إلى التطبيق: https://omaps.app/get?kmzهذا هو الرابط الذي يمكنك من خلاله تنزيل إشاراتك المرجعية: %s. افتح القائمة عبر Organic Maps واستمتع برحلتك!\n\n
+    cs = Dobrý den!\n\nVaše značky můžete stáhnout zde: %s. Otevírejte seznam s pomocí Organic Maps a užívejte si cesty!\n\nStáhnout aplikaci: https://omaps.app/get?kmz
+    da = Hej!\n\nHer er et link, hvor du kan hente dine bogmærker: %s. Åben listen via Organic Maps og nyd turen!\n\nHent applikation: https://omaps.app/get?kmz
+    nl = Hello!\n\nHier is de link waar u uw bladwijzers kunt downloaden: %s. Open de lijst via Organic Maps en geniet van uw reis!\n\nHaal de applicatie op: https://omaps.app/get?kmz
+    fi = Hei!\n\nMerkkinne voi ladata linkistä: %s. Avaa luettelo Organic Maps: llä ja nauti matkasta!\n\nLataa sovellus: https://omaps.app/get?kmz
+    fr = Bonjour !\n\nVoici le lien où vous pouvez télécharger vos signets : %s. Ouvrez la liste via Organic Maps et profitez de votre voyage !\n\nInstaller l'application : https://omaps.app/get?kmz
+    de = Guten Tag!\n\nIhre Markierungen stehen unter folgendem Link zum Download bereit: %s. Öffnen Sie die Liste mit Organic Maps und genießen Sie die Reise!\n\nApp downloaden: https://omaps.app/get?kmz
+    hu = Üdvözlöm!\n\nA jeleit le lehet tölteni ezzel a linkkel: %s. Nyíssa meg a listát Organic Maps segítségével és élvezze az utazását!\n\nAlkalmazás letöltése: https://omaps.app/get?kmz
+    id = Halo!\n\nBerikut tautan untuk mengunduh bookmark Anda: %s. Buka daftar melalui Organic Maps dan nikmati perjalanan Anda!\n\nDapatkan aplikasi: https://omaps.app/get?kmz
+    it = Ciao,\n\npuoi scaricare i tag dal seguente link: %s. Aprire elenco tramite Organic Maps e godersi viaggio!\n\nScaricare l'App: https://omaps.app/get?kmz
+    ja = こんにちは!\n\nこれはあなたのブックマークをダウンロードできるリンクです:%s。Organic Mapsを通じてリストを開いて旅をお楽しみください!\n\nアプリの入手: https://omaps.app/get?kmz
+    ko = 안녕하세요!\n\n여기 즐겨찾기들을 다운로드 받을 수 있는 링크입니다: %s. Organic Maps 를 통해 리스트를 열고 당신의 여행을 즐기세요!\n\n어플리케이션을 받으세요: https://omaps.app/get?kmz
+    nb = Hei!\n\nHer er lenken der du kan laste ned bokmerkene dine: %s. Åpne listen via Organic Maps og nyt reisen!\n\nFå tak i app: https://omaps.app/get?kmz
+    pl = Witaj!\n\nTwoje znaczniki można pobrać, używając link: %s. Otwórz listę, używając Organic Maps i ciesz się podrożą!\n\nPobierz aplikację: https://omaps.app/get?kmz
+    pt = Olá!\n\nSeus rótulos podem ser baixado aqui: %s. Abra a lista usando Organic Maps e desfrute do passeio!\n\nBaixar aplicação: https://omaps.app/get?kmz
+    pt-BR = Olá!\n\nAqui está o link para baixar seus marcas: %s. Abra a lista através do Organic Maps e curta sua viagem!\n\nBaixe o aplicativo: https://omaps.app/get?kmz
+    ro = Bună ziua!\n\nEtichetele dvs. le puteți descărca de pe linki-ul: %s. Deschideți lista cu ajutorul Organic Maps și primiți plăcere de la călătorie!\n\nDescărcați aplicația: https://omaps.app/get?kmz
+    es = Hola!\n\nSus etiquetas se pueden descargar desde el enlace: %s. Abra la lista con la ayuda de Organic Maps y disfrute del viaje!\n\nDescargar la aplicación: https://omaps.app/get?kmz
+    es-MX = ¡Hola!\n\nAquí esta el enlace donde puede descargar sus marcadores: %s. Abra la lista a través de Organic Maps y disfrute su viaje!\n\nObtenga la aplicación: https://omaps.app/get?kmz
+    sv = Hej!\n\nDina etiketter kan laddas ner från länken: %s. Öppna listan med hjälp av Organic Maps och njut av resan!\n\nLadda ner appen: https://omaps.app/get?kmz
+    th = สวัสดี!\n\nนี่คือลิงค์ที่คุณสามารถดาวน์โหลดบุ๊คมาร์คของคุณ: %s เปิดรายการผ่าน Organic Maps และเพลิดเพลินไปกับการเดินทางของคุณ!\n\nรับแอพพลิเคชัน: https://omaps.app/get?kmz
+    tr = Merhaba!\n\nİşte yer işaretlerinizi indirebileceğiniz bağlantı: %s. Organic Maps ile listeyi açın ve yolculuğunuzun tadını çıkarın!\n\nUygulamayı indir: https://omaps.app/get?kmz
+    uk = Вітаємо!\n\nВаші мітки можна завантажити за посиланням: %s. Відкривайте список за допомогою Organic Maps та насолоджуйтесь подорожжю!\n\nЗавантажити додаток: https://omaps.app/get?kmz
+    vi = Xin chào!\n\nĐây là liên kết nơi bạn có thể tải xuống dấu trang của mình: %s. Mở danh sách qua Organic Maps và tận hưởng chuyến đi của bạn!\n\nNhận đơn đăng ký: https://omaps.app/get?kmz
+    el = Γεια!\n\nΕδώ είναι ο σύνδεσμος που μπορείς να κατεβάσεις τους σελιδοδείκτες σου: %s. Ανοίξτε τη λίστα μέσω Organic Maps και απολαύστε το ταξίδι σας!\n\nΚατεβάστε την εφαρμογή: https://omaps.app/get?kmz
+    sk = Dobrý deň!\n\nTu je odkaz, kde si môžete stiahnuť svoje záložky: %s. Otvorte zoznam prostredníctvom služby Organic Maps a užite si výlet!\n\nZískajte aplikáciu: https://omaps.app/get?kmz
+    sw = Aise!\n\nKiunganishi hiki hapa ambapo unaweza kupakua vialamisho vyako: %s. Funua orodha kupitia Organic Maps na ufurahie safari zako!\n\nPata programu-tumizi: https://omaps.app/get?kmz
+    zh-Hans = 您好！\n\n您的标签可以从链接下载：%s.使用Organic Maps打开列表并享受旅行!\n\n下载程序：https://omaps.app/get?kmz
+    zh-Hant = 您好！\n\n您的標籤可以從鏈接下載：%s.使用Organic Maps打開列表並享受旅行!\n\n下載應用程序：https://omaps.app/get?kmz
+    fa = سلام!\n\nاین لینکی است که شما می توانید نشان شده های خود را از آن دانلود نمایید: %s. لیست را از طریق Organic Maps باز کرده و از سفر خود لذت ببرید!\n\nدریافت برنامه: https://omaps.app/get?kmz

  [warning_speedcams_title]
    en = Navigator will warn you about cameras when you exceed the speed limit of %d km/h
@ -30324,7 +30325,8 @@
      fa = اجازه دهید صفحه نمایش بخوابد

  [enable_screen_sleep_description]
-      comment = 
+      comment = Description in preferences
+      tags = android
      en = When enabled the screen will be allowed to sleep after a period of inactivity.
      ru = При включении экран может переходить в спящий режим после периода бездействия.
      ar = عند التمكين ، سيتم السماح للشاشة بالنوم بعد فترة من عدم النشاط.
@ -30356,3 +30358,167 @@
      he = כאשר מופעל המסך יורשה לישון לאחר תקופה של חוסר פעילות.
      sk = Ak je táto možnosť povolená, obrazovka bude môcť po určitej dobe nečinnosti spať.
      fa = درصورت فعال بودن ، بعد از یک دوره عدم فعالیت به صفحه اجازه خواب داده می شود.
+
+  [whats_new_auto_update_title]
+    comment = Autoupdate dialog on start
+    tags = ios
+    en = Update your downloaded maps
+    ru = Обновите ваши загруженные карты
+    ar = قم بتحديث الخرائط التي قمت بنتزيلها
+    cs = Aktualizujte své stažené mapy
+    da = Opdater dine downloadede kort
+    nl = Werk uw gedownloade kaarten bij
+    fi = Päivitä ladatut kartat
+    fr = Mettez à jour vos cartes téléchargées
+    de = Aktualisieren Sie Ihre heruntergeladenen Karten
+    hu = Frissítse a letöltött térképeit
+    id = Perbarui peta yang sudah Anda unduh
+    it = Aggiorna le mappe scaricate
+    ja = ダウンロード済みのマップを更新してください
+    ko = 다운로드한 지도를 업데이트해야 합니다
+    nb = Oppdater dine nedlastede kart
+    pl = Zaktualizuj pobrane mapy
+    pt = Atualize seus mapas transferidos
+    pt-BR = Atualize os mapas no seu dispositivo
+    ro = Actualizați hărțile descărcate
+    es = Actualice sus mapas descargados
+    sv = Uppdatera dina nedladdade kartor
+    th = อัปเดตแผนที่ที่คุณดาวน์โหลดมา
+    tr = İndirdiğiniz haritaları güncelleyin
+    uk = Оновити завантажені карти
+    vi = Cập nhật các bản đồ đã tải về của bạn
+    zh-Hans = 更新已下载的地图
+    zh-Hant = 更新您下載的地圖
+    af = Werk jou afgelaaide kaarte by
+    be = Абнавіце спампаваныя карты
+    el = Θα πρέπει να ενημερώστε τους χάρτες που έχετε κατεβάσει
+    es_MX = Debe actualizar sus mapas descargados
+    fr_CA = Mettez à jour vos cartes téléchargées
+    he = עדכן את המפות שהורדת
+    hi = अपने डाउनलोड किए गए मानचित्र अपडेट करें
+    sk = Aktualizujte svoje stiahnuté mapy
+    sw = Sasisha ramani zako ulizopakua
+    fa = نقشه های دانلود شده خود را به روز کنید
+
+  [whats_new_auto_update_message]
+    comment = Autoupdate dialog on start
+    tags = ios
+    en = Updating maps keeps the information about objects up to date
+    ru = Обновление карт поддерживает информацию об объектах в актуальном состоянии
+    ar = تحديث الخرائط والاحتفاظ بالمعلومات حول الكائنات محدثة
+    cs = Aktualizace map zajišťuje aktuální informace o objektech
+    da = Opdatering af kort sikrer, at oplysningerne om objekter er aktuel
+    nl = Kaarten bijwerken houdt de informatie over objecten actueel
+    fi = Karttojen päivittäminen pitää kohteita koskevat tiedot ajan tasalla
+    fr = Actualiser les cartes permet d'actualiser également les informations sur les objets
+    de = Das Aktualisieren der Karten sorgt dafür, dass die Objektinformationen stets auf dem neuesten Stand sind
+    hu = A térképek frissítésével naprakészen tarthatja az objektumokra vonatkozó adatokat
+    id = Memperbarui peta membuat informasi tentang objek tetap terkini
+    it = Aggiornamento mappe mantiene aggiornate le informazioni sugli oggetti
+    ja = 地図を更新することで物件情報を最新の状態に保ちます
+    ko = 지도를 업데이트하면 개체에 대한 정보가 최신 상태로 유지됩니다.
+    nb = Ved å oppdatere kart holder du også informasjonen om ulike elementer oppdatert
+    pl = Aktualizacja map umożliwia uzyskanie bieżących informacji o obiektach
+    pt = Atualizar os mapas mantém atualizada a informação sobre objetos
+    pt-BR = A atualização de mapas mantém as informações sobre objetos atualizadas
+    ro = Actualizarea hărților vă ajută să păstrați actualizate informațiile despre obiecte
+    es = La actualización de mapas mantiene actualizada la información sobre objetos
+    sv = Uppdatering av kartor håller information om objekt uppdaterade
+    th = การอัปเดตแผนที่จะคงข้อมูลเกี่ยวกับจุดหมายต่าง ๆ ให้ล่าสุดอยู่เสมอ
+    tr = Haritaları güncellemek, nesnelerle ilgili bilgilerin güncel kalmasını sağlar
+    uk = Оновлення карт дозволяє підтримувати інформацію про об'єкти в актуальному стані
+    vi = Cập nhật bản đồ để cập nhật thông tin về các đối tượng trên đó
+    zh-Hans = 更新地图可以让对象的信息保持最新状态
+    zh-Hant = 更新地圖以讓物件資訊保持在最新狀態
+    af = As jy kaarte bywerk, bly inligting oor voorwerpe op datum
+    be = Абнаўленне карт падтрымлівае актуальнасць звестак пра аб’екты
+    el = Η ενημέρωση των χαρτών διατηρεί τις πληροφορίες των στοιχείων επικαιροποιημένες
+    es_MX = Actualizar los mapas mantiene actualizada también la información acerca de los objetos
+    fr_CA = La mise à jour des cartes permet d'avoir des informations à jour sur les objets
+    he = עדכון המפות שומר על המידע שבהן עדכני
+    hi = मानचित्रों का अपडेट होना ऑब्जेक्ट्स के बारे में जानकारी अप टू डेट रखता है
+    sk = Vďaka aktualizácii máp budú informácie o objektoch na mape aktualizované
+    sw = Kusasisha ramani kunaweka taarifa kuhusu vipengee ikiwa ya hivi sasa zaidi
+    fa = به روز رسانی نقشه ها اطلاعات مربوط به اشیا را به روز نگه می دارد
+
+  [whats_new_auto_update_button_size]
+    comment = Autoupdate dialog on start
+    tags = ios
+    en = Update (%s)
+    ru = Обновить (%s)
+    ar = تحديث (%s)
+    cs = Aktualizace (%s)
+    da = Opdater (%s)
+    nl = Bijwerken (%s)
+    fi = Päivitä (%s)
+    fr = Mettre à jour (%s)
+    de = Aktualisieren (%s)
+    hu = Frissítés (%s)
+    id = Pembaruan (%s)
+    it = Aggiorna (%s)
+    ja = 更新 (%s)
+    ko = 업데이트(%s)
+    nb = Oppdater (%s)
+    pl = Zaktualizuj (%s)
+    pt = Atualização (%s)
+    pt-BR = Atualizar (%s)
+    ro = Actualizare (%s)
+    es = Actualizar (%s)
+    sv = Uppdatera (%s)
+    th = อัปเดต (%s)
+    tr = Güncelle (%s)
+    uk = Оновити (%s)
+    vi = Cập nhật (%s)
+    zh-Hans = 更新 (%s)
+    zh-Hant = 更新 (%s)
+    af = Werk by (%s)
+    be = Абнавіць (%s)
+    el = Ενημέρωση (%s)
+    es_MX = Actualizar (%s)
+    fr_CA = Mettre à jour (%s)
+    he = עדכן (%s)
+    hi = (%s) अपडेट करें
+    sk = Aktualizovať (%s)
+    sw = Sasisha (%s)
+    fa = بروزرسانی (%s)
+
+  [whats_new_auto_update_button_later]
+    comment = Autoupdate dialog on start
+    tags = ios
+    en = Manually update later
+    ru = Обновить вручную позже
+    ar = تحديث يدوياً في وقت لاحق
+    cs = Aktualizovat ručně později
+    da = Opdater manuelt senere
+    nl = Later handmatig bijwerken
+    fi = Päivitä manuaalisesti myöhemmin
+    fr = Mettre à jour manuellement plus tard
+    de = Später manuell aktualisieren
+    hu = Kézi frissítés később
+    id = Perbarui secara manual nanti
+    it = Aggiorna manualmente più tardi
+    ja = あとで手動で更新
+    ko = 나중에 수동으로 업데이트
+    nb = Oppdater manuelt senere
+    pl = Zaktualizuj ręcznie później
+    pt = Atualizar manualmente mais tarde
+    pt-BR = Atualizar manualmente mais tarde
+    ro = Actualizare manuală mai târziu
+    es = Actualizar más tarde de forma manual
+    sv = Uppdatera senare manuellt
+    th = อัปเดตด้วยตนเองภายหลัง
+    tr = Daha sonra manüel olarak güncelle
+    uk = Оновити вручну пізніше
+    vi = Cập nhật thủ công sau
+    zh-Hans = 稍后手动更新
+    zh-Hant = 稍後手動更新
+    af = Werk later handmatig by
+    be = Абнавіць пазней уручную
+    el = Χειροκίνητη ενημέρωση αργότερα
+    es_MX = Actualizar después manualmente
+    fr_CA = Plus tard (manuel)
+    he = עדכן ידנית מאוחר יותר
+    hi = बाद में मैनुअल रूप से अपडेट करें
+    sk = Manuálne aktualizovať neskôr
+    sw = Sasisha mwenyewe baadaye
+    fa = بعدا به صورت دستی به روزرسانی کنید
--- a/data/styles/clear/include/Basemap_label.mapcss
+++ b/data/styles/clear/include/Basemap_label.mapcss
@ -214,7 +214,8 @@ node|z4[place=city][capital!=2][population>=1000000],
 node|z5[place=city][capital!=2][population>=150000],
 node|z6[place=city][capital!=2][population>=50000],
 node|z7-8[place=city][capital!=2][population>=40000],
-node|z9-[place=city][capital!=2][population<40000],
+node|z9-11[place=city][capital!=2],
+node|z12-[place=city][capital!=2][population<40000],
 node|z4-[place=city][capital=2][population>=0],
 {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 node|z4[place=city][capital!=2][population>=1000000]::int_name,
@ -222,7 +223,8 @@ node|z5[place=city][capital!=2][population>=150000]::int_name,
 node|z6[place=city][capital!=2][population>=50000]::int_name,
 node|z7-8[place=city][capital!=2][population>=40000]::int_name,
 node|z4-[place=city][capital=2][population<40000]::int_name,
-node|z9-[place=city][capital!=2][population<40000]::int_name
+node|z9-11[place=city][capital!=2]::int_name,
+node|z12-[place=city][capital!=2][population<40000]::int_name
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}

 node|z4[place=city][capital!=2][population>=1000000],
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@ -193,7 +193,8 @@ node|z4[place=city][capital!=2][population>=1000000],
 node|z5[place=city][capital!=2][population>=150000],
 node|z6[place=city][capital!=2][population>=50000],
 node|z7-8[place=city][capital!=2][population>=40000],
-node|z9-[place=city][capital!=2][population<40000]
+node|z9-11[place=city][capital!=2],
+node|z12-[place=city][capital!=2][population<40000],
 node|z4-[place=city][capital=2][population>=0],
 {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 node|z4[place=city][capital!=2][population>=1000000]::int_name,
@ -201,7 +202,8 @@ node|z5[place=city][capital!=2][population>=150000]::int_name,
 node|z6[place=city][capital!=2][population>=50000]::int_name,
 node|z7-8[place=city][capital!=2][population>=40000]::int_name,
 node|z4-[place=city][capital=2][population<40000]::int_name,
-node|z9-[place=city][capital!=2][population<40000]::int_name
+node|z9-11[place=city][capital!=2]::int_name,
+node|z12-[place=city][capital!=2][population<40000]::int_name
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}

 node|z4[place=city][capital!=2][population>=1000000],
--- a/drape_frontend/apply_feature_functors.cpp
+++ b/drape_frontend/apply_feature_functors.cpp
@ -516,9 +516,12 @@ void ApplyPointFeature::Finish(ref_ptr<dp::TextureManager> texMng)
  }

  bool const hasPOI = m_symbolRule != nullptr;
-  double const mainScale = df::VisualParams::Instance().GetVisualScale();
+  auto const & visualParams = df::VisualParams::Instance();
+  double const mainScale = visualParams.GetVisualScale();
  if (hasPOI)
  {
+    double const poiExtendScale = visualParams.GetPoiExtendScale();
+
    PoiSymbolViewParams params;
    params.m_featureId = m_id;
    params.m_tileCenter = m_tileRect.Center();
@ -529,7 +532,7 @@ void ApplyPointFeature::Finish(ref_ptr<dp::TextureManager> texMng)
    params.m_minVisibleScale = m_minVisibleScale;
    params.m_rank = m_rank;
    params.m_symbolName = m_symbolRule->name();
-    params.m_extendingSize = static_cast<uint32_t>(mainScale * m_symbolRule->min_distance());
+    params.m_extendingSize = static_cast<uint32_t>(mainScale * m_symbolRule->min_distance() * poiExtendScale);
    params.m_posZ = m_posZ;
    params.m_hasArea = m_hasArea;
    params.m_prioritized = m_createdByEditor;
--- a/drape_frontend/screen_operations.cpp
+++ b/drape_frontend/screen_operations.cpp
@ -12,17 +12,6 @@

 #include <algorithm>

-namespace
-{
-
-/// @todo Review this logic in future.
-/// Fix bug with floating point calculations (before Android release).
-void ReduceRectHack(m2::RectD & r)
-{
-  r.Inflate(-1.0E-9, -1.0E-9);
-}
-
-} // namespace

 namespace df
 {
@ -93,10 +82,8 @@ bool CanShrinkInto(ScreenBase const & screen, m2::RectD const & boundRect)
      && (boundRect.SizeY() >= clipRect.SizeY());
 }

-ScreenBase const ShrinkInto(ScreenBase const & screen, m2::RectD boundRect)
+ScreenBase const ShrinkInto(ScreenBase const & screen, m2::RectD const & boundRect)
 {
-  ReduceRectHack(boundRect);
-
  ScreenBase res = screen;

  m2::RectD clipRect = res.ClipRect();
@ -116,42 +103,41 @@ ScreenBase const ShrinkInto(ScreenBase const & screen, m2::RectD boundRect)
  return res;
 }

-ScreenBase const ScaleInto(ScreenBase const & screen, m2::RectD boundRect)
+ScreenBase const ScaleInto(ScreenBase const & screen, m2::RectD const & boundRect)
 {
-  ReduceRectHack(boundRect);
-
  ScreenBase res = screen;

  double scale = 1;
-
  m2::RectD clipRect = res.ClipRect();

+  auto const DoScale = [&scale, &clipRect, &boundRect](double k)
+  {
+    // https://github.com/organicmaps/organicmaps/issues/544
+    if (k > 0)
+    {
+      scale /= k;
+      clipRect.Scale(k);
+    }
+    else
+    {
+      // Will break in Debug, log in Release.
+      LOG(LERROR, ("Bad scale factor =", k, "Bound rect =", boundRect, "Clip rect =", clipRect));
+    }
+  };
+
  ASSERT(boundRect.IsPointInside(clipRect.Center()), ("center point should be inside boundRect"));

  if (clipRect.minX() < boundRect.minX())
-  {
-    double k = (boundRect.minX() - clipRect.Center().x) / (clipRect.minX() - clipRect.Center().x);
-    scale /= k;
-    clipRect.Scale(k);
-  }
+    DoScale((boundRect.minX() - clipRect.Center().x) / (clipRect.minX() - clipRect.Center().x));
+
  if (clipRect.maxX() > boundRect.maxX())
-  {
-    double k = (boundRect.maxX() - clipRect.Center().x) / (clipRect.maxX() - clipRect.Center().x);
-    scale /= k;
-    clipRect.Scale(k);
-  }
+    DoScale((boundRect.maxX() - clipRect.Center().x) / (clipRect.maxX() - clipRect.Center().x));
+
  if (clipRect.minY() < boundRect.minY())
-  {
-    double k = (boundRect.minY() - clipRect.Center().y) / (clipRect.minY() - clipRect.Center().y);
-    scale /= k;
-    clipRect.Scale(k);
-  }
+    DoScale((boundRect.minY() - clipRect.Center().y) / (clipRect.minY() - clipRect.Center().y));
+
  if (clipRect.maxY() > boundRect.maxY())
-  {
-    double k = (boundRect.maxY() - clipRect.Center().y) / (clipRect.maxY() - clipRect.Center().y);
-    scale /= k;
-    clipRect.Scale(k);
-  }
+    DoScale((boundRect.maxY() - clipRect.Center().y) / (clipRect.maxY() - clipRect.Center().y));

  res.Scale(scale);
  res.SetOrg(clipRect.Center());
@ -159,10 +145,8 @@ ScreenBase const ScaleInto(ScreenBase const & screen, m2::RectD boundRect)
  return res;
 }

-ScreenBase const ShrinkAndScaleInto(ScreenBase const & screen, m2::RectD boundRect)
+ScreenBase const ShrinkAndScaleInto(ScreenBase const & screen, m2::RectD const & boundRect)
 {
-  ReduceRectHack(boundRect);
-
  ScreenBase res = screen;

  m2::RectD globalRect = res.ClipRect();
--- a/drape_frontend/screen_operations.hpp
+++ b/drape_frontend/screen_operations.hpp
@ -12,9 +12,9 @@ bool CheckBorders(ScreenBase const & screen);

 bool CanShrinkInto(ScreenBase const & screen, m2::RectD const & boundRect);

-ScreenBase const ShrinkInto(ScreenBase const & screen, m2::RectD boundRect);
-ScreenBase const ScaleInto(ScreenBase const & screen, m2::RectD boundRect);
-ScreenBase const ShrinkAndScaleInto(ScreenBase const & screen, m2::RectD boundRect);
+ScreenBase const ShrinkInto(ScreenBase const & screen, m2::RectD const & boundRect);
+ScreenBase const ScaleInto(ScreenBase const & screen, m2::RectD const & boundRect);
+ScreenBase const ShrinkAndScaleInto(ScreenBase const & screen, m2::RectD const & boundRect);

 bool IsScaleAllowableIn3d(int scale);

--- a/drape_frontend/visual_params.cpp
+++ b/drape_frontend/visual_params.cpp
@ -38,6 +38,7 @@ double const VisualParams::kXxxhdpiScale = 3.5;
 VisualParams::VisualParams()
  : m_tileSize(0)
  , m_visualScale(0.0)
+  , m_poiExtendScale(0.1) // found empirically
  , m_fontScale(1.0)
 {}

@ -140,6 +141,12 @@ double VisualParams::GetVisualScale() const
  return m_visualScale;
 }

+double VisualParams::GetPoiExtendScale() const
+{
+  ASSERT_INITED;
+  return m_poiExtendScale;
+}
+
 uint32_t VisualParams::GetTileSize() const
 {
  ASSERT_INITED;
--- a/drape_frontend/visual_params.hpp
+++ b/drape_frontend/visual_params.hpp
@ -31,6 +31,8 @@ public:
  std::string const & GetResourcePostfix() const;

  double GetVisualScale() const;
+  /// This is a scale factor to decrease extending of bbox for POI icons. It could be removed with new style
+  double GetPoiExtendScale() const;
  uint32_t GetTileSize() const;

  /// How many pixels around touch point are used to get bookmark or POI in consideration of visual scale.
@ -64,6 +66,7 @@ private:

  uint32_t m_tileSize;
  double m_visualScale;
+  double m_poiExtendScale;
  GlyphVisualParams m_glyphVisualParams;
  std::atomic<double> m_fontScale;

@ -99,7 +102,7 @@ uint32_t CalculateTileSize(uint32_t screenWidth, uint32_t screenHeight);

 void ExtractZoomFactors(ScreenBase const & s, double & zoom, int & index, float & lerpCoef);
 float InterpolateByZoomLevelsImpl(int index, float lerpCoef, float const * values,
-				  size_t valuesSize);
+                                  size_t valuesSize);
 template <typename Array>
 inline float InterpolateByZoomLevels(int index, float lerpCoef, Array const & values)
 {
--- a/editor/server_api.cpp
+++ b/editor/server_api.cpp
@ -124,7 +124,7 @@ uint64_t ServerApi06::CreateNote(ms::LatLon const & ll, std::string const & mess
  CHECK(!message.empty(), ("Note content should not be empty."));
  std::string const params = "?lat=" + strings::to_string_dac(ll.m_lat, 7) +
                             "&lon=" + strings::to_string_dac(ll.m_lon, 7) +
-                             "&text=" + url::UrlEncode(message + " #mapsme");
+                             "&text=" + url::UrlEncode(message + " #organicmaps");
  OsmOAuth::Response const response = m_auth.Request("/notes" + params, "POST");
  if (response.first != OsmOAuth::HTTP::OK)
    MYTHROW(ErrorAddingNote, ("Could not post a new note:", response));
--- a/geometry/geometry_tests/common_test.cpp
+++ b/geometry/geometry_tests/common_test.cpp
@ -10,18 +10,14 @@ using namespace test;

 UNIT_TEST(Rect)
 {
-  m2::Rect<double> rect(0, 0, 500, 300);
+  m2::RectD rect(0, 0, 500, 300);

  double factor[] = { 0.2, 0.3, 0.5, 0.7, 1.0, 1.3, 1.5, 2.0 };
  for (size_t i = 0; i < ARRAY_SIZE(factor); ++i)
  {
-    m2::Rect<double> r(rect);
+    m2::RectD r(rect);
    r.Scale(factor[i]);
    TEST(is_equal_center(rect, r), ());
-
-    r = rect;
-    r.Scale(-factor[i]);
-    TEST(is_equal_center(rect, r), ());
  }

  m2::RectD external(0, 0, 100, 100);
--- a/geometry/rect2d.hpp
+++ b/geometry/rect2d.hpp
@ -219,6 +219,7 @@ public:

  void Scale(T scale)
  {
+    ASSERT_GREATER(scale, 0, ());
    scale *= 0.5;

    m2::Point<T> const center = Center();
--- a/iphone/Maps/Categories/UIKitCategories.m
+++ b/iphone/Maps/Categories/UIKitCategories.m
@ -85,7 +85,7 @@

 - (void)rateApp
 {
-  NSString * urlString = @"https://testflight.apple.com/join/62l4Qh2K";
+  NSString * urlString = @"https://apps.apple.com/app/id1567437057?action=write-review";
  NSURL * url = [NSURL URLWithString:urlString];
  [self openURL:url options:@{} completionHandler:nil];
 }
--- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
+++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
@ -55,8 +55,7 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController"
 }

 - (void)presentLocationAlertWithCancelBlock:(MWMVoidBlock)cancelBlock {
-  if (![MapViewController sharedController].welcomePageController)
-    [self displayAlert:[MWMAlert locationAlertWithCancelBlock:cancelBlock]];
+  [self displayAlert:[MWMAlert locationAlertWithCancelBlock:cancelBlock]];
 }
 - (void)presentPoint2PointAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock needToRebuild:(BOOL)needToRebuild {
  [self displayAlert:[MWMAlert point2PointAlertWithOkBlock:okBlock needToRebuild:needToRebuild]];
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h
@ -51,6 +51,4 @@

 - (id<MWMFeatureHolder>)featureHolder;

- (void)showAdditionalViewsIfNeeded;
-
@end
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
@ -351,23 +351,4 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
  return self.placePageManager;
 }

- (void)showAdditionalViewsIfNeeded {
-  auto ownerController = self.ownerController;
-
-  if ([MWMRouter isRoutingActive] || [MWMRouter hasSavedRoute])
-    return;
-
-  if (self.searchManager.state != MWMSearchManagerStateHidden)
-    return;
-
-  if (self.menuState != MWMBottomMenuStateInactive)
-    return;
-
-  if (ownerController.navigationController.viewControllers.count > 1)
-    return;
-
-  if (DeepLinkHandler.shared.isLaunchedByDeeplink)
-    return;
-}
-
@end
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@ -226,11 +226,6 @@ using Observers = NSHashTable<Observer>;
  [MWMTextToSpeech tts].active = !isEnabled;
 }

- (IBAction)trafficButtonAction {
-  BOOL const switchOn = ([MWMMapOverlayManager trafficState] == MWMMapOverlayTrafficStateDisabled);
-  [MWMMapOverlayManager setTrafficEnabled:switchOn];
-}
-
 - (IBAction)settingsButtonAction {
  [[MapViewController sharedController] performSegueWithIdentifier:@"Map2Settings" sender:nil];
 }
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift
@ -27,15 +27,6 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MapO
    }
  }

-  @IBOutlet private weak var trafficButton: UIButton! {
-    didSet {
-      trafficButton.setImage(#imageLiteral(resourceName: "ic_setting_traffic_off"), for: .normal)
-      trafficButton.setImage(#imageLiteral(resourceName: "ic_setting_traffic_on"), for: .selected)
-      trafficButton.setImage(#imageLiteral(resourceName: "ic_setting_traffic_on"), for: [.selected, .highlighted])
-      onTrafficStateUpdated()
-    }
-  }
-
  private lazy var dimBackground: DimBackground = {
    DimBackground(mainView: self, tapAction: { [weak self] in
      self?.diminish()
@ -246,17 +237,8 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MapO
    refreshDiminishTimer()
  }

-  func onTrafficStateUpdated() {
-    guard MWMRouter.isRoutingActive() else { return }
-    let isPedestrianRouting = MWMRouter.type() == .pedestrian
-    trafficButton.isHidden = isPedestrianRouting
-    trafficButton.isSelected = MapOverlayManager.trafficState() != .disabled
-    refreshDiminishTimer()
-  }
-
  override func applyTheme() {
    super.applyTheme()
-    onTrafficStateUpdated()
    onTTSStatusUpdated()
  }

--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.xib
@ -84,7 +84,7 @@
                                    </userDefinedRuntimeAttributes>
                                </label>
                                <pageControl opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="100" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="2" translatesAutoresizingMaskIntoConstraints="NO" id="ppd-rW-dYo">
-                                    <rect key="frame" x="12.5" y="4" width="103.5" height="13"/>
+                                    <rect key="frame" x="13" y="4" width="102.5" height="13"/>
                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                    <constraints>
                                        <constraint firstAttribute="height" constant="13" id="BmO-Rd-DKp"/>
@ -230,7 +230,7 @@
                    <rect key="frame" x="0.0" y="52" width="320" height="64"/>
                    <subviews>
                        <stackView opaque="NO" contentMode="right" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="udk-ZC-Gz0">
-                            <rect key="frame" x="9" y="0.0" width="187" height="64"/>
+                            <rect key="frame" x="103" y="0.0" width="93" height="64"/>
                            <subviews>
                                <button opaque="NO" contentMode="center" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bfb-5v-iWA" customClass="MWMButton">
                                    <rect key="frame" x="0.0" y="0.0" width="57" height="64"/>
@ -243,19 +243,8 @@
                                        <action selector="ttsButtonAction" destination="-1" eventType="touchUpInside" id="2U8-vo-LOQ"/>
                                    </connections>
                                </button>
-                                <button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eaa-f0-INU" userLabel="Traffic" customClass="MWMButton">
-                                    <rect key="frame" x="65" y="0.0" width="57" height="64"/>
-                                    <state key="normal" image="ic_setting_traffic_on"/>
-                                    <state key="selected" image="ic_setting_traffic_off"/>
-                                    <userDefinedRuntimeAttributes>
-                                        <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/>
-                                    </userDefinedRuntimeAttributes>
-                                    <connections>
-                                        <action selector="trafficButtonAction" destination="-1" eventType="touchUpInside" id="ZI3-1D-OeH"/>
-                                    </connections>
-                                </button>
                                <button opaque="NO" contentMode="center" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="skM-Xx-3En" userLabel="Settings" customClass="MWMButton">
-                                    <rect key="frame" x="130" y="0.0" width="57" height="64"/>
+                                    <rect key="frame" x="65" y="0.0" width="28" height="64"/>
                                    <state key="normal" image="ic_menu_settings"/>
                                    <userDefinedRuntimeAttributes>
                                        <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/>
@ -266,9 +255,7 @@
                                </button>
                            </subviews>
                            <constraints>
-                                <constraint firstItem="eaa-f0-INU" firstAttribute="width" secondItem="Bfb-5v-iWA" secondAttribute="width" id="LRL-2t-ise"/>
                                <constraint firstItem="Bfb-5v-iWA" firstAttribute="width" secondItem="udk-ZC-Gz0" secondAttribute="height" multiplier="57:64" id="Pvi-bX-9ME"/>
-                                <constraint firstItem="eaa-f0-INU" firstAttribute="width" secondItem="skM-Xx-3En" secondAttribute="width" id="wSy-Ay-Dg5"/>
                            </constraints>
                        </stackView>
                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mtt-q0-SUx" customClass="MWMStopButton">
@ -336,7 +323,6 @@
                <outlet property="speedWithLegendLabel" destination="LY7-dx-CtV" id="tK9-Em-ztB"/>
                <outlet property="timeLabel" destination="wEc-R2-1Tv" id="cfd-vS-d1G"/>
                <outlet property="timePageControl" destination="ppd-rW-dYo" id="U1U-6U-JjR"/>
-                <outlet property="trafficButton" destination="eaa-f0-INU" id="nyl-Nf-A4Z"/>
                <outlet property="ttsButton" destination="Bfb-5v-iWA" id="GMb-ft-G6X"/>
            </connections>
            <point key="canvasLocation" x="33.600000000000001" y="53.073463268365821"/>
@ -345,8 +331,6 @@
    <resources>
        <image name="ic_menu" width="48" height="48"/>
        <image name="ic_menu_settings" width="28" height="28"/>
-        <image name="ic_setting_traffic_off" width="24" height="24"/>
-        <image name="ic_setting_traffic_on" width="24" height="24"/>
        <image name="ic_voice_off" width="28" height="28"/>
        <image name="ic_voice_on" width="28" height="28"/>
    </resources>
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib
@ -252,7 +252,7 @@
                            <rect key="frame" x="228" y="8" width="80" height="32"/>
                            <accessibility key="accessibilityConfiguration" identifier="goButton"/>
                            <constraints>
-                                <constraint firstAttribute="width" constant="80" id="5fJ-hA-Bme"/>
+                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="5fJ-hA-Bme"/>
                                <constraint firstAttribute="height" constant="32" id="b2e-N4-xY6"/>
                            </constraints>
                            <inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="8" maxY="0.0"/>
--- a/iphone/Maps/Classes/MapViewController.h
+++ b/iphone/Maps/Classes/MapViewController.h
@ -2,7 +2,6 @@
 #import "MWMViewController.h"
 #import "MWMMyPositionMode.h"

-@class MWMWelcomePageController;
@class MWMMapViewControlsManager;
@class EAGLView;
@class MWMMapDownloadDialog;
@ -42,7 +41,6 @@
 - (void)dismissPlacePage;

@property(nonatomic, readonly) MWMMapViewControlsManager * _Nonnull controlsManager;
-@property(nonatomic) MWMWelcomePageController * _Nullable welcomePageController;
@property(nonatomic, readonly) MWMMapDownloadDialog * _Nonnull downloadDialog;
@property(nonatomic, readonly) BookmarksCoordinator * _Nonnull bookmarksCoordinator;

--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@ -67,7 +67,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
@end

@interface MapViewController () <MWMFrameworkDrapeObserver,
-                                 MWMWelcomePageControllerProtocol,
                                 MWMKeyboardObserver,
                                 MWMBookmarksObserver>

@ -274,7 +273,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
  [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
  [self.alertController viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
  [self.controlsManager viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
-  [self.welcomePageController viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
 }

 - (void)didReceiveMemoryWarning {
@ -316,32 +314,46 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
  if (self.needDeferFocusNotification)
    [self onGetFocus:self.deferredFocusValue];

-  [self.mapView setLaunchByDeepLink:DeepLinkHandler.shared.isLaunchedByDeeplink];
+  BOOL const isLaunchedByDeeplink = DeepLinkHandler.shared.isLaunchedByDeeplink;
+  [self.mapView setLaunchByDeepLink:isLaunchedByDeeplink];
  [MWMRouter restoreRouteIfNeeded];

  self.view.clipsToBounds = YES;
  [MWMKeyboard addObserver:self];
-  self.welcomePageController = [MWMWelcomePageController controllerWithParent:self];
-  [self processMyPositionStateModeEvent:[MWMLocationManager isLocationProhibited] ? MWMMyPositionModeNotFollowNoPosition
-                                                                                  : MWMMyPositionModePendingPosition];
+
+  if ([FirstSession isFirstSession])
+  {
+    [MWMLocationManager start];
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [MWMFrameworkHelper processFirstLaunch:[MWMLocationManager isStarted]];
+    });
+  }
+  else
+  {
+    [self processMyPositionStateModeEvent:[MWMLocationManager isLocationProhibited] ?
+        MWMMyPositionModeNotFollowNoPosition : MWMMyPositionModePendingPosition];
+  }
+
  if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden)
    self.controlsManager.menuState = self.controlsManager.menuRestoreState;

-  [NSNotificationCenter.defaultCenter addObserver:self
-                                         selector:@selector(didBecomeActive)
-                                             name:UIApplicationDidBecomeActiveNotification
-                                           object:nil];
-  [self.welcomePageController show];
-  if (!self.welcomePageController) {
-    [DeepLinkHandler.shared handleDeeplink];
+  if (isLaunchedByDeeplink)
+    (void)[DeepLinkHandler.shared handleDeepLink];
+  else {
+    // TODO(vng): Uncomment update dialog when we're ready to handle more traffic.
+//  auto const todo = GetFramework().ToDoAfterUpdate();
+//  switch (todo) {
+//    case Framework::DoAfterUpdate::Migrate:
+//    case Framework::DoAfterUpdate::Nothing:
+//      break;
+//    case Framework::DoAfterUpdate::AutoupdateMaps:
+//    case Framework::DoAfterUpdate::AskForUpdateMaps:
+//      [self presentViewController:[MWMAutoupdateController instanceWithPurpose:todo] animated:YES completion:nil];
+//      break;
+//  }
  }
 }

- (void)didBecomeActive {
-  if (!self.welcomePageController)
-    [self.controlsManager showAdditionalViewsIfNeeded];
-}
-
 - (void)viewDidLayoutSubviews {
  [super viewDidLayoutSubviews];
  if (!self.mapView.drapeEngineCreated)
@ -353,23 +365,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
  [MapsAppDelegate customizeAppearance];
 }

- (void)closePageController:(MWMWelcomePageController *)pageController {
-  if ([pageController isEqual:self.welcomePageController])
-    self.welcomePageController = nil;
-
-  auto const todo = GetFramework().ToDoAfterUpdate();
-
-  switch (todo) {
-    case Framework::DoAfterUpdate::Migrate:
-    case Framework::DoAfterUpdate::Nothing:
-      break;
-    case Framework::DoAfterUpdate::AutoupdateMaps:
-    case Framework::DoAfterUpdate::AskForUpdateMaps:
-      [self presentViewController:[MWMAutoupdateController instanceWithPurpose:todo] animated:YES completion:nil];
-      break;
-  }
-}
-
 - (void)showViralAlertIfNeeded {
  NSUserDefaults *ud = NSUserDefaults.standardUserDefaults;

@ -502,9 +497,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
    case MWMMyPositionModeNotFollowNoPosition:
      break;
    case MWMMyPositionModePendingPosition:
-      if (self.welcomePageController && [FirstSession isFirstSession]) {
-        break;
-      }
      [MWMLocationManager start];
      if (![MWMLocationManager isStarted])
        [self processMyPositionStateModeEvent:MWMMyPositionModeNotFollowNoPosition];
@ -526,13 +518,9 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
  }
  BOOL const isMapVisible = (self.navigationController.visibleViewController == self);
  if (isMapVisible && ![MWMLocationManager isLocationProhibited]) {
-    if (self.welcomePageController) {
+    [self.alertController presentLocationNotFoundAlertWithOkBlock:^{
      GetFramework().SwitchMyPositionNextMode();
-    } else {
-      [self.alertController presentLocationNotFoundAlertWithOkBlock:^{
-        GetFramework().SwitchMyPositionNextMode();
-      }];
-    }
+    }];
  }
 }

--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@ -61,13 +61,6 @@ void InitLocalizedStrings() {
  f.AddString("postal_code", L(@"postal_code").UTF8String);
  f.AddString("wifi", L(@"wifi").UTF8String);
 }
-
-void OverrideUserAgent() {
-  [NSUserDefaults.standardUserDefaults registerDefaults:@{
-    @"UserAgent": @"Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/603.1.30 "
-                  @"(KHTML, like Gecko) Version/10.0 Mobile/14E269 Safari/602.1"
-  }];
-}
 }  // namespace

 using namespace osm_auth_ios;
@ -125,8 +118,7 @@ using namespace osm_auth_ios;
 }

 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-  NSLog(@"deeplinking: launchOptions %@", launchOptions);
-  OverrideUserAgent();
+  NSLog(@"application:didFinishLaunchingWithOptions: %@", launchOptions);

  [HttpThreadImpl setDownloadIndicatorProtocol:self];

@ -257,6 +249,7 @@ using namespace osm_auth_ios;
    }
  } else if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb] &&
             userActivity.webpageURL != nil) {
+    LOG(LINFO, ("application:continueUserActivity:restorationHandler: %@", userActivity.webpageURL));
    return [DeepLinkHandler.shared applicationDidReceiveUniversalLink:userActivity.webpageURL];
  }

@ -303,7 +296,7 @@ using namespace osm_auth_ios;
 - (BOOL)application:(UIApplication *)app
            openURL:(NSURL *)url
            options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options {
-
+  NSLog(@"application:openURL: %@ options: %@", url, options);
  return [DeepLinkHandler.shared applicationDidOpenUrl:url];
 }

@ -313,8 +306,12 @@ using namespace osm_auth_ios;

 - (void)updateApplicationIconBadgeNumber {
  auto const number = [self badgeNumber];
-  UIApplication.sharedApplication.applicationIconBadgeNumber = number;
-  BottomTabBarViewController.controller.isApplicationBadgeHidden = number == 0;
+
+  // Delay init because BottomTabBarViewController.controller is null here.
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [UIApplication.sharedApplication setApplicationIconBadgeNumber:number];
+    BottomTabBarViewController.controller.isApplicationBadgeHidden = (number == 0);
+  });
 }

 - (NSUInteger)badgeNumber {
@ -422,6 +419,8 @@ using namespace osm_auth_ios;
 }

 - (BOOL)shouldShowRateAlert {
+  /// @todo Uncomment in follow-up release.
+  /*
  NSUInteger const kMaximumSessionCountForShowingAlert = 21;
  NSUserDefaults const *const standartDefaults = NSUserDefaults.standardUserDefaults;
  if ([standartDefaults boolForKey:kUDAlreadyRatedKey])
@ -446,6 +445,7 @@ using namespace osm_auth_ios;
    if (daysFromLastRateRequest >= 90 || daysFromLastRateRequest == 0)
      return YES;
  }
+  */
  return NO;
 }

--- a/iphone/Maps/Classes/Share/MWMEditorViralActivityItem.mm
+++ b/iphone/Maps/Classes/Share/MWMEditorViralActivityItem.mm
@ -18,16 +18,16 @@
      [activityType isEqualToString:@"com.facebook.Facebook.ShareExtension"] ||
      [activityType.lowercaseString rangeOfString:@"facebook"].length)
  {
-    NSString * url = [NSString stringWithFormat:@"http://omaps.app/fb-editor-v1?lang=%@",
+    NSString * url = [NSString stringWithFormat:@"https://omaps.app/fb-editor-v1?lang=%@",
                      @(languages::GetCurrentNorm().c_str())];
    return [NSURL URLWithString:url];
  }

-  NSString * mapsmeURL = @"http://omaps.app/im_get";
+  NSString * omapsURL = @"https://omaps.app/get";
  if ([activityType isEqualToString:UIActivityTypePostToTwitter] || [activityType isEqualToString:UIActivityTypeMail])
-    return [NSString stringWithFormat:@"%@ %@", L(@"whatsnew_editor_message_1"), mapsmeURL];
+    return [NSString stringWithFormat:@"%@ %@", L(@"whatsnew_editor_message_1"), omapsURL];

-  return [NSString stringWithFormat:@"%@.\n%@\n%@", L(@"editor_sharing_title"), L(@"whatsnew_editor_message_1"), mapsmeURL];
+  return [NSString stringWithFormat:@"%@.\n%@\n%@", L(@"editor_sharing_title"), L(@"whatsnew_editor_message_1"), omapsURL];
 }

 - (NSString *)activityViewController:(UIActivityViewController *)activityViewController
--- a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
+++ b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
@ -8,8 +8,8 @@

 NSString * httpGe0Url(NSString * shortUrl)
 {
-  // Replace 'om://' with 'http://omaps.app/'
-  return [shortUrl stringByReplacingCharactersInRange:NSMakeRange(0, 5) withString:@"http://omaps.app/"];
+  // Replace 'om://' with 'https://omaps.app/'
+  return [shortUrl stringByReplacingCharactersInRange:NSMakeRange(0, 5) withString:@"https://omaps.app/"];
 }

@interface MWMShareActivityItem ()
--- a/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift
+++ b/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift
@ -1,24 +1,8 @@
-@objc enum DeepLinkProvider: Int {
-  case native
-}
-
-class DeepLinkURL {
-  let url: URL
-  let provider: DeepLinkProvider
-
-  init(url: URL, provider: DeepLinkProvider = .native) {
-    self.url = url
-    self.provider = provider
-  }
-}
-
@objc @objcMembers class DeepLinkHandler: NSObject {
  static let shared = DeepLinkHandler()

  private(set) var isLaunchedByDeeplink = false
-  private(set) var deeplinkURL: DeepLinkURL?
-
-  private var canHandleLink = false
+  private(set) var url: URL?

  private override init() {
    super.init()
@ -33,82 +17,103 @@ class DeepLinkURL {

    if let launchDeeplink = options?[UIApplication.LaunchOptionsKey.url] as? URL {
      isLaunchedByDeeplink = true
-      deeplinkURL = DeepLinkURL(url: launchDeeplink)
+      url = launchDeeplink
    }
  }

  func applicationDidOpenUrl(_ url: URL) -> Bool {
-    deeplinkURL = DeepLinkURL(url: url)
-    if canHandleLink {
-      handleInternal()
-    }
-    return true
+    self.url = url
+    return handleDeepLink(url: url)
  }

-  private func setUniversalLink(_ url: URL, provider: DeepLinkProvider) -> Bool {
-    let dlUrl = convertUniversalLink(url)
-    guard deeplinkURL == nil else { return false }
-    deeplinkURL = DeepLinkURL(url: dlUrl)
-    return true
-  }
-
-  func applicationDidReceiveUniversalLink(_ url: URL) -> Bool {
-    return applicationDidReceiveUniversalLink(url, provider: .native)
-  }
-
-  func applicationDidReceiveUniversalLink(_ url: URL, provider: DeepLinkProvider) -> Bool {
-    var result = false
-    if let host = url.host, host == "mapsme.onelink.me" {
-      URLComponents(url: url, resolvingAgainstBaseURL: false)?.queryItems?.forEach {
-        if $0.name == "af_dp" {
-          guard let value = $0.value, let dl = URL(string: value) else { return }
-          result = setUniversalLink(dl, provider: provider)
-        }
-      }
-    } else {
-      result = setUniversalLink(url, provider: provider)
-    }
-    if canHandleLink {
-      handleInternal()
-    }
-    return result
-  }
-
-  func handleDeeplink() {
-    canHandleLink = true
-    if deeplinkURL != nil {
-      handleInternal()
-    }
-  }
-
-  func handleDeeplink(_ url: URL) {
-    deeplinkURL = DeepLinkURL(url: url)
-    handleDeeplink()
+  func applicationDidReceiveUniversalLink(_ universalLink: URL) -> Bool {
+    // Convert http(s)://omaps.app/ENCODEDCOORDS/NAME to om://ENCODEDCOORDS/NAME
+    self.url = URL(string: universalLink.absoluteString
+                    .replacingOccurrences(of: "http://omaps.app", with: "om:/")
+                    .replacingOccurrences(of: "https://omaps.app", with: "om:/"))
+    return handleDeepLink(url: self.url!)
  }

  func reset() {
    isLaunchedByDeeplink = false
-    deeplinkURL = nil
+    url = nil
  }

  func getBackUrl() -> String {
-    guard let urlString = deeplinkURL?.url.absoluteString else { return "" }
+    guard let urlString = url?.absoluteString else { return "" }
    guard let url = URLComponents(string: urlString) else { return "" }
    return (url.queryItems?.first(where: { $0.name == "backurl" })?.value ?? "")
  }

-  private func convertUniversalLink(_ universalLink: URL) -> URL {
-    let convertedLink = String(format: "mapsme:/%@?%@", universalLink.path, universalLink.query ?? "")
-    return URL(string: convertedLink)!
+  func handleDeepLink() -> Bool {
+    if let url = self.url {
+      return handleDeepLink(url: url)
+    }
+    LOG(.error, "handleDeepLink is called with nil URL")
+    return false
  }

-  private func handleInternal() {
-    guard let url = deeplinkURL else {
-      assertionFailure()
-      return
+  private func handleDeepLink(url: URL) -> Bool {
+    LOG(.info, "handleDeepLink: \(url)")
+
+    switch url.scheme {
+      // Process url scheme.
+      case "geo", "ge0", "om":
+        if (DeepLinkParser.showMap(for: url)) {
+          MapsAppDelegate.theApp().showMap()
+          return true
+        }
+      // Import bookmarks.
+      case "file":
+        DeepLinkParser.addBookmarksFile(url)
+        return true  // We don't really know if async parsing was successful.
+      // API scheme.
+      case "mapswithme", "mapsme", "mwm":
+        let dlData = DeepLinkParser.parseAndSetApiURL(url)
+        guard dlData.success else { return false }
+
+        switch dlData.urlType {
+
+          case .route:
+            if let adapter = DeepLinkRouteStrategyAdapter(url) {
+              MWMRouter.buildApiRoute(with: adapter.type, start: adapter.p1, finish: adapter.p2)
+              MapsAppDelegate.theApp().showMap()
+              return true
+            }
+
+          case .map:
+            if (DeepLinkParser.showMap(for: url)) {
+              MapsAppDelegate.theApp().showMap()
+              return true
+            }
+
+          case .search:
+            if let sd = dlData as? DeepLinkSearchData {
+              let kSearchInViewportZoom: Int32 = 16;
+              // Set viewport only when cll parameter was provided in url.
+              // Equator and Prime Meridian are perfectly valid separately.
+              if (sd.centerLat != 0.0 || sd.centerLon != 0.0) {
+                MapViewController.setViewport(sd.centerLat, lon: sd.centerLon, zoomLevel: kSearchInViewportZoom)
+                // Need to update viewport for search API manually because Drape engine
+                // will not notify subscribers when search view is shown.
+                if (!sd.isSearchOnMap) {
+                  sd.onViewportChanged(kSearchInViewportZoom)
+                }
+              }
+              if (sd.isSearchOnMap) {
+                MWMMapViewControlsManager.manager()?.searchText(onMap: sd.query, forInputLocale: sd.locale)
+              } else {
+                MWMMapViewControlsManager.manager()?.searchText(sd.query, forInputLocale: sd.locale)
+              }
+              return true
+            }
+
+          // Invalid API parameters.
+          default: break
+        }
+      // Not supported url schemes.
+      default: break
    }
-    LOG(.info, "Handle deeplink: \(url.url)")
-    let deeplinkHandlerStrategy = DeepLinkStrategyFactory.create(url: url)
-    deeplinkHandlerStrategy.execute()
+    return false
  }
 }
--- a/iphone/Maps/Core/DeepLink/DeepLinkStrategyFactory.swift
+++ b/iphone/Maps/Core/DeepLink/DeepLinkStrategyFactory.swift
@ -1,34 +0,0 @@
-class DeepLinkStrategyFactory {
-  static func create(url deeplinkURL: DeepLinkURL) -> IDeepLinkHandlerStrategy {
-    switch deeplinkURL.url.scheme {
-    case "geo", "ge0", "om":
-      return DeepLinkGeoStrategy(url: deeplinkURL)
-    case "file":
-      return DeepLinkFileStrategy(url: deeplinkURL)
-    case "mapswithme", "mapsme", "mwm":
-      return DeepLinkStrategyFactory.createCommon(url: deeplinkURL)
-    default:
-      return DeepLinkIncorrectStrategy(url: deeplinkURL)
-    }
-  }
-
-  private static func createCommon(url deeplinkURL: DeepLinkURL) -> IDeepLinkHandlerStrategy {
-    let data = DeepLinkParser.parseAndSetApiURL(deeplinkURL.url)
-    guard data.success else {
-      return DeepLinkIncorrectStrategy(url: deeplinkURL, data: data)
-    }
-    switch data.urlType {
-    case .incorrect:
-      return DeepLinkIncorrectStrategy(url: deeplinkURL, data: data)
-    case .route:
-      return DeepLinkRouteStrategy(url: deeplinkURL)
-    case .map:
-      return DeepLinkMapStrategy(url: deeplinkURL)
-    case .search:
-      guard let searchData = data as? DeepLinkSearchData else {
-        return DeepLinkIncorrectStrategy(url: deeplinkURL)
-      }
-      return DeepLinkSearchStrategy(url: deeplinkURL, data: searchData)
-    }
-  }
-}
--- a/iphone/Maps/Core/DeepLink/Strategies/DeepLinkFileStrategy.swift
+++ b/iphone/Maps/Core/DeepLink/Strategies/DeepLinkFileStrategy.swift
@ -1,13 +0,0 @@
-import Foundation
-
-class DeepLinkFileStrategy: IDeepLinkHandlerStrategy {
-  var deeplinkURL: DeepLinkURL
-
-  init(url: DeepLinkURL) {
-    self.deeplinkURL = url
-  }
-
-  func execute() {
-    DeepLinkParser.addBookmarksFile(deeplinkURL.url)
-  }
-}
--- a/iphone/Maps/Core/DeepLink/Strategies/DeepLinkGeoStrategy.swift
+++ b/iphone/Maps/Core/DeepLink/Strategies/DeepLinkGeoStrategy.swift
@ -1,13 +0,0 @@
-class DeepLinkGeoStrategy: IDeepLinkHandlerStrategy {
-  var deeplinkURL: DeepLinkURL
-
-  required init(url: DeepLinkURL) {
-    self.deeplinkURL = url
-  }
-
-  func execute() {
-    if (DeepLinkParser.showMap(for: deeplinkURL.url)) {
-      MapsAppDelegate.theApp().showMap()
-    }
-  }
-}
--- a/iphone/Maps/Core/DeepLink/Strategies/DeepLinkHandlerStrategy.swift
+++ b/iphone/Maps/Core/DeepLink/Strategies/DeepLinkHandlerStrategy.swift
@ -1,5 +0,0 @@
-protocol IDeepLinkHandlerStrategy {
-  var deeplinkURL: DeepLinkURL { get }
-
-  func execute()
-}
--- a/iphone/Maps/Core/DeepLink/Strategies/DeepLinkIncorrectStrategy.swift
+++ b/iphone/Maps/Core/DeepLink/Strategies/DeepLinkIncorrectStrategy.swift
@ -1,13 +0,0 @@
-class DeepLinkIncorrectStrategy: IDeepLinkHandlerStrategy {
-  var deeplinkURL: DeepLinkURL
-  var data: IDeepLinkData?
-
-  init(url: DeepLinkURL, data: IDeepLinkData? = nil) {
-    deeplinkURL = url
-    self.data = data
-  }
-
-  func execute() {
-    LOG(.warning, "Incorrect parsing result for url: \(deeplinkURL.url)")
-  }
-}
--- a/iphone/Maps/Core/DeepLink/Strategies/DeepLinkLeadStrategy.swift
+++ b/iphone/Maps/Core/DeepLink/Strategies/DeepLinkLeadStrategy.swift
@ -1,10 +0,0 @@
-class DeepLinkLeadStrategy: IDeepLinkHandlerStrategy {
-  var deeplinkURL: DeepLinkURL
-
-  init(url: DeepLinkURL) {
-    self.deeplinkURL = url
-  }
-
-  func execute() {
-  }
-}
--- a/iphone/Maps/Core/DeepLink/Strategies/DeepLinkMapStrategy.swift
+++ b/iphone/Maps/Core/DeepLink/Strategies/DeepLinkMapStrategy.swift
@ -1,13 +0,0 @@
-class DeepLinkMapStrategy: IDeepLinkHandlerStrategy {
-  var deeplinkURL: DeepLinkURL
-
-  init(url: DeepLinkURL) {
-    self.deeplinkURL = url
-  }
-
-  func execute() {
-    if (DeepLinkParser.showMap(for: deeplinkURL.url)) {
-      MapsAppDelegate.theApp().showMap()
-    }
-  }
-}
--- a/iphone/Maps/Core/DeepLink/Strategies/DeepLinkRouteStrategy.swift
+++ b/iphone/Maps/Core/DeepLink/Strategies/DeepLinkRouteStrategy.swift
@ -1,14 +0,0 @@
-class DeepLinkRouteStrategy: IDeepLinkHandlerStrategy {
-  var deeplinkURL: DeepLinkURL
-
-  init(url: DeepLinkURL) {
-    self.deeplinkURL = url
-  }
-
-  func execute() {
-    if let adapter = DeepLinkRouteStrategyAdapter(deeplinkURL.url) {
-      MWMRouter.buildApiRoute(with: adapter.type, start: adapter.p1, finish: adapter.p2)
-      MapsAppDelegate.theApp().showMap()
-    }
-  }
-}
--- a/iphone/Maps/Core/DeepLink/Strategies/DeepLinkSearchStrategy.swift
+++ b/iphone/Maps/Core/DeepLink/Strategies/DeepLinkSearchStrategy.swift
@ -1,30 +0,0 @@
-class DeepLinkSearchStrategy: IDeepLinkHandlerStrategy{
-  var deeplinkURL: DeepLinkURL
-  private var data: DeepLinkSearchData
-
-  init(url: DeepLinkURL, data: DeepLinkSearchData) {
-    self.deeplinkURL = url
-    self.data = data
-  }
-
-  func execute() {
-    let kSearchInViewportZoom: Int32 = 16;
-
-    // Set viewport only when cll parameter was provided in url.
-    if (data.centerLat != 0.0 && data.centerLon != 0.0) {
-      MapViewController.setViewport(data.centerLat, lon: data.centerLon, zoomLevel: kSearchInViewportZoom)
-
-      // We need to update viewport for search api manually because of drape engine
-      // will not notify subscribers when search view is shown.
-      if (!data.isSearchOnMap) {
-        data.onViewportChanged(kSearchInViewportZoom)
-      }
-    }
-
-    if (data.isSearchOnMap) {
-      MWMMapViewControlsManager.manager()?.searchText(onMap: data.query, forInputLocale: data.locale)
-    } else {
-      MWMMapViewControlsManager.manager()?.searchText(data.query, forInputLocale: data.locale)
-    }
-  }
-}
--- a/iphone/Maps/Core/Location/MWMLocationManager.mm
+++ b/iphone/Maps/Core/Location/MWMLocationManager.mm
@ -78,14 +78,12 @@ std::map<GeoMode, GeoModeSettings> const kGeoSettings{

 BOOL keepRunningInBackground()
 {
-  bool const needGPSForTrackRecorder = GpsTracker::Instance().IsEnabled();
-  if (needGPSForTrackRecorder)
+  if (GpsTracker::Instance().IsEnabled())
    return YES;

  auto const isOnRoute = [MWMRouter isOnRoute];
  auto const isRouteFinished = [MWMRouter isRouteFinished];
-  auto const needGPSForRouting = (isOnRoute && !isRouteFinished);
-  if (needGPSForRouting)
+  if (isOnRoute && !isRouteFinished)
    return YES;

  return NO;
@ -105,15 +103,16 @@ void setPermissionRequested() {
 }
       
 BOOL needShowLocationAlert() {
- if ([NSUserDefaults.standardUserDefaults objectForKey:kLocationAlertNeedShowKey] == nil)
-   return YES;
- return [NSUserDefaults.standardUserDefaults boolForKey:kLocationAlertNeedShowKey];
+  NSUserDefaults * ud = NSUserDefaults.standardUserDefaults;
+  if ([ud objectForKey:kLocationAlertNeedShowKey] == nil)
+    return YES;
+  return [ud boolForKey:kLocationAlertNeedShowKey];
 }

 void setShowLocationAlert(BOOL needShow) {
- NSUserDefaults * ud = NSUserDefaults.standardUserDefaults;
- [ud setBool:needShow forKey:kLocationAlertNeedShowKey];
- [ud synchronize];
+  NSUserDefaults * ud = NSUserDefaults.standardUserDefaults;
+  [ud setBool:needShow forKey:kLocationAlertNeedShowKey];
+  [ud synchronize];
 }
 }  // namespace

@ -291,7 +290,8 @@ void setShowLocationAlert(BOOL needShow) {
  _lastLocationStatus = lastLocationStatus;
  switch (lastLocationStatus)
  {
-  case MWMLocationStatusNoError: break;
+  case MWMLocationStatusNoError:
+    break;
  case MWMLocationStatusNotSupported:
    [[MWMAlertViewController activeAlertController] presentLocationServiceNotSupportedAlert];
    break;
@ -369,19 +369,25 @@ void setShowLocationAlert(BOOL needShow) {
  if (_geoMode == geoMode)
    return;
  _geoMode = geoMode;
+
  CLLocationManager * locationManager = self.locationManager;
  switch (geoMode)
  {
  case GeoMode::Pending:
  case GeoMode::InPosition:
  case GeoMode::NotInPosition:
-  case GeoMode::FollowAndRotate: locationManager.activityType = CLActivityTypeOther; break;
+  case GeoMode::FollowAndRotate:
+    locationManager.activityType = CLActivityTypeOther;
+    break;
  case GeoMode::VehicleRouting:
    locationManager.activityType = CLActivityTypeAutomotiveNavigation;
    break;
  case GeoMode::PedestrianRouting:
-  case GeoMode::BicycleRouting: locationManager.activityType = CLActivityTypeFitness; break;
+  case GeoMode::BicycleRouting:
+    locationManager.activityType = CLActivityTypeFitness;
+    break;
  }
+
  [self refreshGeoModeSettings];
 }

@ -472,23 +478,32 @@ void setShowLocationAlert(BOOL needShow) {
 {
  MWMVoidBlock doStart = ^{
    LOG(LINFO, ("startUpdatingLocation"));
+
    CLLocationManager * locationManager = self.locationManager;
-    if ([locationManager respondsToSelector:@selector(requestAlwaysAuthorization)])
-      [locationManager requestAlwaysAuthorization];
+    if ([locationManager respondsToSelector:@selector(requestWhenInUseAuthorization)])
+      [locationManager requestWhenInUseAuthorization];
+
    [locationManager startUpdatingLocation];
+
    setPermissionRequested();
+
    if ([CLLocationManager headingAvailable])
      [locationManager startUpdatingHeading];
  };
+
  if ([CLLocationManager locationServicesEnabled])
  {
    switch ([CLLocationManager authorizationStatus])
    {
    case kCLAuthorizationStatusAuthorizedWhenInUse:
    case kCLAuthorizationStatusAuthorizedAlways:
-    case kCLAuthorizationStatusNotDetermined: doStart(); return YES;
+    case kCLAuthorizationStatusNotDetermined:
+        doStart();
+        return YES;
    case kCLAuthorizationStatusRestricted:
-    case kCLAuthorizationStatusDenied: [self processLocationStatus:MWMLocationStatusDenied]; break;
+    case kCLAuthorizationStatusDenied:
+        [self processLocationStatus:MWMLocationStatusDenied];
+        break;
    }
  }
  else
--- a/iphone/Maps/Images.xcassets/AppIcon.appiconset/100.png
+++ b/iphone/Maps/Images.xcassets/AppIcon.appiconset/100.png
--- a/iphone/Maps/Images.xcassets/AppIcon.appiconset/1024.png
+++ b/iphone/Maps/Images.xcassets/AppIcon.appiconset/1024.png
--- a/iphone/Maps/Images.xcassets/AppIcon.appiconset/114.png
+++ b/iphone/Maps/Images.xcassets/AppIcon.appiconset/114.png
--- a/iphone/Maps/Images.xcassets/AppIcon.appiconset/120.png
+++ b/iphone/Maps/Images.xcassets/AppIcon.appiconset/120.png
--- a/iphone/Maps/Images.xcassets/AppIcon.appiconset/144.png
+++ b/iphone/Maps/Images.xcassets/AppIcon.appiconset/144.png
--- a/Show more
+++ b/Show more