Merge remote-tracking branch 'origin/yannikbloscheck-greenery' into test/2025.07.10

# Conflicts: # data/drules_proto.bin # data/drules_proto_default_dark.bin # data/drules_proto_default_light.bin # data/drules_proto_outdoors_dark.bin # data/drules_proto_outdoors_light.bin Signed-off-by: Harry Bond <me@hbond.xyz>
[Android] Add current opening hours status to placepage preview
2026-01-10 14:24:21 +00:00 · 2025-07-10 21:47:23 +01:00 · 2025-07-10 19:41:51 +01:00 · 2025-07-10 19:41:50 +01:00 · 2025-07-05 10:18:15 +02:00 · 2025-07-05 10:17:11 +02:00
867 changed files with 9252 additions and 17450 deletions
--- a/README.md
+++ b/README.md
@@ -8,9 +8,6 @@
  <a href="https://codeberg.org/comaps#keep-connected">Keep Connected</a>
 </p>

-<div align="center" >
-<img src="docs/badges/logo.svg" width="150">
-</div>


 <div align="center">
@@ -149,12 +146,6 @@ The project's financial information is completely open and transparent at [our O

 The Android app has been reviewed by [Exodus Privacy](https://reports.exodus-privacy.eu.org/fr/reports/app.comaps.google/latest/).

-To [verify](https://developer.android.com/studio/command-line/apksigner#usage-verify) the APK, use the following signing certificate fingerprints:
-```
-SHA-256: 4894e8e6963627ef660031d8593fe77297f835acb4e23810003e926135023b4c
-SHA-1: 8b7b5739f917e9f7c681671ced0c9c8562123ade
-MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
-```
 ---

 ## ⚖️ License
--- a/android/.idea/icon.svg
+++ b/android/.idea/icon.svg
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64pt" height="64pt" viewBox="0 0 835 835">
-<path d="M698.5 141.1a20 20 0 0 1 30.8-1.3A416 416 0 0 1 835 417.4a416 416 0 0 1-93.3 263 20 20 0 0 1-31.3-.6l-43-56.6a20 20 0 0 1-.2-24 307 307 0 0 0 59.3-181.8c0-74.2-26.2-142.3-69.9-195.6a20 20 0 0 1-.5-24.8zM260.7 456.4a20 20 0 0 1-7.7-36.7l282-177.4a20 20 0 0 1 29.9 22.7l-97 318.9a20 20 0 0 1-37.5 2.2l-49.2-111.5z" style="fill:#ccdfca"/>
-<path d="M626.3 753a20 20 0 0 1-6.2 29.6A416 416 0 0 1 417.5 835 417.7 417.7 0 0 1 0 417.4 417.7 417.7 0 0 1 603.3 43.5a20 20 0 0 1 7 30l-42.4 55.8a20 20 0 0 1-24.2 6.1 307 307 0 0 0-126.2-27 309 309 0 0 0-309 309c0 170.6 138.5 309 309 309a307 307 0 0 0 141.6-34.3 20 20 0 0 1 25.1 5.6z" style="fill:#fefdf6"/>
-</svg>
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -65,13 +65,6 @@ project.ext.appName = 'CoMaps'
 android {
  namespace 'app.organicmaps'

-  dependenciesInfo {
-    // Disables dependency metadata when building APKs (for IzzyOnDroid/F-Droid)
-    includeInApk = false
-    // Disables dependency metadata when building Android App Bundles (for Google Play)
-    includeInBundle = false
-  }
-
  buildFeatures {
    dataBinding = true
    buildConfig = true
--- a/android/app/ic_launcher-playstore.png
+++ b/android/app/ic_launcher-playstore.png
--- a/android/app/src/fdroid/play/listings/cs-CZ/full-description.txt
+++ b/android/app/src/fdroid/play/listings/cs-CZ/full-description.txt
@@ -6,12 +6,12 @@ Můžete se zde také připojit ke komunitě pomáhat s vytvářením nejlepší
 • Poskytujte zpětnou vazbu a nahlašujte problémy
 • Aktualizujte mapová data v aplikaci nebo na webu OpenStreetMap

-‣ <b>Zaměřené na offline použití</b>: Plánujte a navigujte své cesty do zahraničí bez nutnosti mobilních dat, hledejte body na vzdálených túrách apod. Všechny funkce aplikace jsou navrženy tak, aby fungovaly offline.
-‣ <b>S ohledem na soukromí</b>: Aplikace je navržená s důrazem na soukromí – neidentifikuje lidi, nesleduje vás a nesbírá osobní údaje. Bez reklam.
-‣ <b>Jednoduché a vyladěné</b>: Základní, snadno použitelné funkce, které prostě fungují.
-‣ <b>Šetří vaši baterii a místo</b>: Nevybíjí vaší baterii, jako ostatní navigační aplikace. Kompaktní mapy šetří cenné místo ve vašem telefonu.
-‣ <b>Bezplatné a vytvořené komunitou</b>: S vytvářením aplikace pomáhají lidé, jako jste vy, přidáváním míst do projektu OpenStreetMap, testováním a poskytováním zpětné vazby k funkcím a přispíváním svými vývojářskými schopnostmi a penězi.
-‣ <b>Otevřené a transparentní rozhodování a nakládání s financemi, neziskovost a plně otevřený zdrojový kód.</b>
+• <b>Zaměřené na offline použití</b>: Plánujte a navigujte své cesty do zahraničí bez nutnosti mobilních dat, hledejte body na vzdálených túrách apod. Všechny funkce aplikace jsou navrženy tak, aby fungovaly offline.
+• <b>S ohledem na soukromí</b>: Aplikace je navržená s důrazem na soukromí – neidentifikuje lidi, nesleduje vás a nesbírá osobní údaje. Bez reklam.
+• <b>Jednoduché a vyladěné</b>: Základní, snadno použitelné funkce, které prostě fungují.
+• <b>Šetří vaši baterii a místo</b>: Nevybíjí vaší baterii, jako ostatní navigační aplikace. Kompaktní mapy šetří cenné místo ve vašem telefonu.
+• <b>Bezplatné a vytvořené komunitou</b>: S vytvářením aplikace pomáhají lidé, jako jste vy, přidáváním míst do projektu OpenStreetMap, testováním a poskytováním zpětné vazby k funkcím a přispíváním svými vývojářskými schopnostmi a penězi.
+• <b>Otevřené a transparentní rozhodování a nakládání s financemi, neziskovost a plně otevřený zdrojový kód.</b>

 <b>Hlavní funkce</b>:
 • Stahovatelné podrobné mapy s místy, která nenajdete ani v Mapách Google
--- a/android/app/src/fdroid/play/listings/da-DK/short-description.txt
+++ b/android/app/src/fdroid/play/listings/da-DK/short-description.txt
@@ -1 +0,0 @@
-Nem kortnavigation - Oplev mere af din rejse - Drevet af fællesskabet
--- a/android/app/src/fdroid/play/listings/da-DK/title.txt
+++ b/android/app/src/fdroid/play/listings/da-DK/title.txt
@@ -1 +0,0 @@
-CoMaps - vandr, cykl og kør offline med privatliv
--- a/android/app/src/fdroid/play/listings/de-DE/full-description.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/full-description.txt
@@ -1,4 +1,4 @@
-Eine von der Community betriebene, kostenlose Open-Source Karten-App, die auf OpenStreetMap Daten basiert. Transparent und nicht gewinnorientiert. CoMaps ist ein Fork/Abspaltung von Organic Maps, die wiederum ein Fork/Abspaltung von Maps.Me ist.
+Eine von der Community betriebene, kostenlose Open-Source Karten-App, die auf OpenStreetMap Daten basiert. Transparent, datensparsam und nicht gewinnorientiert. CoMaps ist ein Fork/Abspaltung von Organic Maps, die wiederum ein Fork/Abspaltung von Maps.Me ist.

 Lese mehr über die Gründe und Ziele des Projektes unter <b><i>codeberg.org/comaps</i></b>.
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
@@ -28,5 +28,5 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Dunkler Modus für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor

-<b>Entdecke die Unabhängigkeit</b>
+<b>Freiheit beginnt hier</b>
 Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
--- a/android/app/src/fdroid/play/listings/en-US/graphics/feature-graphic/feature-graphic.jpg
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/feature-graphic/feature-graphic.jpg
--- a/android/app/src/fdroid/play/listings/en-US/graphics/icon/1.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/icon/1.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/icon/logo.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/icon/logo.png
--- a/android/app/src/fdroid/play/listings/fr-FR/short-description.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/short-description.txt
@@ -1 +1 @@
-Navigation cartographique facile - Propulsé par la communauté
+Navigation facile - Découvrez plus lors de votre voyage - Fait par la communauté
--- a/android/app/src/fdroid/play/listings/hu-HU/title.txt
+++ b/android/app/src/fdroid/play/listings/hu-HU/title.txt
@@ -1 +0,0 @@
-CoMaps - Túra, Bicikli, Vezetés offline diszkréten
--- a/android/app/src/fdroid/play/listings/pt-BR/full-description.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/full-description.txt
@@ -8,6 +8,7 @@ Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.

 ‣ <b>Foco offline</b>: Planeje e navegue em sua viagem ao exterior sem a necessidade de sinal de celular, pesquise pontos de referência durante uma caminhada distante, etc. Todas as funções do aplicativo foram projetadas para funcionar offline.
 ‣ <b>Respeito à privacidade</b>: O aplicativo foi projetado com a privacidade em mente - não identifica pessoas, não rastreia e não coleta informações pessoais. Livre de anúncios.
+
 ‣ <b>Simples e sofisticado</b>: recursos essenciais e fáceis de usar que simplesmente funcionam.
 ‣ <b>Economiza bateria e espaço</b>: Não esgota a bateria como outros aplicativos de navegação. Mapas compactos economizam espaço precioso no seu celular.
 ‣ <b>Gratuito e desenvolvido pela comunidade</b>: Pessoas como você ajudaram a desenvolver o aplicativo adicionando lugares ao OpenStreetMap, testando e dando feedback sobre os recursos e contribuindo com suas habilidades de desenvolvimento e dinheiro.
--- a/android/app/src/fdroid/play/listings/ro/title.txt
+++ b/android/app/src/fdroid/play/listings/ro/title.txt
@@ -1 +0,0 @@
-CoMaps - Drumeții, Ciclism, Condus Offline în confidențialitate
--- a/android/app/src/fdroid/play/listings/vi/short-description.txt
+++ b/android/app/src/fdroid/play/listings/vi/short-description.txt
@@ -1 +0,0 @@
-Định vị bản đồ dễ dàng - Khám phá thế giới quanh bạn - Đồng hành cùng cộng đồng
--- a/android/app/src/google/play/listings/da-DK/short-description.txt
+++ b/android/app/src/google/play/listings/da-DK/short-description.txt
@@ -1 +0,0 @@
-Nem kortnavigation - Oplev mere af din rejse - Drevet af fællesskabet
--- a/android/app/src/google/play/listings/de-DE/full-description.txt
+++ b/android/app/src/google/play/listings/de-DE/full-description.txt
@@ -1,4 +1,4 @@
-Eine von der Community betriebene, kostenlose Open-Source Karten App, die auf OpenStreetMap-Daten basiert. Ein Gemeinschaftsprojekt mit Fokus auf Transparenz und non-profit.
+Eine von der Community betriebene, kostenlose Open-Source Karten App, die auf OpenStreetMap-Daten basiert. Transparent, datensparsam und nicht gewinnorientiert.

 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Nutze die App und erzähle anderen davon
@@ -8,8 +8,8 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 <i>Dein Feedback und deine 5-Sterne-Bewertung sind die beste Unterstützung für uns!</i>

 ‣ <b>Einfach und ausgereift</b>: Essenzielle, leicht zu bedienende Funktionen, die einfach funktionieren.
-‣ <b>Offlinekarten</b>: Plane und navigiere im Ausland ohne Mobilfunkverbindung, finde Wegpunkte auf abgelegenen Wanderungen usw. Alle Funktionen sind für den Offline-Einsatz konzipiert.
-‣ <b>Datenschutz ist uns wichtig!</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
+‣ <b>Offline-orientiert</b>: Plane und navigiere im Ausland ohne Mobilfunkverbindung, finde Wegpunkte auf abgelegenen Wanderungen usw. Alle Funktionen sind für den Offline-Einsatz konzipiert.
+‣ <b>Datenschutzfreundlich</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – keine Personenidentifikation, kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
 ‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf Deinem Gerät.
 ‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen, die App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Softwareentwicklung oder Spenden.
 ‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open Source</b>
@@ -32,5 +32,5 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln

 Bitte melde Probleme, schlage neue Funktionen vor und werde Teil der Community auf unserer Website: <b><i>comaps.app</i></b>

-<b>Entdecke die Unabhängigkeit</b>
+<b>Freiheit beginnt hier</b>
 Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
--- a/android/app/src/google/play/listings/fr-FR/short-description.txt
+++ b/android/app/src/google/play/listings/fr-FR/short-description.txt
@@ -1 +1 @@
-Navigation cartographique facile - Propulsé par la communauté
+Navigation facile - Découvrez plus lors de votre voyage - Fait par la communauté
--- a/android/app/src/google/play/listings/ro/title.txt
+++ b/android/app/src/google/play/listings/ro/title.txt
@@ -1 +0,0 @@
-CoMaps - Navighează liniștit
--- a/android/app/src/google/play/listings/vi/full-description.txt
+++ b/android/app/src/google/play/listings/vi/full-description.txt
@@ -1,36 +0,0 @@
-Một ứng dụng bản đồ miễn phí & mã nguồn mở do cộng đồng phát triển, dựa trên dữ liệu OpenStreetMap và cam kết mạnh mẽ về minh bạch, quyền riêng tư và phi lợi nhuận.
-
-Hãy tham gia cộng đồng và cùng chúng tôi xây dựng ứng dụng bản đồ tốt nhất!
-• Sử dụng ứng dụng và chia sẻ với mọi người
-• Đóng góp ý kiến và báo cáo lỗi
-• Cập nhật dữ liệu bản đồ trong ứng dụng hoặc trên trang web OpenStreetMap
-
-<i>Đánh giá 5 sao và phản hồi của bạn là sự ủng hộ quý giá nhất!</i>
-
-‣ <b>Đơn giản và tinh tế</b>: Những tính năng cần thiết, dễ sử dụng và hoạt động mượt mà.
-‣ <b>Hoạt động offline</b>: Lên kế hoạch và điều hướng chuyến đi ở nước ngoài mà không cần kết nối mạng, tìm kiếm địa điểm khi đi bộ đường dài... Tất cả chức năng đều hoạt động offline.
-‣ <b>Tôn trọng quyền riêng tư</b>: Ứng dụng được thiết kế để bảo vệ sự riêng tư - không định danh người dùng, không theo dõi và không thu thập thông tin cá nhân. Hoàn toàn không có quảng cáo.
-‣ <b>Tiết kiệm pin và dung lượng</b>: Không ngốn pin như các ứng dụng bản đồ khác. Bản đồ nhỏ gọn giúp tiết kiệm dung lượng điện thoại.
-‣ <b>Miễn phí và được xây dựng bởi cộng đồng</b>: Chính những người như bạn đã góp phần phát triển ứng dụng bằng cách thêm địa điểm vào OpenStreetMap, kiểm thử tính năng, đóng góp ý kiến, kỹ năng lập trình và tài chính.
-‣ <b>Minh bạch trong quyết định & tài chính, phi lợi nhuận và mã nguồn mở hoàn toàn.</b>
-
-<b>Tính năng chính</b>:
-• Tải bản đồ chi tiết với nhiều địa điểm không có trên Google Maps
-• Chế độ ngoài trời với các tuyến đi bộ, khu cắm trại, nguồn nước, đỉnh núi, đường đồng mức... được đánh dấu rõ ràng
-• Đường đi bộ và đường dành cho xe đạp
-• Địa điểm quan tâm như nhà hàng, trạm xăng, khách sạn, cửa hàng, điểm tham quan...
-• Tìm kiếm theo tên, địa chỉ hoặc danh mục địa điểm
-• Dẫn đường với thông báo bằng giọng nói cho đi bộ, đạp xe hoặc lái xe
-• Đánh dấu địa điểm yêu thích chỉ với một lần chạm
-• Đọc bài viết Wikipedia offline
-• Lớp bản đồ tàu điện ngầm và chỉ dẫn di chuyển
-• Ghi lại lộ trình
-• Xuất/nhập bookmark và lộ trình dưới dạng KML, KMZ, GPX
-• Chế độ tối để sử dụng ban đêm
-• Chỉnh sửa bản đồ cơ bản ngay trong ứng dụng để cải thiện dữ liệu cho mọi người
-• Hỗ trợ Android Auto
-
-Hãy báo cáo lỗi, đề xuất ý tưởng và tham gia cộng đồng của chúng tôi tại trang web <i><b>comaps.app</b></i>.
-
-<b>Tự do ngay trong tay bạn!</b>
-Khám phá hành trình, điều hướng thế giới với sự riêng tư và tinh thần cộng đồng!
--- a/android/app/src/google/play/listings/vi/short-description.txt
+++ b/android/app/src/google/play/listings/vi/short-description.txt
@@ -1 +0,0 @@
-Định vị bản đồ dễ dàng - Khám phá thế giới quanh bạn - Đồng hành cùng cộng đồng
--- a/android/app/src/google/play/listings/vi/title.txt
+++ b/android/app/src/google/play/listings/vi/title.txt
@@ -1 +0,0 @@
-CoMaps - Định vị riêng tư
--- a/android/app/src/main/ic_launcher-playstore.png
+++ b/android/app/src/main/ic_launcher-playstore.png
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -850,7 +850,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      @Override
      public void drawIcon(FloatingActionButton imageView)
      {
-        imageView.setImageResource(R.drawable.ic_logo_monochrome);
+        imageView.setImageResource(R.drawable.ic_question_mark);
      }

      @Override
@@ -2615,7 +2615,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      items.add(new MenuBottomSheetItem(R.string.share_my_location, R.drawable.ic_share, this::onShareLocationOptionSelected));

      if (!BUTTON_HELP_CODE.equals(activeLeftButton))
-        items.add(new MenuBottomSheetItem(R.string.about_help, R.drawable.ic_logo_monochrome, this::showHelp));
+        items.add(new MenuBottomSheetItem(R.string.about_help, R.drawable.ic_question_mark, this::showHelp));

      return items;
    }
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java
@@ -69,7 +69,7 @@ public class DownloaderNotifier
        .setAutoCancel(true)
        .setCategory(NotificationCompat.CATEGORY_ERROR)
        .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-        .setSmallIcon(R.drawable.ic_logo_small)
+        .setSmallIcon(R.drawable.ic_launcher_small)
        .setColor(ContextCompat.getColor(mContext, R.color.notification))
        .setContentTitle(title)
        .setContentText(content)
@@ -124,7 +124,7 @@ public class DownloaderNotifier
    return new NotificationCompat.Builder(mContext, CHANNEL_ID)
            .setAutoCancel(true)
            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-            .setSmallIcon(R.drawable.ic_logo_small)
+            .setSmallIcon(R.drawable.ic_launcher_small)
            .setColor(ContextCompat.getColor(mContext, R.color.notification))
            .setShowWhen(true)
            .setContentTitle(title)
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderService.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderService.java
@@ -3,7 +3,6 @@ package app.organicmaps.downloader;
 import static android.Manifest.permission.POST_NOTIFICATIONS;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;

-import android.app.ForegroundServiceStartNotAllowedException;
 import android.app.Service;
 import android.content.Intent;
 import android.content.pm.ServiceInfo;
@@ -43,24 +42,10 @@ public class DownloaderService extends Service implements MapManager.StorageCall

    var notification = mNotifier.buildProgressNotification();
    Logger.i(TAG, "Starting Downloader Foreground Service");
-    try
-    {
-      int type = 0;
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-        type = ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC;
-      ServiceCompat.startForeground(this, DownloaderNotifier.NOTIFICATION_ID, notification, type);
-    }
-    catch (Exception e)
-    {
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
-          e instanceof ForegroundServiceStartNotAllowedException)
-      {
-        // App not in a valid state to start foreground service (e.g started from bg)
-        Logger.e(TAG, "Not in a valid state to start foreground service", e);
-      }
-      else
-        Logger.e(TAG, "Failed to promote the service to foreground", e);
-    }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+      ServiceCompat.startForeground(this, DownloaderNotifier.NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
+    else
+      ServiceCompat.startForeground(this, DownloaderNotifier.NOTIFICATION_ID, notification, 0);

    return START_NOT_STICKY;
  }
--- a/android/app/src/main/java/app/organicmaps/location/LocationHelper.java
+++ b/android/app/src/main/java/app/organicmaps/location/LocationHelper.java
@@ -36,7 +36,7 @@ public class LocationHelper implements BaseLocationProvider.Listener
 {
  private static final long INTERVAL_FOLLOW_MS = 0;
  private static final long INTERVAL_NOT_FOLLOW_MS = 3000;
-  private static final long INTERVAL_NAVIGATION_MS = 1000;
+  private static final long INTERVAL_NAVIGATION_MS = 0;
  private static final long INTERVAL_TRACK_RECORDING = 0;

  private static final long AGPS_EXPIRATION_TIME_MS = 16 * 60 * 60 * 1000; // 16 hours
--- a/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java
+++ b/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java
@@ -1,6 +1,5 @@
 package app.organicmaps.location;

-import android.app.ForegroundServiceStartNotAllowedException;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -108,7 +107,7 @@ public class TrackRecordingService extends Service implements LocationListener
        .setOngoing(true)
        .setShowWhen(true)
        .setOnlyAlertOnce(true)
-        .setSmallIcon(R.drawable.ic_logo_small)
+        .setSmallIcon(R.drawable.ic_launcher_small)
        .setContentTitle(context.getString(R.string.track_recording))
        .addAction(0, context.getString(R.string.navigation_stop_button), getExitPendingIntent(context))
        .setContentIntent(getPendingIntent(context))
@@ -161,25 +160,10 @@ public class TrackRecordingService extends Service implements LocationListener
    }

    Logger.i(TAG, "Starting Track Recording Foreground service");
-
-    try
-    {
-      int type = 0;
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-        type = ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION;
-      ServiceCompat.startForeground(this, TrackRecordingService.TRACK_REC_NOTIFICATION_ID, getNotificationBuilder(this).build(), type);
-    }
-    catch (Exception e)
-    {
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
-          e instanceof ForegroundServiceStartNotAllowedException)
-      {
-        // App not in a valid state to start foreground service (e.g started from bg)
-        Logger.e(TAG, "Not in a valid state to start foreground service", e);
-      }
-      else
-        Logger.e(TAG, "Failed to promote the service to foreground", e);
-    }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+      ServiceCompat.startForeground(this, TrackRecordingService.TRACK_REC_NOTIFICATION_ID, getNotificationBuilder(this).build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION);
+    else
+      ServiceCompat.startForeground(this, TrackRecordingService.TRACK_REC_NOTIFICATION_ID, getNotificationBuilder(this).build(), 0);

    final LocationHelper locationHelper = LocationHelper.from(this);

--- a/android/app/src/main/java/app/organicmaps/routing/NavigationService.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationService.java
@@ -7,7 +7,6 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 import static app.organicmaps.util.Constants.Vendor.XIAOMI;

 import android.annotation.SuppressLint;
-import android.app.ForegroundServiceStartNotAllowedException;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -155,7 +154,7 @@ public class NavigationService extends Service implements LocationListener
        .setOngoing(true)
        .setShowWhen(false)
        .setOnlyAlertOnce(true)
-        .setSmallIcon(R.drawable.ic_logo_small)
+        .setSmallIcon(R.drawable.ic_launcher_small)
        .setContentIntent(pendingIntent)
        .addAction(0, context.getString(R.string.navigation_stop_button), exitPendingIntent)
        .setColorized(isColorizedSupported())
@@ -227,25 +226,10 @@ public class NavigationService extends Service implements LocationListener
    }

    Logger.i(TAG, "Starting Navigation Foreground service");
