fix Vienna U-Bahn Icon, using colors by PTA

Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>

.github/workflows/android-check.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
 
@@ -78,7 +78,7 @@ jobs:
           pip install "protobuf<3.21" --break-system-packages
 
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 200 # enough to get all commits for the current day
 
@@ -103,7 +103,7 @@ jobs:
           ./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}
 
       - name: Upload ${{ matrix.flavor }} apk
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: android-${{ matrix.flavor }}
           path: android/app/build/outputs/apk/**/CoMaps-*.apk

.github/workflows/ios-check.yaml

@@ -35,7 +35,7 @@ jobs:
           xcodebuild -downloadPlatform iOS
 
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Parallel submodules checkout
         shell: bash

android/app/build.gradle

@@ -254,6 +254,7 @@ android {
   androidResources {
     ignoreAssetsPattern = '!.svn:!.git:!.DS_Store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~'
     noCompress = ['txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj']
+    // Some languages not supported by Android require to be specified here to be applied
     localeFilters += [
             "af",
             "ar",
@@ -281,6 +282,7 @@ android {
             "in",
             "it",
             "ja",
+            "kw",
             "ko",
             "lt",
             "lv",
@@ -352,6 +354,7 @@ dependencies {
   implementation libs.androidx.work.runtime
   implementation libs.androidx.lifecycle.process
   implementation libs.androidx.documentfile
+  // 1.13 Material library version doesn't render properly alpha properties on map buttons
   implementation libs.android.material
   // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
   // https://github.com/organicmaps/organicmaps/issues/6106

android/app/src/fdroid/play/listings/de-DE/release-notes.txt

@@ -1,8 +1,9 @@
-• OpenStreetMap Daten vom 17. Dezember
-• Map download server nun wählbar
-• Warnung über veraltete Karten hinzugefügt + Knopf zum updaten
-• Vermeidung von Parkplatzwegen im Routing
-• Neuer Zoombutton
-• Verbesserte Französchische Suchsynonme
-• OSM editor: Maximale Länge für OSM-Tags werden nun geprüft
-Mehr auf codeberg.org/comaps/comaps/releases
+• OSM-Daten vom 6. Januar
+• Editor: POI mit mehr als einem Tag, (z.B. Arten von Kunstwerken wie Skulpturen...), mehr POI können als leer/stillgelegt werden
+• Miniatureisenbahnen & Kläranlagen hinzugefügt
+• Material 3-Dialoge & dunklerer Hintergrund im Darkmode
+• Fiktive Geschwindigkeitsbegrenzungen für Verbindungsstraßen entfernt
+• Versatz der Kameraausschnitt in der Navigation behoben
+• Weniger empfindliches langes Antippen
+
+Weitere Details unter codeberg.org/comaps/comaps/releases

android/app/src/fdroid/play/listings/en-GB/full-description.txt

@@ -0,0 +1,32 @@
+A community-led free & open source maps app based on OpenStreetMap data and reinforced with commitment to transparency, privacy and being not-for-profit. CoMaps is a fork/spin-off of Organic Maps, which in turn is a fork of Maps.ME.
+
+Read on about reasons for the project and its direction at <b><i>codeberg.org/comaps</i></b>.
+Join the community there and help make the best maps app
+• Use the app and spread the word about it
+• Give feedback and report issues
+• Update map data in the app or on the OpenStreetMap website
+
+‣ <b>Offline-focused</b>: Plan and navigate your trip abroad without the need for cellular service, search waypoints while on a distant hike, etc. All app functions are designed to work offline.
+‣ <b>Respecting Privacy</b>: The app is designed with privacy in mind - does not identify people, does not track, and does not collect personal information. Ads-free.
+‣ <b>Simple and Polished</b>: essential easy to use features that just work.
+‣ <b>Saves Your Battery and Space</b>: Doesn’t drain your battery like other navigation apps. Compact maps save precious space on your phone.
+‣ <b>Free and Built by the Community</b>: People like you helped build the app by adding places to OpenStreetMap, testing and giving feedback on features and contributing their development skills and money.
+‣ <b>Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.</b>
+
+<b>Main Features</b>:
+• Downloadable detailed maps with places which are not available with Google Maps
+• Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc
+• Walking paths and cycleways
+• Points of interest like restaurants, gas stations, hotels, shops, sightseeing and many more
+• Search by name or an address or by point of interest category
+• Navigation with voice announcements for walking, cycling, or driving
+• Bookmark your favorite places with a single tap
+• Offline Wikipedia articles
+• Subway transit layer and directions
+• Track recording
+• Export and import bookmarks and tracks in KML, KMZ, GPX formats
+• A dark mode to use during the night
+• Improve map data for everyone using a basic built-in editor
+
+<b>Freedom Is Here</b>
+Discover your journey, navigate the world with privacy and community at the forefront!

android/app/src/fdroid/play/listings/en-GB/short-description.txt

@@ -0,0 +1 @@
+Easy map navigation - Discover more of your journey - Powered by the community

android/app/src/fdroid/play/listings/en-GB/title.txt

@@ -0,0 +1 @@
+CoMaps - Hike, Bike, Drive Offline with Privacy

android/app/src/fdroid/play/listings/en-US/release-notes.txt

@@ -1,8 +1,9 @@
-• OpenStreetMap data as of December 17
-• Make map download server configurable
-• Added info about outdated maps and an update button to the selected place info card
-• Avoid using parking aisles for routing
-• Changed shape of zoom buttons
-• Improved French search synonyms
-• OSM editor: check length limit for OSM tags in value validation
+• OpenStreetMap data as of January 6
+• Editor: add POI types with more than one OSM tag, e.g. artwork subtypes sculptures, paintings..; more POI types could be marked as vacant/disused
+• Added miniature railways and wastewater treatment plants
+• Use Material 3 dialogs and darker background in dark mode
+• Removed fictional speed limits for link roads
+• Fixed camera cutout offset in navigation
+• Less sensitive long tap (full-screen mode)
+
 More details on codeberg.org/comaps/comaps/releases

android/app/src/fdroid/play/listings/es-ES/release-notes.txt

@@ -0,0 +1,9 @@
+• Datos OSM a 06/01
+• Editor: se añaden tipos de POI con más de una etiqueta, ej. esculturas, pinturas...; se podrán marcar más tipos como en desuso
+• Se añaden ferrocarriles mini y plantas de tratamiento de aguas
+• Se utilizan diálogos Material 3 y fondo más oscuro en el modo oscuro
+• Se eliminan límites de velocidad ficticios para enlaces
+• Se corrige desplazamiento en la navegación
+• Toque largo menos sensible (en pantalla completa)
+
+Más detalles en codeberg.org/comaps/comaps/releases

android/app/src/fdroid/play/listings/fr-FR/release-notes.txt

@@ -1,8 +1,9 @@
-• Données OpenStreetMap du 17 décembre
-• Serveur de téléchargement de cartes configurable
-• Ajout d'un message d'avertissement pour les cartes trop anciennes
-• Évitement des allées de parking dans les itinéraires
-• Mise à jour de l'apparence des boutons de zooms
-• Amélioration des synonymes de recherche en français
-• Editeur OSM: vérification de la taille limite des tags OSM
-Plus d'informations sur codeberg.org/comaps/comaps/releases
+• Données OpenStreetMap du 6 janvier
+• Éditeur : support des types de POI avec plus d’un tag OSM, par exemple types d’œuvres d’art sculptures, peintures..
+• Rendu des rails pour trains miniatures et des stations d'épuration
+• Utilisation des pop-ups Material 3 et d'un fond plus sombre en thème sombre
+• Suppression des limites de vitesse fictives sur les bretelles de routes
+• Correction des instructions de navigation sur les appareils avec des encoches
+• Appui long moins sensible (en mode plein écran)
+
+Plus de détails sur codeberg.org/comaps/comaps/releases

android/app/src/fdroid/play/listings/hr/release-notes.txt

@@ -0,0 +1,7 @@
+• OpenStreetMap podaci od 6. siječnja
+• Uređivač: dodane točake interesa s više od jedne OSM oznake, npr. podtipovi umjetnina kao skulpture, slike...; više točaka interesa se sada može označiti kao upražnjene/napuštene
+• Dodane minijaturne željeznice i postrojenja za pročišćavanje otpadnih voda
+• Korištenje Material 3 dijaloga i tamnije pozadine u tamnom načinu rada
+• Uklonjena su izmišljena ograničenja brzine za spojne ceste
+
+Više detalja na codeberg.org/comaps/comaps/releases

android/app/src/fdroid/play/listings/pt-BR/release-notes.txt

@@ -1,8 +1,9 @@
-• Dados OSM de 17/12
-• Servidor de download de mapas configurável
-• Adição de informações sobre mapas desatualizados e um botão de atualização ao cartão de informações do local selecionado
-• Evita o uso de corredores de estacionamento para roteamento
-• Formato dos botões de zoom alterado
-• Sinônimos de busca em francês aprimorados
-• Editor OSM: verificação do limite de comprimento das tags do OSM na validação de valores
+• Dados OSM de 6/1
+• Editor: adição de POIs com mais de uma etiqueta OSM, por exemplo esculturas e pinturas; mais tipos de POI podem ser marcados como vagos/desativados
+• Adição de ferrovias em miniatura e ETEs
+• Uso de diálogos Material 3 e fundo mais escuro no modo escuro
+• Remoção de limites de velocidade fictícios para vias de ligação
+• Correção de recorte da câmera na navegação
+• Toque longo menos sensível (modo tela cheia)
+
 Mais detalhes em codeberg.org/comaps/comaps/releases

android/app/src/fdroid/play/listings/ru-RU/release-notes.txt

@@ -1,8 +1,8 @@
-• Карты OpenStreetMap от 17 декабря
-• Возможность настройки сервера для скачивания карт
-• Добавлена ​​информация об устаревании карт и ​​кнопка обновления (при выборе места на карте)
-• Парковочные проезды больше не используются для транзитной маршрутизации
-• Изменены кнопки масштабирования карты
-• На карту добавлены ирригационные гидранты
-• Редактор OSM: проверка максимальной длины OSM тегов
+• Карты OpenStreetMap от 6 января
+• Редактор: возможность добавления POI, определяемых несколькими тегами, например церквей, мечетей, буддистских храмов..
+• Добавлены миниатюрные железные дороги и очистные сооружения
+• Использование диалогов Material 3 и более тёмного фона в тёмном режиме
+• Удалены фиктивные ограничения скорости для заездов / съездов с шоссе
+• Менее чувствительное длительное нажатие на экран (переход в полноэкранный режим)
+
 Подробнее на codeberg.org/comaps/comaps/releases

android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java

@@ -446,7 +446,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
       default -> throw new AssertionError("Unexpected result code = " + result);
     };
 
-        mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        mAlertDialog = new MaterialAlertDialogBuilder(this)
                            .setTitle(titleId)
                            .setMessage(messageId)
                            .setCancelable(true)

android/app/src/main/java/app/organicmaps/MwmActivity.java

@@ -132,7 +132,6 @@ import app.organicmaps.widget.placepage.PlacePageViewModel;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -432,7 +431,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
 
     dismissLocationErrorDialog();
-    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this, R.style.MwmTheme_AlertDialog)
+    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this)
                                .setMessage(R.string.unknown_current_position)
                                .setCancelable(true)
                                .setPositiveButton(R.string.ok, null)
@@ -655,7 +654,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
         else
         {
           dismissAlertDialog();
-          mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+          mAlertDialog = new MaterialAlertDialogBuilder(this)
                              .setTitle(R.string.message_invalid_feature_position)
                              .setPositiveButton(R.string.ok, null)
                              .setOnDismissListener(dialog -> mAlertDialog = null)
@@ -712,7 +711,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (!TextUtils.isEmpty(appName))
     {
       setTitle(appName);
-      ((MaterialTextView) mPointChooser.findViewById(R.id.title)).setText(appName);
     }
   }
 
@@ -1155,7 +1153,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     if (type == IsolinesState.EXPIREDDATA)
     {
-      mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+      mAlertDialog = new MaterialAlertDialogBuilder(this)
                          .setTitle(R.string.downloader_update_maps)
                          .setMessage(R.string.isolines_activation_error_dialog)
                          .setPositiveButton(
@@ -1774,7 +1772,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     dismissAlertDialog();
     mAlertDialog =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.unable_to_calc_alert_title)
             .setMessage(R.string.unable_to_calc_alert_subtitle)
             .setPositiveButton(R.string.settings,
@@ -1797,7 +1795,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       builder.append(getString(resId)).append("\n\n");
 
     dismissAlertDialog();
-    mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    mAlertDialog = new MaterialAlertDialogBuilder(this)
                        .setTitle(R.string.dialog_routing_disclaimer_title)
                        .setMessage(builder.toString())
                        .setCancelable(false)
@@ -1846,7 +1844,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       return true;
 
     final MapObject endPoint = Objects.requireNonNull(controller.getEndPoint());
-    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
         .setTitle(R.string.p2p_only_from_current)
         .setMessage(R.string.p2p_reroute_from_current)
         .setCancelable(false)
@@ -2040,7 +2038,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
         {
           mPreciseLocationDialogShown = true;
           final MaterialAlertDialogBuilder builder =
-              new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+              new MaterialAlertDialogBuilder(this)
                   .setTitle("⚠ " + getString(R.string.limited_accuracy))
                   .setMessage(R.string.precise_location_is_disabled_long_text)
                   .setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss())
@@ -2074,7 +2072,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       return;
     }
 
-    mLocationErrorDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    mLocationErrorDialog = new MaterialAlertDialogBuilder(this)
                                .setTitle(R.string.enable_location_services)
                                .setMessage(R.string.location_is_disabled_long_text)
                                .setOnDismissListener(dialog -> mLocationErrorDialog = null)
@@ -2167,7 +2165,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       return;
     }
 
-    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
                                                    .setTitle(R.string.enable_location_services)
                                                    .setMessage(R.string.location_is_disabled_long_text)
                                                    .setOnDismissListener(dialog -> mLocationErrorDialog = null)
@@ -2253,7 +2251,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     dismissAlertDialog();
     final MaterialAlertDialogBuilder builder =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.current_location_unknown_error_title)
             .setCancelable(true)
             .setMessage(R.string.power_save_dialog_summary)
@@ -2278,7 +2276,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     dismissAlertDialog();
     mAlertDialog =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.load_kmz_title)
             .setMessage(getString(R.string.unknown_file_type, uri))
             .setPositiveButton(R.string.ok, null)
@@ -2295,7 +2293,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     dismissAlertDialog();
     mAlertDialog =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.load_kmz_title)
             .setMessage(getString(R.string.failed_to_open_file, uri, error))
             .setPositiveButton(R.string.ok, null)
@@ -2317,7 +2315,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void onBookmarksFileImportFailed()
   {
     dismissAlertDialog();
-    mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    mAlertDialog = new MaterialAlertDialogBuilder(this)
                        .setTitle(R.string.load_kmz_title)
                        .setMessage(R.string.load_kmz_failed)
                        .setPositiveButton(R.string.ok, null)
@@ -2578,7 +2576,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private void reportUnsupported()
   {
-    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(this)
         .setMessage(R.string.unsupported_phone)
         .setCancelable(false)
         .setPositiveButton(R.string.close, (dlg, which) -> this.moveTaskToBack(true))

android/app/src/main/java/app/organicmaps/SplashActivity.java

@@ -120,7 +120,7 @@ public class SplashActivity extends AppCompatActivity
   private void showFatalErrorDialog(@StringRes int titleId, @StringRes int messageId, Exception error)
   {
     mCanceled = true;
-    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_M3_AlertDialog)
         .setTitle(titleId)
         .setMessage(messageId)
         .setPositiveButton(

android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java

@@ -60,14 +60,14 @@ public enum BookmarksSharingHelper
     case BookmarkSharingResult.SUCCESS ->
       SharingUtils.shareBookmarkFile(context, launcher, result.getSharingPath(), result.getMimeType());
     case BookmarkSharingResult.EMPTY_CATEGORY ->
-      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+      new MaterialAlertDialogBuilder(context)
           .setTitle(R.string.bookmarks_error_title_share_empty)
           .setMessage(R.string.bookmarks_error_message_share_empty)
           .setPositiveButton(R.string.ok, null)
           .show();
     case BookmarkSharingResult.ARCHIVE_ERROR, BookmarkSharingResult.FILE_ERROR ->
     {
-      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+      new MaterialAlertDialogBuilder(context)
           .setTitle(R.string.dialog_routing_system_error)
           .setMessage(R.string.bookmarks_error_message_share_general)
           .setPositiveButton(R.string.ok, null)

android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java

@@ -42,6 +42,7 @@ public class ChooseBookmarkCategoryFragment
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
   {
     View root = inflater.inflate(R.layout.choose_bookmark_category_fragment, container, false);
+    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
     mRecycler = root.findViewById(R.id.recycler);
     mRecycler.setLayoutManager(new LinearLayoutManager(requireActivity()));
     return root;

android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java

@@ -77,6 +77,7 @@ public class ChooseBookmarksSortingTypeFragment
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
   {
     super.onViewCreated(view, savedInstanceState);
+    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
 
     final Bundle args = getArguments();
     if (args == null)

android/app/src/main/java/app/organicmaps/car/CarAppSession.java

@@ -114,6 +114,7 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
   public void onCreate(@NonNull LifecycleOwner owner)
   {
     Logger.d(TAG);
+    Framework.nativeSetCarScreenMode(true);
     mSensorsManager = new CarSensorsManager(getCarContext());
     mDisplayManager = MwmApplication.from(getCarContext()).getDisplayManager();
     mDisplayManager.addListener(DisplayType.Car, this);
@@ -159,6 +160,7 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
   public void onDestroy(@NonNull LifecycleOwner owner)
   {
     mDisplayManager.removeListener(DisplayType.Car);
+    Framework.nativeSetCarScreenMode(false);
   }
 
   private void init()

android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java

@@ -42,7 +42,7 @@ public final class CustomMapServerDialog
     edit.setText(current);
 
     MaterialAlertDialogBuilder builder =
-        new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(context)
             .setTitle(R.string.download_resources_custom_url_title)
             .setMessage(R.string.download_resources_custom_url_message)
             .setView(dialogView)

android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java

@@ -113,7 +113,7 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
       negativeButtonText = args.getString(ARG_NEGATIVE_BUTTON);
     }
 
-    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity())
                                      .setView(buildView())
                                      .setNegativeButton(negativeButtonText, null)
                                      .setPositiveButton(positiveButtonText, null)

android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java

@@ -119,7 +119,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
   {
     if (RoutingController.get().isNavigating())
     {
-      new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
+      new MaterialAlertDialogBuilder(adapter.mActivity)
           .setTitle(R.string.downloader_delete_map)
           .setMessage(R.string.downloader_delete_map_while_routing_dialog)
           .setPositiveButton(R.string.ok, null)
@@ -133,7 +133,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       return;
     }
 
-    new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(adapter.mActivity)
         .setTitle(R.string.downloader_delete_map)
         .setMessage(R.string.downloader_delete_map_dialog)
         .setNegativeButton(R.string.cancel, null)

android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java

@@ -49,7 +49,7 @@ public class MapManagerHelper
         return;
     }
 
-    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity)
                                 .setTitle(R.string.country_status_download_failed)
                                 .setMessage(getErrorCodeStrRes(errorData.errorCode))
                                 .setNegativeButton(R.string.cancel,
@@ -72,7 +72,7 @@ public class MapManagerHelper
 
   private static void notifyNoSpaceInternal(Activity activity)
   {
-    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(activity)
         .setTitle(R.string.downloader_no_space_title)
         .setMessage(R.string.downloader_no_space_message)
         .setPositiveButton(android.R.string.ok, null)
@@ -123,7 +123,7 @@ public class MapManagerHelper
       return false;
     }
 
-    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(activity)
         .setTitle(R.string.download_over_mobile_header)
         .setMessage(R.string.download_over_mobile_message)
         .setNegativeButton(R.string.cancel, null)

android/app/src/main/java/app/organicmaps/editor/EditorFragment.java

@@ -493,7 +493,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
       }
     });
 
-    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    return new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.editor_socket)
         .setView(dialogView)
         .setPositiveButton(R.string.save,
@@ -997,7 +997,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
       message = R.string.editor_reset_edits_message;
     }
 
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(message)
         .setPositiveButton(title,
                            (dialog, which) -> {
@@ -1020,7 +1020,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
   private void placeDisused()
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
       .setTitle(R.string.editor_mark_business_vacant_title)
       .setMessage(R.string.editor_mark_business_vacant_description)
       .setPositiveButton(R.string.editor_submit, (dlg, which) -> {

android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java

@@ -237,6 +237,7 @@ public class EditorHostFragment
     for (LocalizedName name : sNames)
       languages.add(name.lang);
     args.putStringArrayList(LanguagesFragment.EXISTING_LOCALIZED_NAMES, languages);
+    args.putBoolean(LanguagesFragment.INCLUDE_LOCAL_LANGUAGE, false);
     editWithFragment(Mode.LANGUAGE, R.string.choose_language, args, LanguagesFragment.class, false);
   }
 
@@ -352,7 +353,7 @@ public class EditorHostFragment
 
   private void processNoFeatures()
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.downloader_no_space_title)
         .setPositiveButton(R.string.ok, null)
         .show();
@@ -386,7 +387,7 @@ public class EditorHostFragment
 
   private void showNoobDialog()
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.editor_share_to_all_dialog_title)
         .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
                     + getString(R.string.editor_share_to_all_dialog_message_2))

android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java

@@ -155,7 +155,7 @@ public class FeatureCategoryFragment
   // Duplicate of showNoobDialog()
   private void showNoteConfirmationDialog(double lat, double lon, String noteText)
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.editor_share_to_all_dialog_title)
         .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
                     + getString(R.string.editor_share_to_all_dialog_message_2))

