Adding general support for subtypes (and switching charging stations to using it)

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
[strings] Update from Codeberg Translate
2026-01-11 06:44:18 +00:00 · 2026-01-10 18:29:29 +01:00 · 2026-01-10 14:18:30 +00:00 · 2026-01-10 15:18:23 +01:00 · 2026-01-10 14:55:09 +01:00 · 2026-01-10 13:36:53 +01:00
382 changed files with 14441 additions and 7472 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -254,18 +254,20 @@ 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 += [
+            "en",
            "af",
            "ar",
            "az",
            "be",
            "bg",
+            "bn",
            "ca",
            "cs",
            "da",
            "de",
            "el",
-            "en",
            "en-rGB",
            "es",
            "es-rMX",
@@ -275,28 +277,38 @@ android {
            "fi",
            "fr",
            "fr-rCA",
-            "iw",
+            "gl",
+            "gsw",
+            "he",
            "hi",
            "hu",
+            "id",
            "in",
+            "is",
            "it",
+            "iw",
            "ja",
+            "kw",
            "ko",
            "lt",
            "lv",
            "mr",
            "mt",
            "nb",
+            "nb-rNO",
            "nl",
            "pl",
            "pt",
            "pt-rBR",
            "ro",
            "ru",
+            "sl",
            "sk",
            "sr",
+            "b+sr+Latn",
            "sv",
            "sw",
+            "ta",
            "th",
            "tr",
            "uk",
@@ -352,6 +364,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
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/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
--- a/android/app/src/fdroid/play/listings/en-AU/full-description.txt
+++ b/android/app/src/fdroid/play/listings/en-AU/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 - it does not identify people, does not track, and does not collect personal information. Ad 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!
--- a/android/app/src/fdroid/play/listings/en-GB/full-description.txt
+++ b/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!
--- a/android/app/src/fdroid/play/listings/en-GB/short-description.txt
+++ b/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
--- a/android/app/src/fdroid/play/listings/en-GB/title.txt
+++ b/android/app/src/fdroid/play/listings/en-GB/title.txt
@@ -0,0 +1 @@
+CoMaps - Hike, Bike, Drive Offline with Privacy
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/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
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/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
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/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
--- a/android/app/src/fdroid/play/listings/hr/release-notes.txt
+++ b/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
--- a/android/app/src/fdroid/play/listings/kw/full-description.txt
+++ b/android/app/src/fdroid/play/listings/kw/full-description.txt
@@ -0,0 +1,32 @@
+Unn app mappys rydh hag ygor selys war an kemeneth, selys war data OpenStreetMap ha krefhys gans omrians dhe klerder, privetter, ha heb budh. CoMaps yw unn forgh a Organic Maps, unn forgh a Maps.ME.
+
+Redya ma a-dro resons rag an ragdres hag y tu yn <b><i>codeberg.org/comaps</i></b>.
+Omjunya an kemeneth ena ha gweres gul an app mappys gwella
+• Devnydhya an app ha kevrenna y'n
+• Dasliva ha derivas kudynnow
+• Nowedhi data mappa yn an app po war an gwasiva OpenStreetMap
+
+‣ <b>Fogellys war dhywarlinen</b>: Devisya ha viajya dha viaj tramor neb res rag gonis kellgowser, hwilas leow ha war unn gwandrans pell, h.e. Oll nasyow app yw desinys dhe oberi dhywarlinen.
+‣ <b>Ow Gul Revrons dhe Privetter</b>: An app yw desinys gans privetter yn brys - na aswon tus, na helerghi, ha na kuntel kudhlow personel. Heb argemynnow.
+‣ <b>Sempel ha Polsys</b>: nasyow es may oberi poran.
+‣ <b>Sawya dha Batri hag Efander</b>: Na gwakhe dha batri haval dhe appys navigacyon aral. Mappys kesstrothys sawya efander precyous war dha kellgowser.
+‣ <b>Rydh ha Byldys gans an Kemeneth</b>: Tus haval dhe ty gwerys byldya an app gans owth addya leos dhe OpenStreetMap, ow previ ha dasliva a-dro nasyow hag ow kevri aga sleynethow hag arghans i.
+‣ <b>Erviransow hag Arghansereth Ygor ha Treusweladow, Heb Budh, ha Kod Ygor yn Leun</b>
+
+<b>Nasyow Chif</b>
+• Mappys manylys iskargadow gans leos ankavadow war Google Maps
+• Fordh Yn-Mes gans olow gwandrans, kampvaow, pennfentynnyow dowr, menydhyow, linennow kettres, h.e.
+• Hensyow kerdhyans ha diwrosyans
+• Leow kepar ha bostiow, petrolvaow, ostelyow, gwethjiow, troyll gwelyow, ha moy
+• Hwilas gans hanow po unn trigva po gans klass leow
+• Navigacyon gans gwarnyansow kewsys rag ow walkya, ow diwrosa, po ow lewa
+• Lyververkya dha leow drudh gans unn tava unnik
+• Artiklow dhywarlinen Wikipedya
+• Gwiskas metro ha tuyow
+• Helerghyans lerghow
+• Esperthi hag ynperthi lyververkys ha lerghow yn furvasow KML, KMZ, GPX
+• Unn fordh du rag an nos
+• Gwellhe data mappa rag peub ow devnydhya unn chanjyell selyek
+
+<b>Rydhses Yw Omma</b>
+Trovya dha viaj, viajya an nor gans privetter ha kemeneth a-talenebek!
--- a/android/app/src/fdroid/play/listings/kw/short-description.txt
+++ b/android/app/src/fdroid/play/listings/kw/short-description.txt
@@ -0,0 +1 @@
+Navigacyon mappa es - Trovya moy a dha kerdh - Selys war an kemeneth
--- a/android/app/src/fdroid/play/listings/kw/title.txt
+++ b/android/app/src/fdroid/play/listings/kw/title.txt
@@ -0,0 +1 @@
+CoMaps - Viajya gans Privetter
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/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
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/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
--- a/android/app/src/fdroid/play/listings/sr-Latn/full-description.txt
+++ b/android/app/src/fdroid/play/listings/sr-Latn/full-description.txt
@@ -0,0 +1,32 @@
+Besplatna aplikacija otvorenog koda koju održava zajednica i koja se zasniva na OpenStreetMap podacima. Neprofitna, transparentna i ceni vašu privatnost. CoMaps je nastala od aplikacije Organic Maps, koja je nastala od aplikacije Maps.ME.
+
+Pročitajte o razlozima projekta i njegovog pravca na <b><i>codeberg.org/comaps</i></b>
+Pridružite se otvorenoj zajednici i pomozite da napravimo najbolju aplikaciju za mape
+• Koristite aplikaciju i proširite glas o tome
+• Dajte povratne informacije i prijavite probleme
+• Ažurirajte podatke na mapi u aplikaciji ili na sajtu OpenStreetMap
+
+‣ <b>Fokusirano na oflajn rad</b>: Planirajte i upravljajte putovanjem u inostranstvu bez potrebe za mobilnim internetom, tražite usputne tačke dok ste na zabačenom planinskom putu, itd. Sve funkcionalnosti su dizajnirane za rad bez interneta.
+‣ <b>Poštovanje privatnosti</b>: Aplikacija je osmišljena sa privatnošću korisnika na umu - ne identifikuje ljude, ne prati ili prikuplja lične podatke. Nema reklama.
+‣ <b>Jednostavno i elegantno</b>: Aplikacija je laka za upotrebu i jednostavno funkcioniše.
+‣ <b>Čuva vašu bateriju i prostor</b>: Ne troši bateriju kao ostale aplikacije za navigaciju. Kompaktne mape čuvaju dragoceni prostor na vašem telefonu.
+‣ <b>Otvoreno i napravljeno od strane zajednice</b>: Ljudi poput vas su doprineli razvoju aplikacije dodavanjem lokacija na OpenStreetMap, testiranjem, davanjem povratnih informacija o aplikaciji i pomogli su svojim programerskim veštinama i donacijama.
+‣ <b>Otvoreno i transparentno donošenje odluka i upotreba donacija, neprofitna i potpuno otvorenog koda.</b>
+
+<b> Glavne karakteristike </b>:
+• Preuzmimanje detaljne mape sa lokacijama koje nisu dostupne sa Google mapama
+• Režim za izlete sa istaknutim planinarskim stazama, kampovima, izvorima vode, planinskim vrhovima, izohipsama itd.
+• Staze za planinarenje i bicikle
+• Tačke interesa kao što su restorani, benzinske pumpe, hoteli, prodavnice, znamenitosti i još mnogo toga
+• Pretraga po nazivu, adresi ili kategorijama
+• Navigacija sa glasovnim instrukcijama za hodanje, vožnju bicikla ili automobila
+• Označivanje omiljenih mesta jednim dodirom
+• Oflajn članci Vikipedije
+• Tranzitni sloj podzemne železnice sa navigacijom
+• Snimanje GPS putanja
+• Uvoz i uvoz markera i putanja u KML, KMZ, GPX formate
+• Tamni režim za upotrebu tokom noći
+• Poboljšajte kartu za sve korisnike, koristeći osnovni editor za mape
+
+<b> Sloboda je ovde </b>
+Otkrijte svoje putovanje, krećete se sa svetom sa privatnošću i zajednicom na prvom mestu!
--- a/android/app/src/fdroid/play/listings/sr-Latn/short-description.txt
+++ b/android/app/src/fdroid/play/listings/sr-Latn/short-description.txt
@@ -0,0 +1 @@
+Jednostavna navigacija - Saznajte više o svom putovanju - Održava zajednica
--- a/android/app/src/fdroid/play/listings/sr-Latn/title.txt
+++ b/android/app/src/fdroid/play/listings/sr-Latn/title.txt
@@ -0,0 +1 @@
+CoMaps - pešačenje, bicikl, vožnja sa privatnošću
--- a/android/app/src/google/play/listings/en-AU/full-description.txt
+++ b/android/app/src/google/play/listings/en-AU/full-description.txt
@@ -0,0 +1,36 @@
+A community led free & open source maps app based on OpenStreetMap data and reinforced with commitment to transparency, privacy and being not-for-profit.
+
+Join the community 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
+
+<i>Your feedback and 5-star reviews are the best support for us!</i>
+
+‣ <b>Simple and Polished</b>: essential easy to use features that just work.
+‣ <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 - it does not identify people, does not track, and does not collect personal information. Ad free.
+‣ <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, sightseeings and many more
+• Search by name or an address or by point of interest category
+• Navigation with voice announcements for walking, biking, 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
+• Android Auto support
+
+Please report app issues, suggest ideas and join our community at <b><i>comaps.app</i></b> website.
+
+<b>Freedom Is Here</b>
+Discover your journey, navigate the world with privacy and community at the forefront!
--- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/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)
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -9,8 +9,7 @@ import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE;
 import static app.organicmaps.sdk.location.LocationState.FOLLOW;
-import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE_COMPASS;
-import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE_ROUTE;
+import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE;
 import static app.organicmaps.sdk.location.LocationState.LOCATION_TAG;
 import static app.organicmaps.sdk.util.PowerManagment.POWER_MANAGEMENT_TAG;
 import static app.organicmaps.sdk.util.Utils.dimen;
@@ -133,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;

@@ -433,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)
@@ -656,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)
@@ -713,7 +711,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
    if (!TextUtils.isEmpty(appName))
    {
      setTitle(appName);
-      ((MaterialTextView) mPointChooser.findViewById(R.id.title)).setText(appName);
    }
  }

@@ -1156,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(
@@ -1775,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,
@@ -1798,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)
@@ -1847,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)
@@ -1901,8 +1898,7 @@ public class MwmActivity extends BaseMwmFragmentActivity

    locationHelper.restartWithNewMode();

-    if ((newMode == FOLLOW || newMode == FOLLOW_AND_ROTATE_ROUTE || newMode == FOLLOW_AND_ROTATE_COMPASS)
-        && !LocationUtils.checkFineLocationPermission(this))
+    if ((newMode == FOLLOW || newMode == FOLLOW_AND_ROTATE) && !LocationUtils.checkFineLocationPermission(this))
    {
      // Try to optimistically request FINE permission for FOLLOW and FOLLOW_AND_ROTATE modes.
      Logger.i(LOCATION_TAG, "Requesting ACCESS_FINE_LOCATION permission for " + LocationState.nameOf(newMode));
@@ -2042,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())
@@ -2076,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)
@@ -2169,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)
@@ -2255,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)
@@ -2280,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)
@@ -2297,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)
@@ -2319,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)
@@ -2580,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))
--- a/android/app/src/main/java/app/organicmaps/SplashActivity.java
+++ b/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(
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
+++ b/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)
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
+++ b/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;
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
+++ b/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)
--- a/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
@@ -183,16 +183,11 @@ public final class UiHelpers
      drawableRes = R.drawable.ic_follow;
      tintColor = Colors.LOCATION_TINT;
    }
-    case LocationState.FOLLOW_AND_ROTATE_COMPASS ->
+    case LocationState.FOLLOW_AND_ROTATE ->
    {
      drawableRes = R.drawable.ic_follow_and_rotate;
      tintColor = Colors.LOCATION_TINT;
    }
-    case LocationState.FOLLOW_AND_ROTATE_ROUTE ->
-    {
-      drawableRes = R.drawable.ic_follow_route;
-      tintColor = Colors.LOCATION_TINT;
-    }
    default -> throw new IllegalArgumentException("Invalid button mode: " + locationMode);
    }

--- a/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java
+++ b/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)
--- a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
+++ b/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)
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/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)
--- a/android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java
+++ b/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)
--- a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
@@ -53,7 +53,6 @@ public class AdvancedTimetableFragment extends BaseMwmFragment implements View.O
  public void onResume()
  {
    super.onResume();
-    refreshTimetables();
  }

  private void initViews(View view)
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/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) -> {
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/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))
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
+++ b/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))
--- a/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java
+++ b/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()]));
  }

--- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
+++ b/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();
--- a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java
+++ b/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)},
--- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java
+++ b/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)
--- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
+++ b/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);
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/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)
--- a/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java
+++ b/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,
--- a/android/app/src/main/java/app/organicmaps/util/Utils.java
+++ b/android/app/src/main/java/app/organicmaps/util/Utils.java
@@ -184,20 +184,6 @@ public class Utils
    }
  }

-  public static void showFacebookPage(Activity activity)
-  {
-    try
-    {
-      // Exception is thrown if we don't have installed Facebook application.
-      getPackageInfo(activity.getPackageManager(), Constants.Package.FB_PACKAGE, 0);
-      activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_OM_COMMUNITY_NATIVE)));
-    }
-    catch (final Exception e)
-    {
-      activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_OM_COMMUNITY_HTTP)));
-    }
-  }
-
  public static void openUrl(@NonNull Context context, @Nullable String url)
  {
    if (TextUtils.isEmpty(url))
--- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
+++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
@@ -53,7 +53,7 @@ public class MenuBottomSheetFragment extends BottomSheetDialogFragment
  @Override
  public Dialog onCreateDialog(@Nullable Bundle savedInstanceState)
  {
-    return new BottomSheetDialog(requireContext(), getTheme()) {
+    return new BottomSheetDialog(requireContext(), R.style.MwmTheme_BottomSheetDialog) {
      @Override
      public void onAttachedToWindow()
      {
--- a/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
+++ b/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);
--- a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
@@ -49,8 +49,8 @@ public class MyPositionButton
    int colorAttr = R.attr.iconTint;
    @DimenRes
    int sizeDimen = R.dimen.map_button_icon_size;
-    if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE_ROUTE
-        || mode == LocationState.FOLLOW_AND_ROTATE_COMPASS || mode == LocationState.PENDING_POSITION)
+    if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE
+        || mode == LocationState.PENDING_POSITION)
    {
      colorAttr = com.google.android.material.R.attr.colorSecondary;
      if (mode == LocationState.PENDING_POSITION)
@@ -69,8 +69,7 @@ public class MyPositionButton
        case LocationState.NOT_FOLLOW_NO_POSITION -> R.drawable.ic_location_off;
        case LocationState.NOT_FOLLOW -> R.drawable.ic_location_crosshair;
        case LocationState.FOLLOW -> R.drawable.ic_follow;
-        case LocationState.FOLLOW_AND_ROTATE_COMPASS -> R.drawable.ic_follow_and_rotate;
-        case LocationState.FOLLOW_AND_ROTATE_ROUTE -> R.drawable.ic_follow_route;
+        case LocationState.FOLLOW_AND_ROTATE -> R.drawable.ic_follow_and_rotate;
        default -> throw new IllegalArgumentException("Invalid button mode: " + mode);
      };
          image = ResourcesCompat.getDrawable(resources, drawableRes, context.getTheme());
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
+++ b/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)
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/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)
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/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()
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/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
--- a/android/app/src/main/res/drawable/bg_clickable_card.xml
+++ b/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">
--- a/android/app/src/main/res/drawable/ic_follow_route.xml
+++ b/android/app/src/main/res/drawable/ic_follow_route.xml
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:strokeColor="@android:color/white"
-      android:fillColor="@android:color/white"
-      android:pathData="M15.15 16.92l-7.04 2.8v0.4l2.63 1.07 0.98 2.67h0.39z"/>
-  <path
-      android:strokeColor="@android:color/white"
-      android:strokeWidth="2"
-      android:strokeLineJoin="miter"
-      android:pathData="m 16.25,15.95 c 2.29,-2.29 1.91,-3.87 -4.06,-3.87"/>
-  <path
-      android:strokeColor="@android:color/white"
-      android:strokeWidth="2"
-      android:strokeLineJoin="miter"
-      android:pathData="M8.98 7.43c-2.97 2.96-2.72 4.66 3.24 4.66"/>
-  <path
-      android:strokeColor="@android:color/white"
-      android:strokeWidth="2"
-      android:strokeLineJoin="miter"
-      android:pathData="M8.89 7.51l8.83-8.79"/>
-  <path
-      android:strokeColor="@android:color/white"
-      android:strokeWidth="2"
-      android:strokeLineJoin="miter"
-      android:pathData="M9.2 22.83c-0.64 0.57-2.9 2.5-3.56 3.13"/>
-</vector>
--- a/android/app/src/main/res/layout-land/dialog_stacked_buttons.xml
+++ b/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>
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/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>
--- a/android/app/src/main/res/layout-land/layout_nav.xml
+++ b/android/app/src/main/res/layout-land/layout_nav.xml
@@ -41,5 +41,5 @@
    android:layout_width="0dp"
    android:layout_height="0dp"
    android:layout_gravity="bottom|start"
-    android:background="?cardBackground"/>
+    android:background="?colorSurfaceContainerLow"/>
 </FrameLayout>
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/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"
--- a/android/app/src/main/res/layout-land/onmap_downloader.xml
+++ b/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"
--- a/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
+++ b/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
@@ -8,7 +8,6 @@
  android:paddingStart="@dimen/margin_base"
  android:paddingEnd="@dimen/margin_base"
  android:gravity="center_vertical"
-  android:background="?clickableBackground"
  android:orientation="horizontal">

  <com.google.android.material.imageview.ShapeableImageView
--- a/android/app/src/main/res/layout/choose_bookmark_category_fragment.xml
+++ b/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>
--- a/android/app/src/main/res/layout/dialog_sorting_types.xml
+++ b/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>
--- a/android/app/src/main/res/layout/dialog_stacked_buttons.xml
+++ b/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>
--- a/android/app/src/main/res/layout/downloader_item_header.xml
+++ b/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"/>
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/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"
--- a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
+++ b/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>
--- a/android/app/src/main/res/layout/fragment_categories.xml
+++ b/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>
--- a/android/app/src/main/res/layout/fragment_downloader.xml
+++ b/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"/>

--- a/android/app/src/main/res/layout/fragment_edit_bookmark.xml
+++ b/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"
--- a/android/app/src/main/res/layout/fragment_editor_host.xml
+++ b/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
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/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"
--- a/android/app/src/main/res/layout/fragment_report.xml
+++ b/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>

--- a/android/app/src/main/res/layout/fragment_search.xml
+++ b/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"
          />
--- a/android/app/src/main/res/layout/fragment_search_categories.xml
+++ b/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>
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/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"
--- a/android/app/src/main/res/layout/item_category_description.xml
+++ b/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
--- a/android/app/src/main/res/layout/item_category_title.xml
+++ b/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"
--- a/android/app/src/main/res/layout/item_feature_category_footer.xml
+++ b/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"
--- a/android/app/src/main/res/layout/item_missed_map.xml
+++ b/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">
--- a/android/app/src/main/res/layout/item_missed_map_group.xml
+++ b/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">
--- a/android/app/src/main/res/layout/item_phone.xml
+++ b/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>
--- a/android/app/src/main/res/layout/layout_nav.xml
+++ b/android/app/src/main/res/layout/layout_nav.xml
@@ -40,5 +40,5 @@
    android:layout_width="0dp"
    android:layout_height="0dp"
    android:layout_gravity="bottom|center"
-    android:background="?cardBackground"/>
+    android:background="?colorSurfaceContainerLow"/>
 </FrameLayout>
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/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"
--- a/android/app/src/main/res/layout/menu.xml
+++ b/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">
--- a/android/app/src/main/res/layout/menu_route_plan_line.xml
+++ b/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">

--- a/android/app/src/main/res/layout/place_page.xml
+++ b/android/app/src/main/res/layout/place_page.xml
@@ -4,6 +4,7 @@
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:descendantFocusability="blocksDescendants"
+  android:background="?cardBackground"
  android:orientation="vertical">
  <include
    android:id="@+id/pp__preview"