-
-    try
-    {
-      int type = 0;
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-        type = ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION;
-      ServiceCompat.startForeground(this, NavigationService.NOTIFICATION_ID, getNotificationBuilder(this).build(), type);
-    }
-    catch (Exception e)
-    {
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
-          e instanceof ForegroundServiceStartNotAllowedException)
-      {
-        // App not in a valid state to start foreground service (e.g started from bg)
-        Logger.e(TAG, "Not in a valid state to start foreground service", e);
-      }
-      else
-        Logger.e(TAG, "Failed to promote the service to foreground", e);
-    }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+      ServiceCompat.startForeground(this, NavigationService.NOTIFICATION_ID, getNotificationBuilder(this).build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION);
+    else
+      ServiceCompat.startForeground(this, NavigationService.NOTIFICATION_ID, getNotificationBuilder(this).build(), 0);

    final LocationHelper locationHelper = LocationHelper.from(this);

--- a/android/app/src/main/res/drawable/ic_launcher.xml
+++ b/android/app/src/main/res/drawable/ic_launcher.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M28.2,58.5q-1.6,0 -2.87,-0.74 -1.26,-0.73 -1.98,-2.09t-0.72,-3.21q0,-1.87 0.72,-3.23t1.98,-2.1q1.27,-0.72 2.87,-0.72 1.03,0 1.91,0.3 0.88,0.31 1.56,0.88 0.68,0.56 1.11,1.36 0.44,0.79 0.58,1.77L30.9,50.72q-0.1,-0.52 -0.34,-0.92 -0.23,-0.4 -0.58,-0.68t-0.8,-0.43q-0.43,-0.15 -0.96,-0.15 -1,0 -1.7,0.48t-1.08,1.36 -0.38,2.08 0.37,2.07 1.09,1.35 1.7,0.48q0.53,0 0.97,-0.14t0.78,-0.43 0.59,-0.68 0.35,-0.91h2.44q-0.14,0.97 -0.58,1.76 -0.43,0.8 -1.11,1.36t-1.57,0.88q-0.87,0.3 -1.9,0.3m10.56,0q-1.25,0 -2.2,-0.55 -0.95,-0.54 -1.48,-1.51 -0.53,-0.98 -0.53,-2.28t0.53,-2.27 1.48,-1.52 2.2,-0.55q1.27,0 2.21,0.55 0.95,0.54 1.48,1.52 0.54,0.97 0.54,2.27t-0.54,2.28 -1.48,1.51 -2.2,0.55m0,-1.88q0.57,0 1,-0.3 0.42,-0.3 0.65,-0.84 0.24,-0.55 0.24,-1.32t-0.24,-1.32q-0.23,-0.55 -0.66,-0.84 -0.42,-0.3 -0.99,-0.3 -0.55,0 -0.98,0.3 -0.42,0.29 -0.66,0.84 -0.23,0.55 -0.23,1.32 0,0.78 0.23,1.33 0.24,0.54 0.66,0.84t0.98,0.29m5.82,1.69L44.58,46.6h3.53l1.93,5.45 0.29,0.91 0.33,1.13q0.18,0.58 0.32,1.11l0.24,0.9h-0.6l0.23,-0.9 0.32,-1.11 0.34,-1.13 0.27,-0.9 1.91,-5.46h3.53v11.7h-2.37v-5.56l0.01,-0.93 0.03,-1.16 0.03,-1.25 0.03,-1.2h0.29l-0.38,1.27 -0.37,1.27 -0.34,1.13 -0.28,0.87 -1.98,5.57h-1.96l-2,-5.57 -0.3,-0.87 -0.35,-1.13 -0.38,-1.27 -0.39,-1.27h0.35l0.02,1.2 0.03,1.25 0.03,1.16 0.01,0.93v5.57zM61.72,58.45q-0.82,0 -1.47,-0.28 -0.64,-0.27 -1.01,-0.82 -0.37,-0.56 -0.37,-1.39 0,-0.7 0.26,-1.16 0.26,-0.47 0.7,-0.75 0.46,-0.3 1.04,-0.44 0.6,-0.15 1.24,-0.2 0.76,-0.09 1.2,-0.16 0.46,-0.07 0.65,-0.2 0.2,-0.14 0.2,-0.4v-0.06q0,-0.3 -0.17,-0.53 -0.16,-0.24 -0.47,-0.37 -0.3,-0.14 -0.72,-0.14t-0.75,0.14 -0.52,0.38q-0.18,0.24 -0.22,0.56h-2.17q0.05,-0.85 0.5,-1.48 0.46,-0.63 1.27,-0.97 0.82,-0.35 1.96,-0.35 0.85,0 1.52,0.2 0.67,0.19 1.12,0.56 0.47,0.37 0.7,0.9 0.24,0.52 0.24,1.19v5.63h-2.27v-1.17h-0.03q-0.22,0.4 -0.54,0.7t-0.79,0.45 -1.1,0.16m0.65,-1.61q0.56,0 0.96,-0.2t0.63,-0.57 0.22,-0.8v-0.83l-0.27,0.11 -0.39,0.1 -0.48,0.08 -0.53,0.09q-0.4,0.06 -0.72,0.2 -0.33,0.12 -0.52,0.34 -0.18,0.21 -0.18,0.54 0,0.3 0.15,0.5 0.16,0.22 0.45,0.33t0.68,0.1m5.98,4.75L68.35,50.01h2.29v1.12h0.02q0.26,-0.43 0.62,-0.72 0.37,-0.29 0.83,-0.43 0.48,-0.15 1.01,-0.15 1.06,0 1.86,0.55 0.81,0.55 1.26,1.52 0.46,0.97 0.46,2.25 0,1.3 -0.45,2.27 -0.45,0.98 -1.25,1.52t-1.9,0.54q-0.54,0 -1,-0.16 -0.46,-0.15 -0.82,-0.47t-0.59,-0.79h-0.02v4.53zM72.51,56.58q0.56,0 0.97,-0.28 0.42,-0.29 0.65,-0.83 0.23,-0.55 0.23,-1.33t-0.23,-1.32 -0.65,-0.83q-0.4,-0.3 -0.97,-0.3 -0.59,0 -1.03,0.31 -0.44,0.3 -0.69,0.85 -0.23,0.54 -0.23,1.29 0,0.74 0.23,1.29 0.25,0.55 0.69,0.85 0.45,0.3 1.03,0.3m9.18,1.92q-1.08,0 -1.92,-0.33 -0.84,-0.34 -1.35,-0.97 -0.5,-0.62 -0.58,-1.51h2.28q0.07,0.54 0.46,0.85 0.4,0.3 1.07,0.3 0.64,0 1,-0.24 0.37,-0.24 0.37,-0.63 0,-0.33 -0.28,-0.53 -0.27,-0.2 -0.79,-0.3l-1.45,-0.29q-1.21,-0.23 -1.84,-0.84 -0.63,-0.62 -0.63,-1.58 0,-0.78 0.43,-1.37t1.21,-0.91q0.8,-0.33 1.88,-0.33t1.88,0.35 1.25,0.97q0.46,0.63 0.48,1.49h-2.14q-0.01,-0.5 -0.4,-0.83 -0.38,-0.33 -1,-0.33 -0.6,0 -0.94,0.26 -0.34,0.25 -0.34,0.62 0,0.32 0.27,0.52t0.74,0.31l1.57,0.3q1.26,0.25 1.85,0.8 0.6,0.56 0.6,1.48 0,0.82 -0.48,1.44 -0.46,0.62 -1.3,0.96 -0.82,0.34 -1.9,0.34"
+      android:fillColor="#fff"/>
+</vector>
--- a/android/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,4 +0,0 @@
-<inset
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_logo"
-    android:inset="20dp" />
--- a/android/app/src/main/res/drawable/ic_launcher_foreground_monochrome.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_foreground_monochrome.xml
@@ -1,4 +0,0 @@
-<inset
-xmlns:android="http://schemas.android.com/apk/res/android"
-android:drawable="@drawable/ic_logo_monochrome"
-android:inset="20dp" />
--- a/android/app/src/main/res/drawable/ic_launcher_small.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_small.xml
@@ -0,0 +1,10 @@
+<!-- Used for notification icon etc -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="144dp"
+    android:height="144dp"
+    android:viewportWidth="144"
+    android:viewportHeight="144">
+  <path
+      android:pathData="M40.34 29.42a41.6 41.6 0 0 0-19.66 5.03q-8.77 4.85-13.8 14.42-5.05 9.57-5.05 23.18 0 13.4 5.04 22.88a36 36 0 0 0 13.71 14.51q8.67 5.04 19.76 5.04 7.95 0 14.2-2.42A33.6 33.6 0 0 0 72.8 96.24a33 33 0 0 0 3.43-11.09l-17.64-0.1q-0.6 3.33-2.22 5.95a12 12 0 0 1-3.83 4.33 19 19 0 0 1-5.44 2.73q-2.93 0.9-6.45 0.9-6.15 0-10.99-3.02-4.82-3.03-7.46-9.07-2.61-6.05-2.62-14.82 0-8.56 2.62-14.61 2.63-6.06 7.46-9.28 4.64-3.22 11.09-3.22 3.53 0 6.55 1 3.13 1.01 5.44 3.03a14.5 14.5 0 0 1 3.83 4.63q1.51 2.63 2.02 6.05h17.64a37 37 0 0 0-3.83-12.8 30 30 0 0 0-7.76-9.47 34 34 0 0 0-10.99-5.95 43 43 0 0 0-13.3-2.01m71.29 21.16q-9.37 0-16.23 4.03a26.6 26.6 0 0 0-10.59 11.2q-3.62 7.14-3.62 16.82 0 9.48 3.62 16.73a28 28 0 0 0 10.69 11.2q6.84 4.01 16.28 4.02 9.24 0 16.07-4.03a27.4 27.4 0 0 0 10.59-11.19q3.72-7.25 3.73-16.73 0-9.87-3.73-16.93a27.6 27.6 0 0 0-10.59-11.09q-6.86-4.03-16.22-4.03m0.2 13.1a9.8 9.8 0 0 1 7.05 2.42 16 16 0 0 1 4.34 6.76q1.5 4.23 1.5 9.57a33 33 0 0 1-1.5 9.68 14 14 0 0 1-4.44 6.65q-2.72 2.52-7.05 2.52-4.24 0-7.26-2.52a15 15 0 0 1-4.44-6.65 31 31 0 0 1-1.4-9.68q0-5.34 1.4-9.57 1.52-4.24 4.44-6.76 2.92-2.41 7.36-2.42"
+      android:fillColor="#fff"/>
+</vector>
--- a/android/app/src/main/res/drawable/ic_logo.xml
+++ b/android/app/src/main/res/drawable/ic_logo.xml
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="835"
-    android:viewportHeight="835">
-  <path
-      android:pathData="M698.5,141.1a20,20 0,0 1,30.8 -1.3A416,416 0,0 1,835 417.4a416,416 0,0 1,-93.3 263,20 20,0 0,1 -31.3,-0.6l-43,-56.6a20,20 0,0 1,-0.2 -24,307 307,0 0,0 59.3,-181.8c0,-74.2 -26.2,-142.3 -69.9,-195.6a20,20 0,0 1,-0.5 -24.8zM260.7,456.4a20,20 0,0 1,-7.7 -36.7l282,-177.4a20,20 0,0 1,29.9 22.7l-97,318.9a20,20 0,0 1,-37.5 2.2l-49.2,-111.5z"
-      android:fillColor="#ccdfca"/>
-  <path
-      android:pathData="M626.3,753a20,20 0,0 1,-6.2 29.6A416,416 0,0 1,417.5 835,417.7 417.7,0 0,1 0,417.4 417.7,417.7 0,0 1,603.3 43.5a20,20 0,0 1,7 30l-42.4,55.8a20,20 0,0 1,-24.2 6.1,307 307,0 0,0 -126.2,-27 309,309 0,0 0,-309 309c0,170.6 138.5,309 309,309a307,307 0,0 0,141.6 -34.3,20 20,0 0,1 25.1,5.6z"
-      android:fillColor="#fefdf6"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_logo_monochrome.xml
+++ b/android/app/src/main/res/drawable/ic_logo_monochrome.xml
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="835"
-    android:viewportHeight="835">
-  <path
-      android:pathData="M698.5,141.1a20,20 0,0 1,30.8 -1.3A416,416 0,0 1,835 417.4a416,416 0,0 1,-93.3 263,20 20,0 0,1 -31.3,-0.6l-43,-56.6a20,20 0,0 1,-0.2 -24,307 307,0 0,0 59.3,-181.8c0,-74.2 -26.2,-142.3 -69.9,-195.6a20,20 0,0 1,-0.5 -24.8zM260.7,456.4a20,20 0,0 1,-7.7 -36.7l282,-177.4a20,20 0,0 1,29.9 22.7l-97,318.9a20,20 0,0 1,-37.5 2.2l-49.2,-111.5z"
-      android:fillColor="#BFFFFFFF"/>
-  <path
-      android:pathData="M626.3,753a20,20 0,0 1,-6.2 29.6A416,416 0,0 1,417.5 835,417.7 417.7,0 0,1 0,417.4 417.7,417.7 0,0 1,603.3 43.5a20,20 0,0 1,7 30l-42.4,55.8a20,20 0,0 1,-24.2 6.1,307 307,0 0,0 -126.2,-27 309,309 0,0 0,-309 309c0,170.6 138.5,309 309,309a307,307 0,0 0,141.6 -34.3,20 20,0 0,1 25.1,5.6z"
-      android:fillColor="#FFFFFFFF"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_logo_small.xml
+++ b/android/app/src/main/res/drawable/ic_logo_small.xml
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="835dp"
-    android:height="835dp"
-    android:viewportWidth="835"
-    android:viewportHeight="835">
-  <path
-      android:pathData="M698.5,141.1a20,20 0,0 1,30.8 -1.3A416,416 0,0 1,835 417.4a416,416 0,0 1,-93.3 263,20 20,0 0,1 -31.3,-0.6l-43,-56.6a20,20 0,0 1,-0.2 -24,307 307,0 0,0 59.3,-181.8c0,-74.2 -26.2,-142.3 -69.9,-195.6a20,20 0,0 1,-0.5 -24.8zM260.7,456.4a20,20 0,0 1,-7.7 -36.7l282,-177.4a20,20 0,0 1,29.9 22.7l-97,318.9a20,20 0,0 1,-37.5 2.2l-49.2,-111.5z"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="M626.3,753a20,20 0,0 1,-6.2 29.6A416,416 0,0 1,417.5 835,417.7 417.7,0 0,1 0,417.4 417.7,417.7 0,0 1,603.3 43.5a20,20 0,0 1,7 30l-42.4,55.8a20,20 0,0 1,-24.2 6.1,307 307,0 0,0 -126.2,-27 309,309 0,0 0,-309 309c0,170.6 138.5,309 309,309a307,307 0,0 0,141.6 -34.3,20 20,0 0,1 25.1,5.6z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/layout/about.xml
+++ b/android/app/src/main/res/layout/about.xml
@@ -17,14 +17,15 @@
      android:orientation="vertical"
      android:padding="@dimen/margin_base">