android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java

@@ -1,11 +1,15 @@
 package app.organicmaps.editor;
 
+import static app.organicmaps.sdk.editor.data.Language.DEFAULT_LANG_CODE;
+
 import android.content.res.Configuration;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.core.os.ConfigurationCompat;
 import androidx.core.os.LocaleListCompat;
 import androidx.fragment.app.Fragment;
+
+import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmRecyclerFragment;
 import app.organicmaps.sdk.editor.Editor;
 import app.organicmaps.sdk.editor.data.Language;
@@ -21,6 +25,7 @@ import java.util.Set;
 public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
 {
   final static String EXISTING_LOCALIZED_NAMES = "ExistingLocalizedNames";
+  final static String INCLUDE_LOCAL_LANGUAGE = "IncludeLocalLanguage";
 
   public interface Listener
   {
@@ -34,6 +39,8 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
   protected LanguagesAdapter createAdapter()
   {
     Bundle args = getArguments();
+    boolean includeLocalLanguage =
+        args != null ? args.getBoolean(INCLUDE_LOCAL_LANGUAGE) : true;
     Set<String> existingLanguages =
         args != null ? new HashSet<>(args.getStringArrayList(EXISTING_LOCALIZED_NAMES)) : new HashSet<>();
 
@@ -68,6 +75,12 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
 
     languages.addAll(0, systemLanguages.stream().filter(Objects::nonNull).toList());
 
+    if (includeLocalLanguage) {
+      String localLanguageLabel = getString(R.string.pref_maplanguage_local);
+      Language localLanguage = new Language(DEFAULT_LANG_CODE, localLanguageLabel);
+      languages.add(0, localLanguage);
+    }
+
     return new LanguagesAdapter(this, languages.toArray(new Language[languages.size()]));
   }
 

android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java

@@ -79,7 +79,7 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment
 
   private void onAuthFail()
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.editor_login_error_dialog)
         .setPositiveButton(R.string.ok, null)
         .show();

android/app/src/main/java/app/organicmaps/help/FaqFragment.java

@@ -66,7 +66,7 @@ public class FaqFragment extends BaseMwmFragment
     FloatingActionButton feedbackFab = root.findViewById(R.id.feedback_fab);
     feedbackFab.setOnClickListener(
         v
-        -> new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+        -> new MaterialAlertDialogBuilder(requireActivity())
                .setTitle(R.string.feedback)
                .setNegativeButton(R.string.cancel, null)
                .setItems(new CharSequence[] {getString(R.string.feedback_general), getString(R.string.report_a_bug)},

android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java

@@ -107,7 +107,7 @@ public class TrafficButtonController implements TrafficManager.TrafficCallback
     if (mDialog != null && mDialog.isShowing())
       return;
 
-    mDialog = new MaterialAlertDialogBuilder(mActivity, R.style.MwmTheme_AlertDialog)
+    mDialog = new MaterialAlertDialogBuilder(mActivity)
                   .setMessage(R.string.common_check_internet_connection_dialog)
                   .setPositiveButton(R.string.ok, (dialog, which) -> TrafficManager.INSTANCE.setEnabled(false))
                   .setCancelable(true)

android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java

@@ -56,7 +56,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
   public Dialog onCreateDialog(Bundle savedInstanceState)
   {
     parseArguments();
-    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity())
                                              .setCancelable(true)
                                              .setNegativeButton(android.R.string.cancel, null);
     beforeDialogCreated(builder);

android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java

@@ -1,6 +1,7 @@
 package app.organicmaps.settings;
 
 import static app.organicmaps.leftbutton.LeftButtonsHolder.DISABLE_BUTTON_CODE;
+import static app.organicmaps.sdk.editor.data.Language.DEFAULT_LANG_CODE;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -140,8 +141,13 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
   private void updateMapLanguageCodeSummary()
   {
     final Preference pref = getPreference(getString(R.string.pref_map_locale));
-    Locale locale = new Locale(MapLanguageCode.getMapLanguageCode());
-    pref.setSummary(locale.getDisplayLanguage());
+    String mapLanguageCode = MapLanguageCode.getMapLanguageCode();
+    if (mapLanguageCode.equals(DEFAULT_LANG_CODE)) {
+      pref.setSummary(R.string.pref_maplanguage_local);
+    } else {
+      Locale locale = new Locale(mapLanguageCode);
+      pref.setSummary(locale.getDisplayLanguage());
+    }
   }
 
   private void updateRoutingSettingsPrefsSummary()
@@ -494,7 +500,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     pref.setOnPreferenceClickListener(preference -> {
       if (MapManager.nativeIsDownloading())
       {
-        new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(requireActivity())
             .setTitle(R.string.downloading_is_active)
             .setMessage(R.string.cant_change_this_setting)
             .setPositiveButton(R.string.ok, null)

android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java

@@ -97,7 +97,7 @@ public class StoragePathFragment extends BaseSettingsFragment
     final String oldPath = storages.get(currentIndex).mPath;
     final String newPath = storages.get(newIndex).mPath;
 
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setCancelable(false)
         .setTitle(R.string.move_maps)
         .setPositiveButton(R.string.ok, (dlg, which) -> moveStorage(newPath, oldPath))
@@ -133,7 +133,7 @@ public class StoragePathFragment extends BaseSettingsFragment
 
         if (!result)
         {
-          new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+          new MaterialAlertDialogBuilder(requireActivity())
               .setTitle(R.string.move_maps_error)
               .setPositiveButton(
                   R.string.report_a_bug,

android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java

@@ -61,6 +61,7 @@ public class StackedButtonsDialog extends AppCompatDialog implements View.OnClic
     setCancelable(mCancelable);
     setOnCancelListener(mCancelListener);
     setContentView(R.layout.dialog_stacked_buttons);
+    getWindow().setBackgroundDrawableResource(android.R.color.transparent);
 
     TextView title = findViewById(R.id.tv__title);
     UiUtils.setTextAndHideIfEmpty(title, mTitle);

android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java

@@ -47,7 +47,7 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
         mIconResId = getArguments().getInt(ICON_RES);
     }
 
-    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    return new MaterialAlertDialogBuilder(requireActivity())
         .setView(buildView())
         .setTitle(R.string.choose_color)
         .setNegativeButton(R.string.cancel, null)

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java

@@ -464,7 +464,7 @@ public class PlacePageController
       mAlertDialog.show();
       return;
     }
-    mAlertDialog = new MaterialAlertDialogBuilder(requireContext(), R.style.MwmTheme_AlertDialog)
+    mAlertDialog = new MaterialAlertDialogBuilder(requireContext())
                        .setTitle(requireContext().getString(R.string.delete_track_dialog_title, mMapObject.getTitle()))
                        .setCancelable(true)
                        .setNegativeButton(R.string.cancel, null)

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java

@@ -428,8 +428,9 @@ public class PlacePageView extends Fragment
 
   private void updateBookmarkView()
   {
+   boolean enabled = mMapObject.isBookmark() || mMapObject.isTrack();
     updateViewFragment(PlacePageBookmarkFragment.class, BOOKMARK_FRAGMENT_TAG, R.id.place_page_bookmark_fragment,
-                       mMapObject.isBookmark());
+                       enabled);
   }
 
   private void updateTrackView()

android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java

@@ -23,6 +23,7 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
+import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -41,6 +42,7 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
   private PlacePageViewModel mViewModel;
 
   private Bookmark currentBookmark;
+  private Track currentTrack;
 
   @Nullable
   @Override
@@ -88,7 +90,15 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
 
   private void updateBookmarkDetails()
   {
-    final String notes = currentBookmark.getBookmarkDescription();
+      String notes = null;
+      if (currentBookmark != null)
+      {
+          notes = currentBookmark.getBookmarkDescription();
+      }
+      if (currentTrack != null)
+      {
+          notes = currentTrack.getTrackDescription();
+      }
     if (TextUtils.isEmpty(notes))
     {
       UiUtils.hide(mTvBookmarkNote);
@@ -120,8 +130,16 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
   public void onClick(View v)
   {
     final FragmentActivity activity = requireActivity();
-    EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(), currentBookmark.getBookmarkId(), activity,
-                                      getChildFragmentManager(), PlacePageBookmarkFragment.this);
+    if (currentBookmark != null)
+    {
+        EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(), currentBookmark.getBookmarkId(), activity,
+                getChildFragmentManager(), PlacePageBookmarkFragment.this);
+    }
+    else if (currentTrack != null)
+    {
+        EditBookmarkFragment.editBookmark(currentTrack.getCategoryId(), currentTrack.getTrackId(), activity,
+                getChildFragmentManager(), PlacePageBookmarkFragment.this);
+    }
   }
 
   @Override
@@ -152,6 +170,11 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
       currentBookmark = (Bookmark) mapObject;
       updateBookmarkDetails();
     }
+    if (mapObject != null && mapObject.isTrack())
+    {
+      currentTrack = (Track) mapObject;
+      updateBookmarkDetails();
+    }
   }
 
   @Override

android/app/src/main/res/drawable/bg_clickable_card.xml

@@ -4,7 +4,7 @@
   android:color="?colorControlHighlight">
   <item>
     <shape>
-      <solid android:color="?cardBackground" />
+      <solid android:color="?appBackground" />
     </shape>
   </item>
   <item android:id="@android:id/mask">

android/app/src/main/res/layout-land/dialog_stacked_buttons.xml

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  android:orientation="vertical"
+  style="@style/Widget.Material3.CardView.Filled"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:paddingBottom="@dimen/margin_half"
-  android:background="?cardBackground">
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
 
   <LinearLayout
     android:orientation="vertical"
@@ -49,3 +55,4 @@
       tools:text="Do not Use Today"/>
   </LinearLayout>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>

android/app/src/main/res/layout-land/fragment_osm_login.xml

@@ -22,12 +22,9 @@
       android:layout_height="match_parent"
       android:clipChildren="false"
       android:clipToPadding="false"
-      android:orientation="vertical"
+      android:baselineAligned="false"
+      android:orientation="horizontal"
       tools:ignore="ScrollViewSize">
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
         <LinearLayout
           android:layout_width="0dp"
           android:layout_height="match_parent"
@@ -111,6 +108,5 @@
             android:text="@string/register_at_openstreetmap" />
         </LinearLayout>
       </LinearLayout>
-    </LinearLayout>
   </ScrollView>
 </LinearLayout>

android/app/src/main/res/layout-land/layout_nav_top.xml

@@ -17,6 +17,7 @@
     android:id="@+id/street_frame"
     android:layout_width="500dp"
     android:layout_height="wrap_content"
+    style="@style/Widget.Material3.CardView.Filled"
     android:layout_marginEnd="@dimen/margin_quarter"
     app:cardCornerRadius="@dimen/margin_half"
     android:elevation="@dimen/nav_elevation"

android/app/src/main/res/layout-land/onmap_downloader.xml

@@ -11,8 +11,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:backgroundTint="?menuBackground"
-    android:background="@drawable/onmap_downloader_background"
+    android:background="?menuBackground"
     android:padding="@dimen/margin_base"
     android:clipToPadding="false"
     android:clipChildren="false"

android/app/src/main/res/layout/choose_bookmark_category_fragment.xml

@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  style="@style/Widget.Material3.CardView.Filled"
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
   android:orientation="vertical"
-  android:background="?cardBackground"
   android:minWidth="@dimen/bookmark_purchase_img_width"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
@@ -21,9 +27,11 @@
     android:layout_marginEnd="@dimen/margin_base_plus"
     android:layout_marginStart="@dimen/margin_base_plus"
     tools:text="Select list"/>
-  <include
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
     android:layout_marginTop="@dimen/margin_base"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    layout="@layout/recycler_default"/>
+    android:scrollbars="vertical"/>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>

android/app/src/main/res/layout/dialog_sorting_types.xml

@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  style="@style/Widget.Material3.CardView.Filled"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:layout_margin="@dimen/margin_double_and_half"
-  android:background="?cardBackground"
   android:minWidth="@dimen/dialog_min_width"
   android:minHeight="@dimen/dialog_min_height"
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
   android:orientation="vertical"
   android:padding="@dimen/margin_base_plus">
 
@@ -77,3 +82,4 @@
       app:buttonTint="@null"/>
   </RadioGroup>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>

android/app/src/main/res/layout/dialog_stacked_buttons.xml

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  android:orientation="vertical"
+  style="@style/Widget.Material3.CardView.Filled"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:paddingBottom="@dimen/margin_half"
-  android:background="?cardBackground">
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
 
   <LinearLayout
     android:orientation="vertical"
@@ -41,3 +47,4 @@
     style="@style/MwmWidget.Button.StackedButtonsDialog"
     tools:text="Do not Use Today"/>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>

android/app/src/main/res/layout/downloader_item_header.xml

@@ -13,7 +13,6 @@
     android:paddingTop="@dimen/margin_half"
     android:paddingBottom="@dimen/margin_half"
     android:layout_marginEnd="@dimen/margin_base"
-    android:background="?cardBackground"
     android:textAppearance="@style/MwmTextAppearance.Caption"
     tools:text="Downloaded"
     tools:background="#80FF0000"/>

android/app/src/main/res/layout/edit_bookmark_common.xml

@@ -6,7 +6,7 @@
   android:id="@+id/rl__bookmark_details"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:padding="@dimen/margin_half">
   <LinearLayout
     android:id="@+id/ll__bookmark_name"

android/app/src/main/res/layout/fragment_bookmark_category_settings.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:orientation="vertical"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
   <com.google.android.material.appbar.MaterialToolbar
@@ -69,7 +69,6 @@
       android:inputType="textMultiLine"/>
     </com.google.android.material.textfield.TextInputLayout>
     <View
-      android:background="?cardBackground"
       android:layout_width="match_parent"
       android:layout_height="match_parent"/>
   </LinearLayout>

android/app/src/main/res/layout/fragment_categories.xml

@@ -11,5 +11,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbars="vertical"
-    android:fadeScrollbars="false" />
+    android:fadeScrollbars="false"
+    android:background="?appBackground"/>
 </LinearLayout>

android/app/src/main/res/layout/fragment_downloader.xml

@@ -4,7 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   style="@style/MwmWidget.Floating"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
   <include layout="@layout/toolbar_with_search"/>
@@ -17,10 +17,12 @@
     style="@style/MwmWidget.Button.Primary"
     tools:text="@string/downloader_update_all_button"/>
 
-  <include
-    layout="@layout/recycler_default"
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?appBackground"
+    android:scrollbars="vertical"
     android:layout_below="@id/toolbar"
     android:layout_above="@id/action"/>
 

android/app/src/main/res/layout/fragment_edit_bookmark.xml

@@ -4,7 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?cardBackground">
+  android:background="?appBackground">
   <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"

android/app/src/main/res/layout/fragment_editor_host.xml

@@ -5,6 +5,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:background="?windowBackgroundForced"
   android:orientation="vertical">
 
   <com.google.android.material.appbar.MaterialToolbar

android/app/src/main/res/layout/fragment_phone.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/frameLayout"
-        android:background="?cardBackground">
+        android:background="?windowBackgroundForced">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/phones_recycler"

android/app/src/main/res/layout/fragment_report.xml

@@ -20,8 +20,8 @@
       android:gravity="center"
       android:layout_gravity="end|center_vertical"
       android:background="?selectableItemBackgroundBorderless"
+      android:textSize="@dimen/text_size_toolbar"
       android:padding="@dimen/margin_half"
-      android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"
       android:text="@string/editor_report_problem_send_button"/>
   </com.google.android.material.appbar.MaterialToolbar>
 

android/app/src/main/res/layout/fragment_search.xml

@@ -61,12 +61,12 @@
         android:layout_height="match_parent"
         android:clickable="true"
         android:focusable="true"
-        android:background="?cardBackground">
+        android:background="?appBackground">
 
         <androidx.recyclerview.widget.RecyclerView
           android:id="@+id/recycler"
           android:clipToPadding="false"
-          android:background="?cardBackground"
+          android:background="?appBackground"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           />

android/app/src/main/res/layout/fragment_search_categories.xml

@@ -4,6 +4,10 @@
   style="@style/MwmWidget.FrameLayout"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <include
-    layout="@layout/recycler_default"/>
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?appBackground"
+    android:scrollbars="vertical"/>
 </FrameLayout>

android/app/src/main/res/layout/fragment_timetable_advanced.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:card_view="http://schemas.android.com/apk/res-auto"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
@@ -13,36 +13,12 @@
     android:orientation="vertical"
     android:padding="@dimen/margin_half">
 
-    <com.google.android.material.card.MaterialCardView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      style="@style/MwmWidget.M3.Editor.CardView"
-      card_view:cardBackgroundColor="?cardBackground"
-      card_view:cardCornerRadius="2dp"
-      card_view:cardElevation="4dp">
-
-      <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/et__timetable"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="@null"
-        android:gravity="top|start"
-        android:inputType="textMultiLine"
-        android:padding="@dimen/margin_base"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        tools:hint="hint"
-        tools:text="trololo \ntrololo \ntrololo"/>
-
-    </com.google.android.material.card.MaterialCardView>
-
     <com.google.android.material.card.MaterialCardView
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_half"
-      card_view:cardBackgroundColor="?cardBackground"
-      card_view:cardCornerRadius="2dp"
-      card_view:cardElevation="4dp">
+      style="@style/MwmWidget.M3.Editor.CardView"
+      app:cardBackgroundColor="?cardBackground">
 
       <LinearLayout
         android:id="@+id/examples"
@@ -50,6 +26,26 @@
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:animateLayoutChanges="true">
+          <com.google.android.material.textfield.TextInputLayout
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:padding="@dimen/margin_half"
+              android:layout_marginBottom="@dimen/margin_half"
+              app:hintEnabled="false">
+
+          <com.google.android.material.textfield.TextInputEditText
+              android:id="@+id/et__timetable"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_alignParentBottom="true"
+              android:background="@null"
+              android:gravity="top|start"
+              android:inputType="textMultiLine"
+              android:padding="@dimen/margin_base"
+              android:textAppearance="@style/MwmTextAppearance.Body3"
+              tools:hint="hint"
+              tools:text="trololo \ntrololo \ntrololo"/>
+          </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textview.MaterialTextView
           android:id="@+id/tv__examples_title"

android/app/src/main/res/layout/item_category_description.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:padding="@dimen/margin_base">
 
   <LinearLayout

android/app/src/main/res/layout/item_category_title.xml

@@ -5,7 +5,7 @@
   style="@style/MwmTextAppearance.Headline6"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?windowBackgroundForced"
+  android:background="?appBackground"
   android:gravity="start|center_vertical"
   android:paddingStart="@dimen/margin_base"
   android:paddingTop="@dimen/margin_base_plus"

android/app/src/main/res/layout/item_feature_category_footer.xml

@@ -6,7 +6,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_gravity="center"
   android:orientation="vertical"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:padding="@dimen/margin_base">
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"

android/app/src/main/res/layout/item_missed_map.xml

@@ -7,7 +7,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?colorSurfaceContainerHigh"
   android:minHeight="@dimen/height_item_oneline"
   android:paddingStart="@dimen/margin_base_plus"
   android:paddingEnd="@dimen/margin_base_plus">

android/app/src/main/res/layout/item_missed_map_group.xml

@@ -7,7 +7,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?colorSurfaceContainerHigh"
   android:minHeight="@dimen/height_item_oneline"
   android:paddingStart="@dimen/margin_base_plus"
   android:paddingEnd="@dimen/margin_base_plus">

android/app/src/main/res/layout/item_phone.xml

@@ -1,11 +1,14 @@
-<androidx.constraintlayout.widget.ConstraintLayout
+<com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/MwmWidget.M3.Editor.CardView"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/height_item_oneline"
-    android:background="?clickableBackground"
-    android:layout_marginTop="@dimen/margin_half"
+    android:layout_margin="@dimen/margin_eighth"
+    android:layout_height="wrap_content">
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/margin_half"
     android:paddingStart="@dimen/margin_half_plus"
     android:paddingEnd="@dimen/margin_half_plus">
 
@@ -25,7 +28,6 @@
         android:layout_marginStart="@dimen/margin_half"
         android:layout_marginEnd="@dimen/margin_half"
         android:layout_toStartOf="@id/delete_icon"
-        android:textColorHint="?android:textColorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/delete_icon"
         app:layout_constraintStart_toEndOf="@+id/phone_icon"
@@ -41,7 +43,6 @@
     <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/delete_icon"
       style="@style/MwmWidget.Editor.MetadataIcon"
-      android:layout_marginStart="@dimen/margin_half"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent"
@@ -49,3 +50,4 @@
       app:srcCompat="@drawable/ic_delete" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>

android/app/src/main/res/layout/layout_nav_top.xml

@@ -17,6 +17,7 @@
     android:id="@+id/street_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    style="@style/Widget.Material3.CardView.Filled"
     android:layout_marginStart="@dimen/nav_street_left"
     android:layout_marginEnd="@dimen/margin_quarter"
     app:cardCornerRadius="@dimen/margin_half"

android/app/src/main/res/layout/menu.xml

@@ -4,7 +4,7 @@
   android:id="@+id/menu_frame"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:clickable="true"
   android:visibility="gone"
   tools:visibility="visible">

android/app/src/main/res/layout/menu_route_plan_line.xml

@@ -2,7 +2,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:orientation="horizontal"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 

android/app/src/main/res/layout/position_chooser.xml

@@ -15,21 +15,14 @@
     android:theme="@style/MwmWidget.ToolbarTheme"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
-      <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/margin_half"
-        android:text="@string/editor_add_select_location"
-        android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"/>
+    app:layout_constraintTop_toTopOf="parent"
+    app:title="@string/editor_add_select_location">
     </com.google.android.material.appbar.MaterialToolbar>
 
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:padding="@dimen/margin_base"
     android:text="@string/editor_focus_map_on_location"
     app:layout_constraintTop_toBottomOf="@+id/toolbar_point_chooser" />

android/app/src/main/res/layout/routing_action_panel.xml

@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:minHeight="@dimen/height_block_base"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:baselineAligned="false">
   <LinearLayout
     android:id="@+id/btn__search_point"

android/app/src/main/res/layout/routing_plan.xml

@@ -146,16 +146,13 @@
     android:foreground="@drawable/shadow_top"
     android:visibility="gone"
     tools:visibility="visible">
-    <RelativeLayout
+    <LinearLayout
       android:id="@+id/driving_options_btn"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="?selectableItemBackgroundBorderless"
       android:gravity="center"
       android:minHeight="@dimen/height_block_base">
-      <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
         <com.google.android.material.imageview.ShapeableImageView
           android:id="@+id/driving_options_btn_img"
           android:layout_width="@dimen/margin_base_plus"
@@ -174,8 +171,7 @@
           android:textAppearance="?android:attr/textAppearanceSmall"
           android:textColor="@color/text_light"
           tools:text="test" />
-      </LinearLayout>
-    </RelativeLayout>
+    </LinearLayout>
   </FrameLayout>
   <FrameLayout
     style="@style/MwmWidget.FrameLayout.Elevation"

android/app/src/main/res/values-bn/strings.xml

@@ -315,4 +315,22 @@
     <string name="error_enter_correct_web">সঠিক ওয়েব এড্রেস দিন</string>
     <string name="error_enter_correct_email">সঠিক ইমেইল দিন</string>
     <string name="placepage_add_place_button">OpenStreetMap এ স্থান যোগ করুন</string>
+    <string name="editor_zip_code">ডাক কোড</string>
+    <string name="error_enter_correct_zip_code">সঠিক ডাক কোড প্রদান করুন</string>
+    <string name="editor_reset_edits_button">পরিবর্তনগুলো বাতিল করুন</string>
+    <plurals name="bookmarks_places">
+        <item quantity="one">%dটি বুকমার্ক</item>
+        <item quantity="other">%dটি বুকমার্ক</item>
+    </plurals>
+    <plurals name="bookmarks_detect_message">
+        <item quantity="one">%dটি ফাইল পাওয়া গেছে। রূপান্তরের পর আপনি এটি দেখতে পারবেন।</item>
+        <item quantity="other">%dটি ফাইল পাওয়া গেছে। রূপান্তরের পর আপনি সেগুলো দেখতে পারবেন।</item>
+    </plurals>
+    <plurals name="tracks">
+        <item quantity="one">%dটি ট্র্যাক</item>
+        <item quantity="other">%dটি ট্র্যাক</item>
+    </plurals>
+    <string name="app_tip_06">আপনি আমাদের অ্যাপটি আপনার ভাষায় অনুবাদ করতে সাহায্য করতে পারেন।</string>
+    <string name="offline_explanation_title">অফলাইন মানচিত্র</string>
+    <string name="offline_explanation_text">এলাকাটি দেখতে এবং নেভিগেট করতে একটি মানচিত্র ডাউনলোড করতে হবে।\nআপনি যেসব এলাকায় ভ্রমণ করতে চান সেগুলোর মানচিত্র ডাউনলোড করুন।</string>
 </resources>

android/app/src/main/res/values-ca/strings.xml

@@ -924,5 +924,5 @@
     <string name="download_resources_custom_url_title">Servidor de Mapes Personalitzat</string>
     <string name="download_resources_custom_url_message">Sobreescriu el servidor de descàrrega de mapes per defecte. Deixa en blanc per a emprar el servidor per defecte de CoMaps.</string>
     <string name="download_resources_custom_url_summary_none">No establert</string>
-    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL completa que comence amb https:// i acabe amb /</string>
+    <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL que comence amb http:// o https://</string>
 </resources>

android/app/src/main/res/values-cs/strings.xml

@@ -915,7 +915,7 @@
     <string name="navigation_start_tts_disabled_message">Hlasové pokyny vypnuty: služba TTS není dostupná</string>
     <string name="download_resources_custom_url_title">Vlastní mapový server</string>
     <string name="download_resources_custom_url_message">Přepsat výchozí server používaný ke stahování map. Nechte pole prázdné, pokud chcete použít výchozí server CoMaps.</string>
-    <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na https:// a končící s /</string>
+    <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na http:// nebo https://</string>
     <string name="advanced">Pokročilé</string>
     <string name="download_resources_custom_url_summary_none">Není nastaveno</string>
 </resources>

android/app/src/main/res/values-da/strings.xml

@@ -906,5 +906,5 @@
     <string name="download_resources_custom_url_title">Brugerdefineret kortserver</string>
     <string name="download_resources_custom_url_message">Tilsidesæt den som standard anvendte server til download af kort. Lad feltet være tomt for at bruge CoMaps\' standardserver.</string>
     <string name="download_resources_custom_url_summary_none">Ikke indstillet</string>
-    <string name="download_resources_custom_url_error_scheme">Indtast en fuld URL, der starter med https:// og ender med /</string>
+    <string name="download_resources_custom_url_error_scheme">Indtast en URL, der starter med http:// eller https://</string>
 </resources>

android/app/src/main/res/values-de/strings.xml

@@ -153,7 +153,7 @@
     <!-- message title of loading file -->
     <string name="load_kmz_title">Lesezeichen werden geladen</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Lesezeichen erfolgreich geladen! Sie können diese nun auf Ihrer Karte oder im Lesezeichen-Manager anzeigen.</string>
+    <string name="load_kmz_successful">Lesezeichen erfolgreich geladen! Du kannst dieses nun auf deiner Karte oder im Lesezeichen-Manager anzeigen lassen.</string>
     <!-- Kml file loading failed -->
     <string name="load_kmz_failed">Laden der Lesezeichen fehlgeschlagen. Die Datei könnte beschädigt oder defekt sein.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
@@ -171,7 +171,7 @@
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Du hast CoMaps nicht installiert? Lade die App hier herunter: https://www.comaps.app/de/download/</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hey, sieh dir meine Stecknadel in der CoMaps-App an!</string>
+    <string name="bookmark_share_email_subject">Hey, sieh dir mein Lesezeichen in der CoMaps-App an!</string>
     <!-- Subject for emailed position -->
     <string name="my_position_share_email_subject">Hey, sieh dir meinen aktuellen Standort auf der CoMaps-Karte an!</string>
     <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
@@ -250,9 +250,9 @@
     <!-- Text in menu + Button in the main Help dialog -->
     <string name="report_a_bug">App-Fehler melden</string>
     <!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
-    <string name="compass_calibration_recommended">Verbessern Sie die Pfeilrichtung, indem Sie das Telefon in einer Achterbewegung bewegen, um den Kompass zu kalibrieren.</string>
+    <string name="compass_calibration_recommended">Verbessere die Pfeilrichtung, indem du das Smartphone so bewegst, als würdest du eine acht (8) in der Luft nachzeichnen, um den Kompass zu kalibrieren.</string>
     <!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
-    <string name="compass_calibration_required">Bewegen Sie das Telefon in einer Achterbewegung, um den Kompass zu kalibrieren und die Pfeilrichtung auf der Karte festzulegen.</string>
+    <string name="compass_calibration_required">Bewege das Smartphone so, als wenn du damit eine acht (8) in der Luft zeichnen würdest, um den Kompass zu kalibrieren und die Pfeilrichtung auf der Karte festzulegen.</string>
     <!-- Toast text when user hides UI with a long tap anywhere on the map -->
     <string name="long_tap_toast">Tippe erneut lange auf die Karte, um die Benutzeroberfläche wiederzusehen</string>
     <!-- Update all button text -->
@@ -289,11 +289,11 @@
     <!-- Text for routing error dialog -->
     <string name="routing_download_maps_along">Karten entlang der Route herunterladen</string>
     <!-- Text for routing error dialog -->
-    <string name="routing_requires_all_map">Zum Erstellen einer Route müssen alle Karten von Ihrem Standort bis zum Ziel heruntergeladen und aktualisiert worden sein.</string>
+    <string name="routing_requires_all_map">Zum Erstellen einer Route müssen alle Karten von deinem Standort bis zum Ziel heruntergeladen und aktualisiert worden sein.</string>
     <!-- Text for routing error dialog -->
     <string name="routing_not_enough_space">Nicht genügend Speicherplatz</string>
     <!-- location service disabled -->
-    <string name="enable_location_services">Bitte aktivieren Sie die Standortdienste</string>
+    <string name="enable_location_services">Bitte aktiviere die Standortdienste</string>
     <string name="save">Speichern</string>
     <string name="create">Erstellen</string>
     <!-- red color -->
@@ -333,7 +333,7 @@
     <string name="dialog_routing_disclaimer_priority">— Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;</string>
     <string name="dialog_routing_disclaimer_precision">— Die Karte kann ungenau sein, und die vorgeschlagene Route ist möglicherweise nicht der optimale Weg, um das Ziel zu erreichen;</string>
     <string name="dialog_routing_disclaimer_recommendations">— Die vorgeschlagenen Routen sind als Empfehlungen zu verstehen;</string>
-    <string name="dialog_routing_disclaimer_borders">— Bitte seien Sie vorsichtig bei Routen in Grenzgebieten: die Routen, die unsere App erstellt, können manchmal Landesgrenzen in gesperrten Gebieten überschreiten.</string>
+    <string name="dialog_routing_disclaimer_borders">— Bitte sei vorsichtig bei Routen in Grenzgebieten: die Routen, die unsere App erstellt, können manchmal Landesgrenzen in gesperrten Gebieten überschreiten.</string>
     <string name="dialog_routing_disclaimer_beware">Bitte fahre aufmerksam und sicher!</string>
     <string name="dialog_routing_check_gps">GPS-Signal prüfen</string>
     <string name="dialog_routing_error_location_not_found">Route kann nicht erstellt werden. Aktuelle GPS-Koordinaten konnten nicht ermittelt werden.</string>
@@ -348,9 +348,9 @@
     <string name="dialog_routing_select_closer_start">Bitte wähle einen Startpunkt, der näher an einer Straße liegt.</string>
     <string name="dialog_routing_change_end">Ziel anpassen</string>
     <string name="dialog_routing_end_not_determined">Route wurde nicht erstellt. Ziel konnte nicht gefunden werden.</string>
-    <string name="dialog_routing_select_closer_end">Bitte wählen Sie einen Zielort näher an einer Straße</string>
+    <string name="dialog_routing_select_closer_end">Bitte wähle einen Zielort näher an einer Straße</string>
     <string name="dialog_routing_change_intermediate">Der Zwischenstopp konnte nicht gefunden werden</string>
-    <string name="dialog_routing_intermediate_not_determined">Bitte passen Sie Ihren Zwischenstopp an</string>
+    <string name="dialog_routing_intermediate_not_determined">Bitte passe deinen Zwischenstopp an</string>
     <string name="dialog_routing_system_error">Systemfehler</string>
     <string name="dialog_routing_application_error">Wegen eines Anwendungsfehlers konnte keine Route erstellt werden</string>
     <string name="dialog_routing_try_again">Bitte versuche es erneut</string>
@@ -358,7 +358,7 @@
     <string name="dialog_routing_download_and_build_cross_route">Möchtest du die Karte herunterladen und eine bessere Route erstellen, die mehr als eine Karte umfasst?</string>
     <string name="dialog_routing_download_cross_route">Lade zusätzliche Karten herunter, um eine bessere Route zu erstellen, welche die Grenzen dieser Karte überschreitet.</string>
     <!-- SECTION: Strings for downloading map from search -->
-    <string name="search_without_internet_advertisement">Um mit der Suche und dem Erstellen von Routen zu beginnen, laden Sie bitte die Karte herunter. Sie benötigen danach keine Internetverbindung mehr.</string>
+    <string name="search_without_internet_advertisement">Um mit der Suche und dem Erstellen von Routen zu beginnen, lade bitte die Karte herunter. Du benötigst danach keine Internetverbindung mehr.</string>
     <string name="search_select_map">Karte auswählen</string>
     <!-- «Show» context menu -->
     <string name="show">Anzeigen</string>
@@ -398,7 +398,7 @@
     <string name="editor_example_values">Beispielwerte</string>
     <string name="editor_correct_mistake">Fehler korrigieren</string>
     <string name="editor_add_select_location">Standort auswählen</string>
-    <string name="editor_report_problem_desription_1">Bitte beschreiben Sie das Problem detailliert, damit die OpenStreetMap-Community den Fehler korrigieren kann.</string>
+    <string name="editor_report_problem_desription_1">Bitte beschreibe das Problem detailliert, damit die OpenStreetMap-Community den Fehler korrigieren kann.</string>
     <string name="editor_report_problem_desription_2">Oder korrigiere es selbst auf https://www.openstreetmap.org/</string>
     <string name="editor_report_problem_send_button">Senden</string>
     <string name="editor_report_problem_title">Problem</string>
@@ -433,7 +433,7 @@
     <!-- Text field to enter non-existing street name, below list of known streets around -->
     <string name="add_street">Eine Straße hinzufügen</string>
     <!-- Error to display when a new street name is not entered in the New street dialog -->
-    <string name="empty_street_name_error">Geben Sie einen Straßennamen ein</string>
+    <string name="empty_street_name_error">Gebe einen Straßennamen ein</string>
     <string name="choose_language">Eine Sprache wählen</string>
     <string name="choose_street">Eine Straße wählen</string>
     <string name="cuisine">Küche</string>
@@ -444,11 +444,11 @@
     <string name="level_value_generic">Stock: %s</string>
     <string name="downloader_delete_map_dialog">Alle Kartenänderungen werden zusammen mit der Karte gelöscht</string>
     <string name="downloader_update_maps">Karten aktualisieren</string>
-    <string name="downloader_mwm_migration_dialog">Um eine Route zu erstellen, müssen Sie alle Karten aktualisieren und dann die Route erneut planen.</string>
+    <string name="downloader_mwm_migration_dialog">Um eine Route zu erstellen, musst du alle heruntergeladenen Karten aktualisieren und dann die Route erneut planen.</string>
     <string name="downloader_search_field_hint">Karte finden</string>
-    <string name="common_check_internet_connection_dialog">Stellen Sie bitte sicher, dass Ihr Gerät mit dem Internet verbunden ist</string>
+    <string name="common_check_internet_connection_dialog">Stelle bitte sicher, dass dein Gerät mit dem Internet verbunden ist</string>
     <string name="downloader_no_space_title">Nicht genug Speicherplatz</string>
-    <string name="downloader_no_space_message">Bitte entfernen Sie unnötige Daten</string>
+    <string name="downloader_no_space_message">Bitte entferne unnötige Daten</string>
     <string name="editor_login_error_dialog">Login fehlgeschlagen</string>
     <string name="editor_profile_changes">Bestätigte Änderungen der Karte</string>
     <string name="editor_focus_map_on_location">Verschiebe die Karte, um das Kreuz an der Stelle zu platzieren, an der sich der Ort oder das Geschäft befindet.</string>
@@ -464,8 +464,8 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Von der Community erstellte OpenStreetMap-Daten (Stand: %s). Erfahre mehr darüber, wie du die Karte bearbeiten und aktualisieren kannst unter OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) ist ein Gemeinschaftsprojekt zum Erstellen einer freien und offenen Karte. Es ist die Hauptquelle für Kartendaten in CoMaps und funktioniert ähnlich wie Wikipedia. Sie können Orte hinzufügen oder bearbeiten, die dann Millionen von Nutzenden auf der ganzen Welt zur Verfügung stehen. \nTreten Sie der Gemeinschaft bei und helfen Sie mit, die Karte für alle besser zu machen!</string>
-    <string name="login_to_make_edits_visible">Erstellen Sie ein Konto bei OpenStreetMap oder melden sich dort an, um Ihre Kartenbearbeitungen weltweit zu veröffentlichen</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) ist ein Gemeinschaftsprojekt zum Erstellen einer freien und offenen Karte. Es ist die Hauptgrundlage für Kartendaten in CoMaps und funktioniert ähnlich wie Wikipedia. Du kannst Orte hinzufügen oder bearbeiten, die dann Millionen von Nutzenden auf der ganzen Welt zur Verfügung stehen.\nTrete der Gemeinschaft bei und helfe mit, die Karte für alle besser zu machen!</string>
+    <string name="login_to_make_edits_visible">Erstelle ein Konto bei OpenStreetMap oder melde dich dort an, um deine Kartenbearbeitungen weltweit zu veröffentlichen</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d von %2$d</string>
     <string name="download_over_mobile_header">Über eine Mobilfunknetzverbindung herunterladen?</string>
@@ -474,11 +474,11 @@
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Das Gebäude kann nicht mehr als %d Etagen haben</string>
     <string name="editor_zip_code">Postleitzahl</string>
-    <string name="error_enter_correct_zip_code">Geben Sie eine gültige Postleitzahl ein</string>
+    <string name="error_enter_correct_zip_code">Gebe eine gültige Postleitzahl ein</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Hinweis an Freiwillige von OpenStreetMap (optional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Beschreiben Sie Kartenfehler oder Dinge, die mit CoMaps nicht bearbeitet werden können</string>
+    <string name="editor_note_hint">Beschreibe Kartenfehler oder Dinge, die mit CoMaps nicht bearbeitet werden können</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Deine Bearbeitungen werden in die öffentliche <a href="https://wiki.openstreetmap.org/wiki/DE:Über_OSM">OpenStreetMap</a> Datenbank hochgeladen. Bitte trage keine privaten oder urheberrechtlich geschützten Informationen ein.</string>
     <string name="editor_more_about_osm">Mehr Informationen über OpenStreetMap</string>
@@ -490,7 +490,7 @@
     <string name="editor_category_unsuitable_title">Keine passende Kategorie gefunden?</string>
     <string name="editor_category_unsuitable_text">Mit CoMaps kannst du nur einfache Punktkategorien hinzufügen, dass bedeutet keine Städte, Straßen, Seen, Gebäudeumrisse etc. Bitte füge solche Kategorien direkt bei <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> hinzu. In unserem <a href="https://www.comaps.app/support/advanced-map-editing/">Leitfaden (auf Englisch)</a> findest du eine detaillierte Schritt-für-Schritt Anleitung.</string>
     <string name="downloader_no_downloaded_maps_title">Keine Karten heruntergeladen</string>
-    <string name="downloader_no_downloaded_maps_message">Laden Sie Karten für die Offline-Suche und Navigation herunter</string>
+    <string name="downloader_no_downloaded_maps_message">Lade Karten für die Offline-Suche und Navigation herunter</string>
     <string name="current_location_unknown_error_title">Aktueller Standort ist unbekannt</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
@@ -507,21 +507,21 @@
     <string name="editor_remove_place_button">Löschen</string>
     <string name="editor_place_doesnt_exist">Dieser Ort existiert nicht</string>
     <!-- Error message for "Place doesn't exist" dialog when comment is empty -->
-    <string name="delete_place_empty_comment_error">Geben Sie bitte den Grund für die Löschung an</string>
+    <string name="delete_place_empty_comment_error">Gebe bitte den Grund für die Löschung an</string>
     <!-- Phone number error message -->
-    <string name="error_enter_correct_phone">Geben Sie eine gültige Telefonnummer ein</string>
-    <string name="error_enter_correct_web">Geben Sie eine gültige Internetadresse ein</string>
-    <string name="error_enter_correct_email">Geben Sie eine gültige Email-Adresse ein</string>
-    <string name="error_enter_correct_facebook_page">Geben Sie eine gültige Facebook-Webadresse, ein Konto oder einen Seitennamen ein</string>
-    <string name="error_enter_correct_instagram_page">Geben Sie eine gültige Instagram-Webadresse oder einen Kontonamen ein</string>
-    <string name="error_enter_correct_twitter_page">Geben Sie eine gültige Twitter-Webadresse oder einen Benutzernamen ein</string>
-    <string name="error_enter_correct_vk_page">Geben Sie eine gültige VK-Webadresse oder einen Kontonamen ein</string>
-    <string name="error_enter_correct_line_page">Geben Sie eine gültige LINE-Webadresse oder LINE ID ein</string>
+    <string name="error_enter_correct_phone">Gebe eine gültige Telefonnummer ein</string>
+    <string name="error_enter_correct_web">Gebe eine gültige Internetadresse ein</string>
+    <string name="error_enter_correct_email">Gebe eine gültige E-Mail-Adresse ein</string>
+    <string name="error_enter_correct_facebook_page">Gebe eine gültige Facebook-Webadresse, ein -Konto oder einen -Seitennamen ein</string>
+    <string name="error_enter_correct_instagram_page">Gebe eine gültige Instagram-Webadresse oder einen -Kontonamen ein</string>
+    <string name="error_enter_correct_twitter_page">Gebe einen gültigen X-Benutzernamen oder eine gültige X-Webadresse ein</string>
+    <string name="error_enter_correct_vk_page">Gebe einen gültigen VK-Benutzernamen oder eine gültige VK-Webadresse ein</string>
+    <string name="error_enter_correct_line_page">Gebe eine gültige LINE-ID oder Webadresse ein</string>
     <string name="placepage_add_place_button">Ort zu OpenStreetMap hinzufügen</string>
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">An alle Nutzer*innen senden?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Stellen Sie sicher, dass Sie keine persönlichen oder privaten Daten eingegeben haben.</string>
+    <string name="editor_share_to_all_dialog_message_1">Stelle sicher, dass du keine privaten oder persönlichen Daten eingegeben hast.</string>
     <string name="editor_share_to_all_dialog_message_2">Freiwillige von OpenStreetMap werden die Änderungen prüfen und sich bei Fragen mit Ihnen in Verbindung setzen.</string>
     <string name="navigation_stop_button">Beenden</string>
     <!-- Shown as toast when starting the recent track recording -->
@@ -541,15 +541,15 @@
     <string name="mobile_data_option_ask">Immer fragen</string>
     <string name="traffic_update_maps_text">Um Verkehrsdaten anzuzeigen, müssen die Karten aktualisiert werden</string>
     <string name="big_font">Schrift auf der Karte vergrößern</string>
-    <string name="traffic_update_app">Bitte aktualisieren Sie CoMaps</string>
+    <string name="traffic_update_app">Bitte aktualisiere CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Es sind keine Verkehrsdaten verfügbar</string>
     <string name="enable_logging">Protokollierung aktivieren</string>
     <!-- Settings: "Send general feedback" button -->
     <string name="feedback_general">Allgemeines Feedback</string>
     <string name="prefs_languages_information">Wir verwenden Text-to-Speech-Systeme (TTS; zu deutsch: Text-zu-Sprache) für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das du bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren kannst</string>
-    <string name="prefs_languages_information_off">Für einige Sprachen müssen Sie einen anderen Sprachgenerator oder ein zusätzliches Sprachpaket aus dem App Store installieren (Google Play, Galaxy Store, App Gallery, FDroid).\nÖffnen Sie die Einstellungen Ihres Gerätes → Sprache und Eingabe → Sprache → Text-to-Speech-Ausgabe.\nHier können Sie die Einstellungen für Sprachsynthese verwalten (beispielsweise ein Sprachpaket für die Offline-Verwendung herunterladen) und ein anderes Sprachausgabeprogramm auswählen.</string>
-    <string name="prefs_languages_information_off_link">Weitere Informationen finden Sie in dieser Anleitung</string>
+    <string name="prefs_languages_information_off">Für einige Sprachen musst du einen anderen Sprachgenerator oder ein zusätzliches Sprachpaket aus deinem App-Store installieren (Google Play Store, Samsung Galaxy Store, Huawei AppGallery, F-Droid).\nÖffne die Einstellungen deines Gerätes → Sprache und Eingabe → Sprache → Text-to-Speech-Ausgabe.\nHier kannst du die Einstellungen für Sprachsynthese verwalten (beispielsweise ein Sprachpaket für die Offline-Verwendung herunterladen) und ein anderes Sprachausgabeprogramm auswählen.</string>
+    <string name="prefs_languages_information_off_link">Weitere Informationen findest du in dieser Anleitung</string>
     <string name="transliteration_title">Transliteration ins lateinische Alphabet</string>
     <string name="learn_more">Weitere Informationen</string>
     <!-- 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". -->
@@ -561,9 +561,9 @@
     <string name="placepage_remove_stop">Stopp entfernen</string>
     <string name="placepage_add_stop">Stopp hinzufügen</string>
     <string name="dialog_error_storage_title">Problem mit dem Zugriff auf den Speicher</string>
-    <string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Überprüfen Sie das bitte oder kontaktieren Sie uns unter support@comaps.app</string>
+    <string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Bitte überprüfe das oder kontaktiere uns unter support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Fehlerhaften Speicher emulieren</string>
-    <string name="error_enter_correct_name">Bitte geben Sie einen korrekten Namen ein</string>
+    <string name="error_enter_correct_name">Bitte gebe deinen korrekten Namen ein</string>
     <string name="bookmark_lists">Listen</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Alle ausblenden</string>
@@ -579,7 +579,7 @@
     <string name="bookmarks_error_title_share_empty">Fehler beim Teilen</string>
     <string name="bookmarks_error_message_share_empty">Eine leere Liste kann nicht geteilt werden</string>
     <string name="bookmarks_error_title_empty_list_name">Der Name darf nicht leer sein</string>
-    <string name="bookmarks_error_message_empty_list_name">Bitte geben Sie den Listennamen ein</string>
+    <string name="bookmarks_error_message_empty_list_name">Bitte gebe den Listennamen ein</string>
     <string name="bookmarks_new_list_hint">Neue Liste</string>
     <string name="bookmarks_error_title_list_name_already_taken">Dieser Name wird bereits verwendet</string>
     <string name="bookmarks_error_message_list_name_already_taken">Bitte wähle einen anderen Namen</string>
@@ -587,8 +587,8 @@
     <string name="phone_number">Telefonnummer</string>
     <string name="profile">OpenStreetMap-Profil</string>
     <plurals name="bookmarks_detect_message">
-        <item quantity="one">%d Datei wurde gefunden. Sie werden sie nach der Konvertierung sehen.</item>
-        <item quantity="other">%d Dateien wurden gefunden. Sie werden sie nach der Konvertierung sehen.</item>
+        <item quantity="one">%d Datei wurde gefunden. Du wirst sie nach der Konvertierung sehen.</item>
+        <item quantity="other">%d Dateien wurden gefunden. Du wirst sie nach der Konvertierung sehen.</item>
     </plurals>
     <string name="restore">Wiederherstellen</string>
     <plurals name="tracks">
@@ -603,7 +603,7 @@
     <string name="subway">U-Bahn</string>
     <string name="layers_title">Kartenstile und Ebenen</string>
     <string name="bookmarks_empty_list_title">Die Liste ist leer</string>
-    <string name="bookmarks_empty_list_message">Zum Hinzufügen eines Lesezeichens tippen Sie in der Karte auf den Ort und dann unten auf das Sternchen</string>
+    <string name="bookmarks_empty_list_message">Zum Hinzufügen eines Lesezeichens tippe in der Karte auf den Ort und dann unten auf das Stern-Symbol</string>
     <string name="category_desc_more">…mehr</string>
     <string name="export_file">KMZ exportieren</string>
     <string name="export_file_gpx">GPX exportieren</string>
@@ -623,7 +623,7 @@
     <string name="power_managment_setting_never">Niemals</string>
     <string name="power_managment_setting_auto">Bei niedrigem Akkustand</string>
     <string name="power_managment_setting_manual_max">Immer</string>
-    <string name="enable_logging_warning_message">Aktivieren Sie diese Option zeitweise, um manuell Aktivitäten zwecks Diagnostik aufzuzeichnen und zu senden. Das hilft unserem Team, Probleme mit der App zu erkennen. Aktivieren Sie diese Option, reproduzieren Sie das Problem und senden Sie die Protokolle über die Schaltfläche \"Fehler melden\" an uns.</string>
+    <string name="enable_logging_warning_message">Aktiviere diese Option zeitweise, um manuell Aktivitäten zwecks Diagnostik aufzuzeichnen und zu senden. Das hilft unserem Team, Probleme mit der App zu erkennen. Aktiviere diese Option, reproduziere das Problem und sende die Protokolle über die Schaltfläche \"Fehler melden\" an uns.</string>
     <string name="driving_options_title">Routenoptionen</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Mautstraßen vermeiden</string>
@@ -633,7 +633,7 @@
     <string name="avoid_ferry">Fähren meiden</string>
     <string name="avoid_motorways">Autobahnen meiden</string>
     <string name="unable_to_calc_alert_title">Route kann nicht berechnet werden</string>
-    <string name="unable_to_calc_alert_subtitle">Es konnte keine Route gefunden werden. Dies kann an Ihren Routingoptionen oder an unvollständigen OpenStreetMap-Daten liegen. Bitte ändern Sie Ihre Routingoptionen und versuchen Sie es erneut.</string>
+    <string name="unable_to_calc_alert_subtitle">Es konnte keine Route gefunden werden. Dies kann an deinen Routingoptionen oder an unvollständigen OpenStreetMap-Daten liegen. Bitte ändere deine Routingoptionen und versuche es erneut.</string>
     <string name="define_to_avoid_btn">Routenoptionen einstellen</string>
     <string name="change_driving_options_btn">Routenoptionen aktiv</string>
     <string name="toll_road">Mautstraße</string>
@@ -651,7 +651,7 @@
     <string name="capacity">Kapazität: %s</string>
     <!-- To indicate the network of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="network">Netzwerk: %s</string>
-    <string name="trip_finished">Sie sind angekommen!</string>
+    <string name="trip_finished">Du bist am Ziel angekommen!</string>
     <string name="ok">OK</string>
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Sortieren…</string>
@@ -690,12 +690,12 @@
     <string name="medicine">Medizin</string>
     <string name="search_in_the_list">In der Liste suchen</string>
     <string name="religious_places">Religiöse Orte</string>
-    <string name="select_list">Wählen Sie eine Liste</string>
+    <string name="select_list">Wähle eine Liste aus</string>
     <string name="transit_not_found">Die U-Bahn-Navigation ist in dieser Region noch nicht verfügbar</string>
     <string name="dialog_pedestrian_route_is_long_header">Keine U-Bahn-Route gefunden</string>
-    <string name="dialog_pedestrian_route_is_long_message">Wählen Sie einen Start- oder Endpunkt näher an einer U-Bahn-Station</string>
+    <string name="dialog_pedestrian_route_is_long_message">Wähle einen Start- oder Endpunkt näher an einer U-Bahn-Station</string>
     <string name="button_layer_isolines">Höhenlinien</string>
-    <string name="isolines_activation_error_dialog">Um die Höhenlinien nutzen zu können, aktualisieren Sie die Karte des betreffenden Gebiets oder laden Sie diese herunter</string>
+    <string name="isolines_activation_error_dialog">Um die Höhenlinien nutzen zu können, aktualisiere die Karte des betreffenden Gebiets oder lade diese herunter</string>
     <string name="isolines_location_error_dialog">Topographieebene ist für dieses Gebiet noch nicht verfügbar</string>
     <string name="elevation_profile_ascent">Bergauf</string>
     <string name="elevation_profile_descent">Bergab</string>
@@ -706,7 +706,7 @@
     <string name="elevation_profile_time">Dauer:</string>
     <string name="isolines_toast_zooms_1_10">Karte vergrößern, um Höhenlinien sichtbar zu machen</string>
     <string name="downloader_loading_ios">Wird heruntergeladen</string>
-    <string name="download_map_title">Laden Sie die weltweite Übersichtskarte herunter</string>
+    <string name="download_map_title">Lade die weltweite Übersichtskarte herunter</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="disk_error">Ordner kann nicht erstellt und Dateien können nicht auf den Gerätespeicher oder die SD-Karte verschoben werden</string>
     <!-- Used in DownloadResources startup screen -->
@@ -735,21 +735,21 @@
     <!-- App tip #01 -->
     <string name="app_tip_01">Mit Ihren Spenden und Ihrer Unterstützung können wir die besten Karten der Welt erstellen!</string>
     <!-- App tip #02 -->
-    <string name="app_tip_02">Gefällt Ihnen unsere App? Bitte spenden Sie, um die Entwicklung zu unterstützen! Gefällt es Ihnen noch nicht? Bitte lassen Sie uns wissen warum und wir werden das Problem beheben!</string>
+    <string name="app_tip_02">Gefällt dir unsere App? Bitte spende, um die Entwicklung zu unterstützen! Gefällt sie dir noch nicht? Bitte lass uns wissen warum und wir werden das Problem beheben!</string>
     <!-- App tip #03 -->
-    <string name="app_tip_03">Wenn Sie eine*n Softwareentwickler*in kennen, können Sie ihn oder sie bitten, eine Funktion zu implementieren, die Sie benötigen.</string>
+    <string name="app_tip_03">Wenn du eine*n Softwareentwickler*in kennst, kannst du der Person bitten, eine Funktion zu implementieren, die du benötigst.</string>
     <!-- App tip #04 -->
-    <string name="app_tip_04">Tippen Sie irgendwo auf die Karte, um etwas auszuwählen. Tippen Sie lange, um die Oberfläche aus- und wieder einzublenden.</string>
+    <string name="app_tip_04">Tippe irgendwo auf der Karte, um etwas auszuwählen. Tippe lange, um die Menü-Oberfläche aus- und wieder einzublenden.</string>
     <!-- App tip #05 -->
-    <string name="app_tip_05">Wussten Sie, dass Sie Ihren aktuellen Standort auf der Karte auswählen können?</string>
+    <string name="app_tip_05">Wusstest du, dass du deinen aktuellen Standort auf der Karte auswählen kannst?</string>
     <!-- App tip #06 -->
-    <string name="app_tip_06">Sie können dabei helfen, unsere App in Ihre Sprache zu übersetzen.</string>
+    <string name="app_tip_06">Du kannst dabei helfen, unsere App in deiner Sprache zu übersetzen.</string>
     <!-- App tip #07 -->
     <string name="app_tip_07">Unsere App wird von einigen Enthusiasten und der Community entwickelt.</string>
     <!-- App tip #08 -->
-    <string name="app_tip_08">Sie können die Kartendaten einfach korrigieren und verbessern.</string>
+    <string name="app_tip_08">Du kannst die Kartendaten einfach korrigieren und verbessern.</string>
     <!-- App tip #09 -->
-    <string name="app_tip_09">Unser Hauptziel ist es, schnelle, datenschutzorientierte und benutzerfreundliche Karten zu erstellen, die Sie lieben werden.</string>
+    <string name="app_tip_09">Unser Hauptziel ist es, schnelle, datenschutzorientierte und benutzerfreundliche Karten zu erstellen, die du lieben wirst.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
     <string name="car_used_on_the_phone_screen">Du verwendest jetzt CoMaps auf dem Telefondisplay</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
@@ -778,7 +778,7 @@
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Einstellungen des Sprachsynthesesystems</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
-    <string name="pref_tts_no_system_tts">Die Einstellungen für die Sprachsynthese wurden nicht gefunden. Bist du sicher, dass dein Gerät sie unterstützt?</string>
+    <string name="pref_tts_no_system_tts">Die Einstellungen für die Sprachsynthese wurden nicht gefunden. Bist du sicher, dass dein Endgerät sie unterstützt?</string>
     <string name="drive_through">Drive-through</string>
     <string name="clear_the_search">Lösche die Suche</string>
     <string name="zoom_in">Vergrößern</string>
@@ -810,7 +810,7 @@
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Route ist leer - nichts zu speichern</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
-    <string name="error_no_file_manager_app">Das Dialogfeld zur Ordnerauswahl kann nicht angezeigt werden, da keine geeignete App auf Ihrem Gerät installiert ist. Bitte installieren Sie eine Dateimanager-App und versuchen Sie es erneut.</string>
+    <string name="error_no_file_manager_app">Das Dialogfeld zur Ordnerauswahl kann nicht angezeigt werden, da keine geeignete App auf deinem Endgerät installiert ist. Bitte installiere eine Dateimanager-App und versuche es erneut.</string>
     <string name="choose_color">Farbe auswählen</string>
     <string name="edit_track">Track bearbeiten</string>
     <string name="uri_open_location_failed">Keine App installiert, die den Speicherort öffnen kann</string>
@@ -824,13 +824,13 @@
     <string name="app_site_url">https://comaps.app/de/</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
-    <string name="error_enter_correct_bluesky_page">Geben Sie einen gültigen Bluesky-Nutzernamen oder Webadresse ein</string>
-    <string name="error_enter_correct_fediverse_page">Geben Sie einen gültigen Mastodon-Nutzernamen oder Webadresse an</string>
+    <string name="error_enter_correct_bluesky_page">Gebe einen gültigen Bluesky-Nutzernamen oder Webadresse ein</string>
+    <string name="error_enter_correct_fediverse_page">Gebe einen gültigen Mastodon-Nutzernamen oder Webadresse an</string>
     <string name="pref_left_button_title">Einstellung linker Knopf</string>
     <string name="saved">Gespeichert</string>
     <string name="pref_left_button_disable">Deaktivieren</string>
     <string name="editor_building_levels">Etagen (inkl. Erdgeschoss, ohne Dach)</string>
-    <string name="error_enter_correct_level">Geben Sie eine gültige Stockwerk-Nummer ein</string>
+    <string name="error_enter_correct_level">Gebe eine gültige Stockwerk-Nummer ein</string>
     <string name="editor_level">Etage (0 ist Erdgeschoss)</string>
     <string name="clear">Löschen</string>
     <string name="vehicle">Fahrzeug</string>
@@ -891,7 +891,7 @@
     <string name="charge_socket_count">Anzahl</string>
     <string name="unknown_count">unbekannt</string>
     <string name="error_invalid_number">ungültige Zahl</string>
-    <string name="list_description_empty">Liste bearbeiten, um eine Beschreibung hinzuzufügen</string>
+    <string name="list_description_empty">Bearbeite die Liste, um eine Beschreibung hinzuzufügen</string>
     <string name="avoid_paved">Befestigte Straßen meiden</string>
     <string name="opens_at">Öffnet um %s</string>
     <string name="closes_at">Schließt um %s</string>
@@ -904,7 +904,7 @@
     <string name="editor_business_vacant_button">Geschäft steht leer</string>
     <string name="editor_mark_business_vacant_title">Geschäft auf leerstehend setzen</string>
     <string name="editor_submit">Absenden</string>
-    <string name="editor_mark_business_vacant_description">Verwenden Sie diese Option, wenn das Geschäft ausgezogen ist und ein neues Geschäft die leerstehenden Räume übernehmen könnte.</string>
+    <string name="editor_mark_business_vacant_description">Verwende diese Option, wenn das Geschäft ausgezogen ist und ein neues Geschäft die leerstehenden Räume übernehmen könnte.</string>
     <string name="charge_socket_schuko">Schuko</string>
     <string name="power_management">Stromverbrauch verwalten</string>
     <string name="place_page_map_too_old_title">Kartendaten veraltet</string>

android/app/src/main/res/values-en-rAU/strings.xml

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_site_url">https://comaps.app/</string>
+    <string name="back">Back</string>
+    <string name="cancel">Cancel</string>
+    <string name="delete">Delete</string>
+    <string name="download_maps">Download Maps</string>
+    <string name="download_has_failed">Download failed, tap to try again</string>
+    <string name="downloading">Downloading…</string>
+    <string name="kilometres">Kilometres</string>
+    <string name="miles">Miles</string>
+    <string name="later">Later</string>
+    <string name="search">Search</string>
+    <string name="search_map">Search Map</string>
+    <string name="location_is_disabled_long_text">You currently have all Location Services for this device or application disabled. Please enable them in Settings.</string>
+    <string name="limited_accuracy">Limited Accuracy</string>
+    <string name="choose_color">Choose Colour</string>
+    <string name="bookmark_color">Bookmark colour</string>
+    <string name="precise_location_is_disabled_long_text">To ensure accurate navigation enable Precise Location in settings</string>
+    <string name="zoom_to_country">Show on the map</string>
+    <string name="country_status_download_failed">Download failed</string>
+    <string name="try_again">Try Again</string>
+    <string name="about_menu_title">About CoMaps</string>
+    <string name="about_headline">Open project powered by the community</string>
+    <string name="about_proposition_1">• Easy to use and polished</string>
+    <string name="about_proposition_2">• Privacy focused and ad-free</string>
+    <string name="about_proposition_3">• Offline, fast and compact</string>
+    <string name="about_developed_by_enthusiasts">Fully open source, not for profit, transparent decision-making and finances.</string>
+    <string name="location_settings">Location Settings</string>
+    <string name="close">Close</string>
+    <string name="unsupported_phone">The app requires hardware accelerated OpenGL. Unfortunately, your device is not supported.</string>
+    <string name="download">Download</string>
+    <string name="disconnect_usb_cable">Please disconnect USB cable or insert a memory card to use CoMaps</string>
+    <string name="not_enough_free_space_on_sdcard">Please free up some space on the SD card or USB storage first in order to use the app</string>
+    <string name="download_resources">Before you start using the app, please download the world overview map to your device. \nIt will use %s of storage.</string>
+    <string name="download_resources_continue">Go to Map</string>
+    <string name="downloading_country_can_proceed">Downloading %1$s (%2$s). You can now \nproceed to the map.</string>
+    <string name="download_country_ask">Download %1$s? (%2$s)</string>
+    <string name="update_country_ask">Update %1$s? (%2$s)</string>
+    <string name="download_country_failed">%s download has failed</string>
+    <string name="add_new_set">Add a new list</string>
+    <string name="bookmarks">Bookmarks</string>
+    <string name="bookmarks_and_tracks">Bookmarks and Tracks</string>
+    <string name="name">Name</string>
+    <string name="address">Address</string>
+    <string name="list">List</string>
+    <string name="settings">Settings</string>
+    <string name="maps_storage">Save maps to</string>
+    <string name="maps_storage_summary">Select the folder to download maps to</string>
+    <string name="maps_storage_downloaded">Downloaded maps</string>
+    <string name="maps_storage_free_size">%1$s free of %2$s</string>
+    <string name="move_maps">Move maps?</string>
+    <string name="move_maps_error">Error moving map files</string>
+    <string name="wait_several_minutes">This might take several minutes. \nPlease wait…</string>
+    <string name="measurement_units">Unit of measurement</string>
+    <string name="description">Notes</string>
+    <string name="share_bookmarks_email_subject">CoMaps bookmarks were shared with you</string>
+    <string name="share_bookmarks_email_body">Hello! \n \nAttached are my bookmarks; please open them in CoMaps. If you don\'t have it installed you can download it here: https://www.comaps.app/download/ \n \nEnjoy travelling with CoMaps!</string>
+    <string name="load_kmz_title">Loading Bookmarks</string>
+    <string name="load_kmz_successful">Bookmarks loaded successfully! You can find them on the map or in the Bookmarks Manager screen.</string>
+    <string name="load_kmz_failed">Failed to load bookmarks. The file may be corrupted.</string>
+    <string name="failed_to_open_file">Failed to open file %1$s \n \n%2$s</string>
+    <string name="edit">Edit</string>
+    <string name="unknown_current_position">Your location hasn\'t been determined yet</string>
+    <string name="cant_change_this_setting">Sorry, Map Storage settings are currently disabled</string>
+    <string name="downloading_is_active">Map download is in progress now</string>
+    <string name="my_position_share_sms">Check out my current location in CoMaps! %1$s or %2$s Don\'t have offline maps? Download here: https://www.comaps.app/download/</string>
+    <string name="share">Share</string>
+    <string name="email">Email</string>
+    <string name="copied_to_clipboard">Copied to clipboard: %s</string>
+    <string name="done">Done</string>
+    <string name="tracks_title">Tracks</string>
+    <string name="length">Length</string>
+    <string name="share_my_location">Share My Location</string>
+    <string name="prefs_group_general">General settings</string>
+    <string name="prefs_group_information">Information</string>
+    <string name="prefs_group_route">Navigation</string>
+    <string name="pref_zoom_title">Zoom buttons</string>
+    <string name="pref_zoom_summary">Display on the map</string>
+    <string name="pref_map_style_title">Night Mode</string>
+    <string name="off">Off</string>
+    <string name="on">On</string>
+    <string name="auto">Auto</string>
+    <string name="pref_map_3d_title">Perspective view</string>
+    <string name="pref_map_3d_buildings_disabled_summary">3D buildings are disabled in power saving mode</string>
+    <string name="pref_tts_enable_title">Voice Instructions</string>
+    <string name="pref_tts_street_names_title">Announce Street Names</string>
+    <string name="pref_tts_street_names_description">When enabled, the name of the street or exit to turn onto will be spoken aloud.</string>
+    <string name="pref_tts_language_title">Voice Language</string>
+    <string name="pref_tts_test_voice_title">Test Voice Directions</string>
+    <string name="pref_tts_playing_test_voice">Check the volume or system Text-To-Speech settings if you don\'t hear the voice now</string>
+    <string name="pref_tts_unavailable">Not Available</string>
+    <string name="pref_map_auto_zoom">Auto zoom</string>
+    <string name="placepage_distance">Distance</string>
+    <string name="search_show_on_map">View on map</string>
+    <string name="menu">Menu</string>
+    <string name="website">Website</string>
+    <string name="news">News</string>
+    <string name="panoramax">Panoramax Picture</string>
+    <string name="feedback">Feedback</string>
+    <string name="rate_the_app">Rate the app</string>
+    <string name="help">Help</string>
+    <string name="faq">Frequently Asked Questions</string>
+    <string name="donate">Donate</string>
+    <string name="how_to_support_us">Volunteer and improve CoMaps</string>
+    <string name="copyright">Copyright</string>
+    <string name="report_a_bug">Report a bug</string>
+    <string name="compass_calibration_recommended">Improve arrow direction by moving the phone in a figure-eight motion to calibrate the compass.</string>
+    <string name="compass_calibration_required">Move the phone in a figure-eight motion to calibrate the compass and fix the arrow direction on the map.</string>
+    <string name="long_tap_toast">Long-tap on the map again to see the interface</string>
+    <string name="downloader_update_all_button">Update All</string>
+    <string name="downloader_cancel_all">Cancel All</string>
+    <string name="downloader_downloaded_subtitle">Downloaded</string>
+    <string name="downloader_queued">Queued</string>
+    <string name="downloader_near_me_subtitle">Near me</string>
+    <string name="downloader_status_maps">Maps</string>
+    <string name="downloader_download_all_button">Download All</string>
+    <string name="downloader_downloading">Downloading:</string>
+    <string name="downloader_delete_map_while_routing_dialog">To delete map, please stop navigation</string>
+    <string name="downloader_download_map">Download map</string>
+    <string name="downloader_retry">Retry</string>
+    <string name="downloader_delete_map">Delete Map</string>
+    <string name="downloader_update_map">Update Map</string>
+    <string name="google_play_services">Google Fused Location Service</string>
+    <string name="pref_use_google_play">A proprietary service that combines GPS, WiFi, cellular networks etc. to determine your location more accurately. It may connect to Google servers.</string>
+    <string name="routing_requires_all_map">In order to create a route, we need to download and update all the maps from your location to your destination.</string>
+    <string name="routing_not_enough_space">Not enough space</string>
+    <string name="enable_location_services">Please enable Location Services</string>
+    <string name="save">Save</string>
+    <string name="create">Create</string>
+    <string name="red">Red</string>
+    <string name="yellow">Yellow</string>
+    <string name="blue">Blue</string>
+    <string name="green">Green</string>
+    <string name="purple">Purple</string>
+    <string name="orange">Orange</string>
+    <string name="brown">Brown</string>
+    <string name="pink">Pink</string>
+    <string name="deep_purple">Deep Purple</string>
+    <string name="light_blue">Light Blue</string>
+    <string name="cyan">Cyan</string>
+    <string name="teal">Teal</string>
+    <string name="lime">Lime</string>
+    <string name="deep_orange">Deep Orange</string>
+    <string name="gray">Grey</string>
+    <string name="blue_gray">Blue Grey</string>
+    <string name="dialog_routing_disclaimer_title">When following the route, please keep in mind:</string>
+    <string name="dialog_routing_disclaimer_priority">— Road conditions, traffic laws, and road signs always take priority over navigation hints;</string>
+    <string name="dialog_routing_disclaimer_precision">— The map might be inaccurate, and the suggested route might not always be the most optimal way to reach the destination;</string>
+    <string name="dialog_routing_disclaimer_recommendations">— Suggested routes should only be understood as recommendations;</string>
+    <string name="dialog_routing_disclaimer_borders">— Exercise caution with routes in border zones: the routes created by our app may sometimes cross country borders in unauthorised places.</string>
+    <string name="dialog_routing_disclaimer_beware">Please stay alert and safe on the roads!</string>
+    <string name="dialog_routing_check_gps">Check GPS signal</string>
+    <string name="dialog_routing_error_location_not_found">Unable to create route. Current GPS coordinates could not be identified.</string>
+    <string name="dialog_routing_location_turn_wifi">Please check your GPS signal. Enabling WiFi will improve your location accuracy.</string>
+    <string name="dialog_routing_location_turn_on">Enable location services</string>
+    <string name="dialog_routing_location_unknown_turn_on">Unable to locate current GPS coordinates. Enable location services to calculate route.</string>
+    <string name="dialog_routing_unable_locate_route">Unable to locate route</string>
+    <string name="dialog_routing_cant_build_route">Unable to create route</string>
+    <string name="dialog_routing_change_start_or_end">Please change your starting point or destination.</string>
+    <string name="dialog_routing_change_start">Change starting point</string>
+    <string name="dialog_routing_start_not_determined">Route was not created. Unable to locate starting point.</string>
+</resources>

android/app/src/main/res/values-en-rGB/strings.xml

@@ -19,8 +19,8 @@
     <string name="editor_zip_code">Postcode</string>
     <string name="error_enter_correct_zip_code">Enter a valid postcode</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d bookmark</item>
-        <item quantity="other">%d bookmarks</item>
+        <item quantity="one">%d place</item>
+        <item quantity="other">%d places</item>
     </plurals>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">%d file was found. You can see it after conversion.</item>

android/app/src/main/res/values-es/strings.xml

@@ -926,5 +926,5 @@
     <string name="download_resources_custom_url_title">Servidor de mapas personalizado</string>
     <string name="download_resources_custom_url_message">Sobreescribe el servidor de mapas por defecto. Deja en blanco para usar el servidor de CoMaps por defecto.</string>
     <string name="download_resources_custom_url_summary_none">No establecido</string>
-    <string name="download_resources_custom_url_error_scheme">Por favor introduce un URL completo empezando con https:// y terminando con /</string>
+    <string name="download_resources_custom_url_error_scheme">Por favor introduce un URL empezando con http:// o https://</string>
 </resources>

android/app/src/main/res/values-et/strings.xml

@@ -915,5 +915,5 @@
     <string name="advanced">Täiendavad seadistused</string>
     <string name="download_resources_custom_url_title">Sinu oma kaardiserver</string>
     <string name="download_resources_custom_url_message">Kui tahad kasutada oma kaardiserverit, siis lisa ta siia. CoMapsi vaikimisi serveri kasutamiseks jäta tühjaks.</string>
-    <string name="download_resources_custom_url_error_scheme">Palun sisesta täismahuline võrguaadress, mille alguses on https:// ja lõpus /</string>
+    <string name="download_resources_custom_url_error_scheme">Palun sisesta täismahuline võrguaadress, mille alguses on http:// või https://</string>
 </resources>

android/app/src/main/res/values-gl/strings.xml

@@ -31,7 +31,7 @@
     <string name="editor_time_from">De</string>
     <string name="daily">Diario</string>
     <string name="details">Detalles</string>
-    <string name="editor_reset_edits_button">Restablecer</string>
+    <string name="editor_reset_edits_button">Desbotar cambios</string>
     <string name="category_parking">Aparcamento</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
@@ -57,8 +57,8 @@
     <string name="editor_time_title">Horario de apertura</string>
     <string name="editor_zip_code">Código postal</string>
     <string name="editor_share_to_all_dialog_title">Quere envialo a todos os usuarios?</string>
-    <string name="editor_share_to_all_dialog_message_1">Comprobe que non escribeu ningún dato privado ou persoal</string>
-    <string name="editor_share_to_all_dialog_message_2">Os editores de OpenStreetMap comprobarán os cambios e poñeranse en contacto con vostede se teñen algunha pregunta</string>
+    <string name="editor_share_to_all_dialog_message_1">Comproba que non escribiches ningún dato privado ou persoal</string>
+    <string name="editor_share_to_all_dialog_message_2">Desde OpenStreetMap comprobarán os cambios e poñeranse en contacto contigo se teñen algunha pregunta.</string>
     <string name="navigation_stop_button">Deter</string>
     <string name="mobile_data_option_ask">Preguntar sempre</string>
     <string name="traffic_update_maps_text">Para mostrar os datos de tráfico, deben actualizarse os mapas</string>
@@ -489,7 +489,7 @@
     <string name="help">Axuda</string>
     <string name="downloader_downloaded_subtitle">Descargado</string>
     <string name="kilometers_per_hour">km/h</string>
-    <string name="create">crear</string>
+    <string name="create">Crear</string>
     <string name="brown">Marrón</string>
     <string name="no_available">Non</string>
     <string name="categories">Categorías</string>
@@ -639,4 +639,19 @@
     <string name="avoid_paved">Evitar estradas asfaltadas</string>
     <string name="editor_business_vacant_button">Dispoñible para empresas</string>
     <string name="editor_mark_business_vacant_title">Marcar como dispoñible para negocios</string>
+    <string name="place_page_map_too_old_title">Datos do mapa desactualizados</string>
+    <string name="place_page_map_too_old_description">Os datos do mapa son moi antigos, por favor actualiza o mapa.</string>
+    <string name="place_page_app_too_old_description">Os datos do mapa actual son moi antigos, actualiza a app CoMaps.</string>
+    <string name="place_page_update_too_old_map">Actualizar rexión do mapa</string>
+    <string name="place_page_too_old_to_edit">A edición de OpenStreetMap está desactivada porque o mapa é demasiado antigo.</string>
+    <string name="prefs_speed_cameras_information">Os avisos de radares están desactivados nos paises onde a lei local prohibe estas alertas.</string>
+    <string name="power_management">Xestión da enerxía</string>
+    <string name="navigation_start_tts_message">"Comezando a Navegación, idioma das instruccións por voz: "</string>
+    <string name="navigation_start_tts_disabled_message">Instruccións por voz desactivadas: non hai un motor TTS dispoñible</string>
+    <string name="charge_socket_schuko">Doméstico na UE</string>
+    <string name="advanced">Avanzado</string>
+    <string name="download_resources_custom_url_title">Servidor persoal do mapa</string>
+    <string name="download_resources_custom_url_message">Sobrescribe o servidor predefinido para descargar mapas. Deixar baleiro para usar o servidor por defecto de CoMaps.</string>
+    <string name="download_resources_custom_url_summary_none">Sen establecer</string>
+    <string name="download_resources_custom_url_error_scheme">Escribe un URL que comece por http:// ou https://</string>
 </resources>

android/app/src/main/res/values-kw/strings.xml

@@ -71,7 +71,7 @@
     <string name="pref_map_3d_buildings_title">Drehevyansow lymnys tri</string>
     <string name="pref_tts_enable_title">Danvonadow dre lev</string>
     <string name="pref_tts_street_names_title">Deklarya Henwyn Stretow</string>
-    <string name="pref_tts_language_title">Tavas Lev</string>
+    <string name="pref_tts_language_title">Yeth Lev</string>
     <string name="pref_tts_test_voice_title">Prov Tuyow Dre Lev</string>
     <string name="pref_tts_unavailable">Nakavadow</string>
     <string name="search_show_on_map">Gweles war mappa</string>
@@ -158,7 +158,7 @@
     <string name="login_osm">Omgelmi dhe OpenStreetMap</string>
     <string name="logout">Omdenna</string>
     <string name="edit_place">Golegi Le</string>
-    <string name="add_language">Addya unn tavas</string>
+    <string name="add_language">Addya unn yeth</string>
     <string name="street">Stret</string>
     <string name="house_number">Niver drehevyans</string>
     <string name="details">Manylyon</string>
@@ -166,7 +166,7 @@
     <string name="building">Drehevyans</string>
     <string name="add_street">Addya unn stret</string>
     <string name="empty_street_name_error">Ynworra unn hanow street mar pleg</string>
-    <string name="choose_language">Dewis unn tavas</string>
+    <string name="choose_language">Dewis unn yeth</string>
     <string name="choose_street">Dewis unn stret</string>
     <string name="editor_add_phone">Addya Niver Fon</string>
     <string name="level">Leur</string>
@@ -175,7 +175,7 @@
     <string name="downloader_search_field_hint">Kavos mappa</string>
     <string name="editor_login_error_dialog">Error dres omgelmi</string>
     <string name="editor_edit_place_name_hint">Hanow a an le</string>
-    <string name="editor_default_language_hint">Dell yw skrifys yn an tavas teythiek</string>
+    <string name="editor_default_language_hint">Dell yw skrifys yn an yeth teythiek</string>
     <string name="editor_edit_place_category_title">Klass</string>
     <string name="detailed_problem_description">Deskrifans manylys a an kudyn</string>
     <string name="editor_report_problem_other_title">Kudyn dyffrans</string>
@@ -195,10 +195,10 @@
     <string name="hour">o</string>
     <string name="minute">mynysen</string>
     <string name="placepage_more_button">Moy</string>
-    <string name="placepage_edit_bookmark_button">Pennskrifa Lyververk</string>
+    <string name="placepage_edit_bookmark_button">Golegi Lyververk</string>
     <string name="placepage_personal_notes_hint">Notennow privedh (tekst bo html)</string>
     <string name="editor_reset_edits_message">Dilea oll chanjyow dhywarlinen?</string>
-    <string name="editor_reset_edits_button">Dilea</string>
+    <string name="editor_reset_edits_button">Dilea chanjyow</string>
     <string name="editor_remove_place_message">Dilea le keworrys?</string>
     <string name="editor_remove_place_button">Dilea</string>
     <string name="editor_place_doesnt_exist">Le na eksistya</string>
@@ -311,7 +311,7 @@
     <string name="download_map_title">Iskarga an mappa bys simpel</string>
     <string name="disk_error_title">Error plasen</string>
     <string name="connection_failure">Defowt kevren</string>
-    <string name="change_map_locale">Tavas mappow</string>
+    <string name="change_map_locale">Yeth mappow</string>
     <string name="splash_subtitle">Data mappow a OpenStreetMap</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
@@ -321,7 +321,7 @@
     <string name="app_tip_00">Meur ras rag usya a\'gan mappys drehevys gans an kemeneth!</string>
     <string name="app_tip_01">Gans agas argevrohow ha skoodhyans, ni a yll gul an mappys an gwella yn an Nor!</string>
     <string name="app_tip_02">Yw da genes a\'gan app? Argevri mar pleg dhe skoodhya an displegyans! Yw na da genes a\'n hwath? Mar pleg, kedhlewgh dhyn prag ha ni a ewnhe a\'n!</string>
-    <string name="app_tip_06">Hwi a yll gweres treylya a\'gan app yn agas tavas.</string>
+    <string name="app_tip_06">Ty a yll gweres treylya a\'gan app yn dhayeth.</string>
     <string name="aa_connected_title">Dha vos lemmyn rosweythys dhe Android Auto</string>
     <string name="aa_grant_permissions">Grontya grontys</string>
     <string name="button_layer_outdoor">Yn-mes</string>
@@ -375,4 +375,299 @@
     <string name="edit">Golegi</string>
     <string name="downloader_no_space_title">Nyns eus lowr dalghuster</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
+    <string name="download_has_failed">Y fyllis an iskarg, tava dhe dasassaya</string>
+    <string name="downloading">Iskargaow…</string>
+    <string name="location_is_disabled_long_text">Hwi ungallosegi y\'n eur ma oll Gonisyow GPS rag an devis po app ma. Mar pleg, gallosegi y\'s yn Settyansow.</string>
+    <string name="precise_location_is_disabled_long_text">Rag surhe navygacyon ewn, gallosegi GPS Kewar yn Settyansow</string>
+    <string name="country_status_download_failed">Yn fyllis iskarg</string>
+    <string name="about_headline">Ragdres poblek selys war an kementh</string>
+    <string name="about_proposition_1">• Es y us ha polsys</string>
+    <string name="about_proposition_2">• Fogellys war privetter ha heb argemynnow</string>
+    <string name="about_developed_by_enthusiasts">Kod poblek yn leun, heb budh, erviransow treusweladow ha arghansereth.</string>
+    <string name="unsupported_phone">An app rekwirya OpenGL gans uskisheans kalesweyth. Soweth, gas devis na skoodhys.</string>
+    <string name="disconnect_usb_cable">Mar pleg, unjunya an korsen USB po ynworra kyf kov dhe devnydhya CoMaps</string>
+    <string name="not_enough_free_space_on_sdcard">Mar pleg, gul neb dalghuster yn an karten SD/kyf kov kyns dhe devnydhya an app</string>
+    <string name="download_resources">Dherag hwi dalleth devnydhya an app, mar pleg iskarga an mappa ollvysel sempel dhe gas devis.\nY devnydhya %s a dalghuster.</string>
+    <string name="downloading_country_can_proceed">Iskargaow %1$s (%2$s). Hwi gallos\nprocedya dhe an mappa.</string>
+    <string name="download_country_failed">%s iskarg yw fyllis</string>
+    <string name="add_new_set">Addya unn Rol Nowydh</string>
+    <string name="bookmark_set_name">Hanow Rol Lyververkys</string>
+    <string name="maps_storage">Sawya mappys dhe</string>
+    <string name="maps_storage_summary">Dewis an restrenva dhe iskarga mappys dhe</string>
+    <string name="maps_storage_downloaded">Mappys iskargys</string>
+    <string name="maps_storage_free_size">%1$s kavadow yn-mes a %2$s</string>
+    <string name="move_maps_error">Error dres gwaya restrennow mappa</string>
+    <string name="wait_several_minutes">An argerdh ma re durya meur a mynysen.\nGortewgh mar pleg…</string>
+    <string name="category_eat">Leow rag dybri</string>
+    <string name="category_secondhand">Gwarennow Wortaswerth</string>
+    <string name="category_nightlife">Delit dres Nos</string>
+    <string name="share_bookmarks_email_subject">Lyververkys CoMaps yw kevrennys gans ty</string>
+    <string name="share_bookmarks_email_body">Dydh da!\n\nOw lyververkys yw stag; mar pleg, ygeri y\'s yn CoMaps. A hwi kavos y na leys, hwi gallos iskarga y omma: https://www.comaps.app/download/ \n\nEnjoya travalya gans CoMaps!</string>
+    <string name="load_kmz_successful">Lyververkys kargys yn sewen! Hwi gallos kavos y\'s war an mappa po yn an skrin Dyghtyer Lyververkys.</string>
+    <string name="load_kmz_failed">Y fyllis an karga lyververkys. An restren re bos anewn.</string>
+    <string name="unknown_file_type">An eghen restren yw anaswonys gans an app:\n%1$s</string>
+    <string name="failed_to_open_file">Y fyllis ygeri restren %1$s \n\n%2$s</string>
+    <string name="unknown_current_position">Dhe tyller yw determys na hwath</string>
+    <string name="cant_change_this_setting">Drog yw genev, settyansyow Gwithyans Mappa yw marow y\'n eur ma</string>
+    <string name="downloading_is_active">Iskarg mappa hwarvos lemmyn</string>
+    <string name="my_position_share_sms">Mires orth ow tyller y\'n eur ma yn CoMaps! %1$s po %2$s Na kavos mappys dhywarlinen? Iskarga omma: https://www.comaps.app/download/</string>
+    <string name="my_position_share_email">Hou,\n\nOv omma lemmyn: %1$s. Klyckya an gorgevren ma %2$s po an unn ma %3$s dhe gweles an tyller war an mappa.\n\nMeur ras.</string>
+    <string name="copied_to_clipboard">Kopys dhe astel glypp: %s</string>
+    <string name="pref_zoom_title">Botonyow brashe</string>
+    <string name="off">Marow</string>
+    <string name="on">Byw</string>
+    <string name="pref_map_3d_buildings_disabled_summary">Drehevyansow 3D yw ungallosegi yn fordh erbysyon batri</string>
+    <string name="pref_tts_street_names_description">Pan gallosegys, an hanow a an stret po fordh \'mes rag mos yn-mes yw lenna.</string>
+    <string name="pref_tts_playing_test_voice">Checkya an ughelder po settyansow system Tekst-dhe-Areth a hwi na klewes an lev lemmyn</string>
+    <string name="pref_map_auto_zoom">Brashe yn awtomatek</string>
+    <string name="placepage_distance">Pellder</string>
+    <string name="how_to_support_us">Bodhegi ha gwellhe CoMaps</string>
+    <string name="compass_calibration_recommended">Gwellhe tu seth gans gwaya an kellgowser yn unn gwayans niver eth dhe selya an mornaswydh.</string>
+    <string name="compass_calibration_required">Gwaya an kellgowser yn unn gwayans niver eth dhe selya an mornaswydh ha ewna an tu seth war an mappa.</string>
+    <string name="long_tap_toast">Tava hir war an mappa arta dhe gweles an ynterfas</string>
+    <string name="downloader_downloaded_subtitle">Iskargys</string>
+    <string name="downloader_queued">Lostys</string>
+    <string name="downloader_downloading">Iskargaow:</string>
+    <string name="downloader_delete_map_while_routing_dialog">Dhe dilea mappa, hedhi navygacyon, mar pleg</string>
+    <string name="routing_failed_cross_mwm_building">Kerdhow gallos gul yw kontaynys yn leun a-berth yn unn mappa a unn pow hepken.</string>
+    <string name="pref_use_google_play">Unn gonis perghenogel may kesunya GPS, Wi-fi, rosweythyow kellgowser h.e. rag determya dhe tyller yn kewar. Y re junya dhe servellow Google.</string>
+    <string name="routing_download_maps_along">Iskarga oll mappys a-hys gas kerdh</string>
+    <string name="routing_requires_all_map">Rag gul unn kerdh, ni res iskarga ha nowedhi oll mappys a gas tyller dhe gas penn an fordh.</string>
+    <string name="save">Sawya</string>
+    <string name="cyan">Blou</string>
+    <string name="dialog_routing_disclaimer_title">Pan holya an hyns, kofhe mar pleg:</string>
+    <string name="dialog_routing_disclaimer_priority">— Studh fordh, laghys traffik, ha arwodhyow kavos ragwir pub eur a-ugh dhe hyntys navygacyon;</string>
+    <string name="dialog_routing_disclaimer_precision">— An mappa re bos ankewar, ha an kussul hyns re na bos an method gwella dhe drehedhes an penn an fordh;</string>
+    <string name="dialog_routing_disclaimer_recommendations">— Kussus kyns yw komendyansow hepken;</string>
+    <string name="dialog_routing_disclaimer_borders">— Gul rach gans hyns ogas emlow: an kerdhow gulys gans agan app re tremena treweythyow emlow keswlasek yn tylleryow anreythhes.</string>
+    <string name="dialog_routing_disclaimer_beware">Mar pleg, gortos hewol ha saw war an fordhow!</string>
+    <string name="dialog_routing_error_location_not_found">Anabel dhe gul kerdh. Kesordenogyon GPS na gallos determys.</string>
+    <string name="dialog_routing_location_turn_wifi">Mar pleg, checkya gas sinell GPS. Gallosegi Wi-Fi re gwellhe gas kewerder GPS.</string>
+    <string name="dialog_routing_location_unknown_turn_on">Anabel dhe desedha kesordenogyon GPS. Gallosegi gonisyow GPS dhe kalkya kerdh.</string>
+    <string name="dialog_routing_unable_locate_route">Anabel dhe desedha kerdh</string>
+    <string name="dialog_routing_cant_build_route">Anabel dhe gul kerdh</string>
+    <string name="dialog_routing_change_start_or_end">Mar pleg, chanjya gas tyller dalleth po penn an fordh.</string>
+    <string name="dialog_routing_change_start">Chanjya tyller dalleth</string>
+    <string name="dialog_routing_start_not_determined">Kerdh na gulys. Anabel dhe desedha tyller dalleth.</string>
+    <string name="dialog_routing_select_closer_start">Mar pleg, dewis unn tyller dalleth yn-nes dhe unn fordh.</string>
+    <string name="dialog_routing_end_not_determined">Kerdh na gulys. Anabel dhe desedha an penn an fordh.</string>
+    <string name="dialog_routing_select_closer_end">Mar pleg, dewis unn penn an fordh yn-nes dhe unn fordh</string>
+    <string name="dialog_routing_change_intermediate">Anabel dhe desedha an tyller kres</string>
+    <string name="dialog_routing_intermediate_not_determined">Mar pleg, chanjya gas tyller kres</string>
+    <string name="dialog_routing_application_error">Anabel dhe gul kerdh drefen unn error app</string>
+    <string name="dialog_routing_download_and_build_cross_route">A vynnsowgh iskarga an mappa ha gul unn kerdh gwell a-dreus moy ages unn mappa?</string>
+    <string name="dialog_routing_download_cross_route">Iskarga mappys keworransel dhe gul unn kerdh gwell a-dreus moy ages unn mappa.</string>
+    <string name="search_without_internet_advertisement">Rag dalleth hwilas ha gul kerdhow, iskarga an mappa, mar pleg. Wosa henna, hwi na fella res unn junyans kesrosweyth.</string>
+    <string name="search_not_found">Soweth, sewyansow kavos vyth</string>
+    <string name="search_not_found_query">Iskarga an pow py tyller hwi hwilas po assaya addya unn hanow tre/gwig yn ogas.</string>
+    <string name="search_history_text">Gweles gas hwithransow a-dhiwedhes</string>
+    <string name="p2p_from_here">Mos dhyworth</string>
+    <string name="p2p_to_here">Mos war-tu</string>
+    <string name="p2p_only_from_current">Navygacyon yw kavadow hepken dhyworth gas tyller a\'n jydh</string>
+    <string name="p2p_reroute_from_current">A vynn\'ta devisya unn kerdh dhyworth gas tyller a\'n jydh?</string>
+    <string name="editor_time_from">Dhyworth</string>
+    <string name="editor_time_to">Bys</string>
+    <string name="editor_example_values">Niverow Ensampel</string>
+    <string name="editor_report_problem_desription_1">Mar pleg, deskrifa an kudyn yn manylyon rag may an kemeneth OpenStreetMap gallos ewnhe y.</string>
+    <string name="editor_report_problem_desription_2">Po gul y dha honan yn https://www.openstreetmap.org/</string>
+    <string name="editor_report_problem_no_place_title">An le ma na eksistya</string>
+    <string name="editor_report_problem_under_construction_title">Deges rag mentons</string>
+    <string name="editor_report_problem_duplicate_place_title">Le dewblek</string>
+    <string name="autodownload">Iskarga mappys yn awtomatek</string>
+    <string name="opens_in">Ygeri yn %s</string>
+    <string name="closes_in">Degea yn %s</string>
+    <string name="opens_at">Ygeri dhe %s</string>
+    <string name="closes_at">Degea dhe %s</string>
+    <string name="opens_day_at">Ygeri war %1$s dhe %2$s</string>
+    <string name="closes_day_at">Degea war %1$s dhe %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="zero">%d mynysennow</item>
+        <item quantity="one">%d mynysen</item>
+        <item quantity="two">%d mynysennow</item>
+        <item quantity="few">%d mynysennow</item>
+        <item quantity="many">%d mynysennow</item>
+        <item quantity="other">%d mynysennow</item>
+    </plurals>
+    <string name="hours_confirmed_time_ago">Komfirmys %s</string>
+    <string name="existence_confirmed_time_ago">Bosva konfirmys %s</string>
+    <string name="not_signed_in">Na omgelmys</string>
+    <string name="cuisine">Eghen Boos</string>
+    <string name="select_cuisine">Dewis eghen boos</string>
+    <string name="downloader_delete_map_dialog">Oll gas chanjyow mappa a vydh dileys a-barth an mappa</string>
+    <string name="downloader_mwm_migration_dialog">Rag gul unn kerdh, hwi res nowedhi oll mappys ha dhanna devisya an kerdh arta.</string>
+    <string name="common_check_internet_connection_dialog">Mar pleg, surhe gas devis yw rosweythys dhe an kesrosweyth</string>
+    <string name="downloader_no_space_message">Mar pleg, dilea neb data heb res</string>
+    <string name="editor_profile_changes">Chanjyow Gwirhys</string>
+    <string name="editor_focus_map_on_location">Draylya an mappa rag settya an krows yn an tyller a an le po negys.</string>
+    <string name="editor_edit_place_title">Golegi</string>
+    <string name="editor_add_place_title">Addya</string>
+    <string name="message_invalid_feature_position">Tra vyth gallos bos desedhys omma</string>
+    <string name="osm_presentation">Data OpenStreetMap gulys gans an kemeneth dhyworth %s. Dyski moy a-dro fatel golegi ha nowedhi an mappa yn OpenStreetMap.org</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) yw unn ragdres kemeneth dhe byldya unn mappa rydh ha apert. Y yw an devedhyans chif a data mappa yn CoMaps ha oberi haval dhe Wikipedya. Hwi gallos addya po golegi leow ha i bos kavadow dhe milvilyow usyoryon dres oll an bys.\nOmjunya an kemeneth ha gweres gul unn mappa gwell rag keniver!</string>
+    <string name="login_to_make_edits_visible">Gul unn akont OpenStreetMap po omgelmi dhe dyllo gas chanjyow dhe an bys</string>
+    <string name="downloader_of">%1$d a %2$d</string>
+    <string name="download_over_mobile_message">Y re bos kostek meur lowr war nebes towlow po a tramor</string>
+    <string name="error_enter_correct_storey_number">An niver a leuryow res na eksedya %d</string>
+    <string name="editor_note_hint">Deskrifa errors war an mappa po pyth may na golegys yn CoMaps</string>
+    <string name="editor_about_osm">Gas chanjyow yw ughkargys dhe an sel dherivadow <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> poblek. Mar pleg, addya kudhlow privedh po gwirbryntys vyth.</string>
+    <string name="editor_category_unsuitable_title">Na gallos kavos unn klass fytti?</string>
+    <string name="editor_category_unsuitable_text">CoMaps alowa hwi addya klassys sempel hepken, rag henna trevow, fordhow, lynnyn, drehevyansow, h.e. vyth. Mar pleg, addya a\'n par na klassys dhe <a href="https://www.openstreetmap.org">OpenStreetMap</a>. Checkya agan <a href="https://www.openstreetmap.org">kowethlyver</a> rag danvonadow kamm ha kamm manylys.</string>
+    <string name="downloader_no_downloaded_maps_title">Hwi na iskargys neb mappys</string>
+    <string name="downloader_no_downloaded_maps_message">Iskarga mappys dhe hwilas ha viajya dhywarlinen</string>
+    <string name="current_location_unknown_error_title">Tyller a\'n jydh yw ankoth</string>
+    <string name="day">d</string>
+    <string name="editor_place_doesnt_exist_description">Deskrifa an studh lemmyn dhe danvon unn noten error dhe an kemeneth OpenStreetMap</string>
+    <string name="editor_mark_business_vacant_description">Devnydhya ma a an negys re movys ha an spas yw gwag ha parys rag unn gobrener nowydh.</string>
+    <string name="place_page_map_too_old_title">Data mappa anterrus</string>
+    <string name="place_page_map_too_old_description">Gas data mappa a\'n jydh yw pur koth, nowedhi an mappa mar pleg.</string>
+    <string name="place_page_app_too_old_description">Gas data mappa a\'n jydh yw pur koth, nowedhi an app CoMaps.</string>
+    <string name="place_page_update_too_old_map">Nowedhi pow mappa</string>
+    <string name="place_page_too_old_to_edit">Golegi OpenStreetMap yw ungallosegi dre reson an data mappa yw re koth.</string>
+    <string name="editor_share_to_all_dialog_message_1">Surhe hwi na ynworra neb kudhlow privedh po personel.</string>
+    <string name="editor_share_to_all_dialog_message_2">Pennskriforyon OpenStreetMap a wra checkya an chanjyow ha kestava hwi a i kavos neb kwestyons.</string>
+    <string name="mobile_data_dialog">Devnydhya junyans kellgowser dhe diskwedhes kudhlow manylys?</string>
+    <string name="mobile_data_option_always">Devnydhya Pub Prys</string>
+    <string name="mobile_data_option_not_today">Na Devnydhya Hedhyw</string>
+    <string name="mobile_data">Junyans Kellgowser</string>
+    <string name="mobile_data_description">Junyans kellgowser yw res rag messajys nowedhyans mappa ha ughkarga chanjyow</string>
+    <string name="mobile_data_option_never">Devnydhya Bynner</string>
+    <string name="mobile_data_option_ask">Govyn Pub Prys</string>
+    <string name="traffic_update_maps_text">Rag diskwedhes data daromdak, mappys res bos nowedhys</string>
+    <string name="big_font">Moghhe braster a labelyow mappa</string>
+    <string name="traffic_data_unavailable">Data daromdak ankavadow</string>
+    <string name="enable_logging">Gallosegi kovadhow</string>
+    <string name="prefs_languages_information">Ni devnydhya lev system rag danvonadow a dros. Lies devisyow Android devnydhya TTS Google, hwi gallos iskarga po nowedhi y yn Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
+    <string name="prefs_languages_information_off">Rag nebes yethow, hwi res lea unn synthesyer kows po unn fardel yeth keworransel yn an gwerthji appys (Google Play, Galaxy Store, App Gallery, FDroid). \nYgeri gas settyansyow devis → Yeth ha ynworrans → Areth → Eskorrans tekst dhe areth. \nHwi gallos dyghtya omma settyansow rag synthesyans kows (rag ensampel, iskarga fardel yeth dhe devnydh dhywarlinen) ha dewis jynn tekst-dhe-areth aral.</string>
+    <string name="prefs_languages_information_off_link">Rag moy kudhlow checkya an kowethlyver ma</string>
+    <string name="prefs_speed_cameras_information">Gwarnyans kamera tooth yw marow yn broyow le may gwarnyansow yw difennys erbynn lagha leel.</string>
+    <string name="transliteration_title">Treylya yn lytherennans Latin</string>
+    <string name="routing_add_start_point">Devnydhya hwithrans po tava war an mappa rag addya unn tyller dalleth</string>
+    <string name="routing_add_finish_point">Devnydhya hwithrans po tava war an mappa rag addya unn penn an fordh</string>
+    <string name="planning_route_manage_route">Dyghtya Kerdh</string>
+    <string name="saved">Sawys</string>
+    <string name="dialog_error_storage_title">Kudyn hedhas dalghuster</string>
+    <string name="dialog_error_storage_message">Dalghuster a-ves ankavadow. An karten SD re bos removys, shyndys, po an system restrennow yw redya-hepken. Mar pleg, checkya gas karten SD po kestava ni gans support@comaps.app</string>
+    <string name="setting_emulate_bad_storage">Hevelebya dalghuster drog</string>
+    <plurals name="bookmarks_places">
+        <item quantity="zero">%d lyververkys</item>
+        <item quantity="one">%d lyververk</item>
+        <item quantity="two">%d lyververkys</item>
+        <item quantity="few">%d lyververkys</item>
+        <item quantity="many">%d lyververkys</item>
+        <item quantity="other">%d lyververkys</item>
+    </plurals>
+    <string name="bookmarks_error_message_share_general">Anabel dhe kevrenna awos unn error app</string>
+    <string name="bookmarks_error_title_share_empty">Error dres kevrenna</string>
+    <string name="bookmarks_error_message_share_empty">Na gallos kevrenna unn rol gwag</string>
+    <string name="bookmarks_error_title_empty_list_name">Hanow a res</string>
+    <plurals name="bookmarks_detect_message">
+        <item quantity="zero">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
+        <item quantity="one">%d restrenn kavos. Hwi gallos gweles y wosa treylyans.</item>
+        <item quantity="two">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
+        <item quantity="few">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
+        <item quantity="many">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
+        <item quantity="other">%d restrennow kavos. Hwi gallos gweles y\'s wosa treylyans.</item>
+    </plurals>
+    <plurals name="tracks">
+        <item quantity="zero">%d lerghow</item>
+        <item quantity="one">%d lergh</item>
+        <item quantity="two">%d lerghow</item>
+        <item quantity="few">%d lerghow</item>
+        <item quantity="many">%d lerghow</item>
+        <item quantity="other">%d lerghow</item>
+    </plurals>
+    <string name="bookmarks_empty_list_message">Rag addya unn lyververk, tava unn le war an mappa ha tava an arwodik steren</string>
+    <string name="notification_channel_downloader">Iskarger mappa</string>
+    <string name="pref_tts_speedcams_always">Gwarnya pub prys</string>
+    <string name="pref_tts_speedcams_never">Gwarnya bynner</string>
+    <string name="power_managment_title">Fordh erbysyon batri</string>
+    <string name="power_managment_description">Assaya lehe usadow batri yn despit dhe nebes nasyow</string>
+    <string name="power_managment_setting_never">Bynner</string>
+    <string name="power_managment_setting_auto">Pan batri yw isel</string>
+    <string name="power_managment_setting_manual_max">Pub prys</string>
+    <string name="enable_logging_warning_message">Gallosegi yn servadow an dewis ma rag rekordya ha danvon dre dhorn kovadhow manylys a-dro gas kudyn dhe ni gans \"Derivas unn kudyn\" yn an folen Gweres. Kovadhow re komprehendya kudhlow GPS.</string>
+    <string name="driving_options_title">Dewisyow kerdh</string>
+    <string name="avoid_tolls">Goheles tollow</string>
+    <string name="avoid_unpaved">Goheles fordh ankonsys</string>
+    <string name="avoid_ferry">Goheles kowbalow</string>
+    <string name="avoid_motorways">Goheles gorfordhow</string>
+    <string name="avoid_steps">Goheles stayrys</string>
+    <string name="avoid_paved">Goheles fordh konsys</string>
+    <string name="unable_to_calc_alert_title">Anabel kalkya kerdh</string>
+    <string name="unable_to_calc_alert_subtitle">Unn kerdh na gallos kavosys. Ma re bos drefen gas dewisyow kerdh po data OpenStreetMap andhien. Mar pleg chanjya gas dewisyow kerdh ha dasassaya.</string>
+    <string name="change_driving_options_btn">Dewisyow kerdh gallosegys</string>
+    <string name="week_ago_sorttype">Nans yw unn seythen</string>
+    <string name="month_ago_sorttype">Nans yw unn mis</string>
+    <string name="moremonth_ago_sorttype">Moy ages nans yw unn mis</string>
+    <string name="moreyear_ago_sorttype">Moy ages nans yw unn bledhen</string>
+    <string name="dialog_pedestrian_route_is_long_header">Kerdh metro kavosys vyth</string>
+    <string name="dialog_pedestrian_route_is_long_message">Mar pleg, dewis unn tyller dalleth po penn an fordh yn-nes unn gorvas metro</string>
+    <string name="isolines_activation_error_dialog">Bywhe linen kettresow res iskargaow data mappa rag an arenebedh ma</string>
+    <string name="isolines_location_error_dialog">Linen kettresow yw kavadow yn an arenebedh ma na hwath</string>
+    <string name="elevation_profile_ascent">Ascendyans</string>
+    <string name="elevation_profile_descent">Diyskynnys</string>
+    <string name="downloader_loading_ios">Iskargaow</string>
+    <string name="disk_error">Anabel dhe gul restrenva ha gwaya restrennow war devis kov po sdcard</string>
+    <string name="disconnect_usb_cable_title">Unjunya korsen USB</string>
+    <string name="enable_keep_screen_on">Gwitha an skrin byw</string>
+    <string name="enable_keep_screen_on_description">A gallosegys, an skrin yw bos byw pub prys dres diskwedhes an mappa.</string>
+    <string name="enable_show_on_lock_screen">Diskwedhes war an skrin floren</string>
+    <string name="enable_show_on_lock_screen_description">A gallosegys, an app yw diskwedhes war an skrin floren pan an devis yw alhwedhys hwath.</string>
+    <string name="app_tip_03">A hwi aswon unn gwrier medhelweyth, hwi gallos peji ga kowlwul unn nas may hwi res.</string>
+    <string name="app_tip_04">Tava yn neb le war an mappa dhe dewis neb tra. Unn tava hir yw rag kudha ha diskwedhes an ynterfas.</string>
+    <string name="app_tip_05">A wodhowgh gas tyller a\'n jydh war an mappa gallos dewisys?</string>
+    <string name="app_tip_07">Agan app yw gul gans nebes diwysygyon ha an kemeneth.</string>
+    <string name="app_tip_08">Hwi gallos ewnhe ha gwellhe yn es an data map.</string>
+    <string name="app_tip_09">Agan amkan chif yw byldya mappys uskis, privedh, ha es may hwi a wra kara.</string>
+    <string name="car_used_on_the_phone_screen">Hwi devnydhya lemmyn CoMaps war an skrin kellgowser</string>
+    <string name="car_used_on_the_car_screen">Hwi devnydhya lemmyn CoMaps war an skrin karr</string>
+    <string name="car_continue_on_the_phone">Pesya war an kellgowser</string>
+    <string name="car_continue_in_the_car">Dhe an skrin karr</string>
+    <string name="aa_location_permissions_request">CoMaps res hedhas GPS. Pan y yw saw, checkya an messach war gas kellgowser.</string>
+    <string name="aa_request_permission_notification">An app ma res gas gront</string>
+    <string name="aa_request_permission_activity_text">CoMaps yn Android Auto res grontys GPS rag oberyans effeythus</string>
+    <string name="pref_tts_open_system_settings">Settyansow system tekst-dhe-areth</string>
+    <string name="pref_tts_no_system_tts">Settyansow tekst-dhe-areth na kavosys, Os ta sur gas devis skoodhya y?</string>
+    <string name="drive_through">Drivya-dredh</string>
+    <string name="self_service">Omgonis</string>
+    <string name="power_save_dialog_summary">Rag navygacyon moggha, ni komendya ungallosegi fordh batri yn settyansow kellgowser batri.</string>
+    <string name="stop_track_recording">Finsya Rekordyans Lergh</string>
+    <string name="stop_without_saving">Hedhi Rekordyans Lergh</string>
+    <string name="continue_recording">Pesya Rekordya</string>
+    <string name="track_recording_alert_title">Sawya yn Lyververkys ha Lerghow?</string>
+    <string name="track_recording_toast_nothing_to_save">Lergh yw gwag - mann rag sawyans</string>
+    <string name="error_no_file_manager_app">Anabel diskwedhes fenester dewis restrenva dre reson app fytti vyth yw leys war gas devis. Mar pleg, lea unn dyghtyer restrennow ha dasassaya.</string>
+    <string name="uri_open_location_failed">App leys vyth may gallos ygeri an tyller</string>
+    <string name="pref_left_button_disable">Ungallosegi</string>
+    <string name="pref_backup_title">Fardel ewnans gans lyververkys ha lerghow</string>
+    <string name="pref_backup_summary">Gul yn awtomatek unn fardel gans data rag ewnans yn unn restrenva war gas devis</string>
+    <string name="pref_backup_now_title">Gul y lemmyn</string>
+    <string name="pref_backup_now_summary">Gul a\'n par na fardel a-dhesempis</string>
+    <string name="pref_backup_now_summary_progress">Yn avonsyans…</string>
+    <string name="pref_backup_now_summary_ok">Sewena</string>
+    <string name="pref_backup_now_summary_empty_lists">Lyververkys ha lerghow vyth rag gul unn fardel</string>
+    <string name="pref_backup_now_summary_failed">Y fyllis gul unn fardel</string>
+    <string name="pref_backup_now_summary_folder_unavailable">An restrenva dewisys yw ankavadow</string>
+    <string name="pref_backup_status_summary_success">Gwrians sewen a-dhiwedhes</string>
+    <string name="pref_backup_location_title">Tyller</string>
+    <string name="pref_backup_location_summary_initial">Mar pleg, dewis unn restrenva a-dherag ha grontya gront</string>
+    <string name="pref_backup_history_title">Niver a fardellow dhe gwitha</string>
+    <string name="pref_backup_interval_title">Gul fardellow yn awtomatek</string>
+    <string name="backup_interval_manual_only">Marow (dre dhorn hepken)</string>
+    <string name="dialog_report_error_missing_folder">An tyller dewisys yw ankavadow po redya-hepken. Dewis unn tyller aral, mar pleg.</string>
+    <string name="dialog_report_error_with_logs">Mar pleg danvon unn derivas error dhe ni:\n - \"Gallosegi kovadhow\" yn an settyansow\n - Dasleverel yn diogel an kudyn\n - yn an skrin \"A-dro ha Gweres\", levna an boton \"Derivas unn kudyn\" ha danvon der ebost po keskows\n - ungallosegi kovadhow</string>
+    <string name="route_type">Eghen kerdh</string>
+    <string name="open_now">Ygeri lemmyn</string>
+    <string name="closed_now">Degeys lemmyn</string>
+    <string name="at">dhe %s</string>
+    <string name="pref_tts_no_system_tts_short">Jynn tekst-dhe-areth kavosys vyth, checkya an settyansow app</string>
+    <string name="navigation_start_tts_message">"Dalleth navygacyon, yeth lev: "</string>
+    <string name="navigation_start_tts_disabled_message">Lenna danvonadow marow: jynn tekst-dhe-areth ankavadow</string>
+    <string name="offline_explanation_text">Unn mappa res iskargys rag gweles ha viajya an arenebedh.\nIskarga mappys rag arenebedhow may hwi mynnes viajya dhe.</string>
+    <string name="list_description_empty">Golegi an rol rag addya unn deskrifans</string>
+    <string name="advanced">Avonsys</string>
+    <string name="download_resources_custom_url_title">Servell Mappa Personel</string>
+    <string name="download_resources_custom_url_message">Aslea an servell defowt devnydhys rag iskargow mappa. Gwitha gwag rag devnydhya an servell CoMaps defowt.</string>
+    <string name="download_resources_custom_url_summary_none">Anavleythys</string>
+    <string name="download_resources_custom_url_error_scheme">Mar pleg, ynworra unn URL may dalleth gans http:// po https://</string>
 </resources>

android/app/src/main/res/values-lt/strings.xml

@@ -900,5 +900,5 @@
     <string name="download_resources_custom_url_title">Pasirinktinis žemėlapių serveris</string>
     <string name="download_resources_custom_url_message">Žemėlapiams parsisiųsti galite nurodyti kitą, nei numatytasis, serverį. Palikite lauką tuščią, jei norite naudoti numatytąjį „CoMaps“ serverį.</string>
     <string name="download_resources_custom_url_summary_none">Nenurodytas</string>
-    <string name="download_resources_custom_url_error_scheme">Įveskite visą URL adresą, pradedant „https://“ ir baigiant „/“</string>
+    <string name="download_resources_custom_url_error_scheme">Įveskite URL adresą, prasidedantį „http://“ arba „https://“</string>
 </resources>

android/app/src/main/res/values-lv/strings.xml

@@ -854,7 +854,7 @@
     <string name="prefs_speed_cameras_information">Brīdinājumi par ātruma noteikšanas kamerā ir atspējoti valstīs, kurās šādus brīdinājumus aizliedz vietējais likums.</string>
     <string name="navigation_start_tts_message">"Uzsāk navigāciju, balss norāžu valoda: "</string>
     <string name="download_resources_custom_url_summary_none">Nav iestatīts</string>
-    <string name="download_resources_custom_url_error_scheme">Lūgums ievadīt pilnu URL, kas sākas ar https:// un beidzas ar /</string>
+    <string name="download_resources_custom_url_error_scheme">Lūgums ievadīt URL, kas sākas ar http:// vai https://</string>
     <string name="advanced">Iestatījumi: izvērsta kopa</string>
     <plurals name="minutes_short">
         <item quantity="zero">%d min.</item>

android/app/src/main/res/values-nb/strings.xml

@@ -908,7 +908,7 @@
     <string name="osm_note_toast">Notatet vil bli sendt til OpenStreetMap</string>
     <string name="advanced">Avansert</string>
     <string name="download_resources_custom_url_summary_none">Ikke angitt</string>
-    <string name="download_resources_custom_url_error_scheme">Angi en fullstendig nettadresse som starter med https:// og slutter med /</string>
+    <string name="download_resources_custom_url_error_scheme">Angi en nettadresse som starter med http:// eller https://</string>
     <string name="download_resources_custom_url_message">Overstyr standardserveren som brukes til nedlasting av kart. La det stå tomt for å bruke CoMaps standardserver.</string>
     <string name="download_resources_custom_url_title">Tilpasset kartserver</string>
 </resources>

android/app/src/main/res/values-night/themes.xml

@@ -11,7 +11,7 @@
     <item name="android:textColorPrimary">@color/text_light</item>
     <item name="android:textColorPrimaryInverse">@color/text_dark</item>
     <item name="android:textColorSecondary">@color/text_light_subtitle</item>
-    <item name="android:windowBackground">?windowBackgroundForced</item>
+    <item name="android:windowBackground">?appBackground</item>
     <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
@@ -21,7 +21,7 @@
     <item name="android:statusBarColor">?colorPrimary</item>
     <item name="android:windowTranslucentNavigation">false</item>
 
-    <item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
+    <item name="alertDialogTheme">@style/MwmTheme.M3.AlertDialog</item>
     <item name="windowBackgroundForced">@color/bg_window</item>
     <item name="cardBackground">@color/bg_cards</item>
     <item name="titleDialogTheme">@color/white_primary</item>

android/app/src/main/res/values-nl/strings.xml

@@ -919,5 +919,5 @@
     <string name="download_resources_custom_url_title">Aangepaste server voor kaarten</string>
     <string name="download_resources_custom_url_message">Overschrijf de standaard kaartdownloadserver die wordt gebruikt voor kaartdownloads. Laat leeg om de standaardserver van CoMaps te gebruiken.</string>
     <string name="download_resources_custom_url_summary_none">Niet ingesteld</string>
-    <string name="download_resources_custom_url_error_scheme">Voer een volledige URL in, beginnend met https:// en eindigend met /</string>
+    <string name="download_resources_custom_url_error_scheme">Voer een URL in beginnend met http:// of https://</string>
 </resources>

android/app/src/main/res/values-pt-rBR/strings.xml

@@ -897,5 +897,5 @@
     <string name="download_resources_custom_url_title">Servidor de Mapas Personalizado</string>
     <string name="download_resources_custom_url_message">Substitua o servidor padrão usado para baixar mapas. Deixe em branco para usar o servidor padrão do CoMaps.</string>
     <string name="download_resources_custom_url_summary_none">Não definido</string>
-    <string name="download_resources_custom_url_error_scheme">Insira um URL completo começando com https:// e terminando com /</string>
+    <string name="download_resources_custom_url_error_scheme">Insira uma URL começando com http:// ou https://</string>
 </resources>

android/app/src/main/res/values-pt/strings.xml

@@ -913,5 +913,5 @@
     <string name="download_resources_custom_url_title">Servidor de Mapa Personalizado</string>
     <string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string>
     <string name="download_resources_custom_url_summary_none">Indefinido</string>
-    <string name="download_resources_custom_url_error_scheme">Por favor insira um URL inteiro começando com https:// e acabando com /</string>
+    <string name="download_resources_custom_url_error_scheme">Por favor, insira um URL começando com http:// ou https://</string>
 </resources>

android/app/src/main/res/values-sv/strings.xml

@@ -38,7 +38,7 @@
     <!-- Text in About screen -->
     <string name="about_proposition_1">• Lättanvändlig och finslipad</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_2">• Integritetsfokuserad och fri från annonser</string>
+    <string name="about_proposition_2">Låg batteriförbrukning, fungerar utan uppkoppling</string>
     <!-- Text in About screen -->
     <string name="about_proposition_3">• Offline, snabb och kompakt</string>
     <!-- Text in About screen -->
@@ -82,7 +82,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Spara kartor i</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Välj en plats för nedladdade kartor.</string>
+    <string name="maps_storage_summary">Välj en plats för nedladdade kartor</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Nedladdade kartor</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -158,9 +158,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Din position har inte fastslagits ännu</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Tyvärr, kartlagring är inaktiverat i inställningar.</string>
+    <string name="cant_change_this_setting">Kartlagring är tyvärr inaktiverat i inställningar</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Kartan har börjat laddas ner.</string>
+    <string name="downloading_is_active">Kartan har börjat laddas ner</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Hej, kolla på min nuvarande position på CoMaps! %1$s eller %2$s Har du inte offline-kartor? Ladda ner här: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -212,7 +212,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Testa röstinstruktioner (TTS, Text-To-Speech)</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Kontrollera volymen eller systemets text-till-tal-inställningar om du inte hör rösten nu.</string>
+    <string name="pref_tts_playing_test_voice">Kontrollera volymen eller systemets text-till-tal-inställningar om du inte hör rösten nu</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Inte tillgängligt</string>
     <string name="pref_map_auto_zoom">Automatisk zoom</string>
@@ -258,7 +258,7 @@
     <string name="downloader_download_all_button">Ladda ned alla</string>
     <string name="downloader_downloading">Laddar ner:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Avsluta navigering för att radera kartan.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Avsluta navigering för att radera kartan</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Rutter kan endast skapas om de finns inom en enda kart-region.</string>
     <!-- Context menu item for downloader. -->
@@ -284,7 +284,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Vänligen aktivera platstjänster</string>
     <string name="save">Spara</string>
-    <string name="create">skapa</string>
+    <string name="create">Skapa</string>
     <!-- red color -->
     <string name="red">Röd</string>
     <!-- yellow color -->
@@ -330,18 +330,18 @@
     <string name="dialog_routing_location_turn_on">Aktivera platstjänster</string>
     <string name="dialog_routing_location_unknown_turn_on">Kan inte läsa nuvarande GPS-koordinater. Aktivera platstjänster för att hitta en rutt.</string>
     <string name="dialog_routing_unable_locate_route">Kan inte hitta rutt</string>
-    <string name="dialog_routing_cant_build_route">Kan inte hitta rutt.</string>
+    <string name="dialog_routing_cant_build_route">Kan inte hitta rutt</string>
     <string name="dialog_routing_change_start_or_end">Justera din startpunkt eller destination.</string>
     <string name="dialog_routing_change_start">Justera startpunkt</string>
     <string name="dialog_routing_start_not_determined">Ingen rutt hittades. Hittar inte startpunkt.</string>
     <string name="dialog_routing_select_closer_start">Välj en startpunkt närmare en väg.</string>
     <string name="dialog_routing_change_end">Justera destination</string>
     <string name="dialog_routing_end_not_determined">Ingen rutt hittades. Kan inte hitta destinationen.</string>
-    <string name="dialog_routing_select_closer_end">Välj en destination närmare en väg.</string>
-    <string name="dialog_routing_change_intermediate">Det går inte att hitta mellanliggande punkt.</string>
-    <string name="dialog_routing_intermediate_not_determined">Justera din mellanliggande punkt.</string>
+    <string name="dialog_routing_select_closer_end">Välj en destination närmare en väg</string>
+    <string name="dialog_routing_change_intermediate">Det går inte att hitta mellanliggande punkt</string>
+    <string name="dialog_routing_intermediate_not_determined">Justera din mellanliggande punkt</string>
     <string name="dialog_routing_system_error">Systemfel</string>
-    <string name="dialog_routing_application_error">Kan inte hitta rutt pga ett programfel.</string>
+    <string name="dialog_routing_application_error">Kan inte hitta rutt pga ett programfel</string>
     <string name="dialog_routing_try_again">Försök igen</string>
     <string name="not_now">Inte nu</string>
     <string name="dialog_routing_download_and_build_cross_route">Vill du ladda ned kartan och hitta en bättre sträcka via fler än en karta?</string>
@@ -355,17 +355,17 @@
     <string name="hide">Dölj</string>
     <string name="categories">Kategorier</string>
     <string name="history">Historik</string>
-    <string name="search_not_found">Ledsen, jag hittade ingenting.</string>
+    <string name="search_not_found">Ledsen, jag hittade ingenting</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Ladda ner den region där du söker eller försök att lägga till ett närliggande stads- eller bynamn.</string>
     <string name="search_history_title">Sökhistorik</string>
-    <string name="search_history_text">Se senaste sökningar.</string>
+    <string name="search_history_text">Se senaste sökningar</string>
     <string name="clear_search">Rensa sökhistorik</string>
     <string name="p2p_your_location">Din plats</string>
     <string name="p2p_start">Start</string>
     <string name="p2p_from_here">Rutt från</string>
     <string name="p2p_to_here">Rutt till</string>
-    <string name="p2p_only_from_current">Navigering är enbart möjlig från din nuvarande plats.</string>
+    <string name="p2p_only_from_current">Navigering är enbart möjlig från din nuvarande plats</string>
     <string name="p2p_reroute_from_current">Vill du att vi planerar en färdväg från din nuvarande plats?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Nästa</string>
@@ -425,14 +425,14 @@
     <string name="select_cuisine">Välj mat</string>
     <!-- login text field -->
     <string name="level">Våningsplan</string>
-    <string name="downloader_delete_map_dialog">Alla kartändringar kommer att raderas tillsammans med kartan.</string>
+    <string name="downloader_delete_map_dialog">Alla kartändringar kommer att raderas tillsammans med kartan</string>
     <string name="downloader_update_maps">Uppdatera kartor</string>
     <string name="downloader_mwm_migration_dialog">För att hitta en rutt måste du uppdatera alla kartor och sedan försöka igen.</string>
     <string name="downloader_search_field_hint">Hitta kartan</string>
-    <string name="common_check_internet_connection_dialog">Kontrollera dina inställningar och se till att din enhet är ansluten till internet.</string>
+    <string name="common_check_internet_connection_dialog">Kontrollera dina inställningar och se till att din enhet är ansluten till internet</string>
     <string name="downloader_no_space_title">Otillräckligt minne</string>
     <string name="downloader_no_space_message">Ta bort onödig data</string>
-    <string name="editor_login_error_dialog">Inloggningsfel.</string>
+    <string name="editor_login_error_dialog">Inloggningsfel</string>
     <string name="editor_profile_changes">Verifierade ändringar</string>
     <string name="editor_focus_map_on_location">Dra kartan för att placera korset på platsen för platsen eller företaget.</string>
     <string name="editor_edit_place_title">Redigerar</string>
@@ -448,16 +448,16 @@
     <string name="osm_presentation">Community-skapade OpenStreetMap-data från och med %s. Läs mer om hur du redigerar och uppdaterar kartan på OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) är ett community-projekt för att bygga en fri och öppen karta. Det är den huvudsakliga källan till kartdata i CoMaps och fungerar på samma sätt som Wikipedia. Du kan lägga till eller redigera platser och de blir tillgängliga för miljontals användare över hela världen. \nGå med i samhället och hjälp till att skapa en bättre karta för alla!</string>