--- a/android/app/src/main/res/layout/position_chooser.xml
+++ b/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" />
--- a/android/app/src/main/res/layout/routing_action_panel.xml
+++ b/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"
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/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"
--- a/android/app/src/main/res/values-b+sr+Latn/strings.xml
+++ b/android/app/src/main/res/values-b+sr+Latn/strings.xml
@@ -1,3 +1,662 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="app_site_url">https://comaps.app/</string>
+    <string name="back">Nazad</string>
+    <string name="cancel">Odustani</string>
+    <string name="delete">Obriši</string>
+    <string name="download_maps">Preuzmi mape</string>
+    <string name="download_has_failed">Preuzimanje nije uspelo. Tapni za ponovni pokušaj</string>
+    <string name="downloading">Preuzimanje…</string>
+    <string name="kilometres">Kilometri</string>
+    <string name="miles">Milje</string>
+    <string name="later">Kasnije</string>
+    <string name="search">Pretraga</string>
+    <string name="search_map">Traži na mapi</string>
+    <string name="location_is_disabled_long_text">Trenutno su svi lokacijski servisi na ovom uređaju ili aplikaciji isključeni. Potrebno je da ih uključite u Podešavanjima.</string>
+    <string name="limited_accuracy">Ograničena tačnost</string>
+    <string name="precise_location_is_disabled_long_text">Da bi se osigurala tačna navigacija omogućite preciznu lokaciju u podešavanjima</string>
+    <string name="zoom_to_country">Prikaži mapu</string>
+    <string name="country_status_download_failed">Preuzimanje nije uspelo</string>
+    <string name="try_again">Pokušaj ponovo</string>
+    <string name="about_menu_title">O aplikaciji</string>
+    <string name="about_headline">Otvoreni projekat koji pokreće zajednica</string>
+    <string name="about_proposition_1">• Laka i polirana</string>
+    <string name="about_proposition_2">• Orijentisana na privatnost i bez reklama</string>
+    <string name="about_proposition_3">• Oflajn, brza i kompaktna</string>
+    <string name="about_developed_by_enthusiasts">Potpuno otvorenog koda, neprofitna, transparentna u odlučivanju i finansijama.</string>
+    <string name="location_settings">Podešavanja lokacije</string>
+    <string name="close">Zatvori</string>
+    <string name="unsupported_phone">Ova aplikacija zahteva OpenGL. Na žalost, vaš uređaj nije podržan.</string>
+    <string name="download">Preuzmi</string>
+    <string name="disconnect_usb_cable">Molim vas otkačite USB kabl, ili ubacite memorijsku karticu da biste koristili CoMaps</string>
+    <string name="not_enough_free_space_on_sdcard">Molim vas, prvo oslobodite nešto prostora na SD kartici ili na USB memoriji da biste koristili aplikaciju</string>
+    <string name="download_resources">Pre nego što počnete da koristite aplikaciju, prvo preuzmite na vaš uređaj mapu sveta. \nZa to će biti potrebno %s memorije.</string>
+    <string name="download_resources_continue">Idi na mapu</string>
+    <string name="downloading_country_can_proceed">Preuzimanje %1$s (%2$s). Možete \notići na mapu.</string>
+    <string name="download_country_ask">Preuzeti %1$s? (%2$s)</string>
+    <string name="update_country_ask">Ažurirati %1$s? (%2$s)</string>
+    <string name="pause">Pauza</string>
+    <string name="continue_button">Nastavi</string>
+    <string name="download_country_failed">%s preuzimanje nije uspelo</string>
+    <string name="add_new_set">Napravi novu listu</string>
+    <string name="bookmark_set_name">Naziv liste</string>
+    <string name="bookmarks">Mesta</string>
+    <string name="bookmarks_and_tracks">Favoriti</string>
+    <string name="name">Naziv</string>
+    <string name="address">Adresa</string>
+    <string name="list">Lista</string>
+    <string name="settings">Podešavanja</string>
+    <string name="maps_storage">Mesto za čuvanje mapa</string>
+    <string name="maps_storage_summary">Izaberite folder u kom se čuvaju mape</string>
+    <string name="maps_storage_downloaded">Preuzete mape</string>
+    <string name="maps_storage_free_size">slobodno %1$s od %2$s</string>
+    <string name="move_maps">Premestiti mapu?</string>
+    <string name="move_maps_error">Greška prilikom premeštanja mapa</string>
+    <string name="wait_several_minutes">Ovo može da potraje nekoliko minuta. \nMolim vas, sačekajte…</string>
+    <string name="measurement_units">Jedinice mere</string>
+    <string name="measurement_units_summary">Izaberite između kilometara i milja</string>
+    <string name="category_eat">Gde jesti</string>
+    <string name="category_food">Namirnice</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_fuel">Gorivo</string>
+    <string name="category_parking">Parking</string>
+    <string name="category_shopping">Kupovina</string>
+    <string name="category_secondhand">Polovna odeća</string>
+    <string name="category_hotel">Hotel</string>
+    <string name="category_tourism">Turistička atrakcija</string>
+    <string name="category_entertainment">Zabava</string>
+    <string name="category_atm">Bankomat</string>
+    <string name="category_nightlife">Noćni život</string>
+    <string name="category_children">Sve za decu</string>
+    <string name="category_bank">Banka</string>
+    <string name="category_pharmacy">Apoteka</string>
+    <string name="category_hospital">Bolnica</string>
+    <string name="category_toilet">Toalet</string>
+    <string name="category_post">Pošta</string>
+    <string name="category_police">Policija</string>
+    <string name="category_recycling">Reciklaža</string>
+    <string name="category_water">Voda</string>
+    <string name="category_rv">Za kamper vozila</string>
+    <string name="description">Napomene</string>
+    <string name="share_bookmarks_email_subject">CoMaps favoriti</string>
+    <string name="share_bookmarks_email_body">Zdravo! \n \nU prilogu su moji favoriti; molim te da ih otvoriš u CoMaps-u. Ako ga nemaš već instaliranog, možeš da ga preuzmeš odavde: https://www.comaps.app/download/ \n \nUživaj u putovanju sa CoMaps-om!</string>
+    <string name="load_kmz_title">Učitavanje favorita</string>
+    <string name="load_kmz_successful">Favoriti su uspešno učitani! Možete ih pronači na mapi pomoću Menadžera favorita.</string>
+    <string name="load_kmz_failed">Neuspešno učitavanje favorita. Moguće da je fajl oštećen ili neispravan.</string>
+    <string name="unknown_file_type">Aplikacija ne prepoznaje ovu vrstu fajla: \n%1$s</string>
+    <string name="failed_to_open_file">Otvaranje fajla %1$s nije uspelo \n \n%2$s</string>
+    <string name="edit">Izmeni</string>
+    <string name="unknown_current_position">Vaša lokacija još nije određena</string>
+    <string name="cant_change_this_setting">Izvinite, podešavanje lokacije za čuvanje mapa je trenutno onemogućeno</string>
+    <string name="downloading_is_active">Preuzimanje mapa je u toku</string>
+    <string name="my_position_share_sms">Vidi moju trenutnu lokaciju u CoMaps-u! %1$s ili %2$s Još ne koristiš offline mape? Preuzmi ih ovde: https://www.comaps.app/download/</string>
+    <string name="bookmark_share_email_subject">Hej, vidi moj marker u CoMaps-u!</string>
+    <string name="my_position_share_email_subject">Hej, vidi moju trenutnu lokaciju na CoMaps mapi!</string>
+    <string name="my_position_share_email">Zdravo, \n \nJa sam ovde: %1$s. Klikni na ovaj %2$s ili ovaj link %3$s da bi video to mesto na mapi. \n \nHvala.</string>
+    <string name="share">Podeli</string>
+    <string name="email">Email</string>
+    <string name="copied_to_clipboard">Kopirano u klipbord: %s</string>
+    <string name="done">Gotovo</string>
+    <string name="data_version">OpenStreetMap podaci: %s</string>
+    <string name="tracks_title">Putanje</string>
+    <string name="length">Dužina</string>
+    <string name="share_my_location">Podeli moju lokaciju</string>
+    <string name="prefs_group_general">Opšta podešavanja</string>
+    <string name="prefs_group_information">Informacije</string>
+    <string name="prefs_group_route">Navigacija</string>
+    <string name="pref_zoom_title">Dugme za zumiranje</string>
+    <string name="pref_zoom_summary">Prikaži na mapi</string>
+    <string name="pref_map_style_title">Noćni režim</string>
+    <string name="off">Isključeno</string>
+    <string name="on">Uključeno</string>
+    <string name="auto">Automatski</string>
+    <string name="pref_map_3d_title">Prikaz perspektive</string>
+    <string name="pref_map_3d_buildings_title">3D zgrade</string>
+    <string name="pref_map_3d_buildings_disabled_summary">3D zgrade se ne prikazuju u režimu čuvanja baterije</string>
+    <string name="pref_tts_enable_title">Glasovne instrukcije</string>
+    <string name="pref_tts_street_names_title">Najavi ime ulice</string>
+    <string name="pref_tts_street_names_description">Kada je uključeno, ime ulice ili izlaz na koji treba skrenuti će biti izgovoren.</string>
+    <string name="pref_tts_language_title">Jezik glasa</string>
+    <string name="pref_tts_test_voice_title">Testiraj glasovne instrukcije</string>
+    <string name="pref_tts_playing_test_voice">Proverite glasnoću ili sistemska podešavanja Teksta-u-govor ako sada ne čujete glas</string>
+    <string name="pref_tts_unavailable">Nije dostupno</string>
+    <string name="pref_map_auto_zoom">Automatsko uvećavanje</string>
+    <string name="placepage_distance">Razdaljina</string>
+    <string name="search_show_on_map">Prikaži na mapi</string>
+    <string name="menu">Meni</string>
+    <string name="website">Veb-sajt</string>
+    <string name="news">Novosti</string>
+    <string name="panoramax">Panoramax Picture</string>
+    <string name="feedback">Povratne informacije</string>
+    <string name="rate_the_app">Ocena aplikacije</string>
+    <string name="help">Pomoć</string>
+    <string name="faq">Često postavljena pitanja</string>
+    <string name="donate">Donacija</string>
+    <string name="how_to_support_us">Volontirajte i poboljšajte CoMaps</string>
+    <string name="copyright">Copyright</string>
+    <string name="report_a_bug">Prijavite problem</string>
+    <string name="compass_calibration_recommended">Poboljšajte smer strelice tako što ćete pomerati telefon u putanji osmice kao biste kalibrisali kompas.</string>
+    <string name="compass_calibration_required">Pomerajte telefon u putanji osmice kako biste kalibrisali kompas i popravili smer strelice na mapi.</string>
+    <string name="long_tap_toast">Dodirnite dugo mapu da biste ponovo videli interfejs</string>
+    <string name="downloader_update_all_button">Ažuriraj sve</string>
+    <string name="downloader_cancel_all">Odustani od svih</string>
+    <string name="downloader_downloaded_subtitle">Preuzeto</string>
+    <string name="downloader_queued">Na čekanju</string>
+    <string name="downloader_near_me_subtitle">Blizu mene</string>
+    <string name="downloader_status_maps">Mape</string>
+    <string name="downloader_download_all_button">Preuzmi sve</string>
+    <string name="downloader_downloading">Preuzimanje:</string>
+    <string name="downloader_delete_map_while_routing_dialog">Da biste obrisali mapu, zaustavite navigaciju</string>
+    <string name="routing_failed_cross_mwm_building">Mogu se kreirati samo rute koje se kompletno nalaze u okviru mape jednog regiona.</string>
+    <string name="downloader_download_map">Preuzmi mapu</string>
+    <string name="downloader_retry">Pokušaj ponovo</string>
+    <string name="downloader_delete_map">Obriši mapu</string>
+    <string name="downloader_update_map">Ažuriraj mapu</string>
+    <string name="google_play_services">Google Fused lokacijski servis</string>
+    <string name="pref_use_google_play">Usluga lokacije koja kombinuje GPS, Wi-Fi, mobilnu mrežu i druge podatke kako bi se lokacija otkrila što je preciznije. Takođe se možete povezati sa Google serverima.</string>
+    <string name="routing_download_maps_along">Preuzmi sve mape koje se nalaze na ruti</string>
+    <string name="routing_requires_all_map">Da bi ruta mogla da se kreira, potrebno je da preuzimanje i ažuriranje svih mapa između vaše lokacije i vašeg odredišta.</string>
+    <string name="routing_not_enough_space">Nema dovoljno prostora</string>
+    <string name="enable_location_services">Molim vas uključite Lokacijske servise</string>
+    <string name="save">Sačuvaj</string>
+    <string name="create">Kreiraj</string>
+    <string name="red">Crvena</string>
+    <string name="yellow">Žuta</string>
+    <string name="blue">Plava</string>
+    <string name="green">Zelena</string>
+    <string name="purple">Ljubičasta</string>
+    <string name="orange">Narandžasta</string>
+    <string name="brown">Braon</string>
+    <string name="pink">Roze</string>
+    <string name="deep_purple">Tamno ljubičasta</string>
+    <string name="light_blue">Svetlo plava</string>
+    <string name="cyan">Cijan</string>
+    <string name="teal">Teal</string>
+    <string name="lime">Limeta</string>
+    <string name="deep_orange">Tamno narandžasta</string>
+    <string name="gray">Siva</string>
+    <string name="blue_gray">Plavo siva</string>
+    <string name="dialog_routing_disclaimer_title">Kada pratite rutu, obratite pažnju:</string>
+    <string name="dialog_routing_disclaimer_priority">— Uslovi na putu, saobraćajni propisi i znakovi imaju prioritet u odnosu na navigaciju;</string>
+    <string name="dialog_routing_disclaimer_precision">— Mapa može biti netačna i predložena ruta ne mora uvek biti najoptimalniji način da stignete na odredište;</string>
+    <string name="dialog_routing_disclaimer_recommendations">— Predloženu rutu treba da shvatite samo kao predlog;</string>
+    <string name="dialog_routing_disclaimer_borders">— Budite pažljivi sa rutama koje prolaze i blizini granica: rute koje kreira naša aplikacija mogu ponekad prelaziti granice dražava na nedozvoljenim mestima.</string>
+    <string name="dialog_routing_disclaimer_beware">Molimo Vas da budete oprezni i bezbedni na putu!</string>
+    <string name="dialog_routing_check_gps">Proveri GPS signal</string>
+    <string name="dialog_routing_error_location_not_found">Ne mogu da napravim rutu. Trenutne GPS koordinate ne mogu da se odrede.</string>
+    <string name="dialog_routing_location_turn_wifi">Molim Vas da proverite vaš GPS signal. Uključivanje Wi-Fi-a će popraviti preciznost vaše lokacije.</string>
+    <string name="dialog_routing_location_turn_on">Uključi Lokacijske servise</string>
+    <string name="dialog_routing_location_unknown_turn_on">Nije moguće odrediti trenutne GPS koordinate. Uključi lokacijske servise radi pronalaženja rute.</string>
+    <string name="dialog_routing_unable_locate_route">Ne mogu da pronađem rutu</string>
+    <string name="dialog_routing_cant_build_route">Ne mogu da napravim rutu</string>
+    <string name="dialog_routing_change_start_or_end">Molim Vas da podesite početnu ili odredišnu tačku.</string>
+    <string name="dialog_routing_change_start">Podesi početnu tačku</string>
+    <string name="dialog_routing_start_not_determined">Ruta nije kreirana. Ne mogu da odredim početnu tačku.</string>
+    <string name="dialog_routing_select_closer_start">Molim vas da izaberete početnu tačku bliže putu.</string>
+    <string name="dialog_routing_change_end">Podesi odredišnu tačku</string>
+    <string name="dialog_routing_end_not_determined">Ruta nije napravljena. Ne mogu da pronađem odredište.</string>
+    <string name="dialog_routing_select_closer_end">Molim Vas da izaberete odredišnu tačnu bliže putu</string>
+    <string name="dialog_routing_change_intermediate">Ne mogu da pronađem međuodredište</string>
+    <string name="dialog_routing_intermediate_not_determined">Molim Vas da podesite međuodredište</string>
+    <string name="dialog_routing_system_error">Sistemska greška</string>
+    <string name="dialog_routing_application_error">Ne mogu da napravim rutu zbog greške u aplikaciji.</string>
+    <string name="dialog_routing_try_again">Molim Vas, pokušajte ponovo</string>
+    <string name="not_now">Ne sada</string>
+    <string name="dialog_routing_download_and_build_cross_route">Da li želite da preuzmete mapu i napravite optimalniju rutu koja se prostire na više od jedne mape?</string>
+    <string name="dialog_routing_download_cross_route">Preuzmi dodatne mape i napravi bolju rutu koja se prestire preko granica ove mape.</string>
+    <string name="search_without_internet_advertisement">Da biste počeli da pretražujete i pravite rute, molim Vas da preuzmete mapu. Nakon toga veza sa internetom Vam više neće biti potrebna.</string>
+    <string name="search_select_map">Izaberi mapu</string>
+    <string name="show">Prikaži</string>
+    <string name="hide">Sakrij</string>
+    <string name="categories">Kategorije</string>
+    <string name="history">Istorija</string>
+    <string name="search_not_found">Ups, nema rezultata</string>
+    <string name="search_not_found_query">Preuzmite region gde vršite pretragu, ili probajte da dodate ime obližnjeg naselja.</string>
+    <string name="search_history_title">Istorija pretrage</string>
+    <string name="search_history_text">Pogledajte vaše nedavne pretrage</string>
+    <string name="clear_search">Obriši istoriju pretrage</string>
+    <string name="read_in_wikipedia">Vikipedija</string>
+    <string name="wikimedia_commons">Vikimedijina ostava</string>
+    <string name="p2p_your_location">Vaša lokacija</string>
+    <string name="p2p_start">Kreni</string>
+    <string name="p2p_from_here">Start</string>
+    <string name="p2p_to_here">Odredište</string>
+    <string name="p2p_only_from_current">Navigacija je moguća samo od vaše trenutne lokacije</string>
+    <string name="p2p_reroute_from_current">Da li želite da napravite rutu od vaše trenutne lokacije?</string>
+    <string name="next_button">Dalje</string>
+    <string name="editor_time_from">Od</string>
+    <string name="editor_time_to">Do</string>
+    <string name="editor_time_add">Dodaj vreme</string>
+    <string name="editor_time_delete">Obriši vreme</string>
+    <string name="editor_time_allday">Non-stop (24 sata)</string>
+    <string name="editor_time_open">Otvoreno</string>
+    <string name="editor_time_close">Zatvoreno</string>
+    <string name="editor_time_add_closed">Dodaj neradno vreme</string>
+    <string name="editor_time_title">Radno vreme</string>
+    <string name="editor_time_advanced">Napredni režim</string>
+    <string name="editor_time_simple">Jednostavni režim</string>
+    <string name="editor_hours_closed">Neradno vreme</string>
+    <string name="editor_example_values">Primeri</string>
+    <string name="editor_correct_mistake">Ispravi grešku</string>
+    <string name="editor_add_select_location">Izaberite lokaciju</string>
+    <string name="editor_report_problem_desription_1">Molim Vas da detaljno opišete problem kako bi OpenStreetMap zajednica mogla da ga popravi.</string>
+    <string name="editor_report_problem_desription_2">Ili to učinite sami na https://www.openstreetmap.org/</string>
+    <string name="editor_report_problem_send_button">Pošalji</string>
+    <string name="editor_report_problem_title">Problem</string>
+    <string name="editor_report_problem_no_place_title">Ovo mesto ne postoji</string>
+    <string name="editor_report_problem_under_construction_title">Zatvoreno zbog održavanja</string>
+    <string name="editor_report_problem_duplicate_place_title">Duplirano mesto</string>
+    <string name="autodownload">Automatsko preuzimanje mapa</string>
+    <string name="daily">Svaki dan</string>
+    <string name="twentyfour_seven">24/7</string>
+    <string name="day_off_today">Danas ne radi</string>
+    <string name="day_off">Zatvoreno</string>
+    <string name="opens_in">Otvara se za %s</string>
+    <string name="closes_in">Zatvara se za %s</string>
+    <string name="closed">Zatvoreno</string>
+    <string name="opens_at">Otvara se u %s</string>
+    <string name="closes_at">Zatvara se u %s</string>
+    <string name="opens_day_at">Otvara se u %1$s u %2$s</string>
+    <string name="closes_day_at">Zatvara se u %1$s u %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="few">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
+    <string name="hours_confirmed_time_ago">Provereno %s</string>
+    <string name="existence_confirmed_time_ago">Provereno da postoji %s</string>
+    <string name="edit_opening_hours">Promeni radno vreme</string>
+    <string name="no_osm_account">Nemate OpenStreetMap nalog?</string>
+    <string name="register_at_openstreetmap">Registrujte se na OpenStreetMap-u</string>
+    <string name="login">Prijavite se</string>
+    <string name="not_signed_in">Niste prijavljeni</string>
+    <string name="login_osm">Prijava na OpenStreetMap</string>
+    <string name="logout">Odjavi se</string>
+    <string name="edit_place">Izmeni mesto</string>
+    <string name="add_language">Dodaj jezik</string>
+    <string name="street">Ulica</string>
+    <string name="house_number">Kućni broj</string>
+    <string name="details">Detalji</string>
+    <string name="social_media">Društveni mediji</string>
+    <string name="building">Zgrada</string>
+    <string name="add_street">Dodaj ulicu</string>
+    <string name="empty_street_name_error">Molim Vas, unesite naziv ulice</string>
+    <string name="choose_language">Izaberite jezik</string>
+    <string name="choose_street">Izaberite ulicu</string>
+    <string name="cuisine">Kuhinja</string>
+    <string name="select_cuisine">Izaberite kuhinju</string>
+    <string name="editor_add_phone">Dodaj broj telefona</string>
+    <string name="level">Sprat</string>
+    <string name="level_value_generic">Sprat: %s</string>
+    <string name="downloader_delete_map_dialog">Sve vaše promene na mapi će biti obrisane zajedno sa mapom</string>
+    <string name="downloader_update_maps">Ažuriraj mape</string>
+    <string name="downloader_mwm_migration_dialog">Da biste napravili rutu, potrebno je da ažurirate sve mape, a zatim da ponovo planirate rutu.</string>
+    <string name="downloader_search_field_hint">Pronađi mapu</string>
+    <string name="common_check_internet_connection_dialog">Molim Vas da proverite da li je Vaš uređaj povezan na internet</string>
+    <string name="downloader_no_space_title">Nema dovoljno prostora</string>
+    <string name="downloader_no_space_message">Molim Vas da obrišete nepotrebne podatke</string>
+    <string name="editor_login_error_dialog">Greška prilikom prijave</string>
+    <string name="editor_profile_changes">Verifikovane promene</string>
+    <string name="editor_focus_map_on_location">Prevucite mapu da postavite krst na lokaciju mesta ili posla.</string>
+    <string name="editor_edit_place_title">Izmena</string>
+    <string name="editor_add_place_title">Dodavanje</string>
+    <string name="editor_edit_place_name_hint">Naziv mesta</string>
+    <string name="editor_default_language_hint">Kao što je napisano na lokalnom jeziku</string>
+    <string name="editor_edit_place_category_title">Kategorija</string>
+    <string name="detailed_problem_description">Detaljan opis problema</string>
+    <string name="editor_report_problem_other_title">Drugi problem</string>
+    <string name="message_invalid_feature_position">Objekat ne može biti na ovom mestu</string>
+    <string name="osm_presentation">Podaci sa OpenStreetMap-a koje je kreirala zajednica do %s. Naučite više o tome kako da menjate i ažurirate mapu na OpenStreetMap.org</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) je projekat zajednice koji ima za cilj pravljenje besplatne, slobodne i otvorene mape. OSM je glavni izvor podataka za mape u CoMaps-u i funkcioniše na sličan način kao Vikipedija. Možete dodati ili promeniti mesta i vaše promene postaju vidljive milionima korisnika širom sveta. \nPridružite se zajednici i pomozite da napravimo bolju mapu koja je dostupna svima!</string>
+    <string name="login_to_make_edits_visible">Prijavite se na openstreetmap.org da biste objavili vaše promene ostatku sveta</string>
+    <string name="downloader_of">%1$d od %2$d</string>
+    <string name="download_over_mobile_header">Preuzimanje preko mobilne mreže?</string>
+    <string name="download_over_mobile_message">Ovo može biti značajno skuplje u okviru određenih paketa ili u romingu</string>
+    <string name="error_enter_correct_house_number">Uneste ispravan kućni broj</string>
+    <string name="editor_building_levels">Spratovi (uklj. prizemlje, isključujući krov)</string>
+    <string name="error_enter_correct_storey_number">Broj spratova ne sme da prelazi %d</string>
+    <string name="editor_zip_code">Poštanski broj</string>
+    <string name="error_enter_correct_zip_code">Unesite ispravan poštanski broj</string>
+    <string name="editor_other_info">Napomena za OpenStreetMap volontere (nije obavezna)</string>
+    <string name="editor_note_hint">Opišite greške na mapi ili stvari koje se ne mogu promeniti pomoću CoMaps-a</string>
+    <string name="editor_about_osm">Vaše promene su poslate u javnu <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> bazu podataka. Molimo Vas da ne dodajete lične podatke ili podatke zaštićene autorskim pravima.</string>
+    <string name="editor_more_about_osm">Više o OpenStreetMap-u</string>
+    <string name="editor_osm_history">Vaša istorija uređivanja</string>
+    <string name="editor_osm_notes">Vaši podaci o mapi</string>
+    <string name="editor_operator">Operator</string>
+    <string name="operator">Operator: %s</string>
+    <string name="editor_category_unsuitable_title">Ne možete da pronađete odgovarajuću kategoriju?</string>
+    <string name="editor_category_unsuitable_text">CoMaps omogućava dodavanje jednostavnih kategorija za tačke na mapi, što isključuje gradove, puteve, jezera, tlocrte zgrada, itd. Molimo Vas da takve kategorije dodate direktno na <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Pročitajte naše <a href="https://www.comaps.app/support/advanced-map-editing/">uputstvo</a> za detaljne instrukcije, korak-po-korak.</string>
+    <string name="downloader_no_downloaded_maps_title">Niste preuzeli ni jednu mapu</string>
+    <string name="downloader_no_downloaded_maps_message">Preuzmite mape da biste pretraživali i koristili navigaciju bez interneta</string>
+    <string name="current_location_unknown_error_title">Trenutna lokacija nije poznata</string>
+    <string name="kilometers_per_hour">km/č</string>
+    <string name="miles_per_hour">mi/č</string>
+    <string name="hour">č</string>
+    <string name="minute">min</string>
+    <string name="day">d</string>
+    <string name="placepage_more_button">Više</string>
+    <string name="placepage_edit_bookmark_button">Izmeni snimljeno mesto</string>
+    <string name="placepage_personal_notes_hint">Lične beleške (tekst ili html)</string>
+    <string name="editor_reset_edits_message">Brisanje svih izmena koje nisu poslate?</string>
+    <string name="editor_reset_edits_button">Odbaci promene</string>
+    <string name="editor_remove_place_message">Brisanje dodatog mesta?</string>
+    <string name="editor_remove_place_button">Obriši</string>
+    <string name="editor_place_doesnt_exist">Mesto ne postoji</string>
+    <string name="editor_place_doesnt_exist_description">Opišite kako mesto sada izgleda ta biste poslali poruku o grešci OpenStreetMap zajednici</string>
+    <string name="delete_place_empty_comment_error">Molim Vas navedite razlog zbog čega brište ovo mesto</string>
+    <string name="editor_business_vacant_button">Poslovni prostor je prazan</string>
+    <string name="editor_mark_business_vacant_title">Označi poslovni prostor kao prazan</string>
+    <string name="editor_mark_business_vacant_description">Koristite da biste naznačili da se firma iselila i da je poslovni prostor prazan i spreman da primi novog zakupca.</string>
+    <string name="editor_submit">Pošalji</string>
+    <string name="error_enter_correct_phone">Unesite ispravan broj telefona</string>
+    <string name="error_enter_correct_web">Unesite ispravnu veb adresu</string>
+    <string name="error_enter_correct_email">Unesite ispravan email</string>
+    <string name="editor_level">Sprat (0 je prizemlje)</string>
+    <string name="error_enter_correct_level">Unesite važeći sprat</string>
+    <string name="error_enter_correct_facebook_page">Unesite ispravnu Facebook veb adresu, nalog, ili ime stranice</string>
+    <string name="error_enter_correct_instagram_page">Unesite ispravno Instagram korisničko ime ili veb adresu</string>
+    <string name="error_enter_correct_twitter_page">Unesite ispravno Twitter korisničko ime ili veb adresu</string>
+    <string name="error_enter_correct_vk_page">Unesite ispravno VK korisničko ime ili veb adresu</string>
+    <string name="error_enter_correct_line_page">Unesite ispravan LINE ID ili veb adresu</string>
+    <string name="error_enter_correct_fediverse_page">Unesite važeće korisničko ime Mastodona ili veb adresu</string>
+    <string name="error_enter_correct_bluesky_page">Unesite važeće Bluesky korisničko ime ili veb adresu</string>
+    <string name="placepage_add_place_button">Dodaj mesto na OpenStreetMap</string>
+    <string name="place_page_map_too_old_title">Mape su zastarele</string>
+    <string name="place_page_map_too_old_description">Mape su stare, preuzmite nove.</string>
+    <string name="place_page_app_too_old_description">Mape su veoma stare, preuzmite novu veziju CoMaps aplikacije.</string>
+    <string name="place_page_update_too_old_map">Ažuriranje regionalnih mapa</string>
+    <string name="place_page_too_old_to_edit">Uređivanje OpenStreetMap-a je onemogućeno jer su podaci mape suviše stari.</string>
+    <string name="osm_note_hint">Ili ostavite napomenu OpenStreetMap zajednici da bi neko drugi mogao da doda ili papravi ovo mesto.</string>
+    <string name="osm_note_toast">Napomena će biti poslata na OpenStreetMap</string>
+    <string name="editor_share_to_all_dialog_title">Da li želite da podelite sa svim drugim korisnicima?</string>
+    <string name="editor_share_to_all_dialog_message_1">Proverite da niste uneli privatne ili lične podatke.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap maperi će proveriti promene i kontaktirati Vas ukoliko budu imali pitanja.</string>
+    <string name="navigation_stop_button">Stop</string>
+    <string name="track_recording">Snimanje putanje</string>
+    <string name="accept">Prihvati</string>
+    <string name="decline">Odbij</string>
+    <string name="mobile_data_dialog">Koristi mobilni internet radi prikaza detljnih informacija?</string>
+    <string name="mobile_data_option_always">Uvek koristi</string>
+    <string name="mobile_data_option_today">Samo danas</string>
+    <string name="mobile_data_option_not_today">Nemoj danas</string>
+    <string name="mobile_data">Mobilni internet</string>
+    <string name="mobile_data_description">Mobilni internet je potreban za obaveštenja o ažuriranju mape i za slanje izmena</string>
+    <string name="mobile_data_option_never">Nikad ne koristi</string>
+    <string name="mobile_data_option_ask">Uvek me pitaj</string>
+    <string name="traffic_update_maps_text">Da bi se prikazali podaci o saobraćaju, mapa mora da se ažurira</string>
+    <string name="big_font">Uvećana slova na mapi</string>
+    <string name="traffic_update_app">Molim Vas da ažurirate CoMaps</string>
+    <string name="traffic_data_unavailable">Podaci o saobraćaju nisu dostupni</string>
+    <string name="enable_logging">Snimanje log fajlova</string>
+    <string name="feedback_general">Vaše mišljenje</string>
+    <string name="prefs_languages_information">Koristimo sistemski servis tekst-u-govor za glasovne instrukcije. Mnogi Android uređaji koriste Google Prepoznavanje i sintezu govora, koji možete da preuzmete ili ažurirate putem Google Play prodavnice (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
+    <string name="prefs_languages_information_off">Za pojedine jezike, moraćete da instalirate sintetizator govora ili jezički paket putem prodavnice aplikacija (Google Play, Galaxy Store, App Gallery, FDroid). \nOtvorite Podešavanja vašeg uređaja → Jezik i unos → Govor → Izlaz Teksta u govor. \nOvde možete da upravljate podešavanjima za sintezu govora (na primer, da preuzmete jezički paket za upotrebu bez interneta) i da izaberete neku drugu mašinu za Tekst-u-govor.</string>
+    <string name="prefs_languages_information_off_link">Za više informacija pogledajte ovo uputstvo</string>
+    <string name="prefs_speed_cameras_information">Upozorenja o prekršajnim kamerama za brzinu su onemogućena u zemljama u kojima su upozorenja zabranjena zakonom.</string>
+    <string name="transliteration_title">Transliteracija u latinicu</string>
+    <string name="learn_more">Saznaj više</string>
+    <string name="routing_add_start_point">Koristite pretragu ili kratko dodirnite mapu da biste dodali početnu tačku rute</string>
+    <string name="routing_add_finish_point">Koristite pretragu ili kratko dodirnite mapu da biste dodali odredišnu tačku</string>
+    <string name="planning_route_manage_route">Izmeni rutu</string>
+    <string name="button_plan">Plan</string>
+    <string name="placepage_remove_stop">Ukloni međuodredište</string>
+    <string name="placepage_add_stop">Međuodredište</string>
+    <string name="saved">Sačuvano</string>
+    <string name="dialog_error_storage_title">Problem sa pristupom memoriji</string>
+    <string name="dialog_error_storage_message">Eksterna memorija nije dostupna. SD kartica je možda uklonjena, oštećena, ili je fajl sistem samo za čitanje. Molim Vas, proverite Vašu SD karticu ili nas kontaktirajte na support@comaps.app</string>
+    <string name="setting_emulate_bad_storage">Simuliraj neispravnu memoriju</string>
+    <string name="error_enter_correct_name">Molim Vas da unesete ispravan naziv</string>
+    <string name="bookmark_lists">Liste favorita</string>
+    <string name="bookmark_lists_hide_all">Sakrij sve</string>
+    <string name="bookmark_lists_show_all">Prikaži sve</string>
+    <plurals name="bookmarks_places">
+        <item quantity="one">%d favorit</item>
+        <item quantity="few">%d favorita</item>
+        <item quantity="other">%d favorita</item>
+    </plurals>
+    <string name="bookmarks_create_new_group">Kreiraj novu listu</string>
+    <string name="bookmarks_import">Uvezi favorite</string>
+    <string name="bookmarks_error_message_share_general">Deljenje nije moguće zbog greške u aplikaciji</string>
+    <string name="bookmarks_error_title_share_empty">Greška prilikom deljenja</string>
+    <string name="bookmarks_error_message_share_empty">Ne može se podeliti prazna lista</string>
+    <string name="bookmarks_error_title_empty_list_name">Naziv ne sme biti prazan</string>
+    <string name="bookmarks_error_message_empty_list_name">Molim Vas unesite ime liste</string>
+    <string name="bookmarks_new_list_hint">Nova lista</string>
+    <string name="bookmarks_error_title_list_name_already_taken">Ovaj naziv već postoji</string>
+    <string name="bookmarks_error_message_list_name_already_taken">Molim Vas izaberite drugi naziv</string>
+    <string name="please_wait">Molim Vas sačekajte…</string>
+    <string name="phone_number">Broj telefona</string>
+    <string name="profile">OpenStreetMap profil</string>
+    <plurals name="bookmarks_detect_message">
+        <item quantity="one">%d fajl je pronađen. Možete da ga pogledate nakon konverzije.</item>
+        <item quantity="few">%d fajla je pronađeno. Možete da ih pogledate nakon konverzije.</item>
+        <item quantity="other">%d fajlova je pronađeno. Možete da ih pogledate nakon konverzije.</item>
+    </plurals>
+    <string name="restore">Rekonstruiši</string>
+    <plurals name="tracks">
+        <item quantity="one">%d putanja</item>
+        <item quantity="few">%d putanje</item>
+        <item quantity="other">%d putanja</item>
+    </plurals>
+    <string name="privacy">Privatnost</string>
+    <string name="privacy_policy">Politika privatnosti</string>
+    <string name="power_management">Upravljanje napajanjem</string>
+    <string name="terms_of_use">Uslovi korišćenja</string>
+    <string name="button_layer_traffic">Saobraćaj</string>
+    <string name="subway">Metro</string>
+    <string name="layers_title">Stilovi mape i slojevi</string>
+    <string name="bookmarks_empty_list_title">Ova lista je prazna</string>
+    <string name="bookmarks_empty_list_message">Da biste dodali mesto, kratko dodirnite mesto na mapi, a onda dodirnite ikonicu sa zvezdom</string>
+    <string name="category_desc_more">…više</string>
+    <string name="export_file">Eksportuj KMZ</string>
+    <string name="export_file_gpx">Eksportuj GPX</string>
+    <string name="delete_list">Obriši listu</string>
+    <string name="speedcams_alert_title">Prekršajne kamere</string>
+    <string name="place_description_title">Opis mesta</string>
+    <string name="notification_channel_downloader">Preuzimanje mapa</string>
+    <string name="pref_tts_speedcams_auto">Upozoriti kod prekoračenja brzine</string>
+    <string name="pref_tts_speedcams_always">Uvek me upozori</string>
+    <string name="pref_tts_speedcams_never">Nemoj da me upozoravaš</string>
+    <string name="power_managment_title">Režim čuvanja baterije</string>
+    <string name="power_managment_description">Smanjuje potrošnju električne energije isključivanjem određenih funkcionalnosti</string>
+    <string name="power_managment_setting_never">Nikad</string>
+    <string name="power_managment_setting_auto">Kada je baterija pri kraju</string>
+    <string name="power_managment_setting_manual_max">Uvek</string>
+    <string name="enable_logging_warning_message">Privremeno uključite ovu opciju da biste sačuvali detaljne dijagnostičke logove ukoliko imate neki problem. Logove možete da nam pošaljete korišćenjem opcije \"Prijavite problem\" u prozoru Pomoć. Napomena: Logovi mogu da sadrže informacije o vašoj lokaciji.</string>
+    <string name="driving_options_title">Opcije rutiranja</string>
+    <string name="avoid_tolls">Izbegavaj putarine</string>
+    <string name="avoid_unpaved">Izbegavaj neasfaltirane puteve</string>
+    <string name="avoid_ferry">Izbegavaj trajekte</string>
+    <string name="avoid_motorways">Izbegavaj autoputeve</string>
+    <string name="avoid_steps">Izbegavaj stepenice</string>
+    <string name="avoid_paved">Izbegavaj asfaltirane puteve</string>
+    <string name="unable_to_calc_alert_title">Nije moguće izračunati rutu</string>
+    <string name="unable_to_calc_alert_subtitle">Ruta nije pronađena. Uzrok mogu biti opcije rutiranja ili nepotpuni OpenStreetMap podaci. Molim Vas da promenite vaše opcije rutiranja i pokušate ponovo.</string>
+    <string name="define_to_avoid_btn">Izaberi puteve za izbegavanje</string>
+    <string name="change_driving_options_btn">Opcije rutiranja su uključene</string>
+    <string name="toll_road">Putevi sa putarinama</string>
+    <string name="unpaved_road">Neasfaltirani putevi</string>
+    <string name="ferry_crossing">Linije trajekta</string>
+    <string name="yes">Da</string>
+    <string name="no">Ne</string>
+    <string name="yes_available">Da</string>
+    <string name="no_available">Ne</string>
+    <string name="capacity">Broj mesta: %s</string>
+    <string name="network">Mreža: %s</string>
+    <string name="trip_finished">Stigli ste!</string>
+    <string name="ok">OK</string>
+    <string name="sort">Sortiranje…</string>
+    <string name="sort_bookmarks">Sortiranje favorita</string>
+    <string name="by_default">Podrazumevano</string>
+    <string name="by_type">Po tipu</string>
+    <string name="by_distance">Po udaljenosti</string>
+    <string name="by_date">Po datumu</string>
+    <string name="by_name">Po nazivu</string>
+    <string name="week_ago_sorttype">Pre nedelju dana</string>
+    <string name="month_ago_sorttype">Pre mesec dana</string>
+    <string name="moremonth_ago_sorttype">Pre više od mesec dana</string>
+    <string name="moreyear_ago_sorttype">Pre više od godinu dana</string>
+    <string name="near_me_sorttype">Blizu mene</string>
+    <string name="others_sorttype">Ostali</string>
+    <string name="food_places">Hrana</string>
+    <string name="tourist_places">Atrakcije</string>
+    <string name="museums">Muzeji</string>
+    <string name="parks">Parkovi</string>
+    <string name="swim_places">Plivanje</string>
+    <string name="mountains">Planine</string>
+    <string name="animals">Životinje</string>
+    <string name="hotels">Hoteli</string>
+    <string name="buildings">Zgrade</string>
+    <string name="money">Novac</string>
+    <string name="shops">Prodavnice</string>
+    <string name="parkings">Parking</string>
+    <string name="fuel_places">Benzinske stanice</string>
+    <string name="medicine">Medicina</string>
+    <string name="search_in_the_list">Pretraži listu</string>
+    <string name="religious_places">Verska mesta</string>
+    <string name="select_list">Izaberite listu</string>
+    <string name="transit_not_found">Navigacija u metrou u ovom regionu još nije dostupna</string>
+    <string name="dialog_pedestrian_route_is_long_header">Nije pronađena metro ruta</string>
+    <string name="dialog_pedestrian_route_is_long_message">Molim vas izaberite početnu i krajnju tačku bliže metro stanicama</string>
+    <string name="button_layer_isolines">Izolinije</string>
+    <string name="isolines_activation_error_dialog">Prikazivanje izolinija zahteva preuzmanje podataka sa mape za ovu oblast</string>
+    <string name="isolines_location_error_dialog">Izolinije nisu dostupne za ovu oblast</string>
+    <string name="elevation_profile_ascent">Uspon</string>
+    <string name="elevation_profile_descent">Spust</string>
+    <string name="elevation_profile_min_elevation">Minimalna visina</string>
+    <string name="elevation_profile_max_elevation">Maksimalna visina</string>
+    <string name="elevation_profile_difficulty">Težina</string>
+    <string name="elevation_profile_distance">Udalj.:</string>
+    <string name="elevation_profile_time">Vreme:</string>
+    <string name="isolines_toast_zooms_1_10">Uvećajte da biste videli izolinije</string>
+    <string name="downloader_loading_ios">Preuzimanje</string>
+    <string name="download_map_title">Preuzmi mapu sveta</string>
+    <string name="disk_error">Ne mogu da napravim folder i premenstim fajlove na internu memoriju uređaja ili na SD karticu</string>
+    <string name="disk_error_title">Greška sa memorijom</string>
+    <string name="connection_failure">Povezivanje nije uspelo</string>
+    <string name="disconnect_usb_cable_title">Otkačite USB kabl</string>
+    <string name="enable_keep_screen_on">Ekran uvek uključen</string>
+    <string name="enable_keep_screen_on_description">Kada je odabrano, ekran će uvek biti uključen dok se prikazuje mapa.</string>
+    <string name="enable_show_on_lock_screen">Prikaz mape na zaključanom ekranu</string>
+    <string name="enable_show_on_lock_screen_description">Kada je odabrano, aplikacija će raditi i na zaključanom ekranu, tj. kada je uređaj zaključan.</string>
+    <string name="change_map_locale">Jezik mape</string>
+    <string name="splash_subtitle">Podaci za mape su sa OpenStreetMap-a</string>
+    <string name="telegram_url">https://t.me/CoMapsApp/</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>
+    <string name="translated_om_site_url">https://comaps.app/</string>
+    <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
+    <string name="comma_separated_pair">%1$s, %2$s</string>
+    <string name="app_tip_00">Hvala što koristite mape koje je napravila zajednica!</string>
+    <string name="app_tip_01">Sa vašim donacijama i podrškom, možemo da napravimo najbolje mape na svetu!</string>
+    <string name="app_tip_02">Da li vam se dopada naša aplikacija? Molim Vas da donirate da biste podržali dalji razvoj! Još vam se ne dopada? Molimo Vas da nam javite zašto, pa ćemo da je popravimo!</string>
+    <string name="app_tip_03">Ako znate nekog programera, možete da ga zamolite da implementira funkcionalnost koja vam je potrebna.</string>
+    <string name="app_tip_04">Dodirnite bilo gde na mapi da biste izabrali bilo šta. Dug dodir se koristi da se sakrije i prikaže interfejs.</string>
+    <string name="app_tip_05">Da li ste znali da možete da izaberete vašu trenutnu lokaciju na mapi?</string>
+    <string name="app_tip_06">Možete da pomognete da se aplikacija prevede na vaš jezik.</string>
+    <string name="app_tip_07">Naša aplikacija je razvijena od strane nekoliko entuzijasta i zajednice.</string>
+    <string name="app_tip_08">Lako možete da popravite ili unapredite podatke na mapi.</string>
+    <string name="app_tip_09">Naš glavni cilj je da napravimo brzu aplikaciju za mape, jednostavnu za korišćenje, orijentisanu na privatnost, koju ćete voleti.</string>
+    <string name="car_used_on_the_phone_screen">Vi sada koristite CoMaps na ekranu telefona</string>
+    <string name="car_used_on_the_car_screen">Vi sada koristite CoMaps na ekranu automobila</string>
+    <string name="aa_connected_title">Povezani ste na Android Auto</string>
+    <string name="car_continue_on_the_phone">Nastavi na telefonu</string>
+    <string name="car_continue_in_the_car">Prebaci na ekran automobila</string>
+    <string name="aa_location_permissions_request">CoMaps je potreban lokacijski pristup. Kada je sigurno, proverite obaveštenje na svom telefonu.</string>
+    <string name="aa_request_permission_notification">Ova aplikacija je potrebna vaša dozvola</string>
+    <string name="aa_request_permission_activity_text">CoMaps u Android Auto-u je potrebna dozvola za lokaciju da efikasno rade</string>
+    <string name="aa_grant_permissions">Odobri dozvole</string>
+    <string name="button_layer_outdoor">Na otvorenom</string>
+    <string name="browser_not_available">Veb čitač nije dostupan</string>
+    <string name="volume">Jačina zvuka</string>
+    <string name="bookmarks_export">Eksportuj sve mesta i putanje</string>
+    <string name="pref_tts_open_system_settings">Sistemska podešavanja sinteze govora</string>
+    <string name="pref_tts_no_system_tts">Sinteza govora nije pronađena, da li ste sigurni da je vaš uređaj podržava?</string>
+    <string name="drive_through">Prolaz za vozila</string>
+    <string name="clear_the_search">Obriši pretragu</string>
+    <string name="zoom_in">Uvećaj</string>
+    <string name="zoom_out">Umanji</string>
+    <string name="website_menu">Link menija</string>
+    <string name="view_menu">Prikaži meni</string>
+    <string name="open_in_app">Otvori u drugoj aplikaciji</string>
+    <string name="self_service">Samoposluživanje</string>
+    <string name="select_option">Izaberite opciju</string>
+    <string name="outdoor_seating">Bašta</string>
+    <string name="power_save_dialog_summary">Za precizniju navigaciju preporučujemo da se isključi režim čuvanja baterije u Podešavanjima vezanim za beteriju telefona.</string>
+    <string name="start_track_recording">Snimi putanju</string>
+    <string name="stop_track_recording">Zaustavi snimanje putanje</string>
+    <string name="stop_without_saving">Zaustavi bez snimanja</string>
+    <string name="continue_recording">Nastavi snimanje</string>
+    <string name="track_recording_alert_title">Sačuvati u favoritima?</string>
+    <string name="track_recording_toast_nothing_to_save">Putanja je prazna, nema šta da se sačuva</string>
+    <string name="error_no_file_manager_app">Dijalog za izbor foldera nije moguće prikazati pošto na uređaju nije instalirana odgovarajuća aplikacija. Molim Vas da instalirate aplikaciju za upravljanje fajlovima i pokušate ponovo.</string>
+    <string name="choose_color">Izaberite boju</string>
+    <string name="edit_track">Izmenite putanju</string>
+    <string name="uri_open_location_failed">Nema instaliranih aplikacija koje mogu da otvore lokaciju.</string>
+    <string name="nav_auto">Automatski u navigaciji</string>
+    <string name="pref_left_button_title">Podešavanje levog dugmeta</string>
+    <string name="pref_left_button_disable">Isključi</string>
+    <string name="pref_backup_title">Čuvanje favorita</string>
+    <string name="pref_backup_summary">Automatski napraviti rezervnu kopiju u folderu na uređaju</string>
+    <string name="pref_backup_now_title">Napravite rezervnu kopiju sada</string>
+    <string name="pref_backup_now_summary">Napravite rezervnu kopiju</string>
+    <string name="pref_backup_now_summary_progress">Pravim rezervnu kopiju…</string>
+    <string name="pref_backup_now_summary_ok">Rezervna kopija je uspešno završena</string>
+    <string name="pref_backup_now_summary_empty_lists">Nema mesta i putanja za izradu rezervne kopije</string>
+    <string name="pref_backup_now_summary_failed">Rezervna kopija nije uspela</string>
+    <string name="pref_backup_now_summary_folder_unavailable">Folder za rezervnu kopiju nije dostupan</string>
+    <string name="pref_backup_status_summary_success">Poslednja uspešna rezervna kopija</string>
+    <string name="pref_backup_location_title">Lokacija rezervnih kopija</string>
+    <string name="pref_backup_location_summary_initial">Molim vas, prvo izaberite folder i dajte dozvolu</string>
+    <string name="pref_backup_history_title">Broj sačuvanih rezervnih kopija</string>
+    <string name="pref_backup_interval_title">Automatska rezervna kopija</string>
+    <string name="backup_interval_every_day">Svaki dan</string>
+    <string name="backup_interval_every_week">Sedmično</string>
+    <string name="backup_interval_manual_only">Isključeno (samo ručno)</string>
+    <string name="dialog_report_error_missing_folder">Izabrana lokacija rezervne kopije nije dostupna za snimanje. Molimo vas, odaberite drugo mesto.</string>
+    <string name="dialog_report_error_with_logs">Molimo vas, pošaljite nam poruku o grešci:\n- \"Omogući vođenje dnevnika\" u podešavanjima\n- reprodukujte problem\n- na ekranu \"O programu i pomoć\" kliknite na dugme \"Prijavi grešku\" i pošaljite na e-mail ili čat\n- onemogući vođenje dnevnika</string>
+    <string name="clear">Čisto</string>
+    <string name="route_type">Tip rute</string>
+    <string name="vehicle">Vozilo</string>
+    <string name="pedestrian">Pešak</string>
+    <string name="bicycle">Bicikla</string>
+    <string name="ruler">Lenjir</string>
+    <string name="bookmark_color">Boja favorita</string>
+    <string name="about_help">O programu i pomoć</string>
+    <string name="open_now">Sada je otvoreno</string>
+    <string name="closed_now">Zatvoreno sada</string>
+    <string name="at">na %s</string>
+    <string name="share_track">Podeli putanju</string>
+    <string name="delete_track_dialog_title">Obrisati %s?</string>
+    <string name="pref_tts_no_system_tts_short">Nije pronađen program za pretvaranje teksta u govor, proverite podešavanja aplikacije</string>
+    <string name="navigation_start_tts_message">"Pokretanje navigacije, jezik glasovnih instrukcija: "</string>
+    <string name="navigation_start_tts_disabled_message">Glasovne instrukcije onemogućene: TTS motor nije dostupan</string>
+    <string name="unknown_power_output">nepoznato</string>
+    <string name="charge_socket_type2">Tip 2 (bez kabla)</string>
+    <string name="charge_socket_type2_cable">Tip 2 (sa kablom)</string>
+    <string name="charge_socket_type2_combo">Tip 2 kombo</string>
+    <string name="charge_socket_type1">Tip 1</string>
+    <string name="charge_socket_nacs">NACS</string>
+    <string name="charge_socket_chademo">CHAdeMO</string>
+    <string name="charge_socket_schuko">Šuho</string>
+    <string name="unknown_socket_type">nepoznata utičnica</string>
+    <string name="edit_socket_info_tooltip">Kreirajte novu utičnicu ili promenite postojeće.</string>
+    <string name="charging_station_available_sockets">Raspoložive utičnice</string>
+    <string name="charge_socket_unknown_other">Druga ili nepoznata</string>
+    <string name="charge_socket_count">Broj</string>
+    <string name="charge_socket_power">Snaga (kW)</string>
+    <string name="editor_socket">Izmeni utičnicu</string>
+    <string name="unknown_count">nepoznato</string>
+    <string name="error_value_must_be_positive">Vrednost mora biti veća od nule</string>
+    <string name="error_invalid_number">Neispravan broj</string>
+    <string name="offline_explanation_title">Oflajn mape</string>
+    <string name="offline_explanation_text">Potrebno je preuzimanje mape da bi oblast mogla da se pregleda i da bi radilo navođenje.\nPreuzmite mape za oblasti gde želite da putujete.</string>
+    <string name="list_description_empty">Promenite listu da biste dodali opis</string>
+    <string name="advanced">Napredno</string>
+    <string name="download_resources_custom_url_title">Sopstveni server mapa</string>
+    <string name="download_resources_custom_url_message">Zameni podrazumevani server za preuzimanje mapa koji se koristi za preuzimanja mapa. Ostavite prazno da biste koristili CoMaps server.</string>
+    <string name="download_resources_custom_url_summary_none">Nije postavljeno</string>
+    <string name="download_resources_custom_url_error_scheme">Unesite punu URL adresu koja počinje sa https:// i koja se završava sa /</string>
+    <string name="pref_maplanguage_local">Lokalni jezik</string>
+</resources>
--- a/android/app/src/main/res/values-bn/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -68,11 +68,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Přidat novou skupinu záložek</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Název záložky</string>
+    <string name="bookmark_set_name">Název seznamu</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Záložky</string>
+    <string name="bookmarks">Místa</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Záložky a stopy</string>
+    <string name="bookmarks_and_tracks">Oblíbené</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Název</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -144,13 +144,13 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Poznámky</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Sdílené záložky CoMaps</string>
+    <string name="share_bookmarks_email_subject">Má oblíbená místa z CoMaps</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Nahrávání záložek</string>
+    <string name="load_kmz_title">Načítání oblíbených</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Záložky byly úspěšně nahrány! Naleznete je na mapě nebo ve správci záložek.</string>
+    <string name="load_kmz_successful">Oblíbená místa byla úspěšně nahrána! Naleznete je na mapě nebo ve správci oblíbených.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Nahrávání záložek se nezdařilo. Soubor může být poškozený nebo vadný.</string>
+    <string name="load_kmz_failed">Nepodařilo se načíst oblíbená místa. Soubor může být poškozený nebo vadný.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">Typ souboru není aplikací rozpoznán: \n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -490,7 +490,7 @@
    <string name="minute">min</string>
    <string name="day">d</string>
    <string name="placepage_more_button">Více</string>
-    <string name="placepage_edit_bookmark_button">Upravit záložku</string>
+    <string name="placepage_edit_bookmark_button">Upravit uložené místo</string>
    <string name="placepage_personal_notes_hint">Vlastní poznámka (text nebo HTML)</string>
    <string name="editor_reset_edits_message">Vymazat všechny místní změny?</string>
    <string name="editor_reset_edits_button">Zahodit změny</string>
@@ -547,18 +547,19 @@
    <string name="dialog_error_storage_message">Externí úložiště není k dispozici, pravděpodobně byla vyjmuta nebo poškozena SD karta, nebo je systém souborů pouze pro čtení. Zkontrolujte to prosím a kontaktujte nás na support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Emulovat špatné úložiště</string>
    <string name="error_enter_correct_name">Zadejte prosím správný název</string>
-    <string name="bookmark_lists">Seznamy</string>
+    <string name="bookmark_lists">Seznamy oblíbených</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Skrýt vše</string>
    <string name="bookmark_lists_show_all">Zobrazit vše</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d záložka</item>
-        <item quantity="few">%d záložky</item>
-        <item quantity="other">%d záložek</item>
+        <item quantity="one">%d uložené místo</item>
+        <item quantity="few">%d uložená místa</item>
+        <item quantity="many">%d uložených míst</item>
+        <item quantity="other">%d uložených míst</item>
    </plurals>
    <string name="bookmarks_create_new_group">Vytvořit nový seznam</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Import záložek a stop</string>
+    <string name="bookmarks_import">Importovat oblíbené</string>
    <string name="bookmarks_error_message_share_general">Nelze sdílet kvůli chybě aplikace</string>
    <string name="bookmarks_error_title_share_empty">Chyba sdílení</string>
    <string name="bookmarks_error_message_share_empty">Nelze sdílet s prázdným seznamem</string>
@@ -589,7 +590,7 @@
    <string name="subway">Metro</string>
    <string name="layers_title">Styly a vrstvy mapy</string>
    <string name="bookmarks_empty_list_title">Seznam je prázdný</string>
-    <string name="bookmarks_empty_list_message">Pro přidání nové značky klikněte na symbol hvězdičky na obrázku objektu</string>
+    <string name="bookmarks_empty_list_message">Pro uložení místa klepněte na místo na mapě a následně na ikonu hvězdy</string>
    <string name="category_desc_more">…ještě</string>
    <string name="export_file">Exportovat KMZ</string>
    <string name="export_file_gpx">Export GPX</string>
@@ -642,7 +643,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Třídit…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Třídit záložky</string>
+    <string name="sort_bookmarks">Třídit oblíbené</string>
    <!-- Android -->
    <string name="by_default">Podle výchozího stavu</string>
    <!-- Android -->
@@ -752,7 +753,7 @@
    <string name="browser_not_available">Webový prohlížeč není k dispozici</string>
    <string name="volume">Hlasitost</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Export všech záložek a stop</string>
+    <string name="bookmarks_export">Exportovat všechna místa a stopy</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Systémové nastavení syntézy řeči</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -784,7 +785,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Pokračovat v nahrávání</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Uložit do záložek a stop?</string>
+    <string name="track_recording_alert_title">Uložit do oblíbených?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">Trasa je prázdná - není co ukládat</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -803,7 +804,7 @@
    <string name="error_enter_correct_instagram_page">Zadejte platné uživatelské jméno nebo webovou adresu Instagramu</string>
    <string name="error_enter_correct_twitter_page">Zadejte platné uživatelské jméno nebo webovou adresu Twitteru</string>
    <string name="maps_storage_free_size">%1$s z %2$s volných</string>
-    <string name="share_bookmarks_email_body">Ahoj! \n \nV příloze najdeš mé záložky; otevři je v aplikaci CoMaps. Pokud ji nemáš nainstalovanou, můžeš si ji stáhnout zde: https://www.comaps.app/download/ \n \nUžij si cestování s CoMaps!</string>
+    <string name="share_bookmarks_email_body">Ahoj! \n \nV příloze najdeš má oblíbená místa; otevři je v aplikaci CoMaps. Pokud ji nemáš nainstalovanou, můžeš si ji stáhnout zde: https://www.comaps.app/download/ \n \nUžij si cestování s CoMaps!</string>
    <string name="disk_error">Nepodařilo se vytvořit složku a přesunout soubory v interní paměti zařízení nebo na SD kartě</string>
    <string name="comma_separated_pair">%1$s, %2$s</string>
    <string name="error_enter_correct_vk_page">Zadejte platné uživatelské jméno nebo webovou adresu VK</string>
@@ -833,16 +834,16 @@
    <string name="pedestrian">Pěší zóna</string>
    <string name="bicycle">Jízdní kolo</string>
    <string name="ruler">Pravítko</string>
-    <string name="bookmark_color">Barva záložky</string>
+    <string name="bookmark_color">Barva oblíbeného místa</string>
    <string name="clear">Vymazat</string>
    <string name="panoramax">Obrázek Panoramax</string>
    <string name="about_help">O aplikaci a nápověda</string>
    <string name="pref_backup_summary">Automaticky zálohovat do složky na vašem zařízení</string>
-    <string name="pref_backup_title">Záloha záložek a stop</string>
+    <string name="pref_backup_title">Zálohovat oblíbené</string>
    <string name="pref_backup_now_title">Zálohovat nyní</string>
    <string name="pref_backup_now_summary">Nyní vytvořit zálohu</string>
    <string name="pref_backup_now_summary_ok">Záloha úspěšně dokončena</string>
-    <string name="pref_backup_now_summary_empty_lists">Nemáte žádné záložky ani stopy k zálohování</string>
+    <string name="pref_backup_now_summary_empty_lists">Nemáte žádná místa ani stopy k zálohování</string>
    <string name="pref_backup_now_summary_progress">Zálohování…</string>
    <string name="pref_backup_now_summary_failed">Zálohování selhalo</string>
    <string name="pref_backup_now_summary_folder_unavailable">Složka pro zálohování není dostupná</string>
@@ -915,7 +916,8 @@
    <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>
+    <string name="pref_maplanguage_local">Místní jazyk</string>
 </resources>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -68,11 +68,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Neue Liste erstellen</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Name der Lesezeichenliste</string>
+    <string name="bookmark_set_name">Name der Liste</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Lesezeichen</string>
+    <string name="bookmarks">Orte</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Lesezeichen und Tracks</string>
+    <string name="bookmarks_and_tracks">Favoriten</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 -->
@@ -148,10 +148,10 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Notizen</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps-Lesezeichen wurden mit dir geteilt</string>
+    <string name="share_bookmarks_email_subject">Meine CoMaps-Favoriten</string>
    <string name="share_bookmarks_email_body">Hallo! \n \nIm Anhang sind meine Lesezeichen aus der CoMaps-App. Du kannst sie in CoMaps öffnen. Wenn du die App nicht installiert hast, kannst du sie unter https://www.comaps.app/de/download/ herunterladen. \n \nViel Spaß beim Navigieren mit CoMaps!</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Lesezeichen werden geladen</string>
+    <string name="load_kmz_title">Favoriten laden</string>
    <!-- Kmz file successful loading -->
    <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 -->
@@ -499,7 +499,7 @@
    <string name="minute">min</string>
    <string name="day">d</string>
    <string name="placepage_more_button">Mehr</string>
-    <string name="placepage_edit_bookmark_button">Lesezeichen bearbeiten</string>
+    <string name="placepage_edit_bookmark_button">Gespeicherten Ort bearbeiten</string>
    <string name="placepage_personal_notes_hint">Persönliche Notizen (Text oder html)</string>
    <string name="editor_reset_edits_message">Alle lokalen Änderungen verwerfen?</string>
    <string name="editor_reset_edits_button">Änderungen verwerfen</string>
@@ -564,17 +564,17 @@
    <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 gebe deinen korrekten Namen ein</string>
-    <string name="bookmark_lists">Listen</string>
+    <string name="bookmark_lists">Favoritenlisten</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Alle ausblenden</string>
    <string name="bookmark_lists_show_all">Alle anzeigen</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d Lesezeichen</item>
-        <item quantity="other">%d Lesezeichen</item>
+        <item quantity="one">%d gespeicherter Ort</item>
+        <item quantity="other">%d gespeicherte Orte</item>
    </plurals>
    <string name="bookmarks_create_new_group">Neue Liste erstellen</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Lesezeichen und Tracks importieren</string>
+    <string name="bookmarks_import">Favoriten importieren</string>
    <string name="bookmarks_error_message_share_general">Teilen wegen eines Anwendungsfehlers nicht möglich</string>
    <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>
@@ -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 tippe in der Karte auf den Ort und dann unten auf das Stern-Symbol</string>
+    <string name="bookmarks_empty_list_message">Um einen Ort zu speichern, tipp einfach auf einen Ort auf der Karte und dann auf das Sternsymbol</string>
    <string name="category_desc_more">…mehr</string>
    <string name="export_file">KMZ exportieren</string>
    <string name="export_file_gpx">GPX exportieren</string>
@@ -656,7 +656,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Sortieren…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Lesezeichen sortieren</string>
+    <string name="sort_bookmarks">Favoriten sortieren</string>
    <!-- Android -->
    <string name="by_default">Nach Voreinstellung</string>
    <!-- Android -->
@@ -774,7 +774,7 @@
    <string name="browser_not_available">Webbrowser ist nicht verfügbar</string>
    <string name="volume">Lautstärke</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Alle Lesezeichen und Tracks exportieren</string>
+    <string name="bookmarks_export">Alle Orte und Tracks exportieren</string>
    <!-- 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. -->
@@ -806,7 +806,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Aufnahme fortsetzen</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">In Lesezeichen und Tracks speichern?</string>
+    <string name="track_recording_alert_title">Zu Favoriten hinzufügen?</string>
    <!-- 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 -->
@@ -838,13 +838,13 @@
    <string name="ruler">Lineal</string>
    <string name="route_type">Routentyp</string>
    <string name="pedestrian">Fußgänger</string>
-    <string name="bookmark_color">Lesezeichenfarbe</string>
+    <string name="bookmark_color">Farbe für Favoriten</string>
    <string name="about_help">Über &amp; Hilfe</string>
    <string name="panoramax">Panoramax-Bild</string>
    <string name="pref_backup_summary">Backup automatisch in einem Ordner auf deinem Gerät erstellen</string>
    <string name="pref_backup_now_summary">Backup sofort erstellen</string>
    <string name="pref_backup_now_summary_ok">Backup erfolgreich abgeschlossen</string>
-    <string name="pref_backup_now_summary_empty_lists">Keine Lesezeichen und Tracks für Backup vorhanden</string>
+    <string name="pref_backup_now_summary_empty_lists">Keine Orte und Tracks zum Sichern</string>
    <string name="pref_backup_now_summary_failed">Backup fehlgeschlagen</string>
    <string name="pref_backup_now_summary_folder_unavailable">Der Backup-Ordner ist nicht verfügbar</string>
    <string name="pref_backup_location_summary_initial">Bitte wähle zuerst einen Ordner und erteile die Berechtigung</string>
@@ -852,7 +852,7 @@
    <string name="pref_backup_interval_title">Automatisches Backup</string>
    <string name="backup_interval_every_day">Täglich</string>
    <string name="backup_interval_manual_only">Aus (nur manuell)</string>
-    <string name="pref_backup_title">Backup von Lesezeichen und Tracks</string>
+    <string name="pref_backup_title">Favoriten sichern</string>
    <string name="pref_backup_status_summary_success">Letztes erfolgreiches Backup</string>
    <string name="dialog_report_error_with_logs">Bitte sende uns einen Fehlerbericht:\n - in den Einstellungen \"Protokollierung aktivieren\"\n - das Problem reproduzieren\n - im Bildschirm \"Über &amp; Hilfe\" drücke den \"App-Fehler melden\"-Knopf und sende via E-Mail oder Chat\n - die Protokollierung deaktivieren</string>
    <string name="dialog_report_error_missing_folder">Der ausgewählte Backup-Ort ist nicht verfügbar oder beschreibbar. Bitte wähle einen anderen Ort.</string>
@@ -920,4 +920,5 @@
    <string name="download_resources_custom_url_summary_none">Nicht konfiguriert</string>
    <string name="download_resources_custom_url_message">Standardserver für Kartendownloads überschreiben. Leer lassen, um den CoMaps-Standardserver zu nutzen.</string>
    <string name="download_resources_custom_url_error_scheme">Bitte eine vollständige URL eingeben, die mit https:// oder http:// anfängt</string>
+    <string name="pref_maplanguage_local">Lokale Sprache</string>
 </resources>
--- a/android/app/src/main/res/values-en-rAU/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-en-rGB/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -72,7 +72,7 @@
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
    <string name="bookmarks">Marcadores</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Marcadores y trazas</string>
+    <string name="bookmarks_and_tracks">Favoritos</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Nombre</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -94,7 +94,7 @@
    <!-- Error moving map files from one storage to another -->
    <string name="move_maps_error">Error al mover los archivos de mapas</string>
    <!-- Ask user to wait several minutes (some long process in modal dialog). -->
-    <string name="wait_several_minutes">Esto podría tardar varios minutos.\nAguarda…</string>
+    <string name="wait_several_minutes">Esto podría tardar varios minutos.\nPor favor, espera…</string>
    <!-- Measurement units title in settings activity -->
    <string name="measurement_units">Unidades de medida</string>
    <!-- Detailed description of Measurement Units settings button -->
@@ -148,14 +148,14 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Notas</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Marcadores de CoMaps compartidos con usted</string>
-    <string name="share_bookmarks_email_body">¡Hola! \n\nAdjunto mis marcadores de la aplicación CoMaps. Por favor, ábralos si tiene instalado CoMaps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://www.comaps.app/es/download/ \n\n¡Disfrute viajando con CoMaps!</string>
+    <string name="share_bookmarks_email_subject">Mis favoritos de CoMaps</string>
+    <string name="share_bookmarks_email_body">¡Hola! \n\nAdjunto mis favoritos de la aplicación CoMaps. Por favor, ábralos si tiene instalado CoMaps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://www.comaps.app/es/download/ \n\n¡Disfrute viajando con CoMaps!</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Cargando marcadores</string>
+    <string name="load_kmz_title">Cargando favoritos</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">¡Los marcadores se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestor de Marcadores.</string>
+    <string name="load_kmz_successful">¡Los favoritos se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestor de Favoritos.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">No se pudieron cargar los marcadores. El archivo podría tener daños o defectos.</string>
+    <string name="load_kmz_failed">No se pudieron cargar los favoritos. El archivo podría tener daños o defectos.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">La aplicación no reconoce el tipo de archivo: \n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -169,7 +169,7 @@
    <!-- Alert message that downloading is in progress. -->
    <string name="downloading_is_active">La descarga del mapa está en curso</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">¡Mira mi ubicación actual en CoMaps! %1$s o %2$s ¿No tiene mapas offline? Descárgalos aquí: https://www.comaps.app/es/download/</string>
+    <string name="my_position_share_sms">¡Mira mi ubicación actual en CoMaps! %1$s o %2$s ¿No tienes mapas offline? Descárgalos aquí: https://www.comaps.app/es/download/</string>
    <!-- Subject for emailed bookmark -->
    <string name="bookmark_share_email_subject">¡Mira mi marcador en el mapa de CoMaps!</string>
    <!-- Subject for emailed position -->
@@ -355,12 +355,12 @@
    <string name="dialog_routing_intermediate_not_determined">Por favor, ajuste la parada intermedia</string>
    <string name="dialog_routing_system_error">Error del sistema</string>
    <string name="dialog_routing_application_error">No se pudo crear la ruta debido a un error en la aplicación</string>
-    <string name="dialog_routing_try_again">Intenta nuevamente</string>
+    <string name="dialog_routing_try_again">Inténtalo de nuevo</string>
    <string name="not_now">Ahora no</string>
    <string name="dialog_routing_download_and_build_cross_route">¿Deseas descargar el mapa y crear una ruta mejor que abarque más de un mapa?</string>
    <string name="dialog_routing_download_cross_route">Descarga mapas adicionales para crear una ruta mejor que cruce los límites de este mapa.</string>
    <!-- SECTION: Strings for downloading map from search -->
-    <string name="search_without_internet_advertisement">Para empezar a buscar y crear rutas, descarga el mapa. Después de eso, ya no necesitarás una conexión a Internet.</string>
+    <string name="search_without_internet_advertisement">Para empezar a buscar y crear rutas, descarga el mapa. Después de eso, ya no necesitarás conexión a Internet.</string>
    <string name="search_select_map">Seleccionar mapa</string>
    <!-- «Show» context menu -->
    <string name="show">Mostrar</string>
@@ -504,7 +504,7 @@
    <string name="placepage_more_button">Más</string>
    <string name="placepage_edit_bookmark_button">Editar marcador</string>
    <string name="placepage_personal_notes_hint">Notas personales (texto o html)</string>
-    <string name="editor_reset_edits_message">¿Restablecer todos los cambios locales?</string>
+    <string name="editor_reset_edits_message">¿Descartar todos los cambios locales?</string>
    <string name="editor_reset_edits_button">Descartar cambios</string>
    <string name="editor_remove_place_message">¿Eliminar el lugar añadido?</string>
    <string name="editor_remove_place_button">Eliminar</string>
@@ -524,7 +524,7 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">¿Quieres enviarlo a todos los usuarios?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Cerciórate de que no has introducido ningún dato privado o personal.</string>
+    <string name="editor_share_to_all_dialog_message_1">Asegúrate de que no has introducido ningún dato privado o personal</string>
    <string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta.</string>
    <string name="navigation_stop_button">Detener</string>
    <!-- Shown as toast when starting the recent track recording -->
@@ -567,7 +567,7 @@
    <string name="dialog_error_storage_message">El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébalo ó escríbenos a support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Emular almacenamiento dañado</string>
    <string name="error_enter_correct_name">Por favor, introduce un nombre válido</string>
-    <string name="bookmark_lists">Listas</string>
+    <string name="bookmark_lists">Listas de favoritos</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Ocultar todo</string>
    <string name="bookmark_lists_show_all">Mostrar todo</string>
@@ -603,7 +603,7 @@
    </plurals>
    <!-- Settings privacy group in settings screen -->
    <string name="privacy">Privacidad</string>
-    <string name="privacy_policy">Normativa de privacidad</string>
+    <string name="privacy_policy">Política de privacidad</string>
    <string name="terms_of_use">Condiciones de uso</string>
    <string name="button_layer_traffic">Tráfico</string>
    <string name="subway">Metro</string>
@@ -915,7 +915,7 @@
    <string name="editor_submit">Enviar</string>
    <string name="power_management">Gestión de energía</string>
    <string name="place_page_map_too_old_title">Datos del mapa anticuados</string>
-    <string name="place_page_map_too_old_description">Tus datos del mapa están muy anticuados, por favor actualiza el mapa.</string>
+    <string name="place_page_map_too_old_description">Tu mapa está muy desactualizado, por favor actualízalo.</string>
    <string name="place_page_app_too_old_description">Tus datos del mapa están muy anticuados, por favor actualiza la aplicación CoMaps.</string>
    <string name="place_page_update_too_old_map">Actualizar mapa de la región</string>
    <string name="place_page_too_old_to_edit">La edición de OpenStreetMap está deshabilitada porque los datos del mapa están muy anticuados.</string>
@@ -924,7 +924,7 @@
    <string name="navigation_start_tts_disabled_message">Instrucciones por voz deshabilitadas: Motor de TTS no disponible</string>
    <string name="advanced">Avanzado</string>
    <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_message">Sobreescribe el servidor de mapas por defecto. Déjalo 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 empezando con http:// o https://</string>
 </resources>
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -62,11 +62,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Lisa uus loend</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Järjehoidjate loendi nimi</string>
+    <string name="bookmark_set_name">Loendi nimi</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Järjehoidjad</string>
+    <string name="bookmarks">Asukohad</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Järjehoidjad ja rajad</string>
+    <string name="bookmarks_and_tracks">Lemmikud</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Nimi</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -142,14 +142,14 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Märkmed</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps järjehoidjaid jagati Sinuga</string>
-    <string name="share_bookmarks_email_body">Tere! \n\nManuses on minu järjehoidjad rakendusest CoMaps. Palun ava need kui Sul on CoMaps paigaldatud. Või kui ei ole, laadi rakendus alla oma iOSi või Androidi seadmesse, järgides seda linki: https://www.comaps.app/download/ \n \nNaudi reisimist CoMapsiga!</string>
+    <string name="share_bookmarks_email_subject">Minu lemmikud CoMapsis</string>
+    <string name="share_bookmarks_email_body">Tere! \n\nManuses on minu järjehoidjad rakendusest CoMaps. Palun ava need kui Sul CoMaps on nutiseadmesse paigaldatud. Või kui ei ole, laadi rakendus alla oma iOSi või Androidi seadmesse, järgides seda linki: https://www.comaps.app/download/ \n \nNaudi reisimist CoMapsiga!</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Laadin järjehoidjaid</string>
+    <string name="load_kmz_title">Laadin lemmikuid</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Järjehoidjad edukalt laaditud! Leiad need kaardil või järjehoidjate halduri vaates.</string>
+    <string name="load_kmz_successful">Lemmikute laadimine õnnestus! Leiad need kaardilt või lemmikute halduri vaates.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Järjehoidjate laadimine ei õnnestunud. Fail võib olla vigane.</string>
+    <string name="load_kmz_failed">Lemmikute laadimine ei õnnestunud. Fail võib olla vigane.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">Rakendus ei tunnista failitüüpi: \n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -494,7 +494,7 @@
    <string name="minute">min</string>
    <string name="day">p</string>
    <string name="placepage_more_button">Veel</string>
-    <string name="placepage_edit_bookmark_button">Muuda järjehoidjat</string>
+    <string name="placepage_edit_bookmark_button">Muuda salvestatud asukohta</string>
    <string name="placepage_personal_notes_hint">Isiklikud märkmed (tekst või html)</string>
    <string name="editor_reset_edits_message">Kas loobud kõigist kohalikest muudatustest?</string>
    <string name="editor_reset_edits_button">Loobu muudatustest</string>
@@ -559,17 +559,17 @@
    <string name="dialog_error_storage_message">Väline andmeruum pole juurdepääsetav. SD-kaart võib olla eemaldatud, kahjustatud või failisüsteem on kirjutuskaitstud. Palun kontrolli oma SD-kaarti või võta meiega ühendust aadressil support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Imiteeri vigast andmeruumi</string>
    <string name="error_enter_correct_name">Palun sisesta korrektne nimi</string>
-    <string name="bookmark_lists">Loendid</string>
+    <string name="bookmark_lists">Lemmikute loendid</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Peida kõik</string>
    <string name="bookmark_lists_show_all">Näita kõiki</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d järjehoidja</item>
-        <item quantity="other">%d järjehoidjat</item>
+        <item quantity="one">%d salvestatud asukoht</item>
+        <item quantity="other">%d salvestatud asukohta</item>
    </plurals>
    <string name="bookmarks_create_new_group">Loo uus loend</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Impordi järjehoidjaid ja radasid</string>
+    <string name="bookmarks_import">Impordi lemmikuid</string>
    <string name="bookmarks_error_message_share_general">Jagamine polnud võimalik rakenduse vea tõttu</string>
    <string name="bookmarks_error_title_share_empty">Viga jagamisel</string>
    <string name="bookmarks_error_message_share_empty">Tühja loendit ei saa jagada</string>
@@ -598,7 +598,7 @@
    <string name="subway">Metroo</string>
    <string name="layers_title">Kaardi stiilid ja kihid</string>
    <string name="bookmarks_empty_list_title">See loend on tühi</string>
-    <string name="bookmarks_empty_list_message">Järjehoidja lisamiseks puuduta kohta kaardil ja seejärel puuduta tähekese ikooni</string>
+    <string name="bookmarks_empty_list_message">ASukoha lisamiseks puuduta kohta kaardil ja seejärel puuduta tähekese ikooni</string>
    <string name="category_desc_more">…veel</string>
    <string name="export_file">Ekspordi KMZ-failina</string>
    <string name="export_file_gpx">Ekspordi GPX-failina</string>
@@ -651,7 +651,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Järjesta…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Järjesta järjehoidjaid</string>
+    <string name="sort_bookmarks">Järjesta lemmikuid</string>
    <!-- Android -->
    <string name="by_default">Vaikimisi</string>
    <!-- Android -->
@@ -765,7 +765,7 @@
    <string name="browser_not_available">Veebibrauser ei ole saadaval</string>
    <string name="volume">Helivaljus</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Ekspordi kõik järjehoidjad ja rajad</string>
+    <string name="bookmarks_export">Ekspordi kõik asukohad ja rajad</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Süsteemsed kõnesünteesi seadistused</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -797,7 +797,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Jätka salvestamist</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Kas salvestame järjehoidjatesse ja radadesse?</string>
+    <string name="track_recording_alert_title">Kas salvestame lemmikute alla?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">Rada on tühi - ei ole midagi salvestada</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -834,16 +834,16 @@
    <string name="vehicle">Sõiduk</string>
    <string name="pedestrian">Jalakäija</string>
    <string name="ruler">Joonlaud</string>
-    <string name="bookmark_color">Järjehoidja värv</string>
+    <string name="bookmark_color">Lemmiku värv</string>
    <string name="panoramax">Panoramaxi pilt</string>
    <string name="about_help">Rakenduse teave ja abiteave</string>
-    <string name="pref_backup_title">Järjehoidjate ja radade varundus</string>
+    <string name="pref_backup_title">Lemmikute varundus</string>
    <string name="pref_backup_now_summary_ok">Varukoopia loomine õnnestus</string>
    <string name="pref_backup_summary">Varunda automaatselt sinu nutiseadmes asuvasse kausta</string>
    <string name="pref_backup_now_title">Varunda kohe</string>
    <string name="pref_backup_now_summary">Tee varukoopia kohe</string>
    <string name="pref_backup_now_summary_progress">Varundamine on töös…</string>
-    <string name="pref_backup_now_summary_empty_lists">Pole järjehoidjaid ega radu, mida varundada</string>
+    <string name="pref_backup_now_summary_empty_lists">Pole asukohti ega radu, mida varundada</string>
    <string name="pref_backup_now_summary_failed">Varundamine ei õnnestunud</string>
    <string name="backup_interval_manual_only">Pole kasutusel (vaid käsitsi varundus)</string>
    <string name="dialog_report_error_with_logs">Palun saada meile veateade, selleks:\n - Vali seadistustest „Lülita logimine sisse“\n - korda probleemi\n - Vaatest „Rakenduse teave ja abiteave“ klõpsi „Teata veast“ nuppu ja saada veateade e-kirjaga või vestluses\n - lülita logimine välja</string>
@@ -915,5 +915,6 @@
    <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>
+    <string name="pref_maplanguage_local">Kohalik keel</string>
 </resources>
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/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>
--- a/android/app/src/main/res/values-hr/strings.xml
+++ b/android/app/src/main/res/values-hr/strings.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="back">Nazad</string>
-    <string name="download_has_failed">Preuzimanje neuspješno. Dotaknite za ponovni pokušaj.</string>
+    <string name="back">Natrag</string>
+    <string name="download_has_failed">Preuzimanje neuspješno. Dodirnite za ponovni pokušaj</string>
    <string name="cancel">Odustani</string>
    <string name="delete">Izbriši</string>
    <string name="kilometres">Kilometara</string>
    <string name="downloading">Preuzimanje…</string>
-    <string name="download_maps">Skini karte</string>
+    <string name="download_maps">Preuzmi karte</string>
    <string name="miles">Milje</string>
    <string name="later">Kasnije</string>
    <string name="search">Traži</string>
@@ -25,7 +25,7 @@
    <string name="report_a_bug">Prijavi pogrešku</string>
    <string name="save">Sačuvaj</string>
    <string name="share">Podijeli</string>
-    <string name="category_parking">Parkiranje</string>
+    <string name="category_parking">Parkiralište</string>
    <string name="website">Web stranica</string>
    <string name="downloader_status_maps">Karte</string>
    <string name="downloader_downloaded_subtitle">Preuzeto</string>
@@ -67,17 +67,17 @@
    <string name="name">Naziv</string>
    <string name="category_post">Pošta</string>
    <string name="email">E-mail</string>
-    <string name="done">Potvrdi</string>
+    <string name="done">Gotovo</string>
    <string name="rate_the_app">Ocijeni aplikaciju</string>
    <string name="downloader_downloading">Preuzima se:</string>
-    <string name="search_history_title">Povijest pretrage</string>
+    <string name="search_history_title">Povijest pretraživanja</string>
    <string name="not_now">Ne sada</string>
    <string name="pref_map_style_title">Noćni način</string>
    <string name="create">Napravi</string>
-    <string name="editor_time_close">Zatvara se</string>
+    <string name="editor_time_close">Zatvoreno</string>
    <string name="p2p_start">Početak</string>
    <string name="editor_time_to">Do</string>
-    <string name="editor_time_open">Otvara se</string>
+    <string name="editor_time_open">Otvoriti</string>
    <string name="day_off">Zatvoreno</string>
    <string name="clear_search">Obriši povijest pretrage</string>
    <string name="next_button">Dalje</string>
@@ -95,10 +95,10 @@
    <string name="minute">min</string>
    <string name="bookmark_lists_show_all">Prikaži sve</string>
    <string name="please_wait">Molim pričekajte…</string>
-    <string name="bookmark_lists">Liste</string>
+    <string name="bookmark_lists">Liste favorita</string>
    <string name="privacy">Privatnost</string>
    <string name="power_managment_setting_never">Nikada</string>
-    <string name="editor_reset_edits_button">Odbaci</string>
+    <string name="editor_reset_edits_button">Odbacite promjene</string>
    <string name="details">Detalji</string>
    <string name="privacy_policy">Politika privatnosti</string>
    <string name="editor_edit_place_category_title">Kategorija</string>
@@ -116,20 +116,20 @@
    <string name="money">Novac</string>
    <string name="app_site_url">https://comaps.app/hr/</string>
    <string name="location_is_disabled_long_text">Trenutno su vam onemogućene sve usluge lokacije za ovaj uređaj ili aplikaciju. Molim omogućite ih u Postavkama.</string>
-    <string name="precise_location_is_disabled_long_text">Kako biste osigurali točnu navigaciju, omogućite Preciznu lokaciju u postavkama.</string>
+    <string name="precise_location_is_disabled_long_text">Za točnu navigaciju omogućite Preciznu lokaciju u postavkama</string>
    <string name="about_menu_title">O CoMaps aplikaciji</string>
    <string name="about_headline">Otvoreni projekt kojeg pokreće zajednica</string>
    <string name="about_proposition_1">• Jednostavan za korištenje i dotjeran</string>
-    <string name="about_proposition_3">• Offline, brz i kompaktan</string>
-    <string name="about_developed_by_enthusiasts">Potpuno otvoreni kod, neprofitan, sa transparentnim odlučivanjem i financijama.</string>
+    <string name="about_proposition_3">• Izvanmrežno, brz i kompaktan</string>
+    <string name="about_developed_by_enthusiasts">Potpuno otvorenog koda, neprofitan, s transparentnim donošenjem odluka i financijama.</string>
    <string name="location_settings">Postavke lokacije</string>
-    <string name="unsupported_phone">Aplikacija zahtijeva hardverski ubrzan OpenGL. Nažalost, vaš uređaj nije podržan.</string>
+    <string name="unsupported_phone">Aplikacija zahtijeva hardverski ubrzani OpenGL. Nažalost, vaš uređaj nije podržan.</string>
    <string name="comma_separated_pair">%1$s, %2$s</string>
    <string name="downloader_loading_ios">Preuzima se</string>
    <string name="zoom_in">Uvećaj</string>
    <string name="zoom_out">Umanji</string>
    <string name="shops">Trgovine</string>
-    <string name="parkings">Parkiranje</string>
+    <string name="parkings">Parkiralište</string>
    <string name="telegram_url">https://t.me/CoMapsApp/</string>
    <string name="translated_om_site_url">https://comaps.app/hr/</string>
    <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
@@ -145,9 +145,9 @@
    <string name="downloading_country_can_proceed">Preuzimanje %1$s (%2$s). Sada možete\nnastaviti na kartu.</string>
    <string name="update_country_ask">Ažurirati %1$s? (%2$s)</string>
    <string name="add_new_set">Dodaj novu Listu</string>
-    <string name="bookmark_set_name">Označi naziv Liste</string>
-    <string name="bookmarks">Oznake</string>
-    <string name="bookmarks_and_tracks">Oznake i Rute</string>
+    <string name="bookmark_set_name">Naziv liste</string>
+    <string name="bookmarks">Mjesta</string>
+    <string name="bookmarks_and_tracks">Favoriti</string>
    <string name="maps_storage">Spremi karte u</string>
    <string name="maps_storage_summary">Odaberite mapu u koju želite spremiti karte</string>
    <string name="maps_storage_downloaded">Preuzete karte</string>
@@ -173,11 +173,11 @@
    <string name="category_police">Policija</string>
    <string name="category_water">Voda</string>
    <string name="category_rv">Objekti za kampere</string>
-    <string name="share_bookmarks_email_subject">CoMaps Oznake su podijeljene s vama</string>
-    <string name="share_bookmarks_email_body">Pozdrav!\n\nU privitku su moje oznake; otvorite ih u CoMaps aplikaciji. Ukoliko ju nemate instaliranu, možete ju preuzeti ovdje: https://www.comaps.app/download/\n\nUživajte u putovanju s CoMapsima!</string>
-    <string name="load_kmz_title">Učitavam Oznake</string>
-    <string name="load_kmz_successful">Oznake su uspješno učitane! Možete ih pronaći na karti ili na zaslonu Upravitelja Oznaka.</string>
-    <string name="load_kmz_failed">Učitavanje Oznaka nije uspjelo. Datoteka je možda oštećena ili neispravna.</string>
+    <string name="share_bookmarks_email_subject">Moji CoMaps favoriti</string>
+    <string name="share_bookmarks_email_body">Pozdrav!\n\nU privitku su moji favoriti; molim vas otvorite ih u CoMaps aplikaciji. Ako je nemate instaliranu, možete je preuzeti ovdje: https://www.comaps.app/download/\n\nUživajte u putovanju s CoMapsom!</string>
+    <string name="load_kmz_title">Učitavanje favorita</string>
+    <string name="load_kmz_successful">Favoriti su uspješno učitani! Možete ih pronaći na karti ili na zaslonu Upravitelj favorita.</string>
+    <string name="load_kmz_failed">Učitavanje favorita nije uspjelo. Datoteka je možda oštećena ili neispravna.</string>
    <string name="unknown_file_type">Aplikacija ne prepoznaje tip datoteke:\n%1$s</string>
    <string name="failed_to_open_file">Nije moguće otvoriti datoteku %1$s\n \n%2$s</string>
    <string name="unknown_current_position">Vaša lokacija još nije utvrđena</string>
@@ -190,10 +190,10 @@
    <string name="copied_to_clipboard">Kopirano u međuspremnik: %s</string>
    <string name="data_version">OpenStreetMap podaci: %s</string>
    <string name="tracks_title">Rute</string>
-    <string name="category_hotel">hotel</string>
+    <string name="category_hotel">Hotel</string>
    <string name="category_toilet">WC</string>
    <string name="track_recording">Snimanje Rute</string>
-    <string name="bookmarks_import">Uvoz Oznaka i Ruta</string>
+    <string name="bookmarks_import">Uvoz favorita</string>
    <plurals name="tracks">
        <item quantity="one">%d ruta</item>
        <item quantity="few">%d rute</item>
@@ -208,7 +208,7 @@
    <string name="pref_backup_title">Sigurnosna kopija Oznaka i Ruta</string>
    <string name="pref_backup_now_summary_empty_lists">Nema Oznaka i Ruta za izradu sigurnosne kopije</string>
    <string name="share_track">Podijeli Rutu</string>
-    <string name="placepage_edit_bookmark_button">Uredi Oznaku</string>
+    <string name="placepage_edit_bookmark_button">Uredi spremljeno mjesto</string>
    <string name="bookmark_lists_hide_all">Sakrij sve</string>
    <plurals name="bookmarks_places">
        <item quantity="one">%d Oznaka</item>
@@ -224,18 +224,18 @@
    <string name="bookmarks_error_title_list_name_already_taken">Taj naziv je već zauzet</string>
    <string name="bookmarks_error_message_list_name_already_taken">Molimo odaberite drugi naziv</string>
    <string name="bookmarks_empty_list_title">Ova Lista je prazna</string>
-    <string name="bookmarks_empty_list_message">Za dodavanje Oznake dotaknite mjesto na karti, a zatim dodirnite ikonu zvjezdice</string>
+    <string name="bookmarks_empty_list_message">Za spremanje mjesta dodirnite mjesto na karti, a zatim dodirnite ikonu zvjezdice</string>
    <string name="sort_bookmarks">Sortiraj Oznake</string>
    <string name="bookmark_color">Boja Oznake</string>
    <string name="share_my_location">Podijeli moju lokaciju</string>
    <string name="pref_zoom_title">Gumbi za zumiranje</string>
    <string name="pref_map_3d_title">Pogled iz perspektive</string>
    <string name="pref_map_3d_buildings_title">3D zgrade</string>
-    <string name="pref_tts_enable_title">Glasovne najave</string>
+    <string name="pref_tts_enable_title">Glasovne upute</string>
    <string name="pref_tts_street_names_title">Najavi nazive ulica</string>
-    <string name="pref_tts_street_names_description">Kada je omogućeno, naziv ulice ili izlaza gdje koji treba skrenuti bit će izgovoren naglas.</string>
+    <string name="pref_tts_street_names_description">Kada je omogućeno, naziv ulice ili izlaza na koji treba skrenuti bit će izgovoren naglas.</string>
    <string name="pref_tts_language_title">Jezik glasovnih najava</string>
-    <string name="pref_tts_test_voice_title">Testiranje glasovnih najava</string>
+    <string name="pref_tts_test_voice_title">Testiranje glasovnih uputa</string>
    <string name="pref_tts_playing_test_voice">Provjerite glasnoću ili sistemske postavke za pretvaranje teksta u govor ako sada ne čujete glas</string>
    <string name="pref_tts_unavailable">Nije dostupno</string>
    <string name="pref_map_auto_zoom">Automatsko zumiranje</string>
@@ -270,4 +270,286 @@
    <string name="editor_time_add">Dodaj Raspored</string>
    <string name="editor_time_delete">Izbriši Raspored</string>
    <string name="editor_time_allday">Cijeli dan (24 sata)</string>
+    <string name="pref_zoom_summary">Prikaz na karti</string>
+    <string name="deep_orange">Tamno narančasta</string>
+    <string name="blue_gray">Plavo siva</string>
+    <string name="dialog_routing_disclaimer_title">Prilikom praćenja rute, imajte na umu:</string>
+    <string name="dialog_routing_disclaimer_priority">— Uvjeti na cestama, prometni propisi i prometni znakovi uvijek imaju prednost pred navigacijskim savjetima;</string>
+    <string name="dialog_routing_disclaimer_precision">— Karta može biti netočna, a predložena ruta možda nije uvijek najoptimalniji način za dolazak do odredišta;</string>
+    <string name="dialog_routing_disclaimer_recommendations">— Predložene rute treba shvatiti samo kao preporuke;</string>
+    <string name="dialog_routing_disclaimer_borders">— Budite oprezni s rutama u pograničnim zonama: rute koje je kreirala naša aplikacija ponekad mogu prelaziti državne granice na nedozvoljenim mjestima.</string>
+    <string name="dialog_routing_disclaimer_beware">Molimo vas da ostanete oprezni i sigurni na cestama!</string>
+    <string name="dialog_routing_check_gps">Provjerite GPS signal</string>
+    <string name="dialog_routing_error_location_not_found">Nije moguće izraditi rutu. Trenutne GPS koordinate nije moguće odrediti.</string>
+    <string name="dialog_routing_location_turn_wifi">Provjerite GPS signal. Uključivanje Wi‑Fi mreže poboljšat će točnost lokacije.</string>
+    <string name="dialog_routing_location_turn_on">Omogući usluge lokacije</string>
+    <string name="dialog_routing_location_unknown_turn_on">Nije moguće pronaći trenutne GPS koordinate. Omogućite usluge lokacije za izračun rute.</string>
+    <string name="dialog_routing_unable_locate_route">Nije moguće pronaći rutu</string>
+    <string name="dialog_routing_cant_build_route">Nije moguće stvoriti rutu</string>
+    <string name="dialog_routing_change_start_or_end">Molimo prilagodite početnu točku ili odredište.</string>
+    <string name="dialog_routing_change_start">Prilagodite početnu točku</string>
+    <string name="dialog_routing_start_not_determined">Ruta nije kreirana. Nije moguće pronaći početnu točku.</string>
+    <string name="dialog_routing_select_closer_start">Odaberite početnu točku bliže cesti.</string>
+    <string name="dialog_routing_change_end">Prilagodite odredište</string>
+    <string name="dialog_routing_end_not_determined">Ruta nije izrađena. Odredište nije moguće pronaći.</string>
+    <string name="dialog_routing_download_and_build_cross_route">Želite li preuzeti kartu i stvoriti optimalniju rutu koja obuhvaća više od jedne karte?</string>
+    <string name="dialog_routing_download_cross_route">Preuzmite dodatne karte kako biste stvorili bolju rutu koja prelazi granice ove karte.</string>
+    <string name="search_without_internet_advertisement">Da biste započeli s pretraživanjem i izradom ruta, preuzmite kartu. Nakon toga vam više neće biti potrebna internetska veza.</string>
+    <string name="search_select_map">Odaberite kartu</string>
+    <string name="search_not_found">Ups, nema pronađenih rezultata</string>
+    <string name="p2p_from_here">Ruta od</string>
+    <string name="p2p_to_here">Ruta do</string>
+    <string name="editor_time_add_closed">Dodajte izvan radno vrijeme</string>
+    <string name="editor_time_title">Radno vrijeme</string>
+    <string name="editor_time_advanced">Napredni način rada</string>
+    <string name="editor_time_simple">Jednostavni način rada</string>
+    <string name="editor_hours_closed">Izvan radnog vremena</string>
+    <string name="editor_example_values">Primjeri vrijednosti</string>
+    <string name="editor_correct_mistake">Ispravite grešku</string>
+    <string name="editor_add_select_location">Odaberite lokaciju</string>
+    <string name="editor_report_problem_desription_1">Molimo opišite problem detaljno kako bi ga OpenStreetMap zajednica mogla ispraviti.</string>
+    <string name="downloader_delete_map_dialog">Sve vaše izmjene na karti bit će izbrisane s kartom</string>
+    <string name="downloader_update_maps">Ažurirajte karte</string>
+    <string name="downloader_mwm_migration_dialog">Za izradu rute potrebno je ažurirati sve karte, a zatim ponovno isplanirati rutu.</string>
+    <string name="downloader_search_field_hint">Pronađite kartu</string>
+    <string name="common_check_internet_connection_dialog">Molimo provjerite je li vaš uređaj spojen na internet</string>
+    <string name="downloader_no_space_title">Nema dovoljno prostora</string>
+    <string name="downloader_no_space_message">Izbrišite sve nepotrebne podatke</string>
+    <string name="editor_login_error_dialog">Pogreška pri prijavi</string>
+    <string name="editor_profile_changes">Potvrđene promjene</string>
+    <string name="editor_focus_map_on_location">Povucite kartu kako biste postavili križić na željenu lokaciju.</string>
+    <string name="editor_add_place_title">Dodavanje</string>
+    <string name="editor_edit_place_name_hint">Naziv mjesta</string>
+    <string name="editor_default_language_hint">Kao što je napisano na lokalnom jeziku</string>
+    <string name="detailed_problem_description">Detaljan opis problema</string>
+    <string name="editor_report_problem_other_title">Drugačiji problem</string>
+    <string name="message_invalid_feature_position">Ovdje se ne može pronaći nijedan objekt</string>
+    <string name="osm_presentation">Podaci OpenStreetMapa koje je kreirala zajednica od %s. Saznajte više o tome kako urediti i ažurirati kartu na OpenStreetMap.org</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) je zajednički projekt stvaranja besplatnih i otvorenih karata. To je glavni izvor kartografskih podataka u CoMaps aplikaciji i funkcionira slično kao Wikipedia. Možete dodavati ili uređivati mjesta, a vaši će unosi postati dostupni milijunima korisnika diljem svijeta.\nPridružite se zajednici i pomozite stvarati još bolju kartu za sve!</string>
+    <string name="login_to_make_edits_visible">Kreiraj OpenStreetMap račun ili se prijavite kako biste svijetu objavili svoje izmjene na karti</string>
+    <string name="downloader_of">%1$d od %2$d</string>
+    <string name="download_over_mobile_header">Preuzeti putem mobilne podatkovne veze?</string>
+    <string name="download_over_mobile_message">Ovo može biti znatno skuplje s nekim tarifama ili ako ste u roamingu</string>
+    <string name="error_enter_correct_house_number">Unesite važeći broj zgrade</string>
+    <string name="editor_building_levels">Broj katova (s prizemljem, bez krova)</string>
+    <string name="error_enter_correct_storey_number">Broj katova ne smije biti veći od %d</string>
+    <string name="editor_zip_code">Poštanski broj</string>
+    <string name="error_enter_correct_zip_code">Unesite važeći poštanski broj</string>
+    <string name="editor_other_info">Napomena za volontere OpenStreetMapa (nije obavezno)</string>
+    <string name="editor_note_hint">Opišite pogreške na karti ili stvari koje se ne mogu uređivati u CoMaps‑u</string>
+    <string name="editor_about_osm">Vaše se izmjene prenose u javnu bazu podataka <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Molimo vas da ne dodajete osobne podatke ili podatke zaštićene autorskim pravima.</string>
+    <string name="editor_more_about_osm">Više o OpenStreetMapu</string>
+    <string name="editor_osm_history">Vaša povijest uređivanja</string>
+    <string name="editor_osm_notes">Vaše bilješke o podacima na karti</string>
+    <string name="editor_operator">Operator</string>
+    <string name="operator">Operator: %s</string>
+    <string name="editor_category_unsuitable_title">Ne možete pronaći odgovarajuću kategoriju?</string>
+    <string name="editor_category_unsuitable_text">**CoMaps** omogućuje dodavanje samo jednostavnih kategorija točaka, što znači da nije moguće dodavati gradove, ceste, jezera, tlocrte zgrada itd. Takve kategorije dodajte izravno na <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Pogledajte naš <a href="https://www.comaps.app/support/advanced-map-editing/">vodič</a> za detaljne upute korak po korak.</string>
+    <string name="downloader_no_downloaded_maps_title">Niste preuzeli nijednu kartu</string>
+    <string name="downloader_no_downloaded_maps_message">Preuzmite karte za pretraživanje i navigaciju izvan mreže</string>
+    <string name="current_location_unknown_error_title">Trenutna lokacija je nepoznata</string>
+    <string name="miles_per_hour">mph</string>
+    <string name="hour">h</string>
+    <string name="day">d</string>
+    <string name="placepage_more_button">Više</string>
+    <string name="placepage_personal_notes_hint">Osobne bilješke (tekst ili html)</string>
+    <string name="editor_reset_edits_message">Odbaciti sve lokalne promjene?</string>
+    <string name="editor_remove_place_message">Izbrisati dodano mjesto?</string>
+    <string name="editor_place_doesnt_exist">Mjesto ne postoji</string>
+    <string name="editor_place_doesnt_exist_description">Opišite kako mjesto sada izgleda kako biste poslali obavijest o pogrešci zajednici OpenStreetMapa</string>
+    <string name="delete_place_empty_comment_error">Molimo navedite razlog brisanja mjesta</string>
+    <string name="editor_business_vacant_button">Objekt više ne posluje</string>
+    <string name="editor_mark_business_vacant_title">Označi da nema aktivnog poslovanja</string>
+    <string name="editor_mark_business_vacant_description">Koristite ovo ako se tvrtka iselila, a prostor je prazan i spreman za novog najmoprimca.</string>
+    <string name="editor_submit">Pošalji</string>
+    <string name="error_enter_correct_phone">Unesite važeći telefonski broj</string>
+    <string name="error_enter_correct_web">Unesite valjanu web-adresu</string>
+    <string name="error_enter_correct_email">Unesite važeću e-adresu</string>
+    <string name="editor_level">Kat (0 je prizemlje)</string>
+    <string name="error_enter_correct_level">Unesite važeći broj kata</string>
+    <string name="error_enter_correct_facebook_page">Unesite važeću Facebook web adresu, račun ili naziv stranice</string>
+    <string name="error_enter_correct_instagram_page">Unesite važeće korisničko ime na Instagramu ili web-adresu</string>
+    <string name="error_enter_correct_twitter_page">Unesite važeće korisničko ime za X (Twitter) ili web-adresu</string>
+    <string name="error_enter_correct_vk_page">Unesite važeće VK korisničko ime ili web adresu</string>
+    <string name="error_enter_correct_line_page">Unesite važeći LINE ID ili web-adresu</string>
+    <string name="error_enter_correct_fediverse_page">Unesite važeće Mastodon korisničko ime ili web adresu</string>
+    <string name="error_enter_correct_bluesky_page">Unesite važeće Bluesky korisničko ime ili web-adresu</string>
+    <string name="placepage_add_place_button">Dodaj mjesto na OpenStreetMap</string>
+    <string name="place_page_map_too_old_title">Podaci na karti su zastarjeli</string>
+    <string name="place_page_map_too_old_description">Podaci vaše trenutne karte su vrlo stari, ažurirajte kartu.</string>
+    <string name="place_page_app_too_old_description">Podaci vaše trenutne karte su vrlo stari, ažurirajte aplikaciju CoMaps.</string>
+    <string name="place_page_update_too_old_map">Ažurirajte regiju karte</string>
+    <string name="place_page_too_old_to_edit">Uređivanje OpenStreetMapa je onemogućeno jer su podaci karte prestari.</string>
+    <string name="osm_note_hint">Ili ostavite bilješku OSM zajednici da netko drugi doda ili ispravi mjesto.</string>
+    <string name="osm_note_toast">Bilješka će biti poslana OpenStreetMapu</string>
+    <string name="editor_share_to_all_dialog_title">Želite li to poslati svim korisnicima?</string>
+    <string name="editor_share_to_all_dialog_message_1">Provjerite da niste unijeli privatne ili osobne podatke.</string>
+    <string name="editor_share_to_all_dialog_message_2">Urednici OpenStreetMapa će provjeriti promjene i kontaktirati vas ako imaju bilo kakvih pitanja.</string>
+    <string name="navigation_stop_button">Stop</string>
+    <string name="decline">Odbaci</string>
+    <string name="mobile_data_dialog">Koristiti mobilni internet za prikaz detaljnih informacija?</string>
+    <string name="mobile_data_option_always">Uvijek koristi</string>
+    <string name="mobile_data_option_today">Samo danas</string>
+    <string name="mobile_data_option_not_today">Ne koristiti danas</string>
+    <string name="mobile_data">Mobilni internet</string>
+    <string name="mobile_data_description">Za obavijesti o ažuriranjima karata i prijenos izmjena potreban je mobilni internet</string>
+    <string name="mobile_data_option_never">Nikad ne koristite</string>
+    <string name="traffic_update_maps_text">Za prikaz podataka o prometu, karte moraju biti ažurirane</string>
+    <string name="big_font">Povećaj veličinu oznaka na karti</string>
+    <string name="traffic_update_app">Molimo ažurirajte CoMaps</string>
+    <string name="traffic_data_unavailable">Podaci o prometu nisu dostupni</string>
+    <string name="enable_logging">Omogući zapisivanje</string>
+    <string name="feedback_general">Opće povratne informacije</string>
+    <string name="prefs_languages_information">Za glasovne upute koristimo sistemski TTS. Mnogi Android uređaji koriste Google TTS, možete ga preuzeti ili ažurirati s Google Playa (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
+    <string name="prefs_languages_information_off">Za neke jezike morat ćete instalirati sintetizator govora ili dodatni jezični paket iz trgovine aplikacija (Google Play, Galaxy Store, App Gallery, FDroid). \nOtvorite postavke uređaja → Jezik i unos → Govor → Izlaz teksta u govor. Ovdje možete upravljati postavkama za sintezu govora (na primjer, preuzeti jezični paket za izvanmrežnu upotrebu) i odabrati drugi program za pretvaranje teksta u govor.</string>
+    <string name="prefs_languages_information_off_link">Za više informacija molimo provjerite ovaj vodič</string>
+    <string name="prefs_speed_cameras_information">Upozorenja na kamere za nadzor brzine onemogućena su u državama u kojima su takva upozorenja zabranjena lokalnim zakonima.</string>
+    <string name="transliteration_title">Prikaži u latinici</string>
+    <string name="learn_more">Saznajte više</string>
+    <string name="routing_add_start_point">Koristite pretraživanje ili dodirnite kartu za dodavanje početne točke rute</string>
+    <string name="routing_add_finish_point">Koristite pretraživanje ili dodirnite kartu za dodavanje odredišne točke</string>
+    <string name="planning_route_manage_route">Upravljanje rutom</string>
+    <string name="button_plan">Plan</string>
+    <string name="placepage_remove_stop">Ukloni zaustavljanje</string>
+    <string name="placepage_add_stop">Dodaj zaustavljanje</string>
+    <string name="dialog_error_storage_title">Problem s pristupom pohrani</string>
+    <string name="dialog_error_storage_message">Vanjska pohrana nije dostupna. SD kartica je možda uklonjena, oštećena ili je datotečni sustav samo za čitanje. Molimo provjerite svoju SD karticu ili nas kontaktirajte na support@comaps.app</string>
+    <string name="setting_emulate_bad_storage">Emuliraj lošu pohranu</string>
+    <string name="error_enter_correct_name">Molimo unesite točno ime</string>
+    <string name="bookmarks_error_title_share_empty">Pogreška dijeljenja</string>
+    <string name="profile">Profil na OpenStreetMapu</string>
+    <string name="restore">Vratiti</string>
+    <string name="power_management">Upravljanje napajanjem</string>
+    <string name="terms_of_use">Uvjeti korištenja</string>
+    <string name="button_layer_traffic">Promet</string>
+    <string name="subway">Metro</string>
+    <string name="layers_title">Stilovi i slojevi karte</string>
+    <string name="export_file">Izvezi kao KMZ</string>
+    <string name="export_file_gpx">Izvezi kao GPX</string>
+    <string name="speedcams_alert_title">Kamera za nadzor brzine</string>
+    <string name="place_description_title">Opis mjesta</string>
+    <string name="notification_channel_downloader">Preuzimanje karata</string>
+    <string name="pref_tts_speedcams_auto">Upozori na prekoračenje brzine</string>
+    <string name="pref_tts_speedcams_always">Uvijek upozori</string>
+    <string name="pref_tts_speedcams_never">Nikad ne upozoravaj</string>
+    <string name="power_managment_title">Način rada za uštedu energije</string>
+    <string name="power_managment_description">Pokušajte smanjiti potrošnju energije na štetu nekih funkcionalnosti</string>
+    <string name="power_managment_setting_auto">Kad je baterija pri kraju</string>
+    <string name="enable_logging_warning_message">Privremeno omogućite ovu opciju kako biste snimili i ručno poslali detaljne dijagnostičke zapisnike o vašem problemu pomoću opcije \"Prijavi grešku\" u dijalogu Pomoć. Zapisnici mogu uključivati podatke o lokaciji.</string>
+    <string name="driving_options_title">Opcije rutiranja</string>
+    <string name="avoid_tolls">Izbjegni cestarine</string>
+    <string name="avoid_unpaved">Izbjegavaj neasfaltirane ceste</string>
+    <string name="avoid_ferry">Izbjegavaj trajekte</string>
+    <string name="avoid_motorways">Izbjegavaj autoceste</string>
+    <string name="avoid_steps">Izbjegavaj stepenice</string>
+    <string name="avoid_paved">Izbjegavaj asfaltirane ceste</string>
+    <string name="unable_to_calc_alert_title">Nije moguće izračunati rutu</string>
+    <string name="unable_to_calc_alert_subtitle">Ruta nije pronađena. Uzrok tome mogu biti vaše opcije rute ili nepotpuni podaci OpenStreetMapa. Molimo promijenite opcije rute i pokušajte ponovno.</string>
+    <string name="define_to_avoid_btn">Definirajte ceste koje treba izbjegavati</string>
+    <string name="change_driving_options_btn">Opcije rutiranja omogućene</string>
+    <string name="toll_road">Cesta s naplatom cestarine</string>
+    <string name="unpaved_road">Neasfaltirana cesta</string>
+    <string name="ferry_crossing">Trajektna linija</string>
+    <string name="capacity">Kapacitet: %s</string>
+    <string name="network">Mreža: %s</string>
+    <string name="ok">OK</string>
+    <string name="pref_map_3d_buildings_disabled_summary">3D zgrade su onemogućene u načinu rada za uštedu energije</string>
+    <string name="downloader_queued">U redu čekanja</string>
+    <string name="google_play_services">Googleov objedinjeni servis za određivanje lokacije</string>
+    <string name="pref_use_google_play">Vlasnički servis koji kombinira GPS, Wi‑Fi i mobilne mreže radi preciznijeg određivanja lokacije. Može se povezivati s Googleovim poslužiteljima.</string>
+    <string name="routing_download_maps_along">Preuzmite sve karte duž svoje rute</string>
+    <string name="routing_requires_all_map">Kako bismo izradili rutu, moramo preuzeti i ažurirati sve karte od vaše lokacije do odredišta.</string>
+    <string name="routing_not_enough_space">Nema dovoljno prostora</string>
+    <string name="enable_location_services">Omogućite Usluge lokacije</string>
+    <string name="deep_purple">Tamno ljubičasta</string>
+    <string name="light_blue">Svijetlo plava</string>
+    <string name="cyan">Cijan</string>
+    <string name="teal">Tirkizna</string>
+    <string name="lime">Limeta</string>
+    <string name="editor_report_problem_desription_2">Ili to učinite sami na https://www.openstreetmap.org/</string>
+    <string name="editor_report_problem_title">Problem</string>
+    <string name="editor_report_problem_no_place_title">Ovo mjesto ne postoji</string>
+    <string name="editor_report_problem_under_construction_title">Zatvoreno zbog održavanja</string>
+    <string name="editor_report_problem_duplicate_place_title">Duplikat mjesta</string>
+    <string name="autodownload">Automatsko preuzimanje karata</string>
+    <string name="twentyfour_seven">24/7</string>
+    <string name="day_off_today">Zatvoreno danas</string>
+    <string name="opens_in">Otvara se za %s</string>
+    <string name="closes_in">Zatvara se za %s</string>
+    <string name="opens_at">Otvara se u %s</string>
+    <string name="closes_at">Zatvara se u %s</string>
+    <string name="opens_day_at">Otvara se %1$s u %2$s</string>
+    <string name="closes_day_at">Zatvara se %1$s u %2$s</string>
+    <string name="by_default">Prema zadanim postavkama</string>
+    <string name="by_type">Po vrsti</string>
+    <string name="by_distance">Po udaljenosti</string>
+    <string name="by_date">Po datumu</string>
+    <string name="by_name">Po imenu</string>
+    <string name="week_ago_sorttype">Prije tjedan dana</string>
+    <string name="month_ago_sorttype">Prije mjesec dana</string>
+    <string name="moremonth_ago_sorttype">Prije više od mjesec dana</string>
+    <string name="moreyear_ago_sorttype">Prije više od godinu dana</string>
+    <string name="near_me_sorttype">U mojoj blizini</string>
+    <string name="others_sorttype">Ostali</string>
+    <string name="food_places">Hrana</string>
+    <string name="tourist_places">Znamenitosti</string>
+    <string name="museums">Muzeji</string>
+    <string name="parks">Parkovi</string>
+    <string name="swim_places">Plivanje</string>
+    <string name="mountains">Planine</string>
+    <string name="animals">Životinje</string>
+    <string name="hotels">Hoteli</string>
+    <string name="buildings">Zgrade</string>
+    <string name="fuel_places">Benzinske postaje</string>
+    <string name="elevation_profile_time">Vrijeme:</string>
+    <string name="medicine">Lijekovi</string>
+    <string name="search_in_the_list">Traži u popisu</string>
+    <string name="religious_places">Vjerska mjesta</string>
+    <string name="select_list">Odaberi popis</string>
+    <string name="transit_not_found">Navigacija podzemnom željeznicom u ovoj regiji još nije dostupna</string>
+    <string name="dialog_pedestrian_route_is_long_header">Nije pronađena ruta podzemne željeznice</string>
+    <string name="dialog_pedestrian_route_is_long_message">Molimo odaberite početnu ili završnu točku bliže stanici podzemne željeznice</string>
+    <string name="button_layer_isolines">Izohipse</string>
+    <string name="isolines_activation_error_dialog">Da biste aktivirali izohipse, preuzmite podatke karte za ovo područje</string>
+    <string name="isolines_location_error_dialog">Izohipse još nisu dostupne u ovom području</string>
+    <string name="elevation_profile_ascent">Uspon</string>
+    <string name="elevation_profile_descent">Silazak</string>
+    <string name="elevation_profile_min_elevation">Minimalna nadmorska visina</string>
+    <string name="elevation_profile_max_elevation">Maks. nadmorska visina</string>
+    <string name="elevation_profile_difficulty">Težina</string>
+    <string name="elevation_profile_distance">Udaljenost:</string>
+    <string name="isolines_toast_zooms_1_10">\"Povećajte prikaz za pregled izohipsi</string>
+    <string name="download_map_title">Preuzmite osnovnu kartu svijeta</string>
+    <string name="disk_error">Nije moguće stvoriti mapu i premjestiti datoteke na internu memoriju uređaja ili SD karticu</string>
+    <string name="disk_error_title">Pogreška diska</string>
+    <string name="connection_failure">Pogreška povezivanja</string>
+    <string name="disconnect_usb_cable_title">Isključite USB kabel</string>
+    <string name="enable_keep_screen_on">Drži zaslon uključenim</string>
+    <string name="enable_keep_screen_on_description">Kada je omogućeno, zaslon će uvijek biti uključen prilikom prikaza karte.</string>
+    <string name="enable_show_on_lock_screen">Prikaži na zaključanom zaslonu</string>
+    <string name="enable_show_on_lock_screen_description">Kada je omogućeno, aplikacija će raditi na zaključanom zaslonu čak i kada je uređaj zaključan.</string>
+    <string name="change_map_locale">Jezik karte</string>
+    <string name="pref_maplanguage_local">Lokalni jezik</string>
+    <string name="splash_subtitle">Podaci karte iz OpenStreetMapa</string>
+    <string name="app_tip_00">Hvala vam što koristite karte koje je izradila naša zajednica!</string>
+    <string name="app_tip_01">Uz vaše donacije i podršku, možemo stvoriti najbolje karte na svijetu!</string>
+    <string name="app_tip_02">Sviđa li vam se naša aplikacija? Donirajte kako biste podržali razvoj! Još vam se ne sviđa? Javite nam zašto i mi ćemo to popraviti!</string>
+    <string name="app_tip_03">Ako poznajete programera softvera, možete ga zamoliti da implementira značajku koja vam je potrebna.</string>
+    <string name="app_tip_04">Dodirnite bilo gdje na karti da biste nešto odabrali. Dugi dodir koristi se za skrivanje i prikaz sučelja.</string>
+    <string name="app_tip_05">Jeste li znali da se vaša trenutna lokacija na karti može odabrati?</string>
+    <string name="app_tip_06">Možete nam pomoći u prevođenju naše aplikacije na vaš jezik.</string>
+    <string name="app_tip_07">Našu aplikaciju razvili su nekoliko entuzijasta i zajednica.</string>
+    <string name="app_tip_08">Podatke karte možete jednostavno popraviti i poboljšati.</string>
+    <string name="app_tip_09">Naš glavni cilj je izrada brzih, na privatnost usmjerenih i jednostavnih karata koje ćete obožavati.</string>
+    <string name="car_used_on_the_phone_screen">Sada koristite CoMaps na zaslonu telefona</string>
+    <string name="car_used_on_the_car_screen">Sada koristite CoMaps na zaslonu automobila</string>
+    <string name="aa_connected_title">Povezani ste s Android Autom</string>
+    <string name="car_continue_on_the_phone">Nastavite na telefonu</string>
+    <string name="car_continue_in_the_car">Na ekran automobila</string>
+    <string name="aa_location_permissions_request">CoMaps treba pristup lokaciji. Kad bude sigurno, provjeri obavijest na svom telefonu.</string>
+    <string name="aa_request_permission_notification">Ova aplikacija treba vaše dopuštenje</string>
+    <string name="aa_request_permission_activity_text">CoMaps u Android Auto zahtijeva dopuštenja za lokaciju kako bi učinkovito funkcionirao</string>
+    <string name="aa_grant_permissions">Dodijeli dopuštenja</string>
+    <string name="button_layer_outdoor">Na otvorenom</string>
+    <string name="browser_not_available">Web preglednik nije dostupan</string>
 </resources>
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -160,7 +160,7 @@
    <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
    <string name="cant_change_this_setting">Maaf, pengaturan Penyimpanan Peta saat ini sedang non-aktif.</string>
    <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Pengunduhan negara sedang berjalan.</string>
+    <string name="downloading_is_active">Pengunduhan peta sedang berjalan</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">Hei, lihat lokasiku saat ini di CoMaps! %1$s atau %2$s belum memiliki peta offline? Unduh di sini: 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">Menguji petunjuk suara (TTS, Text-To-Speech)</string>
    <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Periksa pengaturan volume atau pengaturan teks-ke-ucapan sistem jika anda tidak mendengar suara sekarang.</string>
+    <string name="pref_tts_playing_test_voice">Periksa pengaturan volume atau teks-ke-ucapan sistem jika Anda tidak mendengar suara</string>
    <!-- Settings «Route» category: «Tts unavailable» subtitle -->
    <string name="pref_tts_unavailable">Tidak Tersedia</string>
    <string name="pref_map_auto_zoom">Perbesar otomatis</string>
@@ -231,7 +231,7 @@
    <!-- Button in the main Help dialog -->
    <string name="faq">Pertanyaan dan jawaban</string>
    <!-- Button in the main menu -->
-    <string name="donate">Menyumbangkan</string>
+    <string name="donate">Donasi</string>
    <!-- Button in the main Help dialog -->
    <string name="how_to_support_us">Mendukung proyek</string>
    <!-- Button in the main Help dialog -->
@@ -258,7 +258,7 @@
    <string name="downloader_download_all_button">Unduh semua</string>
    <string name="downloader_downloading">Mengunduh:</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">Untuk menghapus peta, silakan hentikan navigasi.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Untuk menghapus peta, silakan hentikan navigasi terlebih dahulu</string>
    <!-- PointsInDifferentMWM -->
    <string name="routing_failed_cross_mwm_building">Rute hanya dapat dibuat dengan yang seluruhnya ada di dalam peta tunggal.</string>
    <!-- Context menu item for downloader. -->
@@ -272,7 +272,7 @@
    <!-- Preference title -->
    <string name="google_play_services">Layanan Lokasi Google Play</string>
    <!-- Preference text -->
-    <string name="pref_use_google_play">Dengan cepat menentukan perkiraan lokasi Anda melalui Bluetooth, WiFi, atau jaringan seluler</string>
+    <string name="pref_use_google_play">Layanan berpemilik (proprietary) yang memadukan GPS, Wi-Fi, jaringan seluler, dsb. untuk menentukan lokasi Anda dengan lebih akurat. Layanan ini mungkin terhubung ke server Google.</string>
    <!-- Preference title -->
    <!-- Preference description -->
    <!-- Text for routing error dialog -->
@@ -330,18 +330,18 @@
    <string name="dialog_routing_location_turn_on">Aktifkan layanan lokasi</string>
    <string name="dialog_routing_location_unknown_turn_on">TIdak dapat menemukan koordinat GPS saat ini. Aktifkan layanan lokasi untuk mengalkulasi rute.</string>
    <string name="dialog_routing_unable_locate_route">Tidak dapat menemukan rute</string>
-    <string name="dialog_routing_cant_build_route">Tidak dapat membuat rute.</string>
+    <string name="dialog_routing_cant_build_route">Tidak dapat membuat rute</string>
    <string name="dialog_routing_change_start_or_end">Sesuaikan titik mula atau tujuan Anda.</string>
    <string name="dialog_routing_change_start">Sesuaikan titik mula</string>
    <string name="dialog_routing_start_not_determined">Rute tidak dibuat. Tidak dapat menemukan titik mula.</string>
    <string name="dialog_routing_select_closer_start">Pilih titik mula yang lebih dekat dengan jalan.</string>
    <string name="dialog_routing_change_end">Sesuaikan tujuan</string>
    <string name="dialog_routing_end_not_determined">Rute tidak dibuat. Tidak dapat menemukan tujuan.</string>
-    <string name="dialog_routing_select_closer_end">Pilih titik tujuan yang lebih dekat dengan jalan.</string>
+    <string name="dialog_routing_select_closer_end">Mohon pilih titik tujuan yang lebih dekat dengan jalan</string>
    <string name="dialog_routing_change_intermediate">Tidak dapat menemukan titik antara.</string>
    <string name="dialog_routing_intermediate_not_determined">Harap sesuaikan titik antara Anda.</string>
    <string name="dialog_routing_system_error">Kesalahan sistem</string>
-    <string name="dialog_routing_application_error">Tidak dapat membuat rute karena kesalahan aplikasi.</string>
+    <string name="dialog_routing_application_error">Tidak dapat membuat rute karena kesalahan aplikasi</string>
    <string name="dialog_routing_try_again">Mohon coba lagi</string>
    <string name="not_now">Jangan Sekarang</string>
    <string name="dialog_routing_download_and_build_cross_route">Apakah Anda ingin mengunduh peta dan membuat rute yang lebih optimal yang meliputi lebih dari satu peta?</string>
@@ -359,13 +359,13 @@
    <!-- The message when user did not find anything in the search. -->
    <string name="search_not_found_query">Unduh wilayah tempat Anda mencari atau coba tambahkan nama kota/desa terdekat.</string>
    <string name="search_history_title">Riwayat Pencarian</string>
-    <string name="search_history_text">Akses kueri pencarian terbaru dengan cepat.</string>
+    <string name="search_history_text">Lihat pencarian terakhir</string>
    <string name="clear_search">Bersihkan riwayat pencarian</string>
    <string name="p2p_your_location">Lokasi Anda</string>
    <string name="p2p_start">Mulai</string>
    <string name="p2p_from_here">Dari</string>
    <string name="p2p_to_here">Rute ke</string>
-    <string name="p2p_only_from_current">Navigasi tersedia hanya dari lokasi Anda saat ini.</string>
+    <string name="p2p_only_from_current">Navigasi hanya tersedia dari lokasi Anda saat ini</string>
    <string name="p2p_reroute_from_current">Apakah Anda ingin kami merencanakan sebuah rute dari lokasi Anda saat ini?</string>
    <!-- Edit open hours/set time and minutes dialog -->
    <string name="next_button">Berikut</string>
@@ -409,7 +409,7 @@
    <string name="not_signed_in">Belum masuk</string>
    <string name="login_osm">Masuk ke OpenStreetMap</string>
    <string name="logout">Keluar</string>
-    <string name="edit_place">Sunting tempat</string>
+    <string name="edit_place">Sunting Tempat</string>
    <string name="add_language">Tambahkan bahasa</string>
    <string name="street">Jalan</string>
    <!-- Editable House Number text field (in address block). -->
@@ -429,7 +429,7 @@
    <string name="downloader_update_maps">Perbarui peta</string>
    <string name="downloader_mwm_migration_dialog">Untuk membuat rute, Anda perlu memperbarui semua peta dan kemudian merencanakan rute tersebut lagi.</string>
    <string name="downloader_search_field_hint">Temukan peta</string>
-    <string name="common_check_internet_connection_dialog">Harap memeriksa pengaturan Anda dan pastikan perangkat Anda terhubung dengan internet.</string>
+    <string name="common_check_internet_connection_dialog">Pastikan perangkat Anda terhubung dengan internet</string>
    <string name="downloader_no_space_title">Tidak cukup ruang</string>
    <string name="downloader_no_space_message">Harap menghapus data yang tidak diperlukan</string>
    <string name="editor_login_error_dialog">Kesalahan masuk.</string>
@@ -493,7 +493,7 @@
    <string name="error_enter_correct_phone">Masukkan nomor telepon yang benar</string>
    <string name="error_enter_correct_web">Masukkan alamat web valid</string>
    <string name="error_enter_correct_email">Masukkan surel valid</string>
-    <string name="placepage_add_place_button">Menambahkan tempat ke OpenStreetMap</string>
+    <string name="placepage_add_place_button">Tambahkan tempat ke OpenStreetMap</string>
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Apakah Anda ingin mengirimkannya ke semua pengguna?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
@@ -754,7 +754,7 @@
    <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
    <string name="power_save_dialog_summary">Untuk navigasi yang paling akurat, kami sarankan untuk menonaktifkan mode hemat daya dalam pengaturan baterai ponsel.</string>
    <!-- Prompt to start recording a track. -->
-    <string name="start_track_recording">Merekam jalur</string>
+    <string name="start_track_recording">Rekam Jalur</string>
    <!-- Prompt for stopping a track recording. -->
    <string name="stop_track_recording">Hentikan perekaman jalur</string>
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
@@ -779,4 +779,5 @@
    <string name="panoramax">Gambar Panoramax</string>
    <string name="app_site_url">https://comaps.app/id/</string>
    <string name="saved">Disimpan</string>
+    <string name="offline_explanation_text">Peta perlu diunduh untuk melihat dan menavigasi area ini.\nUnduh peta untuk wilayah yang ingin Anda jelajahi.</string>
 </resources>
--- a/android/app/src/main/res/values-kw/strings.xml
+++ b/android/app/src/main/res/values-kw/strings.xml
@@ -23,8 +23,8 @@
    <string name="update_country_ask">Nowedhi %1$s? (%2$s)</string>
    <string name="pause">Powes</string>
    <string name="continue_button">Pesyewgh</string>
-    <string name="bookmarks">Lyververkys</string>
-    <string name="bookmarks_and_tracks">Lyververkys ha Lerghow</string>
+    <string name="bookmarks">Leow</string>
+    <string name="bookmarks_and_tracks">Drudhow</string>
    <string name="name">Hanow</string>
    <string name="address">Trigva</string>
    <string name="list">Rol</string>
@@ -61,7 +61,7 @@
    <string name="tracks_title">Lerghow</string>
    <string name="length">Hys</string>
    <string name="share_my_location">Kevrennewgh Ow Tyller</string>
-    <string name="prefs_group_general">Settyansow mayni</string>
+    <string name="prefs_group_general">Settyansow ollgemmyn</string>
    <string name="prefs_group_information">Kedhlow</string>
    <string name="prefs_group_route">Navygacyon</string>
    <string name="pref_zoom_summary">Displetya war an mappa</string>
@@ -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>
@@ -118,7 +118,7 @@
    <string name="dialog_routing_location_turn_on">Gallosegi servisyow GPS</string>
    <string name="dialog_routing_change_end">Desedha destnans</string>
    <string name="dialog_routing_system_error">Error gans an kevreyth</string>
-    <string name="dialog_routing_try_again">Assayewgh arta mar pleg</string>
+    <string name="dialog_routing_try_again">Assaya arta mar pleg</string>
    <string name="not_now">Na Vynnav Lemmyn</string>
    <string name="search_select_map">Dewis Mappa</string>
    <string name="show">Showya</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>
@@ -186,7 +186,7 @@
    <string name="error_enter_correct_zip_code">Ynworra unn kod post ewn</string>
    <string name="editor_other_info">Noten dhe bodhogyon OpenStreetMap (dre dhewis)</string>
    <string name="editor_more_about_osm">Moy a-dro OpenStreetMap</string>
-    <string name="editor_osm_history">Agas istori golegi</string>
+    <string name="editor_osm_history">Agas istori golegyans</string>
    <string name="editor_osm_notes">Agas notennow mappow</string>
    <string name="editor_operator">Oberador</string>
    <string name="operator">Oberador: %s</string>
@@ -195,14 +195,14 @@
    <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 Le Sawys</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>
-    <string name="delete_place_empty_comment_error">Provia an acheson rag dilea an le mar pleg</string>
+    <string name="delete_place_empty_comment_error">Provia an acheson rag ow dilea an le mar pleg</string>
    <string name="editor_business_vacant_button">Negys usi gwag</string>
    <string name="editor_mark_business_vacant_title">Sin negys dell gwag</string>
    <string name="editor_submit">Danvon</string>
@@ -223,7 +223,7 @@
    <string name="osm_note_toast">Noten a vydh danvon dhe OpenStreetMap</string>
    <string name="editor_share_to_all_dialog_title">A vynn\'ta mos danvon dhe oll usyoryon?</string>
    <string name="navigation_stop_button">Hedhi</string>
-    <string name="track_recording">Y\'n eur ma rekordya an lergh</string>
+    <string name="track_recording">Ow rekordya an lergh</string>
    <string name="accept">Amyttya</string>
    <string name="decline">Nagha</string>
    <string name="mobile_data_option_today">Unn Hedhyw</string>
@@ -234,11 +234,11 @@
    <string name="placepage_remove_stop">Dilea Powes</string>
    <string name="placepage_add_stop">Addya Powes</string>
    <string name="error_enter_correct_name">Ynworra unn hanow ewn mar pleg</string>
-    <string name="bookmark_lists">Rolyow</string>
+    <string name="bookmark_lists">Rolyow Drudhow</string>
    <string name="bookmark_lists_hide_all">Keles oll</string>
    <string name="bookmark_lists_show_all">Diskwedhes oll</string>
    <string name="bookmarks_create_new_group">Gul unn rol nowydh</string>
-    <string name="bookmarks_import">Ynperthi Lyververkys ha Lerghow</string>
+    <string name="bookmarks_import">Ynperthi Drudhow</string>
    <string name="bookmarks_error_message_empty_list_name">Ynworra an hanow rol mar pleg</string>
    <string name="bookmarks_new_list_hint">Rol nowydh</string>
    <string name="bookmarks_error_title_list_name_already_taken">An hanow ma usi seulabrys yn usyans</string>
@@ -261,7 +261,7 @@
    <string name="delete_list">Dilea rol</string>
    <string name="speedcams_alert_title">Kameras finweth tooth</string>
    <string name="place_description_title">Deskrifans Le</string>
-    <string name="pref_tts_speedcams_auto">Gwarnya a tothya</string>
+    <string name="pref_tts_speedcams_auto">Gwarnya a ow tothya</string>
    <string name="define_to_avoid_btn">Styrya fordhow rag avodya</string>
    <string name="toll_road">Tollfordh</string>
    <string name="unpaved_road">Fordh dor</string>
@@ -275,7 +275,7 @@
    <string name="trip_finished">Hwi re wrug!</string>
    <string name="ok">Da lowr</string>
    <string name="sort">Sortya…</string>
-    <string name="sort_bookmarks">Sortya lyververkys</string>
+    <string name="sort_bookmarks">Sortya drudhow</string>
    <string name="by_default">Dre defowt</string>
    <string name="by_type">Dre eghen</string>
    <string name="by_distance">Dre pellder</string>
@@ -311,23 +311,23 @@
    <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>
    <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
    <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
    <string name="comma_separated_pair">%1$s, %2$s</string>
-    <string name="app_tip_00">Meur ras rag usya a\'gan mappys drehevys gans an kemeneth!</string>
+    <string name="app_tip_00">Meur ras rag ow devnydhya 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>
    <string name="browser_not_available">Peurell nakavadow</string>
    <string name="volume">Ughelder</string>
-    <string name="bookmarks_export">Esperthi oll Lyververkys ha Lerghow</string>
+    <string name="bookmarks_export">Esperthi oll Leow ha Lerghow</string>
    <string name="clear_the_search">Dilea an hwithrans</string>
    <string name="zoom_in">Moghhe</string>
    <string name="zoom_out">Lehe</string>
@@ -348,7 +348,7 @@
    <string name="pedestrian">Kerdher</string>
    <string name="bicycle">Diwros</string>
    <string name="ruler">Rewlell</string>
-    <string name="bookmark_color">Kolor lyververk</string>
+    <string name="bookmark_color">Kolor rag Drudh</string>
    <string name="about_help">A-dro ha Gweres</string>
    <string name="share_track">Kevren Lergh</string>
    <string name="delete_track_dialog_title">Dilea %s?</string>
@@ -375,4 +375,300 @@
    <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">Owth 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 ow 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">Owth 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</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 ow 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">Ow Drudhow CoMaps</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 ow travalya gans CoMaps!</string>
+    <string name="load_kmz_successful">Drudhow kargys yn sewen! Ty gallos kavos y\'s war an mappa po yn an skrin Dyghtyer Drudhow.</string>
+    <string name="load_kmz_failed">Y fyllis an karga drudhow. 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 ow 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">Owth Iskarga:</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 ow 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. Ow 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 ow hwilas hag ow 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 ow hwilas po assaya owth 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">Ow Golegi</string>
+    <string name="editor_add_place_title">Owth 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">Ow 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 hag owth 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 leow sawys</item>
+        <item quantity="one">%d le sawys</item>
+        <item quantity="two">%d leow sawys</item>
+        <item quantity="few">%d leow sawys</item>
+        <item quantity="many">%d leow sawys</item>
+        <item quantity="other">%d leow sawys</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 ow 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 sawya unn le, 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">Ow bywhe linen kettresow res owth iskarga 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">Owth Iskarga</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 ow 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 ow devnydhya lemmyn CoMaps war an skrin kellgowser</string>
+    <string name="car_used_on_the_car_screen">Hwi ow 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 owth 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 Drudhow?</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">Backupya drudhow</string>
+    <string name="pref_backup_summary">Backupya yn awtomatek yn unn restrenva war gas devis</string>
+    <string name="pref_backup_now_title">Gul y lemmyn</string>
+    <string name="pref_backup_now_summary">Gul unn backup 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">Leow ha lerghow vyth rag backupya</string>
+    <string name="pref_backup_now_summary_failed">Y fyllis gul unn backup</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 backupys dhe gwitha</string>
+    <string name="pref_backup_interval_title">Backupya 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">"Ow 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 ow dalleth gans http:// po https://</string>
+    <string name="pref_maplanguage_local">Yeth Leel</string>
 </resources>
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -66,9 +66,9 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Naujo sąrašo pridėjimas</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Žymių sąrašo pavadinimas</string>
+    <string name="bookmark_set_name">Sąrašo pavadinimas</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Žymės</string>
+    <string name="bookmarks">Vietos</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Pavadinimas</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -488,7 +488,7 @@
    <string name="minute">min</string>
    <string name="day">d</string>
    <string name="placepage_more_button">Išsamiau</string>
-    <string name="placepage_edit_bookmark_button">Taisyti žymę</string>
+    <string name="placepage_edit_bookmark_button">Taisyti Įsimintą vietą</string>
    <string name="placepage_personal_notes_hint">Asmeninės pastabos (tekstas arba HTML)</string>
    <string name="editor_reset_edits_message">Anuliuoti visus vietinius pakeitimus?</string>
    <string name="editor_reset_edits_button">Atsisakyti pakeitimų</string>
@@ -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>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yannik Bloscheck	bdc3e87813	Adding general support for subtypes (and switching charging stations to using it) Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-10 18:29:29 +01:00
Codeberg Translate	6749856dd2	[strings] Update from Codeberg Translate Co-authored-by: Anonymous <anonymous@noreply.codeberg.org> Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Edgarsons <edgarsons@noreply.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: JanezPavelZebovec <janezpavelzebovec@noreply.codeberg.org> Co-authored-by: NikoM <nikom@noreply.codeberg.org> Co-authored-by: Outbreak2096 <outbreak2096@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org> Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Co-authored-by: ZeljkoBG <zeljkobg@noreply.codeberg.org> Co-authored-by: astro-ray <astro-ray@noreply.codeberg.org> Co-authored-by: cirilla <cirilla@noreply.codeberg.org> Co-authored-by: eatham <eatham@noreply.codeberg.org> Co-authored-by: ggs <ggs@noreply.codeberg.org> Co-authored-by: hectodium <hectodium@noreply.codeberg.org> Co-authored-by: matt_ch <matt_ch@noreply.codeberg.org> Co-authored-by: mcliquid <mcliquid@noreply.codeberg.org> Co-authored-by: mnalis <mnalis@noreply.codeberg.org> Co-authored-by: ovl-005 <ovl-005@noreply.codeberg.org> Co-authored-by: patepelo <patepelo@noreply.codeberg.org> Co-authored-by: phama <phama@noreply.codeberg.org> Co-authored-by: rimas <rimas@noreply.codeberg.org> Co-authored-by: teletext <teletext@noreply.codeberg.org> Co-authored-by: wirabdillah <wirabdillah@noreply.codeberg.org> Co-authored-by: x7z4w <x7z4w@noreply.codeberg.org> Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ Translate-URL: https://translate.codeberg.org/projects/comaps/search-synonyms-aliases/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Android UI Strings (SDK) Translation: CoMaps/Apple AppStore description Translation: CoMaps/Countries and regions names Translation: CoMaps/F-Droid app description Translation: CoMaps/Google Play and Huawei AppGallery descriptions Translation: CoMaps/Search synonyms / aliases Translation: CoMaps/Voice announcements for navigation (TTS) Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS UI Strings	2026-01-10 14:18:30 +00:00
map-per	9e21fdd5f2	[editor] Add public_transport=platform and bus=yes to bus_stop Signed-off-by: map-per <map-per@gmx.de>	2026-01-10 15:18:23 +01:00
Jean-Baptiste	32c27fb4c9	[android] Fix reset on timetable field Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-10 14:55:09 +01:00
Jean-Baptiste	cb4472c325	[android] Remove method to start facebook app Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-10 13:36:53 +01:00
Yannik Bloscheck	d432ead844	[styles] Fix label color for minigolf courses Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-10 11:46:24 +01:00
x7z4w	c1137bd38a	[android] Fix Serbian locale Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-09 20:12:57 +00:00
Yannik Bloscheck	53e1361276	[styles] Keep using shorter type for simple charging stations Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-09 18:22:22 +01:00
Yannik Bloscheck	f2a0b4470f	[styles] Optimize displaying of charging stations, handle implicit motorcars tagging and add motorcycles Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-09 18:22:22 +01:00
Jean-Baptiste	111fd10af9	[android] Apply new dark background on bottomsheet and map buttons Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-09 18:15:03 +01:00
Jean-Baptiste	52edb5da6d	[android] Enable more languages on Android Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-09 17:28:16 +01:00
matheusgomesms	70215404c3	[iOS] Improve confirmed existence format Signed-off-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>	2026-01-09 17:21:00 +01:00
Chris H. Meyer	49b0ec164d	[types] Swap abandoned and disused bridge/tunnel Drop abandoned bridge and tunnel in favor of disused ones. Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-09 17:07:15 +01:00
Lukas H.	018259bb0f	[styles] swap rendering of railway=abandoned and railway=disused Signed-off-by: Lukas H. <lukas@ideallygrey.uk> Co-authored-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-09 17:07:15 +01:00
Jean-Baptiste	b7733786df	[android] Remove useless property apply in main TextView style Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-09 13:56:15 +01:00
Henry Sternberg	245646c45d	[routing] parking_aisle fixes v2 Signed-off-by: Henry Sternberg <henry@bluelightmaps.com>	2026-01-09 12:23:33 +00:00
Jean-Baptiste	6799f17c1b	[android] Rework text style applied on title in app bar Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-09 11:44:18 +01:00
Henry Sternberg	e3abbc712b	[routing] Fix crash on 32-bit devices with conditional access The deserialization of conditional road access data was using size_t which is 8 bytes on 64-bit (where maps are generated) but only 4 bytes on 32-bit devices. This caused stream misalignment and eventual std::length_error when garbage data was interpreted as a huge vector size. Fix by using uint64_t to always read 8 bytes, matching what 64-bit build servers write. Signed-off-by: Henry Sternberg <henry@bluelightmaps.com>	2026-01-09 11:15:38 +01:00
Bastian Greshake Tzovaras	0da7869c5b	[translation] manually add lt strings Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com> Co-authored-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com> Co-committed-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>	2026-01-09 09:13:48 +01:00
Yannik Bloscheck	2e3a76fc94	[ios] Increasing base version number to new year Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-09 09:12:31 +01:00
Dobri Dabar	85d4226eda	[android] Add map Local Language Signed-off-by: Dobri Dabar <dobridabar@noreply.codeberg.org>	2026-01-09 08:41:22 +01:00
Henry Sternberg	3f9dfd6605	[routing] fix/parking-aisle for pedestrian/cycle routing Signed-off-by: Henry Sternberg <henry@bluelightmaps.com> Co-authored-by: Henry Sternberg <henry@bluelightmaps.com> Co-committed-by: Henry Sternberg <henry@bluelightmaps.com>	2026-01-08 21:41:50 +01:00
Jean-Baptiste	fdf698281a	[android] Fix tracks description not showed on the place page Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-08 18:40:19 +01:00
x7z4w	fd57e71ac4	fix Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-08 18:24:08 +01:00
thesupertechie	d86049f6d8	[ui][ux] change bookmarks and tracks to favourites Signed-off-by: thesupertechie <thesupertechie1@gmail.com>	2026-01-08 18:24:08 +01:00
vikiawv	32bba5bc5e	Added T-Road to italy Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>	2026-01-08 18:21:08 +01:00
vikiawv	3068a468a3	Fixed italy again Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>	2026-01-08 18:21:08 +01:00
vikiawv	267378aa23	Fixed two cases for italy Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>	2026-01-08 18:21:08 +01:00
Yannik Bloscheck	0a525b7483	Stop interference with county roads in Bavaria Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-08 18:21:08 +01:00
vikiawv	ea4b39ea47	Readding part that hides roadshield letter for some classification types Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>	2026-01-08 18:21:08 +01:00
vikiawv	67f27482b8	Found mistake in Germany/Austria implementation Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>	2026-01-08 18:21:08 +01:00
vikiawv	b231f2de6e	manually corrected formatting of germany and austria part Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>	2026-01-08 18:21:08 +01:00
vikiawv	2609dd5588	Update libs/indexer/road_shields_parser.cpp Corrected albania	2026-01-08 18:21:08 +01:00
vikiawv	08a87c1962	Reverted Austria and Germany to Simpleroadshieldparser and corrected minor things Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>	2026-01-08 18:21:08 +01:00
Chris H. Meyer	09b07c2631	[styles] Add railway=turntable Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-08 18:20:39 +01:00
matheusgomesms	42f5590210	[iOS] Fix display of long addresses in Place Page Signed-off-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>	2026-01-08 18:19:40 +01:00
matheusgomesms	f7d2e43f09	[iOS] Remove decimals in current speed Signed-off-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>	2026-01-08 18:19:30 +01:00
Chris H. Meyer	7617f85442	[editor] enable tactile maps Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-08 18:18:48 +01:00
Viktor Govako	ffcb694961	[routing] Enable access conditional. Signed-off-by: Viktor Govako <viktor.govako@gmail.com> (cherry picked from commit 6a2f2662b334345dc8789e970f358cec3ed69c85)	2026-01-08 14:59:02 +01:00
Henry Sternberg	3352fc13c1	Revert "[routing] Support conditional routing" This reverts commit `718d0f726b`.	2026-01-08 14:59:02 +01:00
Konstantin Pastbin	268d8936ca	January R1 release notes Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2026-01-08 20:53:02 +07:00
Konstantin Pastbin	a679198c09	[planet] Update map data to 260106 Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2026-01-08 14:05:53 +01:00
x7z4w	6f3ac44e9a	Add Lithuanian Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-08 12:57:14 +01:00
Jean-Baptiste	907c5cf39e	[android] Migrate progress dialog theme to Material 3 Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-08 12:54:22 +01:00
x7z4w	b8e5a70cf7	Deleted translation using Weblate (Lithuanian)	2026-01-08 11:50:09 +00:00
Codeberg Translate	464033a491	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: JanezPavelZebovec <janezpavelzebovec@noreply.codeberg.org> Co-authored-by: Linus_W_Frische <linus_w_frische@noreply.codeberg.org> Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me> Co-authored-by: NikoM <nikom@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Co-authored-by: ZeljkoBG <zeljkobg@noreply.codeberg.org> Co-authored-by: arnyminerz <arnyminerz@noreply.codeberg.org> Co-authored-by: astro-ray <astro-ray@noreply.codeberg.org> Co-authored-by: cirilla <cirilla@noreply.codeberg.org> Co-authored-by: codebergian42 <codebergian42@noreply.codeberg.org> Co-authored-by: eatham <eatham@noreply.codeberg.org> Co-authored-by: ghose <ghose@noreply.codeberg.org> Co-authored-by: liilliil <liilliil@noreply.codeberg.org> Co-authored-by: matheusgomesms <matheusgomesms@noreply.codeberg.org> Co-authored-by: patepelo <patepelo@noreply.codeberg.org> Co-authored-by: rimas <rimas@noreply.codeberg.org> Co-authored-by: teletext <teletext@noreply.codeberg.org> Co-authored-by: x7z4w <x7z4w@noreply.codeberg.org> Co-authored-by: zhuk2 <zhuk2@noreply.codeberg.org> Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Android UI Strings (SDK) Translation: CoMaps/Countries and regions names Translation: CoMaps/F-Droid app description Translation: CoMaps/Search synonyms / aliases Translation: CoMaps/Voice announcements for navigation (TTS) Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS Plist Translation: CoMaps/iOS Plurals Translation: CoMaps/iOS UI Strings	2026-01-08 11:33:48 +00:00
Yannik Bloscheck	832f9bdd11	[drape] Fix highway road parser private field warning Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-08 12:33:43 +01:00
Jean-Baptiste	7d56fc6ba6	[android] Force Cornish language to be used in the app Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-08 11:02:05 +07:00
x7z4w	153e75175d	[drape] Adjust double- and long-tap delays Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-07 18:32:54 +01:00
Chris H. Meyer	4899a12d33	[styles] Add recycling centre to vehicle style Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-07 17:59:46 +01:00
Yannik Bloscheck	4a64bf05be	[ios] Add missing speedcamera icon version Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-07 12:28:51 +01:00
Dobri Dabar	381c1e3979	[desktop] Added Local Language option Signed-off-by: Dobri Dabar <dobridabar@noreply.codeberg.org>	2026-01-07 12:12:32 +01:00
Chris H. Meyer	aa9ee3cbbf	[styles] Add tactile maps Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-07 11:02:50 +01:00
matheusgomesms	20d9185c79	Removing maxspeed estimate from generator Signed-off-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>	2026-01-06 14:54:00 +01:00
Chris H. Meyer	90c18f4983	[types] Add miniature railway Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-06 14:47:40 +01:00
Viktor Govako	fe5d4f5286	[classifier] Added railway=miniature. Signed-off-by: Viktor Govako <viktor.govako@gmail.com> Co-authored-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-06 14:47:40 +01:00
Yannik Bloscheck	13d7def519	[ios] Fix file path Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-06 00:31:44 +01:00
Chris H. Meyer	93b35454eb	[styles] Fix missing comma Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-05 18:26:16 +01:00
Chris H. Meyer	de1c0a061d	[styles] Set text color of fortress and other castles Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-05 18:24:48 +01:00
gedankenstuecke	18ce55afa3	incorp review feedback	2026-01-05 13:27:42 +01:00
gedankenstuecke	43ffd199a4	[docs] Update CB teams description Keeps the docs up to date on the currently existing teams Signed-off-by: gedankenstuecke <gedankenstuecke@noreply.codeberg.org>	2026-01-05 13:23:29 +01:00
thesupertechie	3e75e5e802	[core] Add Tamil TTS support This PR adds TTS voice instruction support for the Tamil language. Co-authored-by: thesupertechie <thesupertechie1@gmail.com> Co-committed-by: thesupertechie <thesupertechie1@gmail.com>	2026-01-05 10:42:53 +01:00
Jean-Baptiste	fc96d17ed7	[android] Remove background apply on item phone view Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-04 19:33:18 +01:00
Jean-Baptiste	e869fe1da1	[android] Fix custom dialog styles Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-04 19:32:11 +01:00
matheusgomesms	f38953458d	[ios] Fix project.pbxproj Signed-off-by: matheusgomesms <matheusgomesms@noreply.codeberg.org> Co-authored-by: matheusgomesms <matheusgomesms@noreply.codeberg.org> Co-committed-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>	2026-01-04 19:31:56 +01:00
Jean-Baptiste	5e8d2e1a59	[android] Use Material Cardview foreach item phone Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-03 22:53:00 +01:00
Jean-Baptiste	07e42c0626	[android] Add comment about issues with Material library Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-03 22:43:15 +01:00
Jean-Baptiste	14e45aa6db	[android] Use Material 3 alert dialogs Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-03 22:34:15 +01:00
Jean-Baptiste	8bd7f9d59a	[android] Use M3 dark background in the app Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-03 22:32:51 +01:00
Radek Olsak	ead092af79	[desktop] Added Void dependencies Signed-off-by: Radek Olsak <radek@olsak.net>	2026-01-03 22:25:36 +01:00
Chris H. Meyer	c3f5986f12	[styles] render man_made=wastewater_plant like landuse=industrial Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-03 22:24:11 +01:00
Jean-Baptiste	143e0562e6	[android] Remove stroke border on cardview in navigation view Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-03 22:22:09 +01:00
Konstantin Pastbin	89cfc6f8e6	[search] Enable Lithuanian for search categories/synonyms Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2026-01-03 21:13:45 +01:00
Jean-Baptiste	4788956720	[android] Simplify some views to improve performance Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-03 20:50:11 +01:00
				`@@ -0,0 +1 @@`
				`Easy map navigation - Discover more of your journey - Powered by the community`
				`@@ -0,0 +1 @@`
				`CoMaps - Hike, Bike, Drive Offline with Privacy`
				`@@ -0,0 +1 @@`
				`Navigacyon mappa es - Trovya moy a dha kerdh - Selys war an kemeneth`
				`@@ -0,0 +1 @@`
				`Jednostavna navigacija - Saznajte više o svom putovanju - Održava zajednica`
				`@@ -0,0 +1 @@`
				`CoMaps - pešačenje, bicikl, vožnja sa privatnošću`