-    <ImageView
+    <!--ImageView
        android:layout_width="@dimen/about_logo"
        android:layout_height="@dimen/about_logo"
        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="@dimen/margin_base"
+        android:layout_marginTop="@dimen/margin_base"
+        android:layout_marginBottom="@dimen/margin_half"
        android:contentDescription="@string/app_name"
-        app:srcCompat="@drawable/ic_logo_monochrome"
-        app:tint="?attr/colorLogo"/>
+        app:srcCompat="@drawable/ic_launcher"
+        app:tint="?attr/colorLogo" /-->

    <TextView
        android:id="@+id/version"
--- a/android/app/src/main/res/layout/activity_splash.xml
+++ b/android/app/src/main/res/layout/activity_splash.xml
@@ -14,7 +14,7 @@
      android:layout_width="300dp"
      android:layout_height="0dp"
      android:contentDescription="@null"
-      app:srcCompat="@drawable/ic_launcher_foreground"
+      app:srcCompat="@drawable/ic_launcher"
      android:layout_weight="1000"
      android:layout_margin="@dimen/margin_double"/>

@@ -22,18 +22,8 @@
      android:id="@+id/tv__app_name"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
-      android:text="@string/app_name"
-      android:gravity="center_horizontal"
-      android:textAppearance="@style/MwmTextAppearance.Title.Splash" />
-
-  <TextView
-      android:id="@+id/tv__splash_subtitle"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/splash_subtitle"
-      android:layout_marginStart="@dimen/margin_double"
-      android:layout_marginEnd="@dimen/margin_double"
      android:layout_marginBottom="@dimen/margin_double"