-    <string name="login_to_make_edits_visible">Skapa ett OpenStreetMap-konto eller logga in för att publicera dina kartredigeringar till hela världen.</string>
+    <string name="login_to_make_edits_visible">Skapa ett OpenStreetMap-konto eller logga in för att publicera dina kartredigeringar till hela världen</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d av %2$d</string>
     <string name="download_over_mobile_header">Ladda ned med mobildata?</string>
-    <string name="download_over_mobile_message">Detta kan vara mycket dyrt med vissa abonnemang och vid roaming.</string>
+    <string name="download_over_mobile_message">Detta kan vara mycket dyrt med vissa abonnemang och vid roaming</string>
     <string name="error_enter_correct_house_number">Ange giltigt husnummer</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Redigera byggnaden med max %d våningar</string>
-    <string name="editor_zip_code">Postnr</string>
-    <string name="error_enter_correct_zip_code">Ange korrekt postnr</string>
+    <string name="editor_zip_code">Postkod</string>
+    <string name="error_enter_correct_zip_code">Ange korrekt postkod</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Meddelande till OpenStreetMap-volontärer (valfritt)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -473,8 +473,8 @@
     <string name="editor_category_unsuitable_title">Hittar du ingen lämplig kategori?</string>
     <string name="editor_category_unsuitable_text">CoMaps tillåter endast att lägga till enkla punktkategorier, det betyder inga städer, vägar, sjöar, byggnadskonturer etc. Lägg till sådana kategorier direkt till <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Kontrollera vår <a href="https://www.comaps.app/support/advanced-map-editing/">guide</a> för detaljerade steg-för-steg-instruktioner.</string>
     <string name="downloader_no_downloaded_maps_title">Du har inte laddat ner några kartor</string>