+      android:text="@string/splash_subtitle"
      android:gravity="center_horizontal"
      android:textAppearance="@style/MwmTextAppearance.Toolbar" />

--- a/android/app/src/main/res/layout/map_buttons_help.xml
+++ b/android/app/src/main/res/layout/map_buttons_help.xml
@@ -4,5 +4,6 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:id="@+id/help_button"
  style="@style/MwmWidget.MapButton.Square"
+  android:tint="@null"
  app:shapeAppearanceOverlay="@style/MwmWidget.MapButton.Square"
  app:srcCompat="@drawable/ic_question_mark" />
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -80,7 +80,7 @@
          android:ellipsize="end"
          android:textAppearance="@style/MwmTextAppearance.Body3"
          tools:background="#300000F0"
-          tools:text="Closes in 45 min • at 23:00" />
+          tools:text="Open • Closing in 45 min" />
      <com.google.android.material.textview.MaterialTextView
        android:id="@+id/tv__address"
        android:textAlignment="viewStart"
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/bg_primary"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome"/>
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher"/>
+    <monochrome android:drawable="@drawable/ic_launcher"/>
 </adaptive-icon>
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher"/>
+</adaptive-icon>
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/android/app/src/main/res/values-af/strings.xml
+++ b/android/app/src/main/res/values-af/strings.xml
@@ -41,11 +41,13 @@
    <string name="try_again">Probeer weer</string>
    <string name="about_menu_title">Oor CoMaps</string>
    <!-- Text in About screen -->
+    <string name="about_headline">Gratis vir almal, gemaak met liefde</string>
+    <!-- Text in About screen -->
    <string name="about_proposition_1">• Geen advertensies, geen nasporing, geen dataversameling</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• Geen battery dreineer, werk vanlyn</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• Vanlyn, vinnig en kompak</string>
+    <string name="about_proposition_3">• Vinnig, minimalisties, ontwikkel deur die gemeenskap</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">Oopbrontoepassing geskep deur entoesiaste en vrywilligers.</string>
    <string name="close">Sluit</string>
@@ -801,5 +803,4 @@
    <string name="panoramax">Panoramax-prent</string>
    <string name="editor_line_social_network">LINE</string>
    <string name="app_site_url">https://comaps.app/</string>
-    <string name="saved">Gestoor</string>
 </resources>
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -41,11 +41,13 @@
    <string name="try_again">محاولة مرة أخرى</string>
    <string name="about_menu_title">حول CoMaps</string>
    <!-- Text in About screen -->
+    <string name="about_headline">مجاني للجميع ، مصنوع من الحب</string>
+    <!-- Text in About screen -->
    <string name="about_proposition_1">• لا إعلانات ، لا تتبع ، لا جمع البيانات</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• لا يوجد استنزاف للبطارية، يعمل دون اتصال بالإنترنت</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• غير متصل بالإنترنت، سريع وصغير الحجم</string>
+    <string name="about_proposition_3">• سريع وبسيط، تم تطويره بواسطة المجتمع</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">تطبيق مفتوح المصدر الذي أنشأه المتحمسون والمتطوعون.</string>
    <!-- The button that opens system location settings -->
@@ -889,5 +891,4 @@
    <string name="editor_line_social_network">LINE</string>
    <string name="panoramax">صورة Panoramax</string>
    <string name="app_site_url">https://comaps.app/ar</string>
-    <string name="saved">تم الحفظ</string>
 </resources>
--- a/android/app/src/main/res/values-ast/strings.xml
+++ b/android/app/src/main/res/values-ast/strings.xml
@@ -185,6 +185,4 @@
    <string name="panoramax">Panoramax Foto</string>
    <string name="app_site_url">https://comaps.app/</string>
    <string name="bluesky">Bluesky</string>
-    <string name="saved">Archivos</string>
-    <string name="about_proposition_3">• Offline, rápidu y compactu</string>
 </resources>
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -46,7 +46,7 @@
    <!-- Text in About screen -->
    <string name="about_proposition_2">• Batareyanın boşalması yoxdur, oflayn işləyir</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• Oflayn, sürətli və yığcam</string>
+    <string name="about_proposition_3">• Sürətli, minimalist, icma tərəfindən hazırlanmışdır</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">Həvəskarlar və könüllülər tərəfindən yaradılan açıq mənbə proqramı.</string>
    <!-- The button that opens system location settings -->
@@ -844,5 +844,4 @@
    <string name="panoramax">Panoramax Şəkil</string>
    <string name="editor_line_social_network">LINE</string>
    <string name="app_site_url">https://comaps.app/tr/</string>
-    <string name="saved">Saxlandı</string>
 </resources>
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -41,11 +41,13 @@
    <string name="try_again">Паспрабаваць зноў</string>
    <string name="about_menu_title">Аб праграме CoMaps</string>
    <!-- Text in About screen -->
+    <string name="about_headline">Бясплатная для ўсіх, зробленая з любоўю</string>
+    <!-- Text in About screen -->
    <string name="about_proposition_1">• Без рэкламы, без трэкінгу, без збірання вашых даных</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• Без празмернай разрадкі батарэі, працуе ў аўтаномным рэжыме</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• Афлайн, хуткі і кампактны</string>
+    <string name="about_proposition_3">• Хуткая, мінімалістычная, распрацаваная супольнасцю</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">Праграма з адкрытым зыходным кодам, створаная энтузіястамі і валанцёрамі.</string>
    <!-- The button that opens system location settings -->
@@ -881,5 +883,4 @@
    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
    <string name="panoramax">Фота Panoramax</string>
    <string name="app_site_url">https://comaps.app/ru/</string>
-    <string name="saved">Захавана</string>
 </resources>
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -41,11 +41,13 @@
    <string name="try_again">Опитайте отново</string>
    <string name="about_menu_title">Относно приложението</string>
    <!-- Text in About screen -->
+    <string name="about_headline">Безплатно за всички, направени с любов</string>
+    <!-- Text in About screen -->
    <string name="about_proposition_1">• Без реклами, без проследяване, без събиране на данни</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• Без източване на батерията, работи офлайн</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• Офлайн, бърз и компактен</string>
+    <string name="about_proposition_3">• Бърз, прост, разработен от общността</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">Приложение с отворен код, създадено от ентусиасти и доброволци.</string>
    <!-- The button that opens system location settings -->
@@ -837,5 +839,4 @@
    <string name="panoramax">Panoramax Снимка</string>
    <string name="editor_line_social_network">LINE</string>
    <string name="app_site_url">https://comaps.app/</string>
-    <string name="saved">Запазено</string>
 </resources>
--- a/android/app/src/main/res/values-bn/strings.xml
+++ b/android/app/src/main/res/values-bn/strings.xml
@@ -39,7 +39,6 @@
    <string name="self_service">স্ব-সেবা</string>
    <string name="panoramax">Panoramax ছবি</string>
    <string name="editor_line_social_network">LINE</string>
-    <string name="mastodon">মাস্টোডন</string>
+    <string name="mastodon">Mastodon</string>
    <string name="bluesky">Bluesky</string>
-    <string name="saved">সংরক্ষণ</string>
 </resources>
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -38,11 +38,13 @@
    <string name="try_again">Torna-ho a intentar</string>
    <string name="about_menu_title">Quant a l’CoMaps</string>
    <!-- Text in About screen -->
+    <string name="about_headline">Gratuït per a tothom, fet amb amor</string>
+    <!-- Text in About screen -->
    <string name="about_proposition_1">• Sense publicitat, rastreig ni recopilació de dades</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• Consum de bateria mínim, funciona fora de línia</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• Fora de línia, ràpid i compacte</string>
+    <string name="about_proposition_3">• Ràpid, minimalista, desenvolupat per la comunitat</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">Aplicació de codi obert creada per entusiastes i voluntaris.</string>
    <!-- The button that opens system location settings -->
@@ -883,5 +885,4 @@
    <string name="comma_separated_pair">%1$s, %2$s</string>
    <string name="panoramax">Imatge Panoramax</string>
    <string name="app_site_url">https://comaps.app/ca/</string>
-    <string name="saved">S\'ha desat</string>
 </resources>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -909,7 +909,4 @@
    <string name="dialog_report_error_with_logs">Pošlete nám prosím hlášení o chybě:\n - „Povolit protokolování“ v nastavení\n - zopakujte problém\n - na stránce „O aplikaci a nápověda“ klepněte na tlačítko „Nahlásit chybu“ a odešlete hlášení skrze e-mail nebo chat\n - zakažte protokolování</string>
    <string name="backup_interval_every_day">Denně</string>
    <string name="backup_interval_every_week">Týdně</string>
-    <string name="open_now">Otevřeno</string>
-    <string name="closed_now">Zavřeno</string>
-    <string name="at">v %s</string>
 </resources>
--- a/android/app/src/main/res/values-cs/types_strings.xml
+++ b/android/app/src/main/res/values-cs/types_strings.xml
@@ -624,7 +624,7 @@
    <string name="type.natural.water">Vodní plocha</string>
    <string name="type.natural.wetland">Mokřadní oblast</string>
    <string name="type.natural.wetland.bog">Rašeliniště</string>
-    <string name="type.natural.wetland.marsh">Močál</string>
+    <string name="type.natural.wetland.marsh">Bažina</string>
    <string name="type.office">Kancelář</string>
    <string name="type.office.company">Kancelář společnosti</string>
    <string name="type.office.estate_agent">Realitní makléř</string>
@@ -774,7 +774,7 @@
    <string name="type.railway.station.subway.lille">Stanice metra</string>
    <string name="type.railway.station.subway.lima">Stanice metra</string>
    <string name="type.railway.station.subway.lisboa">Stanice metra</string>
-    <string name="type.railway.station.subway.london">Stanice londýnského metra</string>
+    <string name="type.railway.station.subway.london">Stanice metra</string>
    <string name="type.railway.station.subway.lyon">Stanice metra</string>
    <string name="type.railway.station.subway.madrid">Stanice metra</string>
    <string name="type.railway.station.subway.malaga">Stanice metra</string>
@@ -1144,14 +1144,14 @@
    <string name="type.waterway.lock_gate">Stavidlo</string>
    <string name="type.waterway.river">Řeka</string>
    <string name="type.waterway.river.tunnel">Řeka</string>
-    <string name="type.waterway.stream">Vodní tok</string>
-    <string name="type.waterway.stream.ephemeral">Dočasný tok</string>
-    <string name="type.waterway.stream.intermittent">Občasný tok</string>
-    <string name="type.waterway.stream.tunnel">Vodní tok</string>
+    <string name="type.waterway.stream">Řeka</string>
+    <string name="type.waterway.stream.ephemeral">Řeka</string>
+    <string name="type.waterway.stream.intermittent">Řeka</string>
+    <string name="type.waterway.stream.tunnel">Řeka</string>
    <string name="type.waterway.waterfall">Vodopád</string>
-    <string name="type.wheelchair.limited">Omezený přístup pro vozíčkáře</string>
+    <string name="type.wheelchair.limited">Omezený vstup pro vozíčkáře</string>
    <string name="type.wheelchair.no">Bez přístupu pro vozíčkáře</string>
-    <string name="type.wheelchair.yes">Plný přístup pro vozíčkáře</string>
+    <string name="type.wheelchair.yes">Plný vstup pro vozíčkáře</string>
    <string name="type.piste_type.snow_park">Snowpark</string>
    <string name="type.piste_type.hike">Zimní stezka</string>
    <string name="type.piste_type.connection">Připojení sjezdovky</string>
@@ -1397,12 +1397,4 @@
    <string name="type.leisure.firepit">Ohniště</string>
    <string name="type.man_made.crane">Jeřáb</string>
    <string name="type.railway.station.subway.qingdao">Stanice metra</string>
-    <string name="type.landuse.religious">Náboženské území</string>
-    <string name="type.natural.wetland.saltmarsh">Slanisko</string>
-    <string name="type.natural.wetland.saltmarsh.tidal">Přílivové slanisko</string>
-    <string name="type.natural.wetland.fen">Slatiniště</string>
-    <string name="type.natural.wetland.reedbed">Rákosina</string>
-    <string name="type.natural.wetland.swamp">Bažina</string>
-    <string name="type.natural.wetland.mangrove">Mangrovy</string>
-    <string name="type.natural.wetland.tidalflat">Wattové pobřeží</string>
 </resources>
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -900,7 +900,4 @@
    <string name="pref_backup_location_title">Placering af sikkerhedskopi</string>
    <string name="pref_left_button_disable">Deaktiver</string>
    <string name="app_site_url">https://comaps.app/</string>
-    <string name="closed_now">Lukket nu</string>
-    <string name="open_now">Åben nu</string>
-    <string name="at">kl. %s</string>
 </resources>
--- a/android/app/src/main/res/values-da/types_strings.xml
+++ b/android/app/src/main/res/values-da/types_strings.xml
@@ -111,7 +111,7 @@
    <string name="type.amenity.post_office">Posthus</string>
    <string name="type.amenity.prison">Fængsel</string>
    <string name="type.amenity.pub">Værtshus</string>
-    <string name="type.amenity.public_bookcase">Bogbytteskab</string>
+    <string name="type.amenity.public_bookcase">Bogudveksling</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Genbrugsplads</string>
    <string name="type.amenity.recycling">Genbrugscontainer</string>
@@ -1368,5 +1368,4 @@
    <string name="type.power.minor_line">Mindre strømledning</string>
    <string name="type.power.line">Strømledning</string>
    <string name="type.highway.ladder">Stige</string>
-    <string name="type.amenity.love_hotel">Kærlighedshotel</string>
 </resources>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -918,7 +918,4 @@
    <string name="pref_backup_location_title">Sicherungsort</string>
    <string name="backup_interval_every_week">Wöchentlich</string>
    <string name="pref_backup_now_summary_progress">Sicherung wird durchgeführt…</string>
-    <string name="open_now">Jetzt geöffnet</string>
-    <string name="at">um %s</string>
-    <string name="closed_now">Jetzt geschlossen</string>
 </resources>
--- a/android/app/src/main/res/values-de/types_strings.xml
+++ b/android/app/src/main/res/values-de/types_strings.xml
@@ -12,8 +12,8 @@
    <string name="type.aerialway.mixed_lift">Kombibahn</string>
    <string name="type.aerialway.station">Liftstation</string>
    <string name="type.aeroway">Luftverkehr</string>
-    <string name="type.aeroway.aerodrome">Flughafen</string>
-    <string name="type.aeroway.aerodrome.international">Internationaler Flughafen</string>
+    <string name="type.aeroway.aerodrome">Flugplatz</string>
+    <string name="type.aeroway.aerodrome.international">Flughafen</string>
    <string name="type.aeroway.apron">Vorfeld</string>
    <string name="type.aeroway.helipad">Hubschrauberlandeplatz</string>
    <string name="type.aeroway.runway">Start-/Landebahn</string>
@@ -41,7 +41,7 @@
    <string name="type.leisure.adult_gaming_centre">Gaming-Zentrum für Erwachsene</string>
    <string name="type.leisure.amusement_arcade">Arkade</string>
    <string name="type.amenity.charging_station">Ladestation</string>
-    <string name="type.amenity.charging_station.bicycle">Fahrrad-Ladestation</string>
+    <string name="type.amenity.charging_station.bicycle">Fahrrad Ladestation</string>
    <string name="type.amenity.charging_station.motorcar">Kfz-Ladestation</string>
    <string name="type.amenity.childcare">Kindertagesstätte</string>
    <string name="type.amenity.cinema">Kino</string>
@@ -715,7 +715,7 @@
    <string name="type.natural.water">Wasserfläche</string>
    <string name="type.natural.wetland">Feuchtgebiet</string>
    <string name="type.natural.wetland.bog">Moor</string>
-    <string name="type.natural.wetland.marsh">Marsch</string>
+    <string name="type.natural.wetland.marsh">Sumpf</string>
    <string name="type.office">Büro</string>
    <string name="type.office.company">Firmenbüro</string>
    <string name="type.office.estate_agent">Immobilienmakler</string>
@@ -1381,7 +1381,7 @@
    <string name="type.fee.yes">$</string>
    <string name="type.man_made.utility_pole">Versorgungsmast</string>
    <string name="type.cuisine.bubble_tea">Bubble Tea</string>
-    <string name="type.aeroway.gate">Gate</string>
+    <string name="type.aeroway.gate">Tor</string>
    <string name="type.amenity.biergarten">Biergarten</string>
    <string name="type.amenity.kindergarten">Kindergarten</string>
    <string name="type.public_transport.platform">Plattform</string>
@@ -1398,12 +1398,4 @@
    <string name="type.amenity.studio">Studio</string>
    <string name="type.man_made.crane">Kran</string>
    <string name="type.railway.station.subway.qingdao">U-Bahn-Station</string>