-    <string name="downloader_no_downloaded_maps_message">Ladda ner kartor för att hitta platsen och navigera offline.</string>
-    <string name="current_location_unknown_error_title">Den nuvarande platsen är okänd.</string>
+    <string name="downloader_no_downloaded_maps_message">Ladda ner kartor för att hitta platsen och navigera offline</string>
+    <string name="current_location_unknown_error_title">Den nuvarande platsen är okänd</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/tim</string>
     <string name="miles_per_hour">mi/tim</string>
@@ -512,10 +512,10 @@
     <string name="mobile_data_option_not_today">Använd inte idag</string>
     <string name="mobile_data">Mobilt internet</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Mobilt internet krävs för att visa detaljerad information om platser, som t. ex. fotografier, priser och omdömen.</string>
+    <string name="mobile_data_description">Mobilt internet krävs för att visa detaljerad information om platser, som t. ex. fotografier, priser och omdömen</string>
     <string name="mobile_data_option_never">Använd aldrig</string>
     <string name="mobile_data_option_ask">Fråga alltid</string>
-    <string name="traffic_update_maps_text">Kartor måste uppdateras för att visa trafikdata.</string>
+    <string name="traffic_update_maps_text">Kartor måste uppdateras för att visa trafikdata</string>
     <string name="big_font">Öka teckenstorlek på kartan</string>
     <string name="traffic_update_app">Uppdatera CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -525,7 +525,7 @@
     <string name="feedback_general">Allmän feedback</string>
     <string name="prefs_languages_information">Vi använder TTS-system för röstinstruktioner. Flera Android-enheter använder Google TTS. Du kan ladda ned eller uppdatera det på Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">För vissa språk måste du installera en annan talsyntes eller ett annat språkpaket från appbutiken (Google Play, Samsung Galaxy Store, Huawei AppGallery, F-Droid). \nÖppna inställningarna på enheten → Språk och inmatning → Tal → Text till tal-uppspelning. \nHär kan du hantera inställningarna för talsyntes (till exempel, ladda ned språkpaket för användning offline) och välja en annan text till tal-motor.</string>