-    <string name="type.landuse.religious">Religiöses Land</string>
-    <string name="type.natural.wetland.saltmarsh">Salzmarsch</string>
-    <string name="type.natural.wetland.saltmarsh.tidal">Gezeitenabhängige Salzmarsch</string>
-    <string name="type.natural.wetland.fen">Fenn</string>
-    <string name="type.natural.wetland.reedbed">Schilfgürtel</string>
-    <string name="type.natural.wetland.swamp">Sumpf</string>
-    <string name="type.natural.wetland.mangrove">Mangrove</string>
-    <string name="type.natural.wetland.tidalflat">Watt</string>
 </resources>
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -39,11 +39,13 @@
    <string name="try_again">Δοκιμάστε ξανά</string>
    <string name="about_menu_title">Σχετικά με το CoMaps</string>
    <!-- Text in About screen -->
+    <string name="about_headline">Δωρεάν για όλους, φτιαγμένα με αγάπη</string>
+    <!-- Text in About screen -->
    <string name="about_proposition_1">• Χωρίς διαφημίσεις, χωρίς tracking, χωρίς συλλογή δεδομένων</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• Δεν εξαντλεί τη μπαταρία, λειτουργεί εκτός σύνδεσης</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• Εκτός σύνδεσης, γρήγορο και συμπαγές</string>
+    <string name="about_proposition_3">- Γρήγορο, μινιμαλιστικό, αναπτυγμένο από την κοινότητα</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">Εφαρμογή ανοιχτού κώδικα που δημιουργήθηκε από θιασώτες και εθελοντές.</string>
    <!-- The button that opens system location settings -->
@@ -878,5 +880,4 @@
    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
    <string name="panoramax">εικόνα Panoramax</string>
    <string name="app_site_url">https://comaps.app/</string>
-    <string name="saved">Αποθηκεύτηκε</string>
 </resources>
--- a/android/app/src/main/res/values-en-rGB/strings.xml
+++ b/android/app/src/main/res/values-en-rGB/strings.xml
@@ -57,5 +57,4 @@
    <string name="panoramax">Panoramax Picture</string>
    <string name="editor_line_social_network">LINE</string>
    <string name="app_site_url">https://comaps.app/</string>
-    <string name="about_proposition_3">• Offline, fast and compact</string>
 </resources>
--- a/android/app/src/main/res/values-es-rMX/strings.xml
+++ b/android/app/src/main/res/values-es-rMX/strings.xml
@@ -221,7 +221,4 @@
    <string name="editor_line_social_network">LINE</string>
    <string name="panoramax">Imagen Panoramax</string>
    <string name="app_site_url">https://comaps.app/es/</string>
-    <string name="about_headline">Proyecto abierto impulsado por la comunidad</string>
-    <string name="saved">Guardado</string>
-    <string name="about_proposition_3">• No necesita conexión a internet, rápido y compacto</string>
 </resources>
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -913,7 +913,4 @@
    <string name="dialog_report_error_missing_folder">Valitud varukoopiate kaust pole kas saadaval või kirjutatav. Palun vali muu kaust.</string>
    <string name="pref_backup_location_title">Varukoopia asukoht</string>
    <string name="pref_backup_interval_title">Automaatne varundus</string>
-    <string name="open_now">Hetkel avatud</string>
-    <string name="at">kell %s</string>
-    <string name="closed_now">Praegu suletud</string>
 </resources>
--- a/android/app/src/main/res/values-et/types_strings.xml
+++ b/android/app/src/main/res/values-et/types_strings.xml
@@ -862,29 +862,29 @@
    <string name="type.railway.station.light_rail.porto">Kergraudtee jaam</string>
    <string name="type.railway.station.monorail">Monorelstee jaam</string>
    <string name="type.railway.station.subway">Metroojaam</string>
-    <string name="type.railway.station.subway.adana">Metroojaam</string>
-    <string name="type.railway.station.subway.algiers">Metroojaam</string>
-    <string name="type.railway.station.subway.almaty">Metroojaam</string>
-    <string name="type.railway.station.subway.amsterdam">Metroojaam</string>
-    <string name="type.railway.station.subway.ankara">Metroojaam</string>
-    <string name="type.railway.station.subway.athens">Metroojaam</string>
-    <string name="type.railway.station.subway.baku">Metroojaam</string>
-    <string name="type.railway.station.subway.bangkok">Metroojaam</string>
-    <string name="type.railway.station.subway.barcelona">Metroojaam</string>
-    <string name="type.railway.station.subway.beijing">Metroojaam</string>
-    <string name="type.railway.station.subway.bengalore">Metroojaam</string>
-    <string name="type.railway.station.subway.berlin">Metroojaam</string>
-    <string name="type.railway.station.subway.bilbao">Metroojaam</string>
+    <string name="type.railway.station.subway.adana">Adana metroojaam</string>
+    <string name="type.railway.station.subway.algiers">Alžiiri metroojaam</string>
+    <string name="type.railway.station.subway.almaty">Almatõ metroojaam</string>
+    <string name="type.railway.station.subway.amsterdam">Amsterdami metroojaam</string>
+    <string name="type.railway.station.subway.ankara">Ankara metroojaam</string>
+    <string name="type.railway.station.subway.athens">Ateena metroojaam</string>
+    <string name="type.railway.station.subway.baku">Bakuu metroojaam</string>
+    <string name="type.railway.station.subway.bangkok">Bangkoki metroojaam</string>
+    <string name="type.railway.station.subway.barcelona">Barcelona metroojaam</string>
+    <string name="type.railway.station.subway.beijing">Pekingi metroojaam</string>
+    <string name="type.railway.station.subway.bengalore">Bengaluru metroojaam</string>
+    <string name="type.railway.station.subway.berlin">Berliini metroojaam</string>
+    <string name="type.railway.station.subway.bilbao">Bilbao metroojaam</string>
    <string name="type.railway.station.subway.brasilia">Brasília Metroojaam</string>
    <string name="type.railway.station.subway.brescia">Brescia metroojaam</string>
-    <string name="type.railway.station.subway.brussels">Metroojaam</string>
-    <string name="type.railway.station.subway.bucharest">Metroojaam</string>
-    <string name="type.railway.station.subway.budapest">Metroojaam</string>
-    <string name="type.railway.station.subway.buenos_aires">Metroojaam</string>
-    <string name="type.railway.station.subway.bursa">Metroojaam</string>
-    <string name="type.railway.station.subway.cairo">Metroojaam</string>
-    <string name="type.railway.station.subway.caracas">Metroojaam</string>
-    <string name="type.railway.station.subway.catania">Metroojaam</string>
+    <string name="type.railway.station.subway.brussels">Brüsseli metroojaam</string>
+    <string name="type.railway.station.subway.bucharest">Bukaresti metroojaam</string>
+    <string name="type.railway.station.subway.budapest">Budapesti metroojaam</string>
+    <string name="type.railway.station.subway.buenos_aires">Buenos Airese metroojaam</string>
+    <string name="type.railway.station.subway.bursa">Bursa metroojaam</string>
+    <string name="type.railway.station.subway.cairo">Kairo metroojaam</string>
+    <string name="type.railway.station.subway.caracas">Caracase metroojaam</string>
+    <string name="type.railway.station.subway.catania">Catania metroojaam</string>
    <string name="type.railway.station.subway.changchun">Changchuni metroojaam</string>
    <string name="type.railway.station.subway.chengdu">Chengdu metroojaam</string>
    <string name="type.railway.station.subway.chicago">Chicago metroojaam</string>
@@ -1400,12 +1400,4 @@
    <string name="type.amenity.studio">Stuudio</string>
    <string name="type.man_made.crane">Kraana</string>
    <string name="type.railway.station.subway.qingdao">Qingdao metroojaam</string>
-    <string name="type.landuse.religious">Usuorganisatsiooni maa</string>
-    <string name="type.natural.wetland.saltmarsh.tidal">Loodete mõjutatud sooldunud padur</string>
-    <string name="type.natural.wetland.fen">Madalsoo</string>
-    <string name="type.natural.wetland.reedbed">Roostik</string>
-    <string name="type.natural.wetland.swamp">Lodu</string>
-    <string name="type.natural.wetland.mangrove">Mangroov</string>
-    <string name="type.natural.wetland.tidalflat">Loodeline tasandik</string>
-    <string name="type.natural.wetland.saltmarsh">Sooldunud padur</string>
 </resources>
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -38,7 +38,7 @@
    <string name="try_again">Saiatu berriro</string>
    <string name="about_menu_title">CoMaps-i buruz</string>
    <!-- Text in About screen -->
-    <string name="about_headline">Proiektu irekia, auzolanean egina</string>
+    <string name="about_headline">Proiektu irekia, auzolanean egina.</string>
    <!-- Text in About screen -->
    <string name="about_proposition_1">• Ez iragarkirik, ez jarraipenik, ez datu-bilketarik</string>
    <!-- Text in About screen -->
@@ -203,7 +203,7 @@
    <!-- Confirmation for OpenStreetMap log out. -->
    <string name="osm_log_out_confirmation">Ziur zure OpenStreetMap kontutik saioa amaitu nahi duzula?</string>
    <!-- Title for tracks category in bookmarks manager -->
-    <string name="tracks_title">Arrasto</string>
+    <string name="tracks_title">Arrastoak</string>
    <!-- Length of track in cell that describes route -->
    <string name="length">Luzera</string>
    <string name="share_my_location">Partekatu nire kokapena</string>
@@ -307,7 +307,7 @@
    <!-- Text for routing error dialog -->
    <string name="routing_download_maps_along">Deskargatu zure arrastoaren mapa guztiak</string>
    <!-- Text for routing error dialog -->
-    <string name="routing_requires_all_map">Arrasto bat sortzeko beharrezkoa da kokapenetik helmugarainoko mapa guztiak deskargatzea eta eguneratzea.</string>
+    <string name="routing_requires_all_map">Arrasto bat sortzeko beharrezkoa da helmugako kokapenaren mapa guztiak deskargatzea eta eguneratzea.</string>
    <!-- Text for routing error dialog -->
    <string name="routing_not_enough_space">Leku nahikorik ez</string>
    <!-- location service disabled -->
@@ -349,7 +349,7 @@
    <!-- SECTION: Routing dialogs strings -->
    <string name="dialog_routing_disclaimer_title">Arrastoa jarraitzean, kontuan izan:</string>
    <string name="dialog_routing_disclaimer_priority">— Bidearen egoera, zirkulazio arauek eta bide seinaleek lehentasuna dute beti nabigazio-iradokizunen gainetik;</string>
-    <string name="dialog_routing_disclaimer_precision">— Zehaztasunik gabeko mapa izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;</string>
+    <string name="dialog_routing_disclaimer_precision">— Mapa zehazgabea izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;</string>
    <string name="dialog_routing_disclaimer_recommendations">— Iradokitako ibilbideak gomendio gisa soilik hartu behar dira;</string>
    <string name="dialog_routing_disclaimer_borders">— Kontuz ibili muga-eremuak dituzten ibilbideetan: gure aplikazioak sortutako ibilbideek batzuetan herrialdeen mugak zeharkatu ditzakete baimendu gabeko tokietan.</string>
    <string name="dialog_routing_disclaimer_beware">Egon adi eta seguru errepideetan!</string>
@@ -360,7 +360,7 @@
    <string name="dialog_routing_location_unknown_turn_on">Ezin dira GPS koordenatuak aurkitu. Aktibatu kokapen zerbitzuak arrastoa kalkulatzeko.</string>
    <string name="dialog_routing_unable_locate_route">Ezin da ibilbiderik aurkitu</string>
    <string name="dialog_routing_cant_build_route">Ezin da ibilbidea sortu.</string>
-    <string name="dialog_routing_change_start_or_end">Ezarri zure abiapuntua edota helmuga.</string>
+    <string name="dialog_routing_change_start_or_end">Ezarri zure abiapuntua edo helmuga.</string>
    <string name="dialog_routing_change_start">Ezarri abiapuntua</string>
    <string name="dialog_routing_start_not_determined">Ibilbidea ez da sortu. Abiapuntua ezin izan da aurkitu.</string>
    <string name="dialog_routing_select_closer_start">Hautatu errepide batetik gertuko abiapuntua.</string>
@@ -392,8 +392,8 @@
    <string name="clear_search">Garbitu bilaketa historia</string>
    <string name="p2p_your_location">Zure kokapena</string>
    <string name="p2p_start">Hasi</string>
-    <string name="p2p_from_here">Abiapuntua</string>
-    <string name="p2p_to_here">Helmuga</string>
+    <string name="p2p_from_here">Hemendik</string>
+    <string name="p2p_to_here">Bidea hona</string>
    <string name="p2p_only_from_current">Nabigazioa zure uneko kokapenetik soilik dago erabilgarri.</string>
    <string name="p2p_reroute_from_current">Zure uneko kokapenetik ibilbide bat antolatzea nahi duzu?</string>
    <!-- Edit open hours/set time and minutes dialog -->
@@ -591,7 +591,7 @@
    <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
    <string name="routing_add_start_point">Erabili bilaketa edo sakatu mapan ibilbidearen abiapuntua gehitzeko</string>
    <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
-    <string name="routing_add_finish_point">Erabili bilaketa edo sakatu mapan helmuga puntua gehitzeko</string>
+    <string name="routing_add_finish_point">Erabili bilaketa edo sakatu mapan helmuga puntu bat gehitzeko</string>
    <string name="planning_route_manage_route">Kudeatu ibilbidea</string>
    <string name="button_plan">Planifikatu</string>
    <string name="placepage_remove_stop">Kendu geltokia</string>
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -41,11 +41,13 @@
    <string name="try_again">تلاش مجدد</string>
    <string name="about_menu_title">CoMaps درباره‌ی</string>
    <!-- Text in About screen -->
+    <string name="about_headline">رایگان برای همه ، ساخته شده با عشق</string>
+    <!-- Text in About screen -->
    <string name="about_proposition_1">• بدون تبلیغات ، ردیابی ، جمع آوری داده ها</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• بدون تخلیه باتری، آفلاین کار می کند</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• آفلاین، سریع و جمع و جور</string>
+    <string name="about_proposition_3">• سریع، مینیمالیستی، توسعه یافته توسط انجمن</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">برنامه منبع باز ایجاد شده توسط علاقه مندان و داوطلبان.</string>
    <!-- The button that opens system location settings -->
@@ -816,5 +818,4 @@
    <string name="panoramax">تصویر Panoramax</string>
    <string name="editor_line_social_network">LINE</string>
    <string name="app_site_url">https://comaps.app</string>
-    <string name="saved">ذخیره شد</string>
 </resources>
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -41,7 +41,7 @@
    <string name="try_again">Yritä uudelleen</string>
    <string name="about_menu_title">Tietoa CoMaps:stä</string>
    <!-- Text in About screen -->
-    <string name="about_headline">Avoin projekti yhteisön voimin</string>
+    <string name="about_headline">Avoin projekti yhteisön toteuttamana</string>
    <!-- Text in About screen -->
    <string name="about_proposition_1">• Helppokäyttöinen ja viimeistelty</string>
    <!-- Text in About screen -->
@@ -917,8 +917,4 @@
    <string name="pref_backup_title">Kirjanmerkkien ja reittien varmuuskopiointi</string>
    <string name="pref_backup_status_summary_success">Viimeisin onnistunut varmuuskopio</string>
    <string name="backup_interval_manual_only">Pois (Varmuuskopioi manuaalisesti)</string>
-    <string name="dialog_report_error_with_logs">Lähetä meille virheraportti:\n - kytke \"Ota loki käyttöön\" asetuksista\n - yritä toistaa ongelma\n - paina \"Tietoja ja ohje\" valikosta \"Ilmoita virhe\" painiketta ja lähetä virheraportti sähköpostin tai chatin kautta\n - kytke lokitallennus pois käytöstä</string>
-    <string name="open_now">Auki nyt</string>
-    <string name="closed_now">Suljettu nyt</string>
-    <string name="at">kello %s</string>
 </resources>
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -1399,12 +1399,4 @@
    <string name="type.mountain_pass">Vuoristosola</string>
    <string name="type.attraction.big_wheel">Maailmanpyörä</string>
    <string name="type.railway.station.subway.qingdao">Metro</string>
-    <string name="type.landuse.religious">Uskonnollinen maa</string>
-    <string name="type.natural.wetland.saltmarsh">Marskimaa</string>
-    <string name="type.natural.wetland.saltmarsh.tidal">Marskimaa</string>
-    <string name="type.natural.wetland.fen">Avosuo</string>
-    <string name="type.natural.wetland.swamp">Suo</string>
-    <string name="type.natural.wetland.mangrove">Mangrove</string>
-    <string name="type.natural.wetland.tidalflat">Vuorovesitasanko</string>
-    <string name="type.natural.wetland.reedbed">Ruovikko</string>
 </resources>
--- a/android/app/src/main/res/values-fr-rCA/strings.xml
+++ b/android/app/src/main/res/values-fr-rCA/strings.xml
@@ -10,5 +10,4 @@
    <string name="editor_line_social_network">LINE</string>
    <string name="panoramax">Image Panoramax</string>
    <string name="app_site_url">https://www.comaps.app/fr/</string>
-    <string name="about_proposition_3">• Hors ligne, rapide et compact</string>
 </resources>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -904,27 +904,4 @@
    <string name="ruler">Règle</string>
    <string name="bookmark_color">Couleur du marque-page</string>
    <string name="panoramax">Image Panoramax</string>
-    <string name="pref_backup_now_title">Sauvegarder maintenant</string>
-    <string name="backup_interval_every_day">Chaque jour</string>
-    <string name="open_now">Actuellement ouvert</string>
-    <string name="closed_now">Actuellement fermé</string>
-    <string name="pref_backup_now_summary_progress">Sauvegarde en cours…</string>
-    <string name="pref_backup_now_summary_failed">La sauvegarde a échoué</string>
-    <string name="backup_interval_every_week">Chaque semaine</string>
-    <string name="pref_backup_location_title">Emplacement de sauvegarde</string>
-    <string name="pref_backup_location_summary_initial">Veuillez d\'abord sélectionner répertoire et accorder l\'autorisation</string>
-    <string name="pref_backup_now_summary_empty_lists">Aucun signet ni de trace à sauvegarder</string>
-    <string name="pref_backup_interval_title">Sauvegarde automatique</string>
-    <string name="pref_backup_status_summary_success">Dernière sauvegarde réussie</string>
-    <string name="pref_backup_now_summary_ok">La sauvegarde s\'est déroulée avec succès</string>
-    <string name="pref_backup_history_title">Nombre de sauvegardes à conserver</string>
-    <string name="pref_backup_now_summary_folder_unavailable">L\'emplacement de sauvegarde n\'est pas disponible</string>
-    <string name="pref_backup_title">Sauvegarde des signets et des traces</string>
-    <string name="backup_interval_manual_only">Désactivé (manuel uniquement)</string>
-    <string name="pref_backup_summary">Sauvegarde automatique dans un dossier de votre appareil</string>
-    <string name="about_help">À propos &amp; aide</string>
-    <string name="dialog_report_error_missing_folder">L\'emplacement de sauvegarde choisi n\'est pas disponible ou accessible en écriture. Veuillez sélectionner un autre emplacement.</string>
-    <string name="dialog_report_error_with_logs">Veuillez nous envoyer un rapport d\'erreur :\n - \"Activer la journalisation\" dans les paramètres\n - reproduire le problème\n - dans l\'écran \"À propos &amp; Help\", appuyez sur le bouton \"SIGNAER UN BUG\" et envoyez-le par e-mail ou par chat\n - désactiver la journalisation</string>
-    <string name="pref_backup_now_summary">Créer une sauvegarde immédiatement</string>
-    <string name="at">à %s</string>
 </resources>
--- a/android/app/src/main/res/values-fr/types_strings.xml
+++ b/android/app/src/main/res/values-fr/types_strings.xml
@@ -1400,12 +1400,4 @@
    <string name="type.hwtag">hwtag</string>
    <string name="type.man_made.crane">Grue</string>
    <string name="type.railway.station.subway.qingdao">Station de métro</string>
-    <string name="type.landuse.religious">Terre religieuse</string>
-    <string name="type.natural.wetland.saltmarsh.tidal">Marais salant à marée</string>
-    <string name="type.natural.wetland.fen">Marais</string>
-    <string name="type.natural.wetland.swamp">Marais</string>
-    <string name="type.natural.wetland.mangrove">Mangrove</string>
-    <string name="type.natural.wetland.tidalflat">Estran</string>
-    <string name="type.natural.wetland.reedbed">Roselière</string>
-    <string name="type.natural.wetland.saltmarsh">Marais salant</string>
 </resources>
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -636,7 +636,4 @@
    <string name="pref_backup_now_summary">Crear unha copia agora mesmo</string>
    <string name="pref_backup_location_summary_initial">Primeiro elixe un cartafol e concede permiso de acceso</string>
    <string name="pref_backup_title">Copia de apoio de marcadores e rutas</string>
-    <string name="open_now">Aberto agora</string>
-    <string name="closed_now">Agora Fechado</string>
-    <string name="at">ás %s</string>
 </resources>
--- a/android/app/src/main/res/values-gl/types_strings.xml
+++ b/android/app/src/main/res/values-gl/types_strings.xml
@@ -1306,5 +1306,4 @@
    <string name="type.sport.diving">Trampolín</string>
    <string name="type.amenity.love_hotel">Hotel por horas</string>
    <string name="type.railway.station.subway.qingdao">Estación de metro</string>
-    <string name="type.landuse.religious">Sagrado</string>
 </resources>
--- a/android/app/src/main/res/values-gsw/strings.xml
+++ b/android/app/src/main/res/values-gsw/strings.xml
@@ -636,7 +636,4 @@
    <string name="ok">OK</string>
    <string name="sort_bookmarks">Lesezeiche sortiere</string>
    <string name="translated_om_site_url">https://comaps.app/de/</string>
-    <string name="open_now">Jetzt offe</string>
-    <string name="closed_now">Jetzt zue</string>
-    <string name="at">am %s</string>
 </resources>
--- a/android/app/src/main/res/values-gsw/types_strings.xml
+++ b/android/app/src/main/res/values-gsw/types_strings.xml
@@ -1306,12 +1306,4 @@
    <string name="type.railway.subway_entrance.wuhan">U-Bahn-Iigang</string>
    <string name="type.railway.subway_entrance.yerevan">U-Bahn-Iigang</string>
    <string name="type.railway.subway_entrance.yokohama">U-Bahn-Iigang</string>
-    <string name="type.landuse.religious">Religiöses Land</string>
-    <string name="type.natural.wetland.saltmarsh">Salzwiese</string>
-    <string name="type.natural.wetland.saltmarsh.tidal">Geziiteabhängigi Salzwiese</string>
-    <string name="type.natural.wetland.fen">Niedermoor</string>
-    <string name="type.natural.wetland.reedbed">Röhricht</string>
-    <string name="type.natural.wetland.swamp">Bruch</string>
-    <string name="type.natural.wetland.mangrove">Mangrove</string>
-    <string name="type.natural.wetland.tidalflat">Watt</string>
 </resources>