-    <string name="prefs_languages_information_off_link">Kolla in den här guiden för mer information.</string>
+    <string name="prefs_languages_information_off_link">Kolla in den här guiden för mer information</string>
     <string name="transliteration_title">Translitterera till latinska alfabetet</string>
     <string name="learn_more">Läs mer</string>
     <!-- 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". -->
@@ -595,7 +595,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Varna aldrig</string>
     <string name="power_managment_title">Energisparläge</string>
-    <string name="power_managment_description">Försök att begränsa strömförbrukningen på bekostnad av vissa funktioner.</string>
+    <string name="power_managment_description">Försök att begränsa strömförbrukningen på bekostnad av vissa funktioner</string>
     <string name="power_managment_setting_never">Aldrig</string>
     <string name="power_managment_setting_auto">Vid lågt batteri</string>
     <string name="power_managment_setting_manual_max">Alltid</string>
@@ -795,7 +795,7 @@
     <string name="enable_show_on_lock_screen">Visa på låsskärmen</string>
     <string name="share_bookmarks_email_body">Hej! \n \nJag bifogar mina bokmärken, öppna gärna dem med CoMaps. Om du inte redan har appen installerad, kan du ladda ner den här: https://www.comaps.app/download/ \n \nTrevlig resa med CoMaps!</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