--- a/android/app/src/main/res/values-hi/strings.xml
+++ b/android/app/src/main/res/values-hi/strings.xml
@@ -41,11 +41,13 @@
    <string name="try_again">पुनः प्रयास करें</string>
    <string name="about_menu_title">CoMaps के बारे में</string>
    <!-- Text in About screen -->
+    <string name="about_headline">सभी के लिए मुफ़्त, प्यार से बनाया गया</string>
+    <!-- Text in About screen -->
    <string name="about_proposition_1">• कोई विज्ञापन नहीं, कोई ट्रैकिंग नहीं, कोई डेटा संग्रह नहीं</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• कोई बैटरी ख़त्म नहीं, ऑफ़लाइन काम करता है</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• ऑफ़लाइन, तेज़ और कॉम्पैक्ट</string>
+    <string name="about_proposition_3">• तेज़, न्यूनतम, समुदाय द्वारा विकसित</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">उत्साही और स्वयंसेवकों द्वारा बनाया गया ओपन-सोर्स एप्लिकेशन।</string>
    <!-- The button that opens system location settings -->
@@ -598,5 +600,4 @@
    <string name="panoramax">Panoramax चित्र</string>
    <string name="editor_line_social_network">LINE</string>
    <string name="app_site_url">https://comaps.app/hi/</string>
-    <string name="saved">सहेजी हुई</string>
 </resources>
--- a/android/app/src/main/res/values-hr/strings.xml
+++ b/android/app/src/main/res/values-hr/strings.xml
@@ -153,5 +153,4 @@
    <string name="editor_line_social_network">LINE</string>
    <string name="panoramax">Panoramax slika</string>
    <string name="bluesky">Bluesky</string>
-    <string name="saved">Spremljeno</string>
 </resources>
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -38,11 +38,13 @@
    <string name="try_again">Újrapróbálkozás</string>
    <string name="about_menu_title">Az CoMaps névjegye</string>
    <!-- Text in About screen -->
+    <string name="about_headline">Mindenki számára ingyenes – szeretettel készült</string>
+    <!-- Text in About screen -->
    <string name="about_proposition_1">• Nincs hirdetés, nyomon követés és adatgyűjtés</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• Nem merül le az akkumulátor – offline is működik</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• Offline, gyors és kompakt</string>
+    <string name="about_proposition_3">• Gyors, minimalista – a közösség által fejlesztett</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">A rajongók és az önkéntesek által létrehozott nyílt forráskódú alkalmazás.</string>
    <!-- The button that opens system location settings -->
@@ -871,5 +873,4 @@
    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
    <string name="panoramax">Panoramax kép</string>
    <string name="app_site_url">https://comaps.app/hu/</string>
-    <string name="saved">Mentett</string>
 </resources>
--- a/android/app/src/main/res/values-ia/strings.xml
+++ b/android/app/src/main/res/values-ia/strings.xml
@@ -11,6 +11,4 @@
    <string name="bluesky">Bluesky</string>
    <string name="kilometres">Kilometros</string>
    <string name="app_site_url">https://comaps.app/</string>
-    <string name="saved">Salvate</string>
-    <string name="about_proposition_3">• Offline, rapide e compacte</string>
 </resources>
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -40,11 +40,13 @@
    <string name="try_again">Coba Lagi</string>
    <string name="about_menu_title">Tentang CoMaps</string>
    <!-- Text in About screen -->
+    <string name="about_headline">Gratis untuk semua orang, dibuat dengan cinta</string>
+    <!-- Text in About screen -->
    <string name="about_proposition_1">• Tidak ada iklan, tidak ada pelacakan, tidak ada pengumpulan data</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• Tidak menguras baterai, bekerja secara offline</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• Offline, cepat dan kompak</string>
+    <string name="about_proposition_3">• Cepat, minimalis, dikembangkan oleh komunitas</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">Aplikasi open-source yang dibuat oleh penggemar dan sukarelawan.</string>
    <!-- The button that opens system location settings -->
@@ -817,5 +819,4 @@
    <string name="panoramax">Gambar Panoramax</string>
    <string name="editor_line_social_network">LINE</string>
    <string name="app_site_url">https://comaps.app/id/</string>
-    <string name="saved">Disimpan</string>
 </resources>
--- a/android/app/src/main/res/values-is/strings.xml
+++ b/android/app/src/main/res/values-is/strings.xml
@@ -406,7 +406,7 @@
    <string name="choose_color">Veldu lit</string>
    <string name="uri_open_location_failed">Ekkert forrit er uppsett sem gæti opnað staðsetninguna</string>
    <string name="about_proposition_2">• Tæmir ekki rafhlöðuna, virkar án nettengingar</string>
-    <string name="about_proposition_3">• Ótengdur, hraður og nettur</string>
+    <string name="about_proposition_3">• Hraðvirkt, mínímalískt, hannað af notendunum</string>
    <string name="failed_to_open_file">Mistókst að opna skrána %1$s \n \n%2$s</string>
    <string name="routing_download_maps_along">Sækja öll landakort meðfram leiðinni þinni</string>
    <string name="about_developed_by_enthusiasts">Forrit með opinn grunnkóða sem útbúið er af áhugafólki og sjálfboðaliðum.</string>
@@ -600,5 +600,4 @@
    <string name="panoramax">Panoramax mynd</string>
    <string name="bluesky">Bluesky</string>
    <string name="app_site_url">https://comaps.app/</string>
-    <string name="saved">Vistað</string>
 </resources>
--- a/android/app/src/main/res/values-it/types_strings.xml
+++ b/android/app/src/main/res/values-it/types_strings.xml
@@ -613,8 +613,8 @@
    <string name="type.landuse.vineyard">Vigne</string>
    <string name="type.leisure">Tempo libero</string>
    <string name="type.leisure.dog_park">Area sgambamento cani</string>
-    <string name="type.leisure.fitness_centre">Palestra</string>
-    <string name="type.leisure.fitness_station">Area Fitness</string>
+    <string name="type.leisure.fitness_centre">Centro benessere</string>
+    <string name="type.leisure.fitness_station">Centro fitness</string>
    <string name="type.leisure.dance">Sala da ballo</string>
    <string name="type.leisure.garden">Giardino</string>
    <string name="type.leisure.garden.residential">Giardino</string>
@@ -1400,6 +1400,4 @@
    <string name="type.barrier.guard_rail">Barriera di contenimento</string>
    <string name="type.man_made.crane">Gru permanente</string>
    <string name="type.railway.station.subway.qingdao">Stazione metropolitana</string>
-    <string name="type.natural.wetland.swamp">Palude</string>
-    <string name="type.natural.wetland.mangrove">Mangrovie</string>
 </resources>
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -38,11 +38,13 @@
    <string name="try_again">נסה שוב</string>
    <string name="about_menu_title">אודות CoMaps</string>
    <!-- Text in About screen -->
+    <string name="about_headline">חינם לכולם, מיוצרים באהבה</string>
+    <!-- Text in About screen -->
    <string name="about_proposition_1">• ללא מודעות, ללא מעקב, ללא איסוף נתונים</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• אין ריקון סוללה, עובד במצב לא מקוון</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• לא מקוון, מהיר וקומפקטי</string>
+    <string name="about_proposition_3">• מהיר, מינימליסטי, שפותח על ידי הקהילה</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">אפליקציית קוד פתוח שנוצרה על ידי חובבים ומתנדבים.</string>
    <!-- The button that opens system location settings -->
@@ -861,5 +863,4 @@
    <string name="editor_line_social_network">LINE</string>
    <string name="panoramax">תמונת Panoramax</string>
    <string name="app_site_url">https://comaps.app</string>
-    <string name="saved">נשמר</string>
 </resources>
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -44,7 +44,7 @@
    <!-- Text in About screen -->
    <string name="about_proposition_2">• バッテリーの消耗がなく、オフラインで動作する</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• オフライン、高速、簡潔</string>
+    <string name="about_proposition_3">• 高速、ミニマリスト、コミュニティによる開発</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">愛好家とボランティアによって作成されたオープンソースアプリケーション。</string>
    <!-- The button that opens system location settings -->
--- a/android/app/src/main/res/values-kab/strings.xml
+++ b/android/app/src/main/res/values-kab/strings.xml
@@ -26,6 +26,4 @@
    <string name="panoramax">Tugna n Panoramax</string>
    <string name="editor_line_social_network">LINE</string>
    <string name="kilometres">ⴽⵉⵍⵓⵎⵉⵜⵔⴻⵏ</string>
-    <string name="saved">Yettwasekles</string>
-    <string name="about_proposition_3">• Yezmer ad yaweḍ berra i usmel, s tɣawla yerna d ameẓyan</string>
 </resources>
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -38,11 +38,13 @@
    <string name="try_again">다시 시도</string>
    <string name="about_menu_title">CoMaps 정보</string>
    <!-- Text in About screen -->
+    <string name="about_headline">사랑으로 만든 모든 사람에게 무료</string>
+    <!-- Text in About screen -->
    <string name="about_proposition_1">• 광고 없음, 추적 없음, 데이터 수집 없음</string>
    <!-- Text in About screen -->
    <string name="about_proposition_2">• 배터리 소모 없음, 오프라인에서 작동</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• 오프라인, 빠르고 간소화됨</string>
+    <string name="about_proposition_3">• 빠르고 미니멀한, 커뮤니티가 개발한</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">애호가와 자원 봉사자가 만든 오픈 소스 응용 프로그램.</string>
    <!-- The button that opens system location settings -->
@@ -820,5 +822,4 @@
    <string name="wikimedia_commons">위키미디어 공용</string>
    <string name="panoramax">Panoramax 사진</string>
    <string name="editor_line_social_network">LINE</string>
-    <string name="saved">저장됨</string>
 </resources>
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -860,5 +860,4 @@
    <string name="telegram_url">https://t.me/CoMapsApp/</string>
    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
    <string name="panoramax">Panoramax vaizdas</string>
-    <string name="saved">Išsaugota</string>
 </resources>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Harry Bond	c287dde93f	Merge remote-tracking branch 'origin/yannikbloscheck-greenery' into test/2025.07.10 # Conflicts: # data/drules_proto.bin # data/drules_proto_default_dark.bin # data/drules_proto_default_light.bin # data/drules_proto_outdoors_dark.bin # data/drules_proto_outdoors_light.bin Signed-off-by: Harry Bond <me@hbond.xyz>	2025-07-10 21:47:23 +01:00
Harry Bond	f7e4fdad6a	[Android] Add current opening hours status to placepage preview And refresh it every 45s Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz>	2025-07-10 19:41:51 +01:00
Harry Bond	f59fb509c9	[core] Remove legacy opening_hours stuff Signed-off-by: Harry Bond <me@hbond.xyz>	2025-07-10 19:41:50 +01:00
Yannik Bloscheck	fae8849869	[styles] Regenerated files for changed how the greenery system works Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-07-05 10:18:15 +02:00
Yannik Bloscheck	3585bd4fad	[styles] Changed how the greenery system works Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-07-05 10:17:11 +02:00
				`@@ -1 +0,0 @@`
				`Nem kortnavigation - Oplev mere af din rejse - Drevet af fællesskabet`
				`@@ -1 +0,0 @@`
				`CoMaps - vandr, cykl og kør offline med privatliv`
				`@@ -1 +0,0 @@`
				`CoMaps - Túra, Bicikli, Vezetés offline diszkréten`
				`@@ -1 +0,0 @@`
				`CoMaps - Drumeții, Ciclism, Condus Offline în confidențialitate`
				`@@ -1 +0,0 @@`
				`Định vị bản đồ dễ dàng - Khám phá thế giới quanh bạn - Đồng hành cùng cộng đồng`