-    <string name="telegram_url">https://t.me/CoMapsApp</string>
+    <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Sv:Om_OpenStreetMap</string>
     <string name="change_map_locale">Kartspråk</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
@@ -836,4 +836,18 @@
     <string name="avoid_paved">Undvik asfalterade vägar</string>
     <string name="error_value_must_be_positive">Värdet måste vara positivt</string>
     <string name="error_invalid_number">ogiltigt tal</string>
+    <string name="vehicle">Fordon</string>
+    <string name="route_type">Ruttyp</string>
+    <string name="clear">Rensa</string>
+    <string name="download_resources_custom_url_error_scheme">Använd en URL som börjar med http:// eller https://</string>
+    <string name="download_resources_custom_url_title">Anpassad karttjänst</string>
+    <string name="advanced">Avancerad</string>
+    <string name="offline_explanation_title">Offlinekartor</string>
+    <string name="charge_socket_count">Antal</string>
+    <string name="charge_socket_unknown_other">Andra eller obekant</string>
+    <string name="bookmark_color">Färg för bökmärken</string>
+    <string name="ruler">Måttstock</string>
+    <string name="bicycle">Cykel</string>
+    <string name="pedestrian">Gående</string>
+    <string name="error_enter_correct_line_page">Ange en giltig webbadress</string>
 </resources>

android/app/src/main/res/values/strings.xml

@@ -73,11 +73,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Add a New List</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Bookmark List Name</string>
+    <string name="bookmark_set_name">List Name</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Bookmarks</string>
+    <string name="bookmarks">Places</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bookmarks and Tracks</string>
+    <string name="bookmarks_and_tracks">Favorites</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Name</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -156,18 +156,18 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notes</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps bookmarks were shared with you</string>
+    <string name="share_bookmarks_email_subject">My CoMaps Favorites</string>
     <string name="share_bookmarks_email_body">Hello!
 \n
-\nAttached are my bookmarks; please open them in CoMaps. If you don\'t have it installed you can download it here: https://www.comaps.app/download/
+\nAttached are my favorites; please open them in CoMaps. If you don\'t have it installed you can download it here: https://www.comaps.app/download/
 \n
 \nEnjoy travelling with CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Loading Bookmarks</string>
+    <string name="load_kmz_title">Loading Favorites</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bookmarks loaded successfully! You can find them on the map or on the Bookmarks Manager screen.</string>
+    <string name="load_kmz_successful">Favorites loaded successfully! You can find them on the map or on the Favorites Manager screen.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Failed to load bookmarks. The file may be corrupted or defective.</string>
+    <string name="load_kmz_failed">Failed to load favorites. The file may be corrupted or defective.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">The file type is not recognized by the app:
 \n%1$s</string>
@@ -541,7 +541,7 @@
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">More</string>
-    <string name="placepage_edit_bookmark_button">Edit Bookmark</string>
+    <string name="placepage_edit_bookmark_button">Edit Saved Place</string>
     <string name="placepage_personal_notes_hint">Personal notes (text or html)</string>
     <string name="editor_reset_edits_message">Discard all local changes?</string>
     <string name="editor_reset_edits_button">Discard changes</string>
@@ -635,17 +635,17 @@
     <string name="dialog_error_storage_message">External storage is not accessible. The SD card may have been removed, damaged, or the file system is read-only. Please, check your SD card or contact us at support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulate bad storage</string>
     <string name="error_enter_correct_name">Please enter a correct name</string>
-    <string name="bookmark_lists">Lists</string>
+    <string name="bookmark_lists">Favorite Lists</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Hide all</string>
     <string name="bookmark_lists_show_all">Show all</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d bookmark</item>
-        <item quantity="other">%d bookmarks</item>
+        <item quantity="one">%d saved place</item>
+        <item quantity="other">%d saved places</item>
     </plurals>
     <string name="bookmarks_create_new_group">Create a new list</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Import Bookmarks and Tracks</string>
+    <string name="bookmarks_import">Import Favorites</string>
     <string name="bookmarks_error_message_share_general">Unable to share due to an application error</string>
     <string name="bookmarks_error_title_share_empty">Sharing error</string>
     <string name="bookmarks_error_message_share_empty">Cannot share an empty list</string>
@@ -675,7 +675,7 @@
     <string name="subway">Subway</string>
     <string name="layers_title">Map Styles and Layers</string>
     <string name="bookmarks_empty_list_title">This list is empty</string>
-    <string name="bookmarks_empty_list_message">To add a bookmark, tap a place on the map and then tap the star icon</string>
+    <string name="bookmarks_empty_list_message">To save a place, tap a place on the map and then tap the star icon</string>
     <string name="category_desc_more">…more</string>
     <string name="export_file">Export KMZ</string>
     <string name="export_file_gpx">Export GPX</string>
@@ -730,7 +730,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Sort…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Sort bookmarks</string>
+    <string name="sort_bookmarks">Sort favorites</string>
     <!-- Android -->
     <string name="by_default">By default</string>
     <!-- Android -->
@@ -797,8 +797,10 @@
     <string name="enable_show_on_lock_screen">Show on the lock screen</string>
     <!-- Description in preferences -->
     <string name="enable_show_on_lock_screen_description">When enabled, the app will work on the lockscreen even when the device is locked.</string>
-    <!-- Current language of the map! -->
+    <!-- Current language of the map -->
     <string name="change_map_locale">Map language</string>
+    <!-- Local language -->
+    <string name="pref_maplanguage_local">Local Language</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Map data from OpenStreetMap</string>
     <!-- Telegram group url for the "?" About page -->
@@ -811,7 +813,7 @@
     <string name="translated_om_site_url">https://comaps.app/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
-    <!-- A number of bookmarks and a number of tracks, separated by comma, like: 1 bookmark, 5 tracks -->
+    <!-- A number of bookmarks and a number of tracks, separated by comma, like: 1 saved place, 5 tracks -->
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <!-- App Tip #00 -->
     <string name="app_tip_00">Thank you for using our community-built maps!</string>
@@ -857,7 +859,7 @@
     <string name="browser_not_available">Web browser is not available</string>
     <string name="volume">Volume</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Export all Bookmarks and Tracks</string>
+    <string name="bookmarks_export">Export all Places and Tracks</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Speech synthesis system settings</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -889,7 +891,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Continue Recording</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Save into Bookmarks and Tracks?</string>
+    <string name="track_recording_alert_title">Save into Favorites?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Track is empty - nothing to save</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -903,13 +905,13 @@
     <string name="pref_left_button_disable">Disable</string>
 
     <!-- Settings "Backup" category: "Backup" title -->
-    <string name="pref_backup_title">Bookmarks and tracks backup</string>
+    <string name="pref_backup_title">Backup favorites</string>
     <string name="pref_backup_summary">Automatically backup to a folder on your device</string>
     <string name="pref_backup_now_title">Backup now</string>
     <string name="pref_backup_now_summary">Create a backup immediately</string>
     <string name="pref_backup_now_summary_progress">Backup in progress…</string>
     <string name="pref_backup_now_summary_ok">Backup completed successfully</string>
-    <string name="pref_backup_now_summary_empty_lists">No bookmarks and tracks to backup</string>
+    <string name="pref_backup_now_summary_empty_lists">No places and tracks to backup</string>
     <string name="pref_backup_now_summary_failed">Backup failed</string>
     <string name="pref_backup_now_summary_folder_unavailable">The backup folder is not available</string>
     <string name="pref_backup_status_summary_success">Last successful backup</string>
@@ -933,7 +935,7 @@
     <string name="pedestrian">Pedestrian</string>
     <string name="bicycle">Bicycle</string>
     <string name="ruler">Ruler</string>
-    <string name="bookmark_color">Bookmark color</string>
+    <string name="bookmark_color">Color for Favorite</string>
     <string name="about_help">About &amp; Help</string>
     <string name="open_now">Open now</string>
     <string name="closed_now">Closed now</string>

android/app/src/main/res/values/styles-text.xml

@@ -2,8 +2,6 @@
 <resources>
   <style name="MwmTextAppearance" parent="android:TextAppearance.Material">
     <item name="android:fontFamily">@string/robotoRegular</item>
-    <!-- Force normal textStyle. Some devices (eg Lenovo P70), uses non-normal textStyle by default. -->
-    <item name="android:textStyle">normal</item>
   </style>
 
   <style name="MwmTextAppearance.Title">
@@ -100,16 +98,6 @@
     <item name="android:textColorHint">@color/text_light_hint</item>
   </style>
 
-  <style name="MwmTextAppearance.Toolbar.Title" parent="android:TextAppearance.Material.Widget.ActionBar.Title">
-    <item name="android:textSize">@dimen/text_size_toolbar</item>
-    <item name="android:textColor">@color/text_light</item>
-    <item name="android:textColorHint">@color/text_light_hint</item>
-  </style>
-
-  <style name="MwmTextAppearance.Toolbar.Title.Light">
-    <item name="android:textColor">@color/bg_cards</item>
-  </style>
-
   <style name="MwmTextAppearance.NavMenu">
     <item name="android:textStyle">bold</item>
   </style>

android/app/src/main/res/values/styles.xml

@@ -143,8 +143,7 @@
     <item name="android:background">?colorPrimary</item>
     <item name="android:displayOptions">homeAsUp|showTitle</item>
     <item name="contentInsetStart">0dp</item>
-    <item name="android:titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
-    <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
+    <item name="titleTextColor">@color/text_light</item>
     <item name="buttonGravity">center_vertical</item>
   </style>
 
@@ -169,9 +168,7 @@
     <item name="android:cacheColorHint">@android:color/transparent</item>
   </style>
 
-  <style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView">
-    <item name="android:background">@android:color/transparent</item>
-  </style>
+  <style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView" />
 
   <style name="MwmWidget.TextView.Item">
     <item name="android:layout_width">match_parent</item>

android/app/src/main/res/values/themes.xml

@@ -12,7 +12,7 @@
     <item name="android:textColorPrimary">@color/text_dark</item>
     <item name="android:textColorPrimaryInverse">@color/text_light</item>
     <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
-    <item name="android:windowBackground">?windowBackgroundForced</item>
+    <item name="android:windowBackground">?appBackground</item>
     <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
@@ -20,7 +20,7 @@
     <item name="android:windowActionBarOverlay">true</item>
     <item name="clickableBackground">?selectableItemBackground</item>
     <item name="android:statusBarColor">?colorPrimary</item>
-    <item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
+    <item name="alertDialogTheme">@style/MwmTheme.M3.AlertDialog</item>
     <item name="windowBackgroundForced">@color/bg_window</item>
     <item name="cardBackground">@color/bg_cards</item>
     <item name="titleDialogTheme">@color/black_primary</item>
@@ -185,11 +185,11 @@
   </style>
 
   <style name="MwmTheme.CardBg">
-    <item name="android:windowBackground">@color/bg_cards</item>
+    <item name="android:windowBackground">?appBackground</item>
   </style>
 
   <style name="MwmTheme.WindowBg">
-    <item name="android:windowBackground">@color/bg_window</item>
+    <item name="android:windowBackground">?appBackground</item>
   </style>
 
   <style name="MwmTheme.AlertDialog" parent="Theme.Material3.DayNight.Dialog.Alert">
@@ -243,7 +243,7 @@
 
   <style name="MwmTheme.FullScreenDialog">
     <item name="android:windowIsFloating">false</item>
-    <item name="android:windowBackground">@android:color/white</item>
+    <item name="android:windowBackground">?appBackground</item>
   </style>
 
   <style name="MwmTheme.MaterialTimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker">
@@ -253,8 +253,9 @@
     <item name="android:fontFamily">@string/robotoMedium</item>
   </style>
 
-  <style name="MwmTheme.ProgressDialog" parent="MwmTheme.AlertDialog">
+  <style name="MwmTheme.ProgressDialog" parent="MwmTheme.M3.AlertDialog">
     <item name="android:textColor">?textDialogTheme</item>
+    <item name="android:background">?attr/colorSurfaceContainerHigh</item>
   </style>
 
   <style name="MwmTheme.Downloader">
@@ -281,4 +282,11 @@
   <style name="PopupMenu" parent="ThemeOverlay.Material3">
     <item name="android:popupBackground">?windowBackgroundForced</item>
   </style>
+    <!-- Theme required to apply M3 dialog style on preference screen -->
+    <style name="MwmTheme.M3.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="dialogCornerRadius">28dp</item>
+        <item name="cornerFamily">rounded</item>
+        <item name="android:colorBackground">?attr/colorSurfaceContainerHigh</item>
+        <item name="android:layout">@layout/m3_alert_dialog</item>
+    </style>
 </resources>

android/app/src/main/res/xml/locales_config.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Some languages not supported by Android require to be specified here to be applied -->
     <locale android:name="en" />
     <locale android:name="af" />
     <locale android:name="ar" />
@@ -26,6 +27,7 @@
     <locale android:name="in" />
     <locale android:name="it" />
     <locale android:name="ja" />
+    <locale android:name="kw" />
     <locale android:name="ko" />
     <locale android:name="lt" />
     <locale android:name="lv" />

android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp

@@ -1490,6 +1490,12 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSet3dMode(JNIEnv
   g_framework->Set3dMode(allow3d, allow3dBuildings);
 }
 
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetCarScreenMode(JNIEnv * env, jclass, jboolean enabled)
+{
+  if (g_framework)
+    frm()->SetCarScreenMode(static_cast<bool>(enabled));
+}
+
 JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject result)
 {
   bool enabled;

android/sdk/src/main/java/app/organicmaps/sdk/Framework.java

@@ -280,6 +280,8 @@ public class Framework
 
   public static native void nativeSet3dMode(boolean allow3d, boolean allow3dBuildings);
 
+  public static native void nativeSetCarScreenMode(boolean enabled);
+
   public static native boolean nativeGetAutoZoomEnabled();
 
   public static native void nativeSetAutoZoomEnabled(boolean enabled);

android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java

@@ -9,6 +9,7 @@ import android.content.Context;
 import android.location.Location;
 import android.location.LocationManager;
 import android.os.Handler;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresPermission;
@@ -16,6 +17,9 @@ import androidx.annotation.UiThread;
 import androidx.core.content.ContextCompat;
 import androidx.core.location.GnssStatusCompat;
 import androidx.core.location.LocationManagerCompat;
+
+import org.chromium.base.ObserverList;
+
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.bookmarks.data.FeatureId;
@@ -25,7 +29,8 @@ import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.NetworkPolicy;
 import app.organicmaps.sdk.util.log.Logger;
-import org.chromium.base.ObserverList;
+
+import java.util.HashMap;
 
 public class LocationHelper implements BaseLocationProvider.Listener
 {
@@ -56,6 +61,12 @@ public class LocationHelper implements BaseLocationProvider.Listener
   private Handler mHandler;
   private Runnable mLocationTimeoutRunnable = this::notifyLocationUpdateTimeout;
 
+  private static final double INTERVAL_PROVIDER_DECISION = 3.0; // seconds
+  private final HashMap<String, Integer> mProviderLocationCounts = new HashMap<>();
+  private final HashMap<String, Float> mProviderAccuracyMeans = new HashMap<>();
+  private double mTimeAtLastProviderChange = Double.NaN;
+  private String mCurrentProvider = null;
+
   @NonNull
   private final GnssStatusCompat.Callback mGnssStatusCallback = new GnssStatusCompat.Callback() {
     @Override
@@ -187,7 +198,6 @@ public class LocationHelper implements BaseLocationProvider.Listener
   @Override
   public void onLocationChanged(@NonNull Location location)
   {
-    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
 
     if (!isActive())
     {
@@ -201,20 +211,80 @@ public class LocationHelper implements BaseLocationProvider.Listener
       return;
     }
 
-    if (mSavedLocation != null)
+    updateProviderDecision(location);
+    if (mCurrentProvider != null && !mCurrentProvider.equals(location.getProvider()))
     {
-      if (!LocationUtils.isLocationBetterThanLast(location, mSavedLocation))
-      {
-        Logger.d(TAG, "The new " + location + " is worse than the last " + mSavedLocation);
-        return;
-      }
+      Logger.d(TAG, "REJECTED: provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
+      return;
     }
 
+    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
+
     mSavedLocation = location;
     mMyPosition = null;
     notifyLocationUpdated();
   }
 
+  private void updateProviderDecision(Location location)
+  {
+    if (Double.isNaN(mTimeAtLastProviderChange))
+      mTimeAtLastProviderChange = location.getElapsedRealtimeNanos() * 1.0E-9;
+
+    String provider = location.getProvider();
+
+    Integer cnt = mProviderLocationCounts.getOrDefault(provider, 0);
+    Float avg = mProviderAccuracyMeans.getOrDefault(provider, 0.0f);
+
+    if (cnt == null || avg == null)
+    {
+      mProviderLocationCounts.clear();
+      mProviderAccuracyMeans.clear();
+      return;
+    }
+
+    int count = cnt;
+    float average = avg;
+
+    float accuracy = location.getAccuracy();
+    int newCount = count + 1;
+    float newAverage = (count * average + accuracy) / newCount;
+
+    mProviderLocationCounts.put(provider, newCount);
+    mProviderAccuracyMeans.put(provider, newAverage);
+
+    double currentTime = location.getElapsedRealtimeNanos();
+    double timeDiff = (currentTime - mTimeAtLastProviderChange) * 1.0E-9;
+
+    if (timeDiff > INTERVAL_PROVIDER_DECISION)
+    {
+      mCurrentProvider = getMinAccuracyProvider();
+      Logger.d(TAG, "Selected: " + mCurrentProvider + ", with acc. " + mProviderAccuracyMeans.get(mCurrentProvider));
+      mTimeAtLastProviderChange = currentTime;
+      mProviderLocationCounts.clear();
+      mProviderAccuracyMeans.clear();
+    }
+  }
+
+  private String getMinAccuracyProvider()
+  {
+    String minAccuracyProvider = null;
+    float minAccuracy = Float.MAX_VALUE;
+    for (String p : mProviderAccuracyMeans.keySet())
+    {
+      Float pAcc = mProviderAccuracyMeans.get(p);
+      if (pAcc == null)
+        continue;
+      float pAccuracy = pAcc;
+
+      if (pAccuracy < minAccuracy)
+      {
+        minAccuracy = pAccuracy;
+        minAccuracyProvider = p;
+      }
+    }
+    return minAccuracyProvider;
+  }
+
   // Used by GoogleFusedLocationProvider.
   @SuppressWarnings("unused")
   @Override

android/sdk/src/main/java/app/organicmaps/sdk/util/LocationUtils.java

@@ -81,20 +81,6 @@ public class LocationUtils
     return location.getAccuracy() > 0.0f;
   }
 
-  public static boolean isLocationBetterThanLast(@NonNull Location newLocation, @NonNull Location lastLocation)
-  {
-    if (newLocation.getElapsedRealtimeNanos() < lastLocation.getElapsedRealtimeNanos())
-      return false;
-
-    // As described in isAccuracySatisfied, GPS may have zero accuracy "for some reasons".
-    if (isFromGpsProvider(lastLocation) && lastLocation.getAccuracy() == 0.0f)
-      return true;
-
-    double speed = Math.max(DEFAULT_SPEED_MPS, (newLocation.getSpeed() + lastLocation.getSpeed()) / 2.0);
-    double lastAccuracy = lastLocation.getAccuracy() + speed * LocationUtils.getTimeDiff(lastLocation, newLocation);
-    return newLocation.getAccuracy() < lastAccuracy;
-  }
-
   public static boolean areLocationServicesTurnedOn(@NonNull Context context)
   {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)

android/sdk/src/main/res/values-b+sr+Latn/strings.xml

@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="mb">MB</string>
+</resources>