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

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>

.forgejo/workflows/android-check.yaml

@@ -38,26 +38,7 @@ jobs:
   lint:
     name: Android Lint
     runs-on: ubuntu-latest
-    container:
-      image: codeberg.org/comaps/docker-android-sdk:latest
-      options: --user root
     steps:
-      - name: Install build dependencies
-        shell: bash
-        run: |
-          apt-get update -y
-          apt-get install -y \
-            git \
-            python3-pip \
-            openjdk-21-jdk
-          pip install "protobuf<3.21" --break-system-packages
-
-      - name: Install Android SDK components
-        shell: bash
-        run: |
-          yes | sdkmanager --licenses || true
-          sdkmanager "platforms;android-36" "build-tools;36.0.0" "ndk;28.2.13676358"
-
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
@@ -75,9 +56,6 @@ jobs:
   android-check:
     name: Build Android Debug
     runs-on: ubuntu-latest
-    container:
-      image: codeberg.org/comaps/docker-android-sdk:latest
-      options: --user root
     strategy:
       fail-fast: false
       matrix:
@@ -96,31 +74,8 @@ jobs:
       - name: Install build tools and dependencies
         shell: bash
         run: |
-          apt-get update -y
-          apt-get install -y \
-            ninja-build \
-            qt6-base-dev \
-            qt6-declarative-dev \
-            qt6-positioning-dev \
-            libqt6svg6-dev \
-            optipng \
-            libfreetype-dev \
-            libharfbuzz-dev \
-            libxrandr-dev \
-            libxinerama-dev \
-            libxcursor-dev \
-            libxi-dev \
-            python3-pip \
-            zlib1g-dev \
-            git \
-            ccache
-          pip install "protobuf<3.21" --break-system-packages
-
-      - name: Install Android SDK components
-        shell: bash
-        run: |
-          yes | sdkmanager --licenses || true
-          sdkmanager "platforms;android-36" "build-tools;36.0.0" "ndk;28.2.13676358"
+          sudo apt-get update -y
+          sudo apt-get install -y ninja-build
 
       - name: Checkout sources
         uses: actions/checkout@v4

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",

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

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

android/app/src/fdroid/play/listings/en-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!

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

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

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

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

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

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

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

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

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

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

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

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

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

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

android/app/src/fdroid/play/listings/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!

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

android/app/src/fdroid/play/listings/kw/title.txt

@@ -0,0 +1 @@
+CoMaps - Viajya gans Privetter

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

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

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

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

android/app/src/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!

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

android/app/src/fdroid/play/listings/sr-Latn/title.txt

@@ -0,0 +1 @@
+CoMaps - pešačenje, bicikl, vožnja sa privatnošću

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!

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

@@ -132,7 +132,6 @@ import app.organicmaps.widget.placepage.PlacePageViewModel;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -712,7 +711,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (!TextUtils.isEmpty(appName))
     {
       setTitle(appName);
-      ((MaterialTextView) mPointChooser.findViewById(R.id.title)).setText(appName);
     }
   }
 

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)

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);
   }
 

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

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

android/app/src/main/java/app/organicmaps/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()

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))

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()
       {

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

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

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

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

android/app/src/main/res/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>

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

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

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

android/app/src/main/res/layout/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>

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"

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

@@ -15,15 +15,8 @@
     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/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>

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

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

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

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

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

@@ -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>

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>

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

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

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

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

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

@@ -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>

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>

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

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

android/app/src/main/res/values-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>

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>

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>

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>

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

@@ -66,11 +66,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Pievienot jaunu sarakstu</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Grāmatzīmju saraksta nosaukums</string>
+    <string name="bookmark_set_name">Saraksta nosaukums</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Grāmatzīmes</string>
+    <string name="bookmarks">Vietas</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Grāmatzīmes un ceļi</string>
+    <string name="bookmarks_and_tracks">Izlase</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nosaukums</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -146,16 +146,16 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Piezīmes</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Ar jums kopīgoja „Oranic Maps“ grāmatzīmes</string>
-    <string name="share_bookmarks_email_body">Sveiki! \n \nPielikumā ir grāmatzīmes. Lūdzu, atveriet tās „CoMaps“ lietotnē. Ja Jums tā nav instalēta, instalējiet to te: https://www.comaps.app/download/ \n \nBaudiet ceļošanu ar „Oranic Maps“!</string>
+    <string name="share_bookmarks_email_subject">Mana “CoMaps” izlase</string>
+    <string name="share_bookmarks_email_body">Sveiciens! \n \nPielikumā ir mana izlase. Lūgums atvērt to lietotnē “CoMaps”. Ja tā nav uzstādīta, to var iegūt šeit: https://www.comaps.app/download/ \n \nIzbaudi ceļošanu ar “CoMaps”!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Ielādē grāmatzīmes</string>
+    <string name="load_kmz_title">Ielādē izlasi</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Grāmatzīmes ir ielādētas! Tās varat atrast kartē un grāmatzīmju pārvaldīšanas ekrānā.</string>
+    <string name="load_kmz_successful">Izlase sekmīgi ielādēta. To var atrast kartē vai izlases pārvaldīšanas skatā.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Grāmatzīmes ielādēt neizdevās. Iespējams, datne ir bojāta.</string>
+    <string name="load_kmz_failed">Neizdevās ielādēt izlasi. Datne var būt bojāta.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
-    <string name="unknown_file_type">Lietotne neatpazīst datnes tipu: \n%1$s</string>
+    <string name="unknown_file_type">Lietotne neatpazīst datnes veidu: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Neizdevās atvērt datni %1$s \n \n%2$s</string>
     <!-- resource for context menu -->
@@ -496,9 +496,9 @@
     <string name="minute">min.</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Vairāk</string>
-    <string name="placepage_edit_bookmark_button">Rediģēt grāmatzīmi</string>
-    <string name="placepage_personal_notes_hint">Personīgi pieraksti (teksts vai HTML)</string>
-    <string name="editor_reset_edits_message">Vai izmest visas lokāli saglabātās izmaiņas?</string>
+    <string name="placepage_edit_bookmark_button">Labot saglabāto vietu</string>
+    <string name="placepage_personal_notes_hint">Personīgas piezīmes (teksts vai HTML)</string>
+    <string name="editor_reset_edits_message">Vai atmest visas vietējās izmaiņas?</string>
     <string name="editor_reset_edits_button">Atmest izmaiņas</string>
     <string name="editor_remove_place_message">Vai dzēst pievienoto vietu?</string>
     <string name="editor_remove_place_button">Dzēst</string>
@@ -561,19 +561,19 @@
     <string name="dialog_error_storage_message">Ārējā krātuve nav pieejama. Iespējams, ir izņemta vai bojāta SD karte, vai arī datņu sistēma ir tikai lasāma. Pārbaudiet savu SD karti vai sazinieties ar mums, rakstot uz support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simulēt bojātu krātuvi</string>
     <string name="error_enter_correct_name">Ierakstiet pareizu nosaukumu</string>
-    <string name="bookmark_lists">Saraksti</string>
+    <string name="bookmark_lists">Izlases saraksti</string>
     <!-- Do not display all bookmark lists on the map -->
-    <string name="bookmark_lists_hide_all">Slēpt visus</string>
+    <string name="bookmark_lists_hide_all">Paslēpt visus</string>
     <string name="bookmark_lists_show_all">Rādīt visus</string>
     <plurals name="bookmarks_places">
-        <item quantity="zero">%d grāmatzīmju</item>
-        <item quantity="one">%d grāmatzīme</item>
-        <item quantity="other">%d grāmatzīmes</item>
+        <item quantity="zero">%d saglabātu vietu</item>
+        <item quantity="one">%d saglabāta vieta</item>
+        <item quantity="other">%d saglabātas vietas</item>
     </plurals>
     <string name="bookmarks_create_new_group">Izveidot jaunu sarakstu</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importēt grāmatzīmes un ceļus</string>
-    <string name="bookmarks_error_message_share_general">Programmas kļūdas dēļ kopīgošana neizdevās</string>
+    <string name="bookmarks_import">Ievietot izlasi</string>
+    <string name="bookmarks_error_message_share_general">Nav iespējams kopīgot lietotnes kļūdas dēļ</string>
     <string name="bookmarks_error_title_share_empty">Kopīgošanas kļūda</string>
     <string name="bookmarks_error_message_share_empty">Nav iespējams kopīgot tukšu sarakstu</string>
     <string name="bookmarks_error_title_empty_list_name">Nosaukums nevar būt tukšs</string>
@@ -603,7 +603,7 @@
     <string name="subway">Metro</string>
     <string name="layers_title">Kartes stili un slāņi</string>
     <string name="bookmarks_empty_list_title">Saraksts ir tukšs</string>
-    <string name="bookmarks_empty_list_message">Lai pievienotu grāmatzīmi, sākumā spiediet uz vietas kartē, bet tad uz zvaigznītes ikonas</string>
+    <string name="bookmarks_empty_list_message">Lai saglabātu vietu, jāpiesit vietai kartē un tad zvaigznes ikonai</string>
     <string name="category_desc_more">…vairāk</string>
     <string name="export_file">Izgūt KMZ formātā</string>
     <string name="export_file_gpx">Izgūt GPX formātā</string>
@@ -656,7 +656,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Kārtot…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Kārtot grāmatzīmes</string>
+    <string name="sort_bookmarks">Kārtot izlasi</string>
     <!-- Android -->
     <string name="by_default">Pēc noklusējuma</string>
     <!-- Android -->
@@ -723,7 +723,7 @@
     <!-- Description in preferences -->
     <string name="enable_show_on_lock_screen_description">Ja ieslēgts, lietotne darbosies pat tad, ja ierīce būs nobloķēta.</string>
     <!-- OpenStreetMap text on splash screen -->
-    <string name="splash_subtitle">Kartes datu avots ir „OpenStreetMap“</string>
+    <string name="splash_subtitle">Kartes dati ir no “OpenStreetMap”</string>
     <!-- App Tip #00 -->
     <string name="app_tip_00">Paldies, ka izmantojat mūsu kopienas veidotās kartes!</string>
     <!-- App tip #01 -->
@@ -760,12 +760,12 @@
     <string name="browser_not_available">Tīmekļa pārlūkprogramma nav pieejama</string>
     <string name="volume">Skaļums</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Izgūt visus ceļus un grāmatzīmes</string>
+    <string name="bookmarks_export">Izgūt visas vietas un ceļus</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
-    <string name="pref_tts_open_system_settings">Runas sintēzes sistēmas iestatījumi</string>
+    <string name="pref_tts_open_system_settings">Runas atveidošanas sistēmas iestatījumi</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
-    <string name="pref_tts_no_system_tts">Lietotnes neatrada runas sintēzes iestatījumus. Vai ierīce tos atbalsta?</string>
-    <string name="drive_through">Caurbrauktuve caur</string>
+    <string name="pref_tts_no_system_tts">Runas atveidošanas iestatījumi netika atrasti. Vai ierīce tos atbalsta?</string>
+    <string name="drive_through">Caurbrauktuve</string>
     <string name="clear_the_search">Notīrīt meklēšanu</string>
     <string name="zoom_in">Tuvināt</string>
     <!-- Accessibility text for the zoom-out button on the map -->
@@ -783,7 +783,7 @@
     <string name="outdoor_seating">Ārtelpu sēdvietas</string>
     <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
     <string name="power_save_dialog_summary">Lai navigācija būtu pēc iespējas precīzāka, iesakām tālruņa baterijas iesatatījumos izslēgt energotaupības režīmu.</string>
-    <string name="choose_color">Izvēlieties krāsu</string>
+    <string name="choose_color">Izvēlēties krāsu</string>
     <string name="edit_track">Labot ceļu</string>
     <string name="change_map_locale">Kartes valoda</string>
     <string name="wikimedia_commons">Vikikrātuve</string>
@@ -795,10 +795,10 @@
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="continue_recording">Turpināt ierakstīt</string>
-    <string name="track_recording_alert_title">Saglabāt ceļu grāmatzīmju sadaļā?</string>
+    <string name="track_recording_alert_title">Pievienot izlasei?</string>
     <string name="editor_other_info">Piezīme OpenStreetMap brīvprātigajiem (nav obligāts)</string>
-    <string name="track_recording_toast_nothing_to_save">Ceļš ir tukšs – nav ko saglabāt</string>
-    <string name="error_no_file_manager_app">Nevar parādīt mapes atlases dialoglodziņu, jo jūsu ierīcē nav instalēta piemērota lietotne. Lūdzu, uzstādiet failu pārvaldnieka lietotni un mēģiniet vēlreiz.</string>
+    <string name="track_recording_toast_nothing_to_save">Ceļš ir tukšs – nav nekā saglabājama</string>
+    <string name="error_no_file_manager_app">Nevar attēlot mapes atlasīšanas logu, jo ierīcē nav uzstādīta piemērota lietotne. Lūgums uzstādīt datņu pārvaldnieka lietotni un mēģināt vēlreiz.</string>
     <string name="uri_open_location_failed">Nav uzstādīta neviena lietotne, kas varētu atvērt atrašanās vietu</string>
     <string name="aa_request_permission_notification">Šai lietotnei ir nepieciešama jūsu atļauja</string>
     <string name="editor_about_osm">Jūsu labojumi tiek augšupielādēti sabiedriskajā <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> datubāzē. Lūdzu, nepievienojiet personisku vai ar autortiesībām aizsargātu informāciju.</string>
@@ -861,4 +861,5 @@
         <item quantity="one">%d min.</item>
         <item quantity="other">%d min.</item>
     </plurals>
+    <string name="pref_maplanguage_local">Vietējā valoda</string>
 </resources>

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

@@ -68,11 +68,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Legg til en ny liste</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Bokmerkelistenavn</string>
+    <string name="bookmark_set_name">Listenavn</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Bokmerker</string>
+    <string name="bookmarks">Steder</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bokmerker og spor</string>
+    <string name="bookmarks_and_tracks">Favoritter</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Navn</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -148,14 +148,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Merknader</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Delte CoMaps-bokmerker</string>
-    <string name="share_bookmarks_email_body">Hei! \n \nVedlagt er mine bokmerker; åpne dem i CoMaps. Har du ikke installert appen kan du laste ned her: https://www.comaps.app/download/ \n \nGod reise med CoMaps!</string>
+    <string name="share_bookmarks_email_subject">Mine CoMaps-favoritter</string>
+    <string name="share_bookmarks_email_body">Hei! \n \nVedlagt er mine favoritter; åpne dem i CoMaps. Har du ikke installert appen kan du laste ned her: https://www.comaps.app/download/ \n \nGod reise med CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Laster inn bokmerker</string>
+    <string name="load_kmz_title">Laster inn favoritter</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bokmerkene ble lastet inn! Du finner dem på kartet eller på skjermen Bokmerkehåndtering.</string>
+    <string name="load_kmz_successful">Favoritter ble lastet inn! Du finner dem på kartet eller på skjermen Favoritthåndtering.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Mislyktes i å laste inn bokmerker. Filen kan være skadet eller defekt.</string>
+    <string name="load_kmz_failed">Mislyktes i å laste inn favoritter. Filen kan være skadet eller defekt.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Filtypen gjenkjennes ikke av appen: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -500,7 +500,7 @@
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Mer</string>
-    <string name="placepage_edit_bookmark_button">Rediger bokmerke</string>
+    <string name="placepage_edit_bookmark_button">Rediger lagret sted</string>
     <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
     <string name="editor_reset_edits_message">Forkaste alle lokale endringer?</string>
     <string name="editor_reset_edits_button">Forkast endringer</string>
@@ -565,17 +565,17 @@
     <string name="dialog_error_storage_message">Ekstern lagring er ikke tilgjengelig. Sannsynligvis er SD-kortet fjernet eller skadet eller så er filsystemet skrivebeskyttet. Undersøk og kontakt oss på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulere skadet lagring</string>
     <string name="error_enter_correct_name">Skriv inn korrekt navn</string>
-    <string name="bookmark_lists">Lister</string>
+    <string name="bookmark_lists">Favorittlister</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Skjul alle</string>
     <string name="bookmark_lists_show_all">Vis alle</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d bokmerke</item>
-        <item quantity="other">%d bokmerker</item>
+        <item quantity="one">%d lagret sted</item>
+        <item quantity="other">%d lagrede steder</item>
     </plurals>
     <string name="bookmarks_create_new_group">Opprett ny liste</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importer bokmerker og spor</string>
+    <string name="bookmarks_import">Importer favoritter</string>
     <string name="bookmarks_error_message_share_general">Kan ikke dele på grunn av en programfeil</string>
     <string name="bookmarks_error_title_share_empty">Delingsfeil</string>
     <string name="bookmarks_error_message_share_empty">Kan ikke dele en tom liste</string>
@@ -604,7 +604,7 @@
     <string name="subway">T-bane</string>
     <string name="layers_title">Kartstiler og -lag</string>
     <string name="bookmarks_empty_list_title">Denne listen er tom</string>
-    <string name="bookmarks_empty_list_message">For å legge til et bokmerke, trykk et sted på kartet og trykk så stjerneikonet</string>
+    <string name="bookmarks_empty_list_message">For å lagre et sted, trykk et sted på kartet og trykk så stjerneikonet</string>
     <string name="category_desc_more">…mer</string>
     <string name="export_file">Eksporter KMZ</string>
     <string name="export_file_gpx">Eksporter GPX</string>
@@ -657,7 +657,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Sorter…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Sorter bokmerker</string>
+    <string name="sort_bookmarks">Sorter favoritter</string>
     <!-- Android -->
     <string name="by_default">Som standard</string>
     <!-- Android -->
@@ -724,7 +724,7 @@
     <!-- Description in preferences -->
     <string name="enable_show_on_lock_screen_description">Når dette er aktivert, fungerer appen på låseskjermen selv når enheten er låst.</string>
     <!-- Current language of the map! -->
-    <string name="change_map_locale">Kart-språk</string>
+    <string name="change_map_locale">Kartspråk</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Kartdata fra OpenStreetMap</string>
     <!-- App Tip #00 -->
@@ -771,7 +771,7 @@
     <string name="browser_not_available">Nettleser er ikke tilgjengelig</string>
     <string name="volume">Volum</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Eksporter alle bokmerker og spor</string>
+    <string name="bookmarks_export">Eksporter alle steder og spor</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Systeminnstillinger for talesyntese</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -803,7 +803,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Fortsett opptak</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Lagre i bokmerker og spor?</string>
+    <string name="track_recording_alert_title">Lagre i favoritter?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Sporet er tomt - ingenting å lagre</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -832,7 +832,7 @@
     <string name="pref_backup_interval_title">Automatisk sikkerhetskopiering</string>
     <string name="backup_interval_manual_only">Av (kun manuelt)</string>
     <string name="delete_track_dialog_title">Slette %s?</string>
-    <string name="bookmark_color">Bokmerkefarge</string>
+    <string name="bookmark_color">Farge for favoritt</string>
     <string name="about_help">Om &amp; Hjelp</string>
     <string name="open_now">Åpen nå</string>
     <string name="read_in_wikipedia">Wikipedia</string>
@@ -851,11 +851,11 @@
     <string name="at">kl. %s</string>
     <string name="pref_tts_no_system_tts_short">Ingen tekst-til-tale-motor funnet, sjekk appinnstillingene</string>
     <string name="pref_left_button_title">Venstreknappoppsett</string>
-    <string name="pref_backup_title">Sikkerhetskopi av bokmerker og spor</string>
+    <string name="pref_backup_title">Sikkerhetskopier favoritter</string>
     <string name="pref_backup_summary">Automatisk sikkerhetskopiering til en mappe på enheten din</string>
     <string name="pref_backup_now_summary">Opprett en sikkerhetskopi med en gang</string>
     <string name="pref_backup_now_summary_ok">Sikkerhetskopiering fullført</string>
-    <string name="pref_backup_now_summary_empty_lists">Ingen bokmerker og spor å sikkerhetskopiere</string>
+    <string name="pref_backup_now_summary_empty_lists">Ingen steder og spor å sikkerhetskopiere</string>
     <string name="pref_backup_now_summary_folder_unavailable">Sikkerhetskopimappen er ikke tilgjengelig</string>
     <string name="pref_backup_status_summary_success">Siste vellykkede sikkerhetskopiering</string>
     <string name="pref_backup_location_summary_initial">Velg en mappe først og gi tillatelse</string>
@@ -911,4 +911,5 @@
     <string name="download_resources_custom_url_error_scheme">Angi en nettadresse som starter med http:// eller https://</string>
     <string name="download_resources_custom_url_message">Overstyr standardserveren som brukes til nedlasting av kart. La det stå tomt for å bruke CoMaps standardserver.</string>
     <string name="download_resources_custom_url_title">Tilpasset kartserver</string>
+    <string name="pref_maplanguage_local">Lokalt språk</string>
 </resources>

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

@@ -15,6 +15,7 @@
   <color name="bg_cards">#FF3C4044</color>
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#FF588157</color>
+  <color name="bg_app">#10140F</color>
 
   <color name="bg_menu">#CC2D3237</color>
 

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

@@ -68,11 +68,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Nieuwe groep toevoegen</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Naam van bladwijzergroep</string>
+    <string name="bookmark_set_name">Naam van lijst</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Bladwijzers</string>
+    <string name="bookmarks">Plaatsen</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bladwijzers en sporen</string>
+    <string name="bookmarks_and_tracks">Favorieten</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Naam</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -148,14 +148,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notities</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps bladwijzers zijn met u gedeeld</string>
-    <string name="share_bookmarks_email_body">Hallo! \n \nBijgesloten zijn mijn bladwijzers uit de CoMaps app. Open ze als je CoMaps geïnstalleerd hebt. Of, als je dat niet hebt, download de app voor je iOS- of Android-apparaat door deze link te volgen: https://www.comaps.app/download/ \n \nGeniet van het reizen met CoMaps!</string>
+    <string name="share_bookmarks_email_subject">Mijn CoMaps Favorieten</string>
+    <string name="share_bookmarks_email_body">Hallo! \n \nBijgevoegd zijn mijn favorieten; te openen in CoMaps. Als u dit niet geïnstalleerd heeft, dan kunt u het hier downloaden: https://www.comaps.app/download/ \n \nGeniet van het reizen met CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Bladwijzers laden</string>
+    <string name="load_kmz_title">Favorieten laden</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bladwijzers succesvol geladen! U vindt ze op de kaart of op het scherm van de Bladwijzerbeheerder.</string>
+    <string name="load_kmz_successful">Favorieten met succes geladen! U vindt ze op de kaart of op het scherm Favorietenbeheer.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Bladwijzers laden is mislukt. Het bestand is mogelijk beschadigd of defect.</string>
+    <string name="load_kmz_failed">Favorieten laden is mislukt. Het bestand is mogelijk beschadigd of defect.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Het bestandstype wordt niet herkend door de app: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -498,7 +498,7 @@
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Meer</string>
-    <string name="placepage_edit_bookmark_button">Bladwijzer bewerken</string>
+    <string name="placepage_edit_bookmark_button">Opgeslagen plaats bewerken</string>
     <string name="placepage_personal_notes_hint">Persoonlijke aantekeningen (tekst of html)</string>
     <string name="editor_reset_edits_message">Alle lokale wijzigingen weggooien?</string>
     <string name="editor_reset_edits_button">Wijzigingen weggooien</string>
@@ -563,17 +563,17 @@
     <string name="dialog_error_storage_message">Externe opslag is niet beschikbaar, wellicht is de SD-kaart verwijderd, beschadigd of is het bestandssysteem alleen-lezen. Gelieve dit te controleren en ons te contacteren via support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Slechte opslag emuleren</string>
     <string name="error_enter_correct_name">Voer een geldige naam in</string>
-    <string name="bookmark_lists">Lijsten</string>
+    <string name="bookmark_lists">Favoriete lijsten</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Verberg alles</string>
     <string name="bookmark_lists_show_all">Toon alles</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d bladwijzer</item>
-        <item quantity="other">%d bladwijzers</item>
+        <item quantity="one">%d opgeslagen plaats</item>
+        <item quantity="other">%d opgeslagen plaatsen</item>
     </plurals>
     <string name="bookmarks_create_new_group">Maak een nieuwe lijst</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Bladwijzers en sporen importeren</string>
+    <string name="bookmarks_import">Favorieten importeren</string>
     <string name="bookmarks_error_message_share_general">Delen is onmogelijk wegens een toepassingsfout</string>
     <string name="bookmarks_error_title_share_empty">Deelfout</string>
     <string name="bookmarks_error_message_share_empty">Een lege lijst kan niet gedeeld worden</string>
@@ -602,7 +602,7 @@
     <string name="subway">Metro</string>
     <string name="layers_title">Kaartstijlen en -lagen</string>
     <string name="bookmarks_empty_list_title">Deze lijst is leeg</string>
-    <string name="bookmarks_empty_list_message">Om een bladwijzer toe te voegen, tikt u op een plaats op de kaart en vervolgens op het sterpictogram</string>
+    <string name="bookmarks_empty_list_message">Om een plaats op te slaan, tikt u op een plaats op de kaart en vervolgens op het sterpictogram</string>
     <string name="category_desc_more">…meer</string>
     <string name="export_file">Exporteer KMZ</string>
     <string name="export_file_gpx">Exporteer GPX</string>
@@ -655,7 +655,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Sorteer…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Sorteer bladwijzers</string>
+    <string name="sort_bookmarks">Favorieten sorteren</string>
     <!-- Android -->
     <string name="by_default">Standaard</string>
     <!-- Android -->
@@ -773,7 +773,7 @@
     <string name="browser_not_available">Webbrowser is niet beschikbaar</string>
     <string name="volume">Volume</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Alle bladwijzers en sporen exporteren</string>
+    <string name="bookmarks_export">Alle plaatsen en sporen exporteren</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Instellingen spraaksynthesesysteem</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -805,7 +805,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Opname voortzetten</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Opslaan in bladwijzers en sporen?</string>
+    <string name="track_recording_alert_title">Opslaan in Favorieten?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Spoor is leeg - niets op te slaan</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -838,16 +838,16 @@
     <string name="pedestrian">Voetganger</string>
     <string name="ruler">Lineaal</string>
     <string name="about_help">Over &amp; help</string>
-    <string name="bookmark_color">Bladwijzer kleur</string>
+    <string name="bookmark_color">Kleur voor favoriet</string>
     <string name="backup_interval_every_day">Dagelijks</string>
     <string name="backup_interval_manual_only">Uit (alleen handmatig)</string>
-    <string name="pref_backup_title">Back-up van bladwijzers en sporen</string>
+    <string name="pref_backup_title">Back-up van favorieten</string>
     <string name="pref_backup_summary">Automatisch back-up maken naar een map op je apparaat</string>
     <string name="pref_backup_now_title">Nu back-uppen</string>
     <string name="pref_backup_now_summary">Maak onmiddellijk een back-up</string>
     <string name="pref_backup_now_summary_progress">Bezig met het maken van back-up…</string>
     <string name="pref_backup_now_summary_ok">Back-up succesvol voltooid</string>
-    <string name="pref_backup_now_summary_empty_lists">Geen bladwijzers en sporen voor een back-up</string>
+    <string name="pref_backup_now_summary_empty_lists">Geen plaatsen en sporen voor een back-up</string>
     <string name="pref_backup_status_summary_success">Laatste succesvolle back-up</string>
     <string name="pref_backup_interval_title">Automatische back-up</string>
     <string name="pref_backup_location_title">Back-up locatie</string>
@@ -920,4 +920,5 @@
     <string name="download_resources_custom_url_message">Overschrijf de standaard kaartdownloadserver die wordt gebruikt voor kaartdownloads. Laat leeg om de standaardserver van CoMaps te gebruiken.</string>
     <string name="download_resources_custom_url_summary_none">Niet ingesteld</string>
     <string name="download_resources_custom_url_error_scheme">Voer een URL in beginnend met http:// of https://</string>
+    <string name="pref_maplanguage_local">Plaatselijke taal</string>
 </resources>

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

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

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

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

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

@@ -42,8 +42,8 @@
     <string name="continue_button">Nadaljuj</string>
     <string name="download_country_failed">Prenos za državo %s ni uspel</string>
     <string name="add_new_set">Dodaj nov seznam</string>
-    <string name="bookmark_set_name">Ime seznama zaznamkov</string>
-    <string name="bookmarks">Zaznamki</string>
+    <string name="bookmark_set_name">Ime seznama</string>
+    <string name="bookmarks">Kraji</string>
     <string name="name">Ime</string>
     <string name="address">Naslov</string>
     <string name="list">Seznam</string>
@@ -81,17 +81,17 @@
     <string name="category_rv">Prostori za avtodome</string>
     <string name="description">Pripis</string>
     <string name="share_bookmarks_email_subject">Nekdo je z vami delil zaznamke CoMaps</string>
-    <string name="share_bookmarks_email_body">Živjo! \n \nV priponki so moji zaznamki. Prosim, odpri jih v aplikaciji CoMaps. Če je še nimaš nameščene, jo lahko preneseš tukaj: https://www.comaps.app/download/ \n \nUživaj v potovanju s CoMaps!</string>
+    <string name="share_bookmarks_email_body">Živjo! \n \nV priponki so moji zaznamki. Prosim, odpri jih v orodju CoMaps. Če ga še nisi namestil, ga lahko preneseš tukaj: https://www.comaps.app/download/ \n \nUživaj v potovanju s CoMaps!</string>
     <string name="load_kmz_title">Nalagam zaznamke</string>
     <string name="load_kmz_successful">Zaznamki so uspešno naloženi! Najdete jih lahko na zemljevidu ali v upravitelju zaznamkov.</string>
-    <string name="load_kmz_failed">Zaznamkov ni bilo mogoče naložiti. Datoteka je morda okvarjena.</string>
+    <string name="load_kmz_failed">Zaznamkov ni bilo mogoče naložiti. Datoteka je morda poškodovana ali okvarjena.</string>
     <string name="unknown_file_type">Aplikacija ne prepozna te vrste datoteke: \n%1$s</string>
     <string name="failed_to_open_file">Ni bilo mogoče odpreti datoteke %1$s \n \n%2$s</string>
     <string name="edit">Uredi</string>
     <string name="unknown_current_position">Vaša lokacija še ni znana</string>
     <string name="cant_change_this_setting">Žal so nastavitve shranjevanja zemljevidov trenutno onemogočene</string>
     <string name="downloading_is_active">Poteka prenašanje zemljevida</string>
-    <string name="bookmarks_and_tracks">Zaznamki in poti</string>
+    <string name="bookmarks_and_tracks">Priljubljeni</string>
     <string name="my_position_share_sms">Oglej si mojo trenutno lokacijo na CoMaps! %1$s ali %2$s Si brez zemljevidov? Prenesi jih tukaj: https://www.comaps.app/download/</string>
     <string name="bookmark_share_email_subject">Živjo, oglej si tale kraj na CoMaps!</string>
     <string name="my_position_share_email_subject">Živjo, poglej si mojo trenutno lokacijo na zemljevidu CoMaps!</string>

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

@@ -62,11 +62,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Направи нову листу</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Назив листе маркера</string>
+    <string name="bookmark_set_name">Назив листе</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Маркери</string>
+    <string name="bookmarks">Места</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Маркери и путање</string>
+    <string name="bookmarks_and_tracks">Фаворити</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Назив</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">Напомене</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps маркери су подељени са вама</string>
-    <string name="share_bookmarks_email_body">Здраво! \n \nУ прилогу су моји маркери; молим те да их отвориш у CoMaps-у. Ако га немаш већ инсталираног, можеш да га преузмеш одавде: https://www.comaps.app/download/ \n \nУживај у путовању са CoMaps-ом!</string>
+    <string name="share_bookmarks_email_subject">CoMaps фаворити</string>
+    <string name="share_bookmarks_email_body">Здраво! \n \nУ прилогу су моји фаворити; молим те да их отвориш у CoMaps-у. Ако га немаш већ инсталираног, можеш да га преузмеш одавде: https://www.comaps.app/download/ \n \nУживај у путовању са CoMaps-ом!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Учитавање маркера</string>
+    <string name="load_kmz_title">Учитавање фаворита</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Маркери су успешно учитани! Можете их проначи на мапи помоћу Менаџера маркера.</string>
+    <string name="load_kmz_successful">Фаворити су успешно учитани! Можете их проначи на мапи помоћу Менаџера фаворита.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Неуспешно учитавање маркера. Могуће да је фајл оштећен или неисправан.</string>
+    <string name="load_kmz_failed">Неуспешно учитавање фаворита. Могуће да је фајл оштећен или неисправан.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Апликација не препознаје ову врсту фајла: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -492,7 +492,7 @@
     <string name="minute">мин</string>
     <string name="day">д</string>
     <string name="placepage_more_button">Више</string>
-    <string name="placepage_edit_bookmark_button">Измени маркер</string>
+    <string name="placepage_edit_bookmark_button">Измени снимљено место</string>
     <string name="editor_reset_edits_message">Брисање свих измена које нису послате?</string>
     <string name="editor_reset_edits_button">Одбаци промене</string>
     <string name="editor_remove_place_message">Брисање додатог места?</string>
@@ -556,18 +556,18 @@
     <string name="dialog_error_storage_message">Екстерна меморија није доступна. SD картица је можда уклоњена, оштећена, или је фајл систем само за читање. Молим Вас, проверите Вашу SD картицу или нас контактирајте на support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Симулирај неисправну меморију</string>
     <string name="error_enter_correct_name">Молим Вас да унесете исправан назив</string>
-    <string name="bookmark_lists">Листе</string>
+    <string name="bookmark_lists">Листе фаворита</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Сакриј све</string>
     <string name="bookmark_lists_show_all">Прикажи све</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d маркер</item>
-        <item quantity="few">%d маркера</item>
-        <item quantity="other">%d маркера</item>
+        <item quantity="one">%d фаворит</item>
+        <item quantity="few">%d фаворита</item>
+        <item quantity="other">%d фаворита</item>
     </plurals>
     <string name="bookmarks_create_new_group">Креирај нову листу</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Увези маркере и путање</string>
+    <string name="bookmarks_import">Увези фаворите</string>
     <string name="bookmarks_error_message_share_general">Дељење није могуће због грешке у апликацији</string>
     <string name="bookmarks_error_title_share_empty">Грешка приликом дељења</string>
     <string name="bookmarks_error_message_share_empty">Не може се поделити празна листа</string>
@@ -598,7 +598,7 @@
     <string name="subway">Метро</string>
     <string name="layers_title">Стилови мапе и слојеви</string>
     <string name="bookmarks_empty_list_title">Ова листа је празна</string>
-    <string name="bookmarks_empty_list_message">Да бисте додали маркер, кратко додирните место на мапи, а онда додирните иконицу са звездом</string>
+    <string name="bookmarks_empty_list_message">Да бисте додали место, кратко додирните место на мапи, а онда додирните иконицу са звездом</string>
     <string name="category_desc_more">…више</string>
     <string name="export_file">Експортуј KMZ</string>
     <string name="export_file_gpx">Експортуј GPX</string>
@@ -651,7 +651,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Сортирање…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Сортирање маркера</string>
+    <string name="sort_bookmarks">Сортирање фаворита</string>
     <!-- Android -->
     <string name="by_default">Подразумевано</string>
     <!-- Android -->
@@ -757,7 +757,7 @@
     <string name="browser_not_available">Веб читач није доступан</string>
     <string name="volume">Јачина звука</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Експортуј све маркере и путање</string>
+    <string name="bookmarks_export">Експортуј све места и путање</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Системска подешавања синтезе говора</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -789,7 +789,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Настави снимање</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Сачувати у маркерима и путањама?</string>
+    <string name="track_recording_alert_title">Сачувати у фаворитима?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Путања је празна, нема шта да се сачува</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -834,7 +834,7 @@
     <string name="route_type">Тип руте</string>
     <string name="pedestrian">Пешак</string>
     <string name="ruler">Лењир</string>
-    <string name="bookmark_color">Колор маркера</string>
+    <string name="bookmark_color">Боја фаворита</string>
     <string name="vehicle">Возило</string>
     <string name="about_help">О програму и помоћ</string>
     <string name="panoramax">Panoramax Picture</string>
@@ -855,8 +855,8 @@
     <string name="dialog_report_error_with_logs">Молимо вас, пошаљите нам поруку о грешци:\n- \"Омогући вођење дневника\" у подешавањима\n- репродукујте проблем\n- на екрану \"О програму и помоћ\" кликните на дугме \"Пријави грешку\" и пошаљите на е-маил или чат\n- онемогући вођење дневника</string>
     <string name="dialog_report_error_missing_folder">Изабрана локација резервне копије није доступна за снимање. Молимо вас, одаберите друго место.</string>
     <string name="pref_backup_interval_title">Аутоматска резервна копија</string>
-    <string name="pref_backup_now_summary_empty_lists">Нема маркера и путања за израду резервне копије</string>
-    <string name="pref_backup_title">Чување маркера и путања</string>
+    <string name="pref_backup_now_summary_empty_lists">Нема места и путања за израду резервне копије</string>
+    <string name="pref_backup_title">Чување фаворита</string>
     <string name="closed_now">Затворено сада</string>
     <string name="open_now">Сада је отворено</string>
     <string name="at">на %s</string>
@@ -919,4 +919,5 @@
     <string name="download_resources_custom_url_message">Замени подразумевани сервер за преузимање мапа који се користи за преузимања мапа. Оставите празно да бисте користили CoMaps сервер.</string>
     <string name="download_resources_custom_url_summary_none">Није постављено</string>
     <string name="download_resources_custom_url_error_scheme">Унесите пуну УРЛ адресу која почиње са https:// и која се завршава са /</string>
+    <string name="pref_maplanguage_local">Локални језик</string>
 </resources>

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

@@ -68,13 +68,13 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">添加新的书签列表</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">书签列表名称</string>
+    <string name="bookmark_set_name">列表名称</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">书签</string>
+    <string name="bookmarks">地点</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">书签和轨迹</string>
+    <string name="bookmarks_and_tracks">收藏</string>
     <!-- Add bookmark dialog - bookmark name -->
-    <string name="name">名字</string>
+    <string name="name">名称</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
     <string name="address">地址</string>
     <!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
@@ -148,14 +148,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">注记</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">已与您分享 CoMaps 书签</string>
-    <string name="share_bookmarks_email_body">您好！ \n \n附件是我的书签，请在 CoMaps 中打开。如果您没有安装 CoMaps，可以在这里下载: https://www.comaps.app/download/ \n \n祝您使用 CoMaps 旅行愉快！</string>
+    <string name="share_bookmarks_email_subject">我的 CoMaps 收藏</string>
+    <string name="share_bookmarks_email_body">您好！\n\n附件是我的收藏，请在 CoMaps 中打开。如果您没有安装 CoMaps，可以在这里下载：https://www.comaps.app/download/\n\n祝您使用 CoMaps 旅行愉快！</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">正在加载书签</string>
+    <string name="load_kmz_title">正在加载收藏</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">书签载入成功！您可以在地图或书签管理页面中找到它们。</string>
+    <string name="load_kmz_successful">收藏加载成功！您可以在地图或收藏管理页面中找到它们。</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">书签载入失败，文件可能已损坏或不完整。</string>
+    <string name="load_kmz_failed">无法加载收藏，文件可能已损坏或不完整。</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">应用程序无法识别该文件类型： \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -508,7 +508,7 @@
     <string name="minute">分钟</string>
     <string name="day">天</string>
     <string name="placepage_more_button">更多</string>
-    <string name="placepage_edit_bookmark_button">编辑书签</string>
+    <string name="placepage_edit_bookmark_button">编辑已保存的地点</string>
     <string name="placepage_personal_notes_hint">个人注记（文字或 html）</string>
     <string name="editor_reset_edits_message">舍弃所有本地更改？</string>
     <string name="editor_reset_edits_button">舍弃更改</string>
@@ -573,20 +573,20 @@
     <string name="dialog_error_storage_message">外部存储空间不可用，很可能是因为 SD 卡已移除、损毁，或者文件系统为只读状态。请进行检查，然后通过 support@comaps.app 联系我们</string>
     <string name="setting_emulate_bad_storage">模拟不良存储空间</string>
     <string name="error_enter_correct_name">请输入正确的名称</string>
-    <string name="bookmark_lists">列表</string>
+    <string name="bookmark_lists">收藏列表</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">全部隐藏</string>
     <string name="bookmark_lists_show_all">全部显示</string>
     <plurals name="bookmarks_places">
-        <item quantity="other">%d 个书签</item>
+        <item quantity="other">%d 个已保存的地点</item>
     </plurals>
     <string name="bookmarks_create_new_group">创建新的列表</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">导入书签和轨迹</string>
+    <string name="bookmarks_import">导入收藏</string>
     <string name="bookmarks_error_message_share_general">由于应用程序出错，导致无法分享</string>
     <string name="bookmarks_error_title_share_empty">无法分享</string>
     <string name="bookmarks_error_message_share_empty">无法分享空列表</string>
-    <string name="bookmarks_error_title_empty_list_name">名字不能为空</string>
+    <string name="bookmarks_error_title_empty_list_name">名称不能为空</string>
     <string name="bookmarks_error_message_empty_list_name">请输入列表名称</string>
     <string name="bookmarks_new_list_hint">新的列表</string>
     <string name="bookmarks_error_title_list_name_already_taken">这个名称已经被使用了</string>
@@ -609,7 +609,7 @@
     <string name="subway">地铁</string>
     <string name="layers_title">地图样式和图层</string>
     <string name="bookmarks_empty_list_title">该列表为空</string>
-    <string name="bookmarks_empty_list_message">要添加新书签，请点击对象卡片中的星形图标</string>
+    <string name="bookmarks_empty_list_message">要保存地点，请在地图上点击一个地点，然后点击星形图标</string>
     <string name="category_desc_more">…更多</string>
     <string name="export_file">导出为 KMZ</string>
     <string name="export_file_gpx">导出为 GPX</string>
@@ -662,15 +662,15 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">排序…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">分类排序</string>
+    <string name="sort_bookmarks">排序收藏</string>
     <!-- Android -->
-    <string name="by_default">使用默认值</string>
+    <string name="by_default">按默认</string>
     <!-- Android -->
     <string name="by_type">按类型</string>
     <!-- Android -->
     <string name="by_distance">按距离</string>
     <!-- Android -->
-    <string name="by_date">按时间</string>
+    <string name="by_date">按日期</string>
     <!-- Android -->
     <string name="by_name">按名称</string>
     <string name="week_ago_sorttype">一周前</string>
@@ -780,7 +780,7 @@
     <string name="browser_not_available">网络浏览器不可用</string>
     <string name="volume">音量</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">导出所有书签和轨迹</string>
+    <string name="bookmarks_export">导出所有地点和轨迹</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">文本转语音系统设置</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -812,7 +812,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">继续录制</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">保存到书签和轨迹？</string>
+    <string name="track_recording_alert_title">保存到收藏？</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">轨迹为空 — 无内容可保存</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -840,7 +840,7 @@
     <string name="route_type">路线类型</string>
     <string name="bicycle">自行车</string>
     <string name="ruler">标尺</string>
-    <string name="bookmark_color">书签颜色</string>
+    <string name="bookmark_color">收藏颜色</string>
     <string name="pedestrian">行人</string>
     <string name="about_help">关于和帮助</string>
     <string name="panoramax">Panoramax 图片</string>
@@ -849,8 +849,8 @@
     <string name="pref_backup_now_summary">立即创建备份</string>
     <string name="pref_backup_now_summary_progress">正在备份…</string>
     <string name="pref_backup_now_summary_ok">备份已成功完成</string>
-    <string name="pref_backup_title">备份书签与轨迹</string>
-    <string name="pref_backup_now_summary_empty_lists">没有要备份的书签和轨迹</string>
+    <string name="pref_backup_title">备份收藏</string>
+    <string name="pref_backup_now_summary_empty_lists">没有要备份的地点和轨迹</string>
     <string name="pref_backup_now_summary_failed">备份失败</string>
     <string name="pref_backup_now_summary_folder_unavailable">备份文件夹不可用</string>
     <string name="pref_backup_status_summary_success">上次成功备份</string>
@@ -922,4 +922,5 @@
     <string name="advanced">高级</string>
     <string name="download_resources_custom_url_title">自定义地图服务器</string>
     <string name="download_resources_custom_url_message">覆盖用于地图下载的默认地图下载服务器。留空则使用 CoMaps 默认服务器。</string>
+    <string name="pref_maplanguage_local">本地语言</string>
 </resources>

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

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

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

@@ -98,16 +98,6 @@
     <item name="android:textColorHint">@color/text_light_hint</item>
   </style>
 
-  <style name="MwmTextAppearance.Toolbar.Title" parent="android:TextAppearance.Material.Widget.ActionBar.Title">
-    <item name="android:textSize">@dimen/text_size_toolbar</item>
-    <item name="android:textColor">@color/text_light</item>
-    <item name="android:textColorHint">@color/text_light_hint</item>
-  </style>
-
-  <style name="MwmTextAppearance.Toolbar.Title.Light">
-    <item name="android:textColor">@color/bg_cards</item>
-  </style>
-
   <style name="MwmTextAppearance.NavMenu">
     <item name="android:textStyle">bold</item>
   </style>

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

@@ -143,8 +143,7 @@
     <item name="android:background">?colorPrimary</item>
     <item name="android:displayOptions">homeAsUp|showTitle</item>
     <item name="contentInsetStart">0dp</item>
-    <item name="android:titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
-    <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
+    <item name="titleTextColor">@color/text_light</item>
     <item name="buttonGravity">center_vertical</item>
   </style>
 
@@ -169,9 +168,7 @@
     <item name="android:cacheColorHint">@android:color/transparent</item>
   </style>
 
-  <style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView">
-    <item name="android:background">@android:color/transparent</item>
-  </style>
+  <style name="MwmWidget.TextView" parent="Widget.MaterialComponents.TextView" />
 
   <style name="MwmWidget.TextView.Item">
     <item name="android:layout_width">match_parent</item>
@@ -290,13 +287,13 @@
   </style>
 
   <style name="MwmWidget.BottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
-    <item name="backgroundTint">?cardBackground</item>
+    <item name="backgroundTint">?colorSurfaceContainerLow</item>
     <item name="elevationOverlayEnabled">false</item>
     <item name="shapeAppearance">@style/ShapeAppearance.Material3.LargeComponent</item>
   </style>
 
   <style name="MwmWidget.BottomSheet" parent="MwmWidget.BottomSheetDialog">
-    <item name="android:background">?cardBackground</item>
+    <item name="android:background">?colorSurfaceContainerLow</item>
     <item name="behavior_hideable">false</item>
   </style>
 

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

@@ -253,8 +253,9 @@
     <item name="android:fontFamily">@string/robotoMedium</item>
   </style>
 
-  <style name="MwmTheme.ProgressDialog" parent="MwmTheme.AlertDialog">
+  <style name="MwmTheme.ProgressDialog" parent="MwmTheme.M3.AlertDialog">
     <item name="android:textColor">?textDialogTheme</item>
+    <item name="android:background">?attr/colorSurfaceContainerHigh</item>
   </style>
 
   <style name="MwmTheme.Downloader">

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

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Some languages not supported by Android require to be specified here to be applied -->
     <locale android:name="en" />
     <locale android:name="af" />
     <locale android:name="ar" />
     <locale android:name="az" />
     <locale android:name="be" />
     <locale android:name="bg" />
+    <locale android:name="bn" />
     <locale android:name="ca" />
     <locale android:name="cs" />
     <locale android:name="da" />
@@ -20,28 +22,38 @@
     <locale android:name="fi" />
     <locale android:name="fr" />
     <locale android:name="fr-CA" />
-    <locale android:name="iw" />
+    <locale android:name="gl" />
+    <locale android:name="gsw" />
+    <locale android:name="he" />
     <locale android:name="hi" />
     <locale android:name="hu" />
+    <locale android:name="id" />
     <locale android:name="in" />
+    <locale android:name="is" />
     <locale android:name="it" />
+    <locale android:name="iw" />
     <locale android:name="ja" />
+    <locale android:name="kw" />
     <locale android:name="ko" />
     <locale android:name="lt" />
     <locale android:name="lv" />
     <locale android:name="mr" />
     <locale android:name="mt" />
     <locale android:name="nb" />
+    <locale android:name="nb-NO" />
     <locale android:name="nl" />
     <locale android:name="pl" />
     <locale android:name="pt" />
     <locale android:name="pt-BR" />
     <locale android:name="ro" />
     <locale android:name="ru" />
+    <locale android:name="sl" />
     <locale android:name="sk" />
     <locale android:name="sr" />
+    <locale android:name="sr-Latn" />
     <locale android:name="sv" />
     <locale android:name="sw" />
+    <locale android:name="ta" />
     <locale android:name="th" />
     <locale android:name="tr" />
     <locale android:name="uk" />

android/sdk/src/main/assets/subtypes.csv

@@ -0,0 +1 @@
+../../../../../data/subtypes.csv

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

@@ -22,9 +22,6 @@ public final class Constants
     public static final String LEMMY = "https://sopuli.xyz/c/CoMaps";
     public static final String BLUESKY = "https://bsky.app/profile/comaps.app";
     public static final String PIXELFED = "https://pixelfed.social/comaps";
-    public static final String FB_OM_COMMUNITY_HTTP = "https://www.facebook.com/profile.php?id=61575286559965";
-    public static final String FB_OM_COMMUNITY_NATIVE = "fb://profile/61575286559965";
-
     public static final String CODE_REPO = "https://codeberg.org/comaps/comaps";
 
     public static final String COPYRIGHT = "file:///android_asset/copyright.html";
@@ -36,13 +33,6 @@ public final class Constants
     private Url() {}
   }
 
-  public static class Package
-  {
-    public static final String FB_PACKAGE = "com.facebook.katana";
-
-    private Package() {}
-  }
-
   public static class Vendor
   {
     public static final String HUAWEI = "HUAWEI";

android/sdk/src/main/res/values-af/types_strings.xml

@@ -410,7 +410,6 @@
     <string name="type.highway.pedestrian.area">Voetgangergebied</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Voetgangerbrug</string>
-
     <string name="type.highway.pedestrian.square">Plein</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Voetgangertonnel</string>
@@ -770,8 +769,6 @@
     <string name="type.public_transport.platform">Platform</string>
     <string name="type.railway">Spoorweg</string>
     <string name="type.railway.abandoned">Verlate treinspoor</string>
-    <string name="type.railway.abandoned.bridge">Verlate treintonnel</string>
-    <string name="type.railway.abandoned.tunnel">Verlate treintonnel</string>
     <string name="type.railway.construction">Spoorweg in aanbou</string>
     <string name="type.railway.crossing">Spoorwegoorgang</string>
     <string name="type.railway.disused">Ongebruikte spoor</string>

android/sdk/src/main/res/values-az/types_strings.xml

@@ -421,7 +421,6 @@
     <string name="type.highway.pedestrian.area">Piyada ərazisi</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Körpü</string>
-
     <string name="type.highway.pedestrian.square">Kvadrat</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Tunel</string>
@@ -787,8 +786,6 @@
     <string name="type.public_transport.platform">Platforma</string>
     <string name="type.railway">Dəmir yolu</string>
     <string name="type.railway.abandoned">Tərk edilmiş dəmir yolu</string>
-    <string name="type.railway.abandoned.bridge">Tərk edilmiş dəmir yolu</string>
-    <string name="type.railway.abandoned.tunnel">Tərk edilmiş dəmir yolu</string>
     <string name="type.railway.construction">Dəmir yolu tikintisi</string>
     <string name="type.railway.crossing">Dəmiryol kəsişməsi</string>
     <string name="type.railway.disused">Istifadəsiz dəmir yolu</string>

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

@@ -1,3 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="core_my_position">Moja pozicija</string>
+    <string name="core_my_places">Moja mesta</string>
+    <string name="maps_storage_internal">Interna privatna memorija</string>
+    <string name="maps_storage_shared">Interna deljena memorija</string>
+    <string name="maps_storage_removable">SD kartica</string>
+    <string name="maps_storage_external">Eksterna deljena memorija</string>
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Poštanski broj</string>
+    <string name="core_placepage_unknown_place">Tačka na mapi</string>
+    <string name="m">m</string>
+    <string name="km">km</string>
+    <string name="mi">mi</string>
+    <string name="ft">stopa</string>
+    <string name="core_exit">Izlaz</string>
+    <string name="core_entrance">Ulaz</string>
+    <string name="subway_data_unavailable">Mapa metroa ne postoji</string>
+    <string name="public_access">Javni pristup</string>
+    <string name="limited_access">Ograničen pristup</string>
+    <string name="not_shared">Privatno</string>
+    <string name="access_rules_author_only">Online izmene</string>
+    <string name="today">Danas</string>
+    <string name="yesterday">Juče</string>
+    <string name="days_ago">pre %s dana</string>
+    <string name="week_ago">pre %s nedelja</string>
+    <string name="weeks_ago">pre %s nedelja</string>
+    <string name="month_ago">pre %s mesec</string>
+    <string name="months_ago">pre %s meseci</string>
+    <string name="year_ago">pre %s godine</string>
+    <string name="years_ago">pre %s godina</string>
+</resources>

android/sdk/src/main/res/values-bg/types_strings.xml

@@ -977,8 +977,6 @@
     <string name="type.power.tower">Електрическа кула</string>
     <string name="type.power.pole">Електрически стълб</string>
     <string name="type.railway.abandoned">Изоставена железопътна линия</string>
-    <string name="type.railway.abandoned.bridge">Изоставен железопътен мост</string>
-    <string name="type.railway.abandoned.tunnel">Изоставен железопътен тунел</string>
     <string name="type.railway.construction">Строителство на железопътни линии</string>
     <string name="type.railway.crossing">Железопътен прелез</string>
     <string name="type.railway.disused">Неизползвана железопътна линия</string>

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

@@ -18,4 +18,12 @@
     <string name="month_ago">%s মাস আগে</string>
     <string name="year_ago">%s বছর আগে</string>
     <string name="core_entrance">প্রবেশ</string>
+    <string name="core_placepage_unknown_place">মানচিত্র বিন্দু</string>
+    <string name="subway_data_unavailable">সাবওয়ে মানচিত্র অনুপলব্ধ</string>
+    <string name="core_exit">প্রস্থান</string>
+    <string name="weeks_ago">%s সপ্তাহ আগে</string>
+    <string name="months_ago">%s মাস আগে</string>
+    <string name="years_ago">%s বছর আগে</string>
+    <string name="m">মি</string>
+    <string name="ft">ফুট</string>
 </resources>

android/sdk/src/main/res/values-bn/types_strings.xml

@@ -139,4 +139,39 @@
     <string name="type.public_transport">গণপরিবহন</string>
     <string name="type.route.ferry">ফেরি</string>
     <string name="type.amenity.studio">মিডিয়া স্টুডিও</string>
+    <string name="type.barrier.gate">গেট</string>
+    <string name="type.barrier.kissing_gate">কিসিঙ্গ গেট</string>
+    <string name="type.barrier.lift_gate">লিফ্ট গেট</string>
+    <string name="type.barrier.wicket_gate">উইকেট গেট</string>
+    <string name="type.barrier.swing_gate">সুইঙ্গ গেট</string>
+    <string name="type.aeroway.helipad">হেলিপ্যাড</string>
+    <string name="type.amenity.bicycle_parking.covered">আচ্ছাদিত সাইকেল পার্কিং</string>
+    <string name="type.amenity.boat_rental">নৌকা ভাড়া</string>
+    <string name="type.amenity.bicycle_rental">সাইকেল ভাড়া</string>
+    <string name="type.man_made.telescope">দূরবিক্ষণ</string>
+    <string name="type.man_made.telescope.optical">দূরবিক্ষণ (আলোক রশ্মি)</string>
+    <string name="type.man_made.telescope.radio">দূরবিক্ষণ (রেডিও রশ্মি)</string>
+    <string name="type.man_made.telescope.gamma">দূরবিক্ষণ (গামা রশ্মি)</string>
+    <string name="type.man_made.observatory">পর্যবেক্ষণাগার</string>
+    <string name="type.amenity.car_rental">গাড়ি ভাড়া</string>
+    <string name="type.amenity.motorcycle_rental">মোটরসাইকেল ভাড়া</string>
+    <string name="type.amenity.cinema">সিনেমা</string>
+    <string name="type.amenity.shelter.public_transport">আশ্রয়</string>
+    <string name="type.amenity.post_office">পোস্ট অফিস</string>
+    <string name="type.amenity.restaurant">রেস্টুরেন্ট</string>
+    <string name="type.amenity.taxi">ট্যাক্সি স্ট্যান্ড</string>
+    <string name="type.shop.mobile_phone">মোবাইল ফোনের দোকান</string>
+    <string name="type.addr_interpolation.even">ঠিকানা/ব্লক</string>
+    <string name="type.addr_interpolation.odd">ঠিকানা/ব্লক</string>
+    <string name="type.natural.water.wastewater">নিকাশী জল</string>
+    <string name="type.man_made.wastewater_plant">নিকাশী জল পরিশোধনাগার</string>
+    <string name="type.man_made.water_tap.drinking_water_no">জলের কল</string>
+    <string name="type.man_made.water_well.drinking_water_no">পাতকুয়া</string>
+    <string name="type.natural.water.reservoir">জলাধার</string>
+    <string name="type.natural.water.basin">অববাহিকা</string>
+    <string name="type.waterway">জলপথ</string>
+    <string name="type.waterway.canal">ক্যানাল</string>
+    <string name="type.waterway.drain">ড্রেন</string>
+    <string name="type.amenity.bar">বার</string>
+    <string name="type.amenity.bicycle_parking">সাইকেল পার্কিং</string>
 </resources>

android/sdk/src/main/res/values-ca/types_strings.xml

@@ -1039,7 +1039,6 @@
     <string name="type.man_made.telescope.radio">Telescopi (Ràdio)</string>
     <string name="type.man_made.telescope.gamma">Telescopi (Gamma)</string>
     <string name="type.man_made.observatory">Observatori</string>
-    <string name="type.amenity.charging_station.motorcar.small">Punt de Càrrega de Cotxes</string>
     <string name="type.amenity.sailing_school">Escola de Navegació</string>
     <string name="type.amenity.flight_school">Escola de Vol</string>
     <string name="type.amenity.prep_school">Escola Preparatòria</string>

android/sdk/src/main/res/values-cs/types_strings.xml

@@ -1301,8 +1301,6 @@
     <string name="type.organic.yes">Přírodní</string>
     <string name="type.railway.tram">Tramvajová trať</string>
     <string name="type.railway.light_rail.tunnel">Tunel lehké železnice</string>
-    <string name="type.railway.abandoned.bridge">Most zaniklé železnice</string>
-    <string name="type.railway.abandoned.tunnel">Tunel zaniklé železnice</string>
     <string name="type.railway.funicular.tunnel">Tunel pozemní lanové dráhy</string>
     <string name="type.railway.monorail.bridge">Most jednokolejné železnice</string>
     <string name="type.railway.narrow_gauge.bridge">Most úzkorozchodné železnice</string>
@@ -1396,7 +1394,6 @@
     <string name="type.building.guardhouse">Vrátnice</string>
     <string name="type.shop.lighting">Obchod s osvětlením</string>
     <string name="type.amenity.bench.backless">Lavička bez opěradla</string>
-    <string name="type.amenity.charging_station.motorcar.small">Nabíjecí stanice aut</string>
     <string name="type.leisure.bandstand">Otevřený altán</string>
     <string name="type.leisure.sports_centre.sport.multi">Sportovní centrum</string>
     <string name="type.leisure.sports_centre.sport.american_football">Sportovní centrum</string>
@@ -1498,4 +1495,11 @@
     <string name="type.xmas.tree">Vánoční strom</string>
     <string name="type.man_made.mast.communication">Komunikační stožár</string>
     <string name="type.amenity.hydrant">Hydrant na zavlažování</string>
+    <string name="type.railway.miniature">Miniaturní železnice</string>
+    <string name="type.tourism.information.tactile_map">Haptická mapa</string>
+    <string name="type.railway.miniature.bridge">Most miniaturní železnice</string>
+    <string name="type.railway.miniature.tunnel">Tunel miniaturní železnice</string>
+    <string name="type.railway.turntable">Železniční točna</string>
+    <string name="type.railway.disused.bridge">Nepoužívaný železniční most</string>
+    <string name="type.railway.disused.tunnel">Nepoužívaný železniční tunel</string>
 </resources>

android/sdk/src/main/res/values-da/types_strings.xml

@@ -1281,8 +1281,6 @@
     <string name="type.railway.platform">Jernbaneperron</string>
     <string name="type.railway">Jernbane</string>
     <string name="type.railway.crossing">Jernbaneovergang</string>
-    <string name="type.railway.abandoned.bridge">Forladt jernbanebro</string>
-    <string name="type.railway.abandoned.tunnel">Forladt jernbanetunnel</string>
     <string name="type.railway.construction">Jernbanebyggeri</string>
     <string name="type.railway.disused">Ubenyttet jernbane</string>
     <string name="type.railway.funicular.bridge">Kabelbanebro</string>
@@ -1389,7 +1387,6 @@
     <string name="type.natural.wetland.reedbed">Rørskov</string>
     <string name="type.shop.lighting">Lysbutik</string>
     <string name="type.amenity.bench.backless">Bænk</string>
-    <string name="type.amenity.charging_station.motorcar.small">Ladestander til biler</string>
     <string name="type.leisure.sports_centre.sport.multi">Idrætscenter</string>
     <string name="type.leisure.sports_centre.sport.american_football">Idrætscenter</string>
     <string name="type.amenity.car_pooling">Samkørsel</string>
@@ -1463,4 +1460,5 @@
     <string name="type.entrance.house">Husdør</string>
     <string name="type.leisure.fitness_centre.sport.yoga">Yogastudie</string>
     <string name="type.leisure.sports_centre.sport.climbing">Klatrehal</string>
+    <string name="type.aeroway.gate">Gate</string>
 </resources>

android/sdk/src/main/res/values-de/types_strings.xml

@@ -43,9 +43,10 @@
     <string name="type.leisure.adult_gaming_centre">Spielhalle für Erwachsene</string>
     <string name="type.leisure.amusement_arcade">Spielhalle für Unterhaltungsspiele</string>
     <string name="type.amenity.charging_station">Ladestation</string>
-    <string name="type.amenity.charging_station.bicycle">Fahrrad-Ladestation</string>
-    <string name="type.amenity.charging_station.motorcar">Kfz-Ladestation</string>
-    <string name="type.amenity.charging_station.motorcar.small">Kfz-Ladestation</string>
+    <string name="type.amenity.charging_station.bicycle">Fahrräder</string>
+    <string name="type.amenity.charging_station.motorcycle">Motorräder</string>
+    <string name="type.amenity.charging_station.motorcar">Autos</string>
+    <string name="type.amenity.charging_station.small">Begrenzte Kapazität</string>
     <string name="type.amenity.childcare">Kindertagesstätte</string>
     <string name="type.amenity.cinema">Kino</string>
     <string name="type.leisure.bowling_alley">Bowlingbahn</string>
@@ -864,8 +865,6 @@
     <string name="type.public_transport">Öffentlicher Verkehr</string>
     <string name="type.railway">Eisenbahn</string>
     <string name="type.railway.abandoned">Ehemalige Eisenbahnstrecke</string>
-    <string name="type.railway.abandoned.bridge">Ehemalige Eisenbahnbrücke</string>
-    <string name="type.railway.abandoned.tunnel">Ehemaliger Eisenbahntunnel</string>
     <string name="type.railway.construction">Eisenbahnstrecke im Bau</string>
     <string name="type.railway.crossing">Bahnübergang</string>
     <string name="type.railway.disused">Stillgelegte Bahnstrecke</string>
@@ -1503,4 +1502,11 @@
     <string name="type.amenity.food_sharing">Food Sharing</string>
     <string name="type.natural.sand">Sand</string>
     <string name="type.amenity.hydrant">Beregnungshydrant</string>
+    <string name="type.railway.disused.tunnel">Stillgelegter Eisenbahntunnel</string>
+    <string name="type.railway.disused.bridge">Stillgelegte Eisenbahnbrücke</string>
+    <string name="type.railway.miniature.bridge">Miniatur-Eisenbahnbrücke</string>
+    <string name="type.railway.miniature.tunnel">Miniatur-Eisenbahntunnel</string>
+    <string name="type.railway.turntable">Eisenbahn-Drehscheibe</string>
+    <string name="type.tourism.information.tactile_map">Taktile Karte</string>
+    <string name="type.railway.miniature">Miniatureisenbahn</string>
 </resources>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="core_my_position">My Location</string>
+    <string name="postal_code">Postcode</string>
+    <string name="subway_data_unavailable">Metro map is unavailable</string>
+</resources>

android/sdk/src/main/res/values-en-rAU/types_strings.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="type.amenity.bbq">Barbecue</string>
+    <string name="type.amenity.bicycle_parking">Bike Parking</string>
+    <string name="type.amenity.bicycle_parking.covered">Covered Bike Parking</string>
+    <string name="type.amenity.bicycle_rental">Bike Rental</string>
+    <string name="type.amenity.bicycle_repair_station">Bike Repair Station</string>
+    <string name="type.amenity.motorcycle_rental">Motorbike Rental</string>
+    <string name="type.amenity.childcare">Childcare</string>
+    <string name="type.amenity.charging_station.bicycle">Bike Charging Station</string>
+    <string name="type.amenity.fuel">Servo</string>
+    <string name="type.amenity.motorcycle_parking">Motorbike Parking</string>
+    <string name="type.amenity.parking.multi.storey.fee">Multi Story Parking</string>
+    <string name="type.amenity.parking.multi.storey">Multi Story Parking</string>
+    <string name="type.amenity.telephone">Payphone</string>
+    <string name="type.amenity.veterinary">Vet</string>
+    <string name="type.highway.cycleway">Bike Path</string>
+    <string name="type.highway.cycleway.permissive">Bike Path</string>
+    <string name="type.highway.footway">Footpath</string>
+    <string name="type.highway.motorway">Freeway</string>
+    <string name="type.highway.motorway.bridge">Freeway Bridge</string>
+    <string name="type.highway.motorway.tunnel">Freeway Tunnel</string>
+    <string name="type.highway.motorway_link">Freeway Ramp</string>
+    <string name="type.area_highway.cycleway">Bike Path</string>
+    <string name="type.area_highway.footway">Footpath</string>
+    <string name="type.area_highway.motorway">Freeway</string>
+    <string name="type.man_made.surveillance">Security Camera</string>
+    <string name="type.man_made.communications_tower">Telcom Tower</string>
+    <string name="type.man_made.tower.communication">Telcom Tower</string>
+    <string name="type.man_made.mast.communication">Telcom Mast</string>
+    <string name="type.office.estate_agent">Real Estate Agency</string>
+    <string name="type.power.generator.wind">Wind Turbine</string>
+    <string name="type.railway.tram">Tramway</string>
+    <string name="type.railway.tram.bridge">Tramway Bridge</string>
+    <string name="type.railway.tram.tunnel">Tram Tunnel</string>
+    <string name="type.shop.alcohol">Bottle Shop</string>
+    <string name="type.shop.bicycle">Bike Shop</string>
+    <string name="type.shop.deli">Deli</string>
+    <string name="type.shop.grocery">Supermarket</string>
+    <string name="type.shop.mall">Shopping Centre</string>
+    <string name="type.shop.mobile_phone">Phone Shop</string>
+    <string name="type.shop.motorcycle">Motorbike Shop</string>
+    <string name="type.shop.motorcycle_repair">Motorbike Repair</string>
+    <string name="type.shop.rental.bicycle">Bike Rental Shop</string>
+    <string name="type.shop.seafood">Fish Shop</string>
+    <string name="type.shop.second_hand">Op Shop</string>
+    <string name="type.shop.telecommunication">Telcom Shop</string>
+    <string name="type.shop.charity">Op Shop</string>
+    <string name="type.shop.lottery">Lotto</string>
+    <string name="type.sport.australian_football">AFL</string>
+    <string name="type.sport.table_tennis">Ping Pong</string>
+</resources>

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

@@ -2,4 +2,5 @@
 <resources>
     <string name="postal_code">Postcode</string>
     <string name="subway_data_unavailable">Metro map is unavailable</string>
+    <string name="mb">MB</string>
 </resources>

android/sdk/src/main/res/values-en-rGB/types_strings.xml

@@ -287,4 +287,6 @@
     <string name="type.power.pole">Power Pole</string>
     <string name="type.man_made.utility_pole">Utility Pole</string>
     <string name="type.railway.station.subway.qingdao">Metro Station</string>
+    <string name="type.addr_interpolation">Address/Block</string>
+    <string name="type.addr_interpolation.even">Address/Block</string>
 </resources>

android/sdk/src/main/res/values-es-rMX/types_strings.xml

@@ -372,8 +372,6 @@
     <string name="type.power.pole">Poste eléctrico</string>
     <string name="type.man_made.utility_pole">Poste</string>
     <string name="type.power.tower">Torre eléctrica</string>
-    <string name="type.railway.abandoned.bridge">Puente ferroviario abandonado</string>
-    <string name="type.railway.abandoned.tunnel">Túnel ferroviario abandonado</string>
     <string name="type.railway.light_rail.bridge">Puente de tren ligero</string>
     <string name="type.railway.monorail.bridge">Puente de monorriel</string>
     <string name="type.railway.monorail.tunnel">Túnel de monorriel</string>

android/sdk/src/main/res/values-es/types_strings.xml

@@ -627,7 +627,7 @@
     <string name="type.landuse.vineyard">Viñedo</string>
     <string name="type.leisure">Ocio</string>
     <string name="type.leisure.common">Zona pública</string>
-    <string name="type.leisure.dog_park">Parque para perros</string>
+    <string name="type.leisure.dog_park">Parque canino</string>
     <string name="type.leisure.fitness_centre">Centro de fitnes</string>
     <string name="type.leisure.fitness_station">Parque de fitnes</string>
     <string name="type.leisure.dance">Salón de baile</string>
@@ -1360,8 +1360,6 @@
     <string name="type.railway.preserved.tunnel">Túnel ferroviario conservado</string>
     <string name="type.power.pole">Poste eléctrico</string>
     <string name="type.man_made.utility_pole">Poste</string>
-    <string name="type.railway.abandoned.tunnel">Túnel ferroviario abandonado</string>
-    <string name="type.railway.abandoned.bridge">Puente ferroviario abandonado</string>
     <string name="type.railway.funicular.bridge">Puente de funicular</string>
     <string name="type.railway.funicular.tunnel">Túnel de funicular</string>
     <string name="type.railway.light_rail.tunnel">Túnel de tren ligero</string>
@@ -1401,7 +1399,6 @@
     <string name="type.power.portal">Torre de alta tensión</string>
     <string name="type.shop.lighting">Tienda de iluminación</string>
     <string name="type.amenity.bench.backless">Banco sin respaldo</string>
-    <string name="type.amenity.charging_station.motorcar.small">Punto de carga para autos</string>
     <string name="type.leisure.bandstand">Templete</string>
     <string name="type.leisure.sports_centre.sport.multi">Centro deportivo</string>
     <string name="type.leisure.sports_centre.sport.american_football">Centro deportivo</string>

android/sdk/src/main/res/values-et/types_strings.xml

@@ -805,8 +805,6 @@
     <string name="type.public_transport.platform">Ooteplatvorm</string>
     <string name="type.railway">Raudtee</string>
     <string name="type.railway.abandoned">Mahajäetud raudtee</string>
-    <string name="type.railway.abandoned.bridge">Mahajäetud sild</string>
-    <string name="type.railway.abandoned.tunnel">Mahajäetud raudteetunnel</string>
     <string name="type.railway.construction">Ehitusel raudtee</string>
     <string name="type.railway.crossing">Raudtee ülesõit</string>
     <string name="type.railway.disused">Kasutamata raudtee</string>
@@ -1399,7 +1397,6 @@
     <string name="type.office.security">Turvafirma kontor</string>
     <string name="type.shop.lighting">Lambipood</string>
     <string name="type.amenity.bench.backless">Ilma seljatoeta pink</string>
-    <string name="type.amenity.charging_station.motorcar.small">Auto laadimispunkt</string>
     <string name="type.leisure.bandstand">Väike vabaõhulava</string>
     <string name="type.leisure.sports_centre.sport.multi">Spordikeskus</string>
     <string name="type.leisure.fitness_centre.sport.yoga">Joogastuudio</string>
@@ -1495,4 +1492,17 @@
     <string name="type.man_made.mast.communication">Sidemast</string>
     <string name="type.shop.beauty.nails">Küünestuudio</string>
     <string name="type.amenity.hydrant">Kastmishüdrant</string>
+    <string name="type.lateral.port">Pakpoordis</string>
+    <string name="type.lateral.starboard">Tüürpoordis</string>
+    <string name="type.cardinal.east">Idas</string>
+    <string name="type.cardinal.north">Põhjas</string>
+    <string name="type.cardinal.south">Lõunas</string>
+    <string name="type.cardinal.west">Läänes</string>
+    <string name="type.railway.miniature">Väikeraudtee/pargiraudtee</string>
+    <string name="type.railway.miniature.bridge">Väikeraudtee/pargiraudtee sild</string>
+    <string name="type.railway.miniature.tunnel">Väikeraudtee/pargiraudtee tunnel</string>
+    <string name="type.railway.turntable">Raudtee pöördesild</string>
+    <string name="type.tourism.information.tactile_map">Kombatav kaart</string>
+    <string name="type.railway.disused.bridge">Kasutuselt eemaldatud raudteesild</string>
+    <string name="type.railway.disused.tunnel">Kasutuselt eemaldatud raudteetunnel</string>
 </resources>

android/sdk/src/main/res/values-eu/types_strings.xml

@@ -1303,8 +1303,6 @@
     <string name="type.public_transport.platform">Plataforma</string>
     <string name="type.railway">Trenbidea</string>
     <string name="type.railway.abandoned">Utzitako trenbidea</string>
-    <string name="type.railway.abandoned.bridge">Utzitako trenbide zubia</string>
-    <string name="type.railway.abandoned.tunnel">Utzitako trenbide tunela</string>
     <string name="type.railway.crossing">Trenbide gurutzea</string>
     <string name="type.railway.disused">Erabilerarik gabeko trenbidea</string>
     <string name="type.railway.funicular.tunnel">Funikularreko tunela</string>
@@ -1356,5 +1354,4 @@
     <string name="type.man_made.telescope.radio">Teleskopioa (irratia)</string>
     <string name="type.man_made.telescope.gamma">Teleskopioa (gamma)</string>
     <string name="type.man_made.observatory">Behatokia</string>
-    <string name="type.amenity.charging_station.motorcar.small">Autoak kargatzeko puntua</string>
 </resources>

android/sdk/src/main/res/values-fi/types_strings.xml

@@ -1304,8 +1304,6 @@
     <string name="type.sport.diving">Korkeasukellus</string>
     <string name="type.power.line.underground">Maanalainen sähkölinja</string>
     <string name="type.railway">Rautatie</string>
-    <string name="type.railway.abandoned.bridge">Hylätty rautatiesilta</string>
-    <string name="type.railway.abandoned.tunnel">Hylätty rautatietunneli</string>
     <string name="type.railway.platform">Rautatielaituri</string>
     <string name="type.railway.subway.tunnel">Metrolinjan tunneli</string>
     <string name="type.railway.tram.tunnel">Raitiovaunulinjan tunneli</string>
@@ -1397,7 +1395,6 @@
     <string name="type.building.guardhouse">Vartijankoppi</string>
     <string name="type.power.portal">Sähköportaali</string>
     <string name="type.amenity.bench.backless">Selkänojaton penkki</string>
-    <string name="type.amenity.charging_station.motorcar.small">Auton latauspiste</string>
     <string name="type.amenity.boat_rental">Venevuokraus</string>
     <string name="type.man_made.telescope">Teleskooppi</string>
     <string name="type.man_made.telescope.optical">Teleskooppi (optinen)</string>
@@ -1459,4 +1456,5 @@
     <string name="type.man_made.mast.communication">Tietoliikennemasto</string>
     <string name="type.leisure.bandstand">Esiintymislava</string>
     <string name="type.leisure.indoor_play">Sisäleikkipuisto</string>
+    <string name="type.railway.disused.tunnel">Käytöstä poistettu rautatietunneli</string>
 </resources>

android/sdk/src/main/res/values-fr/types_strings.xml

@@ -773,8 +773,6 @@
     <string name="type.public_transport.platform">Quai de transport en commun</string>
     <string name="type.railway">Chemin de fer</string>
     <string name="type.railway.abandoned">Chemin de fer abandonné</string>
-    <string name="type.railway.abandoned.bridge">Chemin de fer abandonné</string>
-    <string name="type.railway.abandoned.tunnel">Chemin de fer abandonné</string>
     <string name="type.railway.construction">Chemin de fer en construction</string>
     <string name="type.railway.crossing">Passage à niveau pour piéton</string>
     <string name="type.railway.disused">Chemin de fer désaffecté</string>
@@ -1400,7 +1398,6 @@
     <string name="type.power.portal">Portique haute tension</string>
     <string name="type.shop.lighting">Boutique de luminaires</string>
     <string name="type.amenity.bench.backless">Banc sans dossier</string>
-    <string name="type.amenity.charging_station.motorcar.small">Borne de recharge pour voiture</string>
     <string name="type.leisure.bandstand">Kiosque à musique</string>
     <string name="type.leisure.sports_centre.sport.multi">Complexe sportif</string>
     <string name="type.leisure.sports_centre.sport.american_football">Complexe sportif</string>

android/sdk/src/main/res/values-gl/types_strings.xml

@@ -403,7 +403,6 @@
     <string name="type.highway.pedestrian">Cale peonil</string>
     <string name="type.highway.pedestrian.area">Zona peonil</string>
     <string name="type.highway.pedestrian.bridge">Puente peonil</string>
-
     <string name="type.highway.pedestrian.square">Praza</string>
     <string name="type.highway.pedestrian.tunnel">Túnel peonil</string>
     <string name="type.highway.primary">Estrada principal</string>
@@ -731,8 +730,6 @@
     <string name="type.man_made.utility_pole">Poste</string>
     <string name="type.public_transport">Transporte público</string>
     <string name="type.railway.abandoned">Vía férrea abandonada</string>
-    <string name="type.railway.abandoned.bridge">Puente ferroviario abandonado</string>
-    <string name="type.railway.abandoned.tunnel">Túnel ferroviario abandonado</string>
     <string name="type.railway.construction">Vía férrea en construción</string>
     <string name="type.railway.crossing">Paso a nivel</string>
     <string name="type.railway.disused">Vía férrea en desuso</string>

android/sdk/src/main/res/values-gsw/types_strings.xml

@@ -530,8 +530,8 @@
     <string name="type.leisure.sauna">Sauna</string>
     <string name="type.leisure.slipway">Bootsrampe</string>
     <string name="type.leisure.sports_centre">Sportzentrum</string>
-    <string name="type.sport.climbing">Chlätterhalle</string>
-    <string name="type.sport.yoga">Yoga Studio</string>
+    <string name="type.sport.climbing">Chlättere</string>
+    <string name="type.sport.yoga">Yoga</string>
     <string name="type.leisure.stadium">Stadion</string>
     <string name="type.leisure.swimming_pool.private">Schwümmbecki</string>
     <string name="type.leisure.track">Laufbahn</string>
@@ -669,7 +669,6 @@
     <string name="type.public_transport.platform">Plattform</string>
     <string name="type.railway">Isebahn</string>
     <string name="type.railway.abandoned">Ehemaligi Isebahnstrecki</string>
-    <string name="type.railway.abandoned.bridge">Ehemaligi Isebahnbrugg</string>
     <string name="type.railway.construction">Isebahnstrecki im Bau</string>
     <string name="type.railway.crossing">Bahnübergang</string>
     <string name="type.railway.disused">Stillgleiti Bahnstrecki</string>
@@ -835,7 +834,6 @@
     <string name="type.natural.shingle">Chieselstei</string>
     <string name="type.natural.vineyard">Wiiberg</string>
     <string name="type.place.quarter">Stadtviertel</string>
-    <string name="type.railway.abandoned.tunnel">Ehemalige Isebahntunnel</string>
     <string name="type.railway.rail.highspeed">Höchgschwindigkeitsisebahn</string>
     <string name="type.area_highway.primary">Hauptstrass</string>
     <string name="type.man_made.cross">Chrüz</string>
@@ -1311,7 +1309,6 @@
     <string name="type.man_made.telescope.radio">Teleskop (Radio)</string>
     <string name="type.man_made.telescope.gamma">Teleskop (Gamma)</string>
     <string name="type.man_made.observatory">Observatorium</string>
-    <string name="type.amenity.charging_station.motorcar.small">Autoladestation</string>
     <string name="type.amenity.sailing_school">Sägelschuel</string>
     <string name="type.amenity.flight_school">Flugschuel</string>
     <string name="type.amenity.prep_school">Nachhilfsschuel</string>
@@ -1334,4 +1331,11 @@
     <string name="type.entrance.entry">(Nur) Iigang</string>
     <string name="type.entrance.emergency">Notuusgang</string>
     <string name="type.leisure.sports_centre.sport.multi">Sportzentrum</string>
+    <string name="type.amenity.hydrant">Berägnigshydrant</string>
+    <string name="type.cardinal.east">Oschte</string>
+    <string name="type.cardinal.north">Norde</string>
+    <string name="type.cardinal.south">Süüde</string>
+    <string name="type.cardinal.west">Weschte</string>
+    <string name="type.lateral.starboard">Schtüürbord</string>
+    <string name="type.lateral.port">Backbord</string>
 </resources>

android/sdk/src/main/res/values-hr/strings.xml

@@ -8,4 +8,27 @@
     <string name="mb">MB</string>
     <string name="gb">GB</string>
     <string name="today">Danas</string>
+    <string name="core_my_places">Moja mjesta</string>
+    <string name="maps_storage_internal">Unutarnja privatna pohrana</string>
+    <string name="maps_storage_shared">Unutarnja dijeljena pohrana</string>
+    <string name="maps_storage_removable">SD kartica</string>
+    <string name="maps_storage_external">Vanjska dijeljena pohrana</string>
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Poštanski broj</string>
+    <string name="core_placepage_unknown_place">Točka na karti</string>
+    <string name="mi">mi</string>
+    <string name="ft">ft</string>
+    <string name="core_entrance">Ulaz</string>
+    <string name="subway_data_unavailable">Karta podzemne željeznice nije dostupna</string>
+    <string name="public_access">Javni pristup</string>
+    <string name="limited_access">Ograničen pristup</string>
+    <string name="access_rules_author_only">Online uređivanje</string>
+    <string name="yesterday">Jučer</string>
+    <string name="days_ago">Prije %s dana</string>
+    <string name="week_ago">prije %s tjedan</string>
+    <string name="weeks_ago">prije %s tjedna</string>
+    <string name="month_ago">Prije %s mjesec</string>
+    <string name="months_ago">Prije %s mjeseca</string>
+    <string name="year_ago">prije %s godine</string>
+    <string name="years_ago">prije %s godina</string>
 </resources>

android/sdk/src/main/res/values-hu/types_strings.xml

@@ -1290,8 +1290,6 @@
     <string name="type.public_transport.platform">Peron</string>
     <string name="type.railway">Vasút</string>
     <string name="type.railway.abandoned">Elhagyott vasútvonal</string>
-    <string name="type.railway.abandoned.bridge">Elhagyott vasúti híd</string>
-    <string name="type.railway.abandoned.tunnel">Elhagyott vasúti alagút</string>
     <string name="type.railway.construction">Vasúti építési terület</string>
     <string name="type.railway.crossing">Gyalogos vasúti átjáró</string>
     <string name="type.railway.disused">Használaton kívüli vasútvonal</string>
@@ -1430,7 +1428,6 @@
     <string name="type.leisure.sports_centre.sport.volleyball">Sportközpont</string>
     <string name="type.leisure.sports_centre.sport.yoga">Sportközpont</string>
     <string name="type.leisure.fitness_centre.sport.yoga">Jógastúdió</string>
-    <string name="type.amenity.charging_station.motorcar.small">Elektromos töltőpont</string>
     <string name="type.amenity.boat_rental">Hajóbérlés</string>
     <string name="type.man_made.telescope">Távcső</string>
     <string name="type.man_made.telescope.optical">Távcső (Optikai)</string>

android/sdk/src/main/res/values-in/strings.xml

@@ -28,4 +28,13 @@
     <string name="not_shared">Pribadi</string>
     <string name="access_rules_author_only">Pengeditan online</string>
     <string name="today">Hari ini</string>
+    <string name="gb">GB</string>
+    <string name="yesterday">Kemarin</string>
+    <string name="days_ago">%s hari yang lalu</string>
+    <string name="week_ago">%s minggu yang lalu</string>
+    <string name="weeks_ago">%s minggu yang lalu</string>
+    <string name="month_ago">%s bulan yang lalu</string>
+    <string name="months_ago">%s bulan yang lalu</string>
+    <string name="year_ago">%s tahun yang lalu</string>
+    <string name="years_ago">%s tahun yang lalu</string>
 </resources>

android/sdk/src/main/res/values-in/types_strings.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- SECTION: Types -->
-    <string name="type.addr_interpolation">Alamat/Blokir</string>
-    <string name="type.addr_interpolation.even">Alamat/Blokir</string>
-    <string name="type.addr_interpolation.odd">Alamat/Blokir</string>
+    <string name="type.addr_interpolation">Alamat/Blok</string>
+    <string name="type.addr_interpolation.even">Alamat/Blok</string>
+    <string name="type.addr_interpolation.odd">Alamat/Blok</string>
     <string name="type.aerialway.station">Stasiun kereta gantung</string>
-    <string name="type.aeroway.aerodrome">Bandar udara</string>
-    <string name="type.aeroway.aerodrome.international">Bandar udara</string>
+    <string name="type.aeroway.aerodrome">Bandar Udara|Bandara</string>
+    <string name="type.aeroway.aerodrome.international">Bandar Udara Internasional|Bandara Internasional</string>
     <string name="type.aeroway.helipad">Landasan helikopter</string>
     <string name="type.amenity">Ruang berfasilitas</string>
     <string name="type.amenity.arts_centre">Pusat kesenian</string>
@@ -144,7 +144,7 @@
     <string name="type.amenity.vending_machine.public_transport_tickets">Mesin penjual otomatis tiket transportasi umum</string>
     <string name="type.amenity.vehicle_inspection">Pemeriksaan kendaraan</string>
     <string name="type.amenity.veterinary">Dokter Hewan</string>
-    <string name="type.amenity.waste_basket">Kotak sampah</string>
+    <string name="type.amenity.waste_basket">Tempat Sampah</string>
     <string name="type.amenity.waste_disposal">Sampah</string>
     <string name="type.amenity.water_point">Titik Air</string>
     <string name="type.amenity.water_point.drinking_water_no">Titik Air</string>
@@ -205,91 +205,91 @@
     <string name="type.craft.shoemaker">Tukang sepatu</string>
     <string name="type.craft.winery">Kilang Anggur</string>
     <string name="type.craft.tailor">Tukang jahit</string>
-    <string name="type.cuisine.african">Masakan afrika</string>
-    <string name="type.cuisine.american">Masakan amerika</string>
-    <string name="type.cuisine.arab">Masakan arab</string>
-    <string name="type.cuisine.argentinian">Masakan argentina</string>
-    <string name="type.cuisine.asian">Masakan asia</string>
-    <string name="type.cuisine.austrian">Masakan austria</string>
+    <string name="type.cuisine.african">Masakan Afrika</string>
+    <string name="type.cuisine.american">Masakan Amerika</string>
+    <string name="type.cuisine.arab">Masakan Arab</string>
+    <string name="type.cuisine.argentinian">Masakan Argentina</string>
+    <string name="type.cuisine.asian">Masakan Asia</string>
+    <string name="type.cuisine.austrian">Masakan Austria</string>
     <string name="type.cuisine.bagel">Roti bagel</string>
-    <string name="type.cuisine.balkan">Masakan balkan</string>
+    <string name="type.cuisine.balkan">Masakan Balkan</string>
     <string name="type.cuisine.barbecue">Barbekyu</string>
-    <string name="type.cuisine.bavarian">Masakan bavaria</string>
+    <string name="type.cuisine.bavarian">Masakan Bayern</string>
     <string name="type.cuisine.beef_bowl">Nasi daging sapi</string>
-    <string name="type.cuisine.brazilian">Masakan brasil</string>
+    <string name="type.cuisine.brazilian">Masakan Brasil</string>
     <string name="type.cuisine.breakfast">Sarapan</string>
     <string name="type.cuisine.burger">Burger</string>
     <string name="type.cuisine.buschenschank">Taverna anggur</string>
     <string name="type.cuisine.cake">Kue</string>
-    <string name="type.cuisine.caribbean">Masakan karibia</string>
+    <string name="type.cuisine.caribbean">Masakan Karibia</string>
     <string name="type.cuisine.chicken">Ayam</string>
-    <string name="type.cuisine.chinese">Masakan tionghoa</string>
+    <string name="type.cuisine.chinese">Masakan Tionghoa</string>
     <string name="type.cuisine.coffee_shop">Kopi</string>
-    <string name="type.cuisine.crepe">Kue dadar</string>
-    <string name="type.cuisine.croatian">Masakan kroasia</string>
+    <string name="type.cuisine.crepe">Crepes</string>
+    <string name="type.cuisine.croatian">Masakan Kroasia</string>
     <string name="type.cuisine.curry">Kari</string>
     <string name="type.cuisine.deli">Toko makanan jadi</string>
-    <string name="type.cuisine.diner">Makan malam</string>
+    <string name="type.cuisine.diner">Diner</string>
     <string name="type.cuisine.donut">Donat</string>
-    <string name="type.cuisine.ethiopian">Masakan etiopia</string>
-    <string name="type.cuisine.filipino">Masakan filipina</string>
-    <string name="type.cuisine.fine_dining">Adiboga</string>
+    <string name="type.cuisine.ethiopian">Masakan Etiopia</string>
+    <string name="type.cuisine.filipino">Masakan Filipina</string>
+    <string name="type.cuisine.fine_dining">Fine Dining|Adiboga</string>
     <string name="type.cuisine.fish">Ikan</string>
-    <string name="type.cuisine.fish_and_chips">Ikan dan kentang goreng</string>
-    <string name="type.cuisine.french">Masakan prancis</string>
+    <string name="type.cuisine.fish_and_chips">Fish and Chips</string>
+    <string name="type.cuisine.french">Masakan Prancis</string>
     <string name="type.cuisine.friture">Gorengan</string>
-    <string name="type.cuisine.georgian">Masakan georgia</string>
-    <string name="type.cuisine.german">Masakan jerman</string>
-    <string name="type.cuisine.greek">Masakan yunani</string>
+    <string name="type.cuisine.georgian">Masakan Georgia</string>
+    <string name="type.cuisine.german">Masakan Jerman</string>
+    <string name="type.cuisine.greek">Masakan Yunani</string>
     <string name="type.cuisine.grill">Panggangan</string>
     <string name="type.cuisine.heuriger">Taverna anggur</string>
     <string name="type.cuisine.hotdog">Hotdog</string>
-    <string name="type.cuisine.hungarian">Masakan hongaria</string>
-    <string name="type.cuisine.ice_cream">Es_krim</string>
-    <string name="type.cuisine.indian">Masakan india</string>
-    <string name="type.cuisine.indonesian">Masakan indonesia</string>
-    <string name="type.cuisine.international">Masakan internasional</string>
-    <string name="type.cuisine.irish">Masakan irlandia</string>
-    <string name="type.cuisine.italian">Masakan italia</string>
-    <string name="type.cuisine.italian_pizza">Italia, pizza</string>
-    <string name="type.cuisine.japanese">Masakan jepang</string>
+    <string name="type.cuisine.hungarian">Masakan Hungaria</string>
+    <string name="type.cuisine.ice_cream">Es Krim</string>
+    <string name="type.cuisine.indian">Masakan India</string>
+    <string name="type.cuisine.indonesian">Masakan Indonesia</string>
+    <string name="type.cuisine.international">Masakan Internasional</string>
+    <string name="type.cuisine.irish">Masakan Irlandia</string>
+    <string name="type.cuisine.italian">Masakan Italia</string>
+    <string name="type.cuisine.italian_pizza">Italia, Pizza</string>
+    <string name="type.cuisine.japanese">Masakan Jepang</string>
     <string name="type.cuisine.kebab">Kebab</string>
     <string name="type.cuisine.korean">Korea</string>
-    <string name="type.cuisine.lao">Masakan laos</string>
-    <string name="type.cuisine.lebanese">Masakan lebanon</string>
-    <string name="type.cuisine.local">Masakan lokal</string>
-    <string name="type.cuisine.malagasy">Masakan madagaskar</string>
-    <string name="type.cuisine.malaysian">Masakan malaysia</string>
-    <string name="type.cuisine.mediterranean">Masakan mediterania</string>
-    <string name="type.cuisine.mexican">Masakan meksiko</string>
-    <string name="type.cuisine.moroccan">Masakan maroko</string>
+    <string name="type.cuisine.lao">Masakan Laos</string>
+    <string name="type.cuisine.lebanese">Masakan Lebanon</string>
+    <string name="type.cuisine.local">Masakan Lokal</string>
+    <string name="type.cuisine.malagasy">Masakan Madagaskar</string>
+    <string name="type.cuisine.malaysian">Masakan Malaysia</string>
+    <string name="type.cuisine.mediterranean">Masakan Mediterania</string>
+    <string name="type.cuisine.mexican">Masakan Meksiko</string>
+    <string name="type.cuisine.moroccan">Masakan Maroko</string>
     <string name="type.cuisine.noodles">Bakmi</string>
-    <string name="type.cuisine.oriental">Masakan oriental</string>
+    <string name="type.cuisine.oriental">Masakan Oriental|Masakan Asia Timur</string>
     <string name="type.cuisine.pancake">Panekuk</string>
     <string name="type.cuisine.pasta">Pasta</string>
-    <string name="type.cuisine.persian">Masakan persia</string>
-    <string name="type.cuisine.peruvian">Masakan peru</string>
+    <string name="type.cuisine.persian">Masakan Persia|Masakan Iran</string>
+    <string name="type.cuisine.peruvian">Masakan Peru</string>
     <string name="type.cuisine.pizza">Pizza</string>
-    <string name="type.cuisine.polish">Masakan polandia</string>
-    <string name="type.cuisine.portuguese">Masakan portugis</string>
+    <string name="type.cuisine.polish">Masakan Polandia</string>
+    <string name="type.cuisine.portuguese">Masakan Portugis|Masakan Portugal</string>
     <string name="type.cuisine.ramen">Ramen</string>
-    <string name="type.cuisine.regional">Masakan regional</string>
-    <string name="type.cuisine.russian">Masakan rusia</string>
+    <string name="type.cuisine.regional">Masakan Regional</string>
+    <string name="type.cuisine.russian">Masakan Rusia</string>
     <string name="type.cuisine.sandwich">Roti isi</string>
     <string name="type.cuisine.sausage">Sosis</string>
     <string name="type.cuisine.savory_pancakes">Panekuk gurih</string>
     <string name="type.cuisine.seafood">Hidangan laut</string>
     <string name="type.cuisine.soba">Soba</string>
-    <string name="type.cuisine.spanish">Masakan spanyol</string>
-    <string name="type.cuisine.steak_house">Restoran_steik</string>
-    <string name="type.cuisine.sushi">Sushi</string>
-    <string name="type.cuisine.tapas">Kudapan spanyol</string>
+    <string name="type.cuisine.spanish">Masakan Spanyol</string>
+    <string name="type.cuisine.steak_house">Restoran Steik</string>
+    <string name="type.cuisine.sushi">Susyi</string>
+    <string name="type.cuisine.tapas">Tapas</string>
     <string name="type.cuisine.tea">Teh</string>
-    <string name="type.cuisine.thai">Masakan thailand</string>
-    <string name="type.cuisine.turkish">Masakan turki</string>
-    <string name="type.cuisine.vegan">Masakan vegan</string>
-    <string name="type.cuisine.vegetarian">Masakan vegetarian</string>
-    <string name="type.cuisine.vietnamese">Masakan vietnam</string>
+    <string name="type.cuisine.thai">Masakan Thailand</string>
+    <string name="type.cuisine.turkish">Masakan Turki</string>
+    <string name="type.cuisine.vegan">Masakan Vegan</string>
+    <string name="type.cuisine.vegetarian">Masakan Vegetarian</string>
+    <string name="type.cuisine.vietnamese">Masakan Vietnam</string>
     <string name="type.emergency.assembly_point">Titik Berkumpul Darurat</string>
     <string name="type.emergency.defibrillator">Defibrilator</string>
     <string name="type.emergency.fire_hydrant">Keran Kebakaran</string>
@@ -371,7 +371,6 @@
     <string name="type.highway.pedestrian.area">Jalan</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Menjembatani</string>
-
     <string name="type.highway.pedestrian.square">Lapangan kota</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Terowongan</string>
@@ -1169,4 +1168,17 @@
     <string name="type.leisure.sports_hall">Ruang olahraga</string>
     <string name="type.leisure.hackerspace">Hackerspace</string>
     <string name="type.man_made.silo">Silo</string>
+    <string name="type.aerialway">Transportasi Kabel</string>
+    <string name="type.aerialway.chair_lift">Kursi Gantung</string>
+    <string name="type.aerialway.cable_car">Kereta Gantung</string>
+    <string name="type.aerialway.gondola">Gondola</string>
+    <string name="type.amenity.bank">Bank</string>
+    <string name="type.amenity.bar">Bar</string>
+    <string name="type.amenity.bicycle_parking.covered">Parkir Sepeda Beratap</string>
+    <string name="type.man_made.telescope">Teleskop</string>
+    <string name="type.man_made.telescope.optical">Teleskop Optik</string>
+    <string name="type.man_made.telescope.radio">Teleskop Radio</string>
+    <string name="type.man_made.observatory">Observatorium</string>
+    <string name="type.aeroway.runway">Landasan Pacu</string>
+    <string name="type.emergency">Darurat</string>
 </resources>

android/sdk/src/main/res/values-is/types_strings.xml

@@ -1018,7 +1018,6 @@
     <string name="type.highway.footway.bridge">Göngubrú</string>
     <string name="type.highway.footway.tunnel">Göng fyrir fótgangandi</string>
     <string name="type.highway.pedestrian.bridge">Göngubrú</string>
-
     <string name="type.highway.pedestrian.square">Torg</string>
     <string name="type.historic">Sögulegur hlutur</string>
     <string name="type.historic.stone">Sögulegur steinn</string>
@@ -1080,7 +1079,6 @@
     <string name="type.historic.castle.manor">Herragarður</string>
     <string name="type.power.generator.solar">Sólaraflgjafi</string>
     <string name="type.power.generator.wind">Vindaflgjafi</string>
-    <string name="type.railway.abandoned.tunnel">Aflögð járnbrautargöng</string>
     <string name="type.railway.construction">Járnbraut í byggingu</string>
     <string name="type.railway.rail.tourism">Ferðamannalest</string>
     <string name="type.shop.car_repair">Bílaviðgerðir</string>
@@ -1152,7 +1150,6 @@
     <string name="type.power.minor_line">Minni raflína</string>
     <string name="type.power.plant.gas">Gastúrbínuknúin aflstöð</string>
     <string name="type.power.plant.hydro">Vatnsaflstöð</string>
-    <string name="type.railway.abandoned.bridge">Aflögð járnbrautarbrú</string>
     <string name="type.railway.light_rail.bridge">Léttlestarbrú</string>
     <string name="type.railway.light_rail.tunnel">Léttlestargöng</string>
     <string name="type.railway.monorail.bridge">Einteinungsbrú</string>

android/sdk/src/main/res/values-it/types_strings.xml

@@ -1328,13 +1328,11 @@
     <string name="type.man_made.utility_pole">Palo di servizio</string>
     <string name="type.power.line.underground">Linea elettrica sotterranea</string>
     <string name="type.public_transport.platform">Banchina</string>
-    <string name="type.railway.abandoned.tunnel">Tunnel ferroviario abbandonato</string>
     <string name="type.railway.light_rail.tunnel">Tunnel metropolitana</string>
     <string name="type.internet_access">Internet</string>
     <string name="type.landuse.greenfield">Zona selvaggia</string>
     <string name="type.railway.light_rail.bridge">Ponte metropolitana</string>
     <string name="type.man_made.pipeline.overground">Condotto non interrato</string>
-    <string name="type.railway.abandoned.bridge">Ponte ferroviario abbandonato</string>
     <string name="type.landuse.greenhouse_horticulture">Serra</string>
     <string name="type.man_made.cairn">Tumulo</string>
     <string name="type.railway.funicular.tunnel">Galleria funicolare</string>
@@ -1399,7 +1397,6 @@
     <string name="type.power.portal">Portale elettrico</string>
     <string name="type.shop.lighting">Negozio di illuminazione</string>
     <string name="type.amenity.bench.backless">Panchina senza schienale</string>
-    <string name="type.amenity.charging_station.motorcar.small">Colonnina di ricarica</string>
     <string name="type.man_made.observatory">Osservatorio</string>
     <string name="type.cardinal.north">Nord</string>
     <string name="type.cardinal.south">Sud</string>

android/sdk/src/main/res/values-iw/types_strings.xml

@@ -433,7 +433,6 @@
     <string name="type.highway.pedestrian.area">אזור הולכי רגל</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">גשר הולכי רגל</string>
-
     <string name="type.highway.pedestrian.square">כיכר עירונית</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">מנהרה להולכי רגל</string>
@@ -802,8 +801,6 @@
     <string name="type.public_transport.platform">רציף תחבורה</string>
     <string name="type.railway">מסילת רכבת</string>
     <string name="type.railway.abandoned">מסילת רכבת נטושה</string>
-    <string name="type.railway.abandoned.bridge">גשר רכבת נטוש</string>
-    <string name="type.railway.abandoned.tunnel">מנהרת רכבת נטושה</string>
     <string name="type.railway.construction">מסילת רכבת בבניה</string>
     <string name="type.railway.crossing">מעבר חציית פסי רכבת</string>
     <string name="type.railway.disused">מסילת רכבת לא בשימוש</string>

android/sdk/src/main/res/values-ja/types_strings.xml

@@ -406,7 +406,6 @@
     <string name="type.highway.pedestrian.area">ストリート</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">橋</string>
-
     <string name="type.highway.pedestrian.square">広場</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">トンネル</string>
@@ -770,8 +769,6 @@
     <string name="type.public_transport.platform">公共交通機関のプラットホーム</string>
     <string name="type.railway">鉄道</string>
     <string name="type.railway.abandoned">廃線</string>
-    <string name="type.railway.abandoned.bridge">廃線(橋)</string>
-    <string name="type.railway.abandoned.tunnel">廃線(トンネル)</string>
     <string name="type.railway.construction">建設中の鉄道</string>
     <string name="type.railway.crossing">歩行者専用踏切</string>
     <string name="type.railway.disused">休止線</string>

android/sdk/src/main/res/values-kw/types_strings.xml

@@ -50,7 +50,7 @@
     <string name="type.amenity.money_transfer">Treusworrans Mona</string>
     <string name="type.amenity.music_school">Skol-ilowek</string>
     <string name="type.amenity.flight_school">Skol Ayr</string>
-    <string name="type.amenity.language_school">Skol Tavas</string>
+    <string name="type.amenity.language_school">Skol Yeth</string>
     <string name="type.office.diplomatic">Kanatti</string>
     <string name="type.office.security">Buro Gwithyas Diogeledh</string>
     <string name="type.building.guardhouse">Borth Gwithyas Diogeledh</string>
@@ -123,7 +123,7 @@
     <string name="type.toilets.yes">Attesva</string>
     <string name="type.amenity.townhall">Odyans</string>
     <string name="type.amenity.university">Pennskol</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Jynn Tokyn</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Jynn Tokyn rag Karyans Poblek</string>
     <string name="type.amenity.parcel_locker">Amari Fardel</string>
     <string name="type.amenity.vehicle_inspection">Hwithrans Karr</string>
     <string name="type.amenity.vending_machine.fuel">Pomp Petrol</string>
@@ -278,7 +278,7 @@
     <string name="type.healthcare.podiatrist">Medhek Troos</string>
     <string name="type.healthcare.psychotherapist">Yaghheans Brysoniethel</string>
     <string name="type.healthcare.sample_collection">Kres Kuntel Sampel</string>
-    <string name="type.healthcare.speech_therapist">Pathologydh Kows ha Tavas</string>
+    <string name="type.healthcare.speech_therapist">Pathologydh Kows ha Yeth</string>
     <string name="type.highway">Fordh Veur</string>
     <string name="type.highway.bridleway">Marghlergh</string>
     <string name="type.highway.bridleway.bridge">Pons</string>
@@ -670,8 +670,6 @@
     <string name="type.public_transport.platform">Kay</string>
     <string name="type.railway">Hyns Horn</string>
     <string name="type.railway.abandoned">Hyns Horn Gesys</string>
-    <string name="type.railway.abandoned.bridge">Pons Hyns Horn Gesys</string>
-    <string name="type.railway.abandoned.tunnel">Kowfordh Hyns Horn Gesys</string>
     <string name="type.railway.construction">Hyns Horn Drehevyans</string>
     <string name="type.railway.crossing">Treusva Hyns Horn</string>
     <string name="type.railway.disused">Hyns Horn Undevnydhys</string>
@@ -861,4 +859,554 @@
     <string name="type.railway.subway_entrance.hamburg">Entrans Metro</string>
     <string name="type.railway.subway_entrance.helsinki">Entrans Metro</string>
     <string name="type.railway.subway_entrance.hiroshima">Entrans Metro</string>
+    <string name="type.aerialway">Hyns Ayrel</string>
+    <string name="type.aerialway.drag_lift">Yskynnell Drayl</string>
+    <string name="type.aerialway.mixed_lift">Yskynnell Kemyskys</string>
+    <string name="type.aerialway.station">Gorsav Hyns Ayrel</string>
+    <string name="type.aeroway">Isframweyth Ayrel</string>
+    <string name="type.aeroway.taxiway">Hyns Ayrennow</string>
+    <string name="type.amenity.bench.backless">Bynk heb Keyn</string>
+    <string name="type.amenity.car_sharing">Kevrennewgh Karr</string>
+    <string name="type.man_made.telescope.optical">Pellweler (Optek)</string>
+    <string name="type.man_made.telescope.gamma">Pellweler (Gamma)</string>
+    <string name="type.amenity.casino">Casino</string>
+    <string name="type.amenity.gambling">Hapwaryans</string>
+    <string name="type.leisure.adult_gaming_centre">Kres Gwariow Tevesik</string>
+    <string name="type.amenity.charging_station">Poyntys-karga</string>
+    <string name="type.amenity.charging_station.bicycle">Poyntys-karga Diwros</string>
+    <string name="type.amenity.charging_station.motorcar">Poyntys-karga Karr</string>
+    <string name="type.leisure.bowling_alley">Kres Gwari Pelyow</string>
+    <string name="type.amenity.compressed_air">Ayr Strooth</string>
+    <string name="type.amenity.driving_school">Skol Lewya</string>
+    <string name="type.amenity.sailing_school">Skol Golya</string>
+    <string name="type.amenity.prep_school">Skol Ragober</string>
+    <string name="type.amenity.food_court">Lys Boos</string>
+    <string name="type.amenity.hunting_stand">Tour Helgh</string>
+    <string name="type.amenity.lounger">Gweli-worwedha</string>
+    <string name="type.amenity.mobile_money_agent">Maynor Mobile Money</string>
+    <string name="type.amenity.nursing_home">Annedh-witha</string>
+    <string name="type.amenity.parking.street_side">Parkans ryb Stret</string>
+    <string name="type.amenity.parking.street_side.fee">Parkans ryb Stret</string>
+    <string name="type.amenity.parking.street_side.private">Parkans Privedh ryb Stret</string>
+    <string name="type.amenity.parking.lane">Parkyans war Stret</string>
+    <string name="type.amenity.parking.lane.fee">Parkyans war Stret</string>
+    <string name="type.amenity.parking.lane.private">Parkyans Privedh war Stret</string>
+    <string name="type.amenity.parking_space">Spas Parkyans</string>
+    <string name="type.amenity.parking_space.permissive">Spas Parkyans</string>
+    <string name="type.amenity.parking_space.private">Spas Parkyans</string>
+    <string name="type.amenity.parking_space.underground">Spas Parkyans</string>
+    <string name="type.amenity.parking_space.disabled">Spas Parkyans Evredhek</string>
+    <string name="type.amenity.car_pooling">Kevrennewgh Karr</string>
+    <string name="type.amenity.payment_centre">Kres Talas</string>
+    <string name="type.amenity.payment_terminal">Termynal Talas</string>
+    <string name="type.amenity.place_of_worship">Gordhyaji</string>
+    <string name="type.amenity.place_of_worship.christian.mormon">Eglos Mormon</string>
+    <string name="type.amenity.place_of_worship.christian.jehovahs_witness">Hel Jehovah\'s Witnesses</string>
+    <string name="type.amenity.place_of_worship.hindu">Tempel Hindu</string>
+    <string name="type.amenity.place_of_worship.shinto">Krerva Shinto</string>
+    <string name="type.amenity.place_of_worship.taoist">Tempel Taoist</string>
+    <string name="type.amenity.post_box">Kist lytherow</string>
+    <string name="type.post_office.post_partner">Keskoweth Post</string>
+    <string name="type.recycling.cartons">Kisten</string>
+    <string name="type.amenity.sanitary_dump_station">Poynt Skollva Tankow Septyk</string>
+    <string name="type.amenity.shelter.basic_hut">Krellas</string>
+    <string name="type.amenity.shelter.lean_to">Skovva Posa</string>
+    <string name="type.amenity.stripclub">Klub Omdhiwiskans</string>
+    <string name="type.amenity.taxi">Poynt Taksi</string>
+    <string name="type.amenity.vending_machine">Jynn-Gwertha</string>
+    <string name="type.amenity.vending_machine.cigarettes">Jynn-Cigarigow</string>
+    <string name="type.amenity.vending_machine.coffee">Jynn-Koffi</string>
+    <string name="type.amenity.vending_machine.condoms">Jynn-Kondoms</string>
+    <string name="type.amenity.vending_machine.drinks">Jynn-Diwosow</string>
+    <string name="type.amenity.vending_machine.food">Jynn-Boos</string>
+    <string name="type.amenity.vending_machine.newspapers">Jynn-Paper-Nowodhow</string>
+    <string name="type.amenity.vending_machine.parking_tickets">Jynn-Feow-Parkya</string>
+    <string name="type.amenity.vending_machine.sweets">Jynn-Hwegennow</string>
+    <string name="type.amenity.vending_machine.excrement_bags">Jynn-Seghyer-Kawgh-Ki</string>
+    <string name="type.amenity.waste_transfer_station">Poynt Treusporth Tredn</string>
+    <string name="type.amenity.water_point">Poynt Daslenwel Dowrarghow</string>
+    <string name="type.amenity.water_point.drinking_water_no">Poynt Daslenwel Dowrarghow</string>
+    <string name="type.barrier.bollard">Peul</string>
+    <string name="type.natural.water.moat">Kleys Kastel</string>
+    <string name="type.natural.water.wastewater">Dowr Wast</string>
+    <string name="type.barrier.lift_gate">Yet ow Sevel</string>
+    <string name="type.barrier.retaining_wall">Fos Gwitha</string>
+    <string name="type.barrier.turnstile">Yet Rosellek</string>
+    <string name="type.barrier.swing_gate">Yet Leska</string>
+    <string name="type.boundary.protected_area">Arenebedh Gwithys</string>
+    <string name="type.boundary.protected_area.2">Arenebedh Gwithys</string>
+    <string name="type.boundary.protected_area.3">Arenebedh Gwithys</string>
+    <string name="type.boundary.protected_area.4">Arenebedh Gwithys</string>
+    <string name="type.boundary.protected_area.5">Arenebedh Gwithys</string>
+    <string name="type.boundary.protected_area.6">Arenebedh Gwithys</string>
+    <string name="type.craft.beekeeper">Gonis Bewin</string>
+    <string name="type.craft.brewery">Bragji Kreft</string>
+    <string name="type.craft.caterer">Provier Metherieth</string>
+    <string name="type.craft.confectionery">Gwerthji Hwegennow</string>
+    <string name="type.craft.grinding_mill">Melin-Rolya</string>
+    <string name="type.craft.hvac">Ayrewnans</string>
+    <string name="type.craft.key_cutter">Gwrier a Alhwedhow</string>
+    <string name="type.craft.locksmith">Florener</string>
+    <string name="type.craft.sawmill">Melin-Prenn</string>
+    <string name="type.cuisine.bagel">Bagel</string>
+    <string name="type.cuisine.balkan">Balkek</string>
+    <string name="type.cuisine.bavarian">Bavariek</string>
+    <string name="type.cuisine.buschenschank">Buschenschank</string>
+    <string name="type.cuisine.caribbean">Karibiek</string>
+    <string name="type.cuisine.crepe">Krampoth</string>
+    <string name="type.cuisine.deli">Deli</string>
+    <string name="type.cuisine.diner">Dinerji</string>
+    <string name="type.cuisine.filipino">Felypinek</string>
+    <string name="type.aerialway.cable_car">Karr Fun</string>
+    <string name="type.aerialway.gondola">Karr Fun</string>
+    <string name="type.amenity">Le</string>
+    <string name="type.leisure.amusement_arcade">Kres Gwari Gwydhyow</string>
+    <string name="type.boundary.protected_area.1">Arenebedh Gwithys</string>
+    <string name="type.cuisine.friture">Asklos</string>
+    <string name="type.cuisine.heuriger">Heuriger</string>
+    <string name="type.cuisine.hotdog">Hotdog</string>
+    <string name="type.cuisine.kebab">Kebab</string>
+    <string name="type.cuisine.malagasy">Malagasiek</string>
+    <string name="type.cuisine.ramen">Ramen</string>
+    <string name="type.cuisine.savory_pancakes">Krampothennow</string>
+    <string name="type.cuisine.seafood">Boos a an Mor</string>
+    <string name="type.cuisine.soba">Soba</string>
+    <string name="type.cuisine.tapas">Tapas</string>
+    <string name="type.emergency.defibrillator">Jynn Dastalleth Kolon</string>
+    <string name="type.emergency.fire_hydrant">Poynt Dowr rag Tangasoryon</string>
+    <string name="type.amenity.hydrant">Poynt Dowr rag Tiogow</string>
+    <string name="type.beacon.cardinal.east">Beacon Cardinek</string>
+    <string name="type.beacon.cardinal.north">Beacon Cardinek</string>
+    <string name="type.beacon.cardinal.south">Beacon Cardinek</string>
+    <string name="type.beacon.cardinal.west">Beacon Cardinek</string>
+    <string name="type.beacon.isolated_danger">Beacon Enyshes Peryl</string>
+    <string name="type.beacon.lateral.port">Beacon Tenewen</string>
+    <string name="type.beacon.lateral.starboard">Beacon Tenewen</string>
+    <string name="type.beacon.safe_water">Beacon Dowr Saw</string>
+    <string name="type.beacon.special_purpose">Beacon Arbennik</string>
+    <string name="type.buoy.cardinal.east">Morverk Cardinek</string>
+    <string name="type.buoy.cardinal.north">Morverk Cardinek</string>
+    <string name="type.buoy.cardinal.south">Morverk Cardinek</string>
+    <string name="type.buoy.cardinal.west">Morverk Cardinek</string>
+    <string name="type.buoy.isolated_danger">Morverk Enyshes Peryl</string>
+    <string name="type.buoy.lateral.port">Morverk Tenewen</string>
+    <string name="type.buoy.lateral.starboard">Morverk Tenewen</string>
+    <string name="type.buoy.safe_water">Morverk Dowr Saw</string>
+    <string name="type.buoy.special_purpose">Morverk Arbennik</string>
+    <string name="type.spherical_buoy.cardinal.east">Morverk Pelyek Cardinek</string>
+    <string name="type.spherical_buoy.cardinal.north">Morverk Pelyek Cardinek</string>
+    <string name="type.spherical_buoy.cardinal.south">Morverk Pelyek Cardinek</string>
+    <string name="type.spherical_buoy.cardinal.west">Morverk Pelyek Cardinek</string>
+    <string name="type.spherical_buoy.isolated_danger">Morverk Pelyek Enyshes Peryl</string>
+    <string name="type.spherical_buoy.lateral.port">Morverk Pelyek Tenewen</string>
+    <string name="type.spherical_buoy.lateral.starboard">Morverk Pelyek Tenewen</string>
+    <string name="type.spherical_buoy.safe_water">Morverk Pelyek Dowr Saw</string>
+    <string name="type.spherical_buoy.special_purpose">Morverk Pelyek Arbennik</string>
+    <string name="type.highway.raceway">Fordh Resek</string>
+    <string name="type.landuse.plant_nursery">Meythrinva</string>
+    <string name="type.leisure.escape_game">Roum Diank</string>
+    <string name="type.leisure.fitness_station">Poynt Yeghes Korfek</string>
+    <string name="type.leisure.hackerspace">Spas Hacker</string>
+    <string name="type.leisure.ice_rink">Gwel Skes Yey</string>
+    <string name="type.leisure.slipway">Fordh Skath</string>
+    <string name="type.leisure.sports_centre.sport.padel">Kres Padel</string>
+    <string name="type.leisure.sports_centre.sport.pelota">Kres Pelota</string>
+    <string name="type.leisure.sports_centre.sport.scuba_diving">Kres Sedh Scuba</string>
+    <string name="type.leisure.sports_centre.sport.shooting">Kres Setha gans Gonn</string>
+    <string name="type.leisure.sports_centre.sport.yoga">Kres Yoga</string>
+    <string name="type.leisure.fitness_centre.sport.yoga">Studhla Yoga</string>
+    <string name="type.leisure.water_park">Park Dowr</string>
+    <string name="type.man_made.breakwater">Lett Mordonnow</string>
+    <string name="type.man_made.cutline">Lin a Gwedhennow Treghys</string>
+    <string name="type.man_made.silo">Silo</string>
+    <string name="type.man_made.storage_tank">Tank</string>
+    <string name="type.man_made.flare">Tour Flamm Gass</string>
+    <string name="type.military.bunker">Dinas yn-dann Dhor</string>
+    <string name="type.mountain_pass">Nans Menydh</string>
+    <string name="type.natural.saddle">Diber Menydh</string>
+    <string name="type.natural.strait">Kons</string>
+    <string name="type.natural.wetland">Byng</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Hal Holanek an Mortid</string>
+    <string name="type.natural.wetland.tidalflat">Stag Gwastas an Mortid</string>
+    <string name="type.office.estate_agent">Gwerther Pyth</string>
+    <string name="type.power.generator.gas">Tredanva Gass</string>
+    <string name="type.power.generator.hydro">Tredanva Dowr</string>
+    <string name="type.railway.funicular">Hyns Horn Mena</string>
+    <string name="type.railway.funicular.bridge">Pons Hyns Horn Mena</string>
+    <string name="type.railway.funicular.tunnel">Kowfordh Hyns Horn Mena</string>
+    <string name="type.railway.narrow_gauge">Hyns Horn Ynn</string>
+    <string name="type.railway.narrow_gauge.bridge">Pons Hyns Horn Ynn</string>
+    <string name="type.railway.narrow_gauge.tunnel">Kowfordh Hyns Horn Ynn</string>
+    <string name="type.railway.preserved">Hyns Horn Istorek</string>
+    <string name="type.railway.preserved.bridge">Pons Hyns Horn Istorek</string>
+    <string name="type.railway.preserved.tunnel">Kowfordh Hyns Horn Istorek</string>
+    <string name="type.railway.rail.spur">Hyns Horn Berr</string>
+    <string name="type.railway.rail.service">Hyns Horn Servis</string>
+    <string name="type.railway.rail.utility.bridge">Pons Hyns Horn Servis</string>
+    <string name="type.railway.rail.spur.bridge">Pons Hyns Horn Berr</string>
+    <string name="type.railway.rail.service.bridge">Pons Hyns Horn Servis</string>
+    <string name="type.railway.rail.utility.tunnel">Kowfordh Hyns Horn Servis</string>
+    <string name="type.railway.rail.spur.tunnel">Kowfordh Hyns Horn Berr</string>
+    <string name="type.railway.rail.service.tunnel">Kowfordh Hyns Horn Servis</string>
+    <string name="type.railway.station.funicular">Gorsav Hyns Horn Mena</string>
+    <string name="type.railway.subway.bridge">Pons Metro</string>
+    <string name="type.railway.subway.tunnel">Kowfordh Metro</string>
+    <string name="type.railway.subway_entrance.hongkong">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.isfahan">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.istanbul">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.izmir">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kazan">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kharkiv">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kiev">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kobe">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kolkata">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kunming">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.kyoto">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.la">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.lausanne">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.lille">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.london">Entrans Tube</string>
+    <string name="type.railway.tram">Linen Tram</string>
+    <string name="type.railway.tram.bridge">Pons Tram</string>
+    <string name="type.railway.tram.tunnel">Kowfordh Tram</string>
+    <string name="type.railway.tram_stop">Salva Tram</string>
+    <string name="type.route.ferry">Kowbalhyns</string>
+    <string name="type.shop">Gwerthji</string>
+    <string name="type.shop.alcohol">Gwerthji Las</string>
+    <string name="type.shop.bakery">Popti</string>
+    <string name="type.shop.bathroom_furnishing">Gwerthji Stevel-Omwolghi</string>
+    <string name="type.shop.beauty">Gwerthji Tekter</string>
+    <string name="type.shop.beauty.nails">Le Ewin</string>
+    <string name="type.shop.beverages">Gwerthji Swynennow</string>
+    <string name="type.shop.bicycle">Gwerthji Diwros</string>
+    <string name="type.shop.bookmaker">Gwrier Lyverow</string>
+    <string name="type.shop.books">Gwerthji Lyver</string>
+    <string name="type.shop.butcher">Kigti</string>
+    <string name="type.shop.cannabis">Gwerthji Kanabys</string>
+    <string name="type.shop.car">Gwerthji Karr</string>
+    <string name="type.shop.car_parts">Gwerthji Darnow Karr</string>
+    <string name="type.shop.car_repair">Jynner</string>
+    <string name="type.shop.car_repair.tyres">Mekanek Bonden</string>
+    <string name="type.shop.caravan">Gwerthji Karavan</string>
+    <string name="type.shop.carpet">Gwerthji Leurlen</string>
+    <string name="type.shop.chemist">Kymyst</string>
+    <string name="type.shop.chocolate">Gwerthji Choklet</string>
+    <string name="type.shop.clothes">Gwerthji Dillas</string>
+    <string name="type.shop.coffee">Gwerthji Koffi</string>
+    <string name="type.shop.computer">Gwerthji Amontyellow</string>
+    <string name="type.shop.confectionery">Gwerthji Hwegennow</string>
+    <string name="type.shop.convenience">Gwerthji Es</string>
+    <string name="type.shop.copyshop">Gwerthji Kopia</string>
+    <string name="type.shop.cosmetics">Gwerthji Tremmliw</string>
+    <string name="type.shop.curtain">Gwerthji Kroglen</string>
+    <string name="type.shop.deli">Gwerthji Deli</string>
+    <string name="type.shop.department_store">Gwerthji Asrannow</string>
+    <string name="type.shop.doityourself">Gwerthji Gwellheans Tre</string>
+    <string name="type.shop.dry_cleaning">Glanher Sygh</string>
+    <string name="type.railway.subway_entrance.lima">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.lisboa">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.lyon">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.madrid">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.malaga">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.manila">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.maracaibo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.mashhad">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.mecca">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.medellin">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.mexico">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.milan">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.minsk">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.montreal">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.moscow">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.munchen">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.nagoya">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.newyork">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.nnov">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.novosibirsk">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.osaka">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.oslo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.palma">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.panama">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.paris">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.philadelphia">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.pyongyang">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.rennes">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.rio">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.roma">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.rotterdam">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.samara">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.santiago">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.santo_domingo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.saopaulo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.sapporo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.sendai">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.sf">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.shanghai">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.shenzhen">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.shiraz">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.singapore">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.sofia">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.spb">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.stockholm">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.tabriz">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.taipei">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.taoyuan">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.tashkent">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.tbilisi">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.tehran">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.tianjin">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.tokyo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.valencia">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.vienna">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.warszawa">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.washington">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.wuhan">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.yerevan">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.yokohama">Entrans Metro</string>
+    <string name="type.route">Hyns</string>
+    <string name="type.shop.electronics">Gwerthji Elektronek</string>
+    <string name="type.shop.erotic">Gwerthji Erotik</string>
+    <string name="type.shop.fabric">Gwerthji Gwias</string>
+    <string name="type.shop.farm">Gwerthji Amethva</string>
+    <string name="type.shop.fashion_accessories">Gwerthji Gweresoryon Kelvydh</string>
+    <string name="type.shop.florist">Flourydh</string>
+    <string name="type.shop.funeral_directors">Ynkleudhyer</string>
+    <string name="type.shop.furniture">Gwerthji Mebel</string>
+    <string name="type.shop.garden_centre">Gwerthji Jardin</string>
+    <string name="type.shop.gas">Gwerthji Gass</string>
+    <string name="type.shop.gift">Gwerthji Rohow</string>
+    <string name="type.shop.greengrocer">Gwerthji Losow</string>
+    <string name="type.shop.grocery">Gwerthji Gwara Boos</string>
+    <string name="type.shop.hairdresser">Barbour</string>
+    <string name="type.shop.hardware">Gwerthji Toulys</string>
+    <string name="type.shop.health_food">Gwerthji Sosten Yaghus</string>
+    <string name="type.shop.hearing_aids">Gwerthji Klewell</string>
+    <string name="type.shop.herbalist">Losower</string>
+    <string name="type.shop.hifi">Gwerthji HiFi</string>
+    <string name="type.shop.houseware">Gwerthji Gwara a\'n Mayni</string>
+    <string name="type.shop.jewelry">Joweler</string>
+    <string name="type.shop.kiosk">Kiosk</string>
+    <string name="type.shop.kitchen">Gwerthji Toulys Kegin</string>
+    <string name="type.shop.laundry">Golghva</string>
+    <string name="type.shop.mall">Kresen-Brenassa</string>
+    <string name="type.shop.beauty.day_spa">Spa</string>
+    <string name="type.shop.massage">Leuvdoser</string>
+    <string name="type.shop.mobile_phone">Gwerthji Kellgowser</string>
+    <string name="type.shop.money_lender">Lendyer Mona</string>
+    <string name="type.shop.motorcycle">Gwerthji Jynn Diwros</string>
+    <string name="type.shop.motorcycle_repair">Jynner Jynn Diwros</string>
+    <string name="type.shop.music">Gwerthji Musik</string>
+    <string name="type.shop.musical_instrument">Gwerthji Daffar Ilow</string>
+    <string name="type.shop.newsagent">Gwerther Jornalys</string>
+    <string name="type.shop.optician">Optycyan</string>
+    <string name="type.shop.outdoor">Gwerthji Daffar Powdir</string>
+    <string name="type.shop.outpost">Poynt Kuntel Post</string>
+    <string name="type.shop.pasta">Gwerthji Pasta</string>
+    <string name="type.shop.pastry">Gwerthji Hogen</string>
+    <string name="type.shop.pawnbroker">Gostler</string>
+    <string name="type.shop.pet">Gwerthji Enevales Dov</string>
+    <string name="type.shop.pet_grooming">Barbour rag Enevales Dov</string>
+    <string name="type.shop.photo">Gwerthji Skeusenieth</string>
+    <string name="type.shop.rental">Gobrener</string>
+    <string name="type.shop.rental.bicycle">Gobrener Diwros</string>
+    <string name="type.shop.seafood">Gwerthji Pysk</string>
+    <string name="type.shop.second_hand">Gwerthji Wortaswerth</string>
+    <string name="type.shop.shoes">Gwerthji Eskis</string>
+    <string name="type.shop.sports">Gwerthji Sport</string>
+    <string name="type.shop.stationery">Gwerthji Daffar Buro</string>
+    <string name="type.shop.supermarket">Gorvarghas</string>
+    <string name="type.shop.tattoo">Korfliwer</string>
+    <string name="type.shop.tea">Gwerthji Te</string>
+    <string name="type.shop.telecommunication">Gwerthji Pellgomunyans</string>
+    <string name="type.shop.ticket">Gwerthji Toknys</string>
+    <string name="type.shop.toys">Gwerthji Gwariellow</string>
+    <string name="type.shop.travel_agency">Mayner-Viajya</string>
+    <string name="type.shop.tyres">Gwerthji Bondennow</string>
+    <string name="type.shop.variety_store">Gwerthji Divers</string>
+    <string name="type.shop.video">Gwerthji Gwydhyow</string>
+    <string name="type.shop.video_games">Gwerthji Gwari Gwydhyow</string>
+    <string name="type.shop.wine">Gwerthji Gwin</string>
+    <string name="type.shop.agrarian">Gwerthji Amethel</string>
+    <string name="type.shop.antiques">Gwerthji Henbythow</string>
+    <string name="type.shop.appliance">Gwerthji Darbar</string>
+    <string name="type.shop.art">Gwerthji Art</string>
+    <string name="type.shop.baby_goods">Gwerthji Gwara Babanes</string>
+    <string name="type.shop.bag">Gwerthji Sagh</string>
+    <string name="type.shop.bed">Gwerthji Gweli</string>
+    <string name="type.shop.boutique">Gwerthji Dillas Kelvydh</string>
+    <string name="type.shop.charity">Gwerthji Aluseneth</string>
+    <string name="type.shop.cheese">Gwerthji Keus</string>
+    <string name="type.shop.craft">Gwerthji Toulys Kreft</string>
+    <string name="type.shop.dairy">Gwerthji Trevas Lethek</string>
+    <string name="type.shop.electrical">Gwerthji Gwara Tredanel</string>
+    <string name="type.shop.fishing">Gwerthji Pyskessa</string>
+    <string name="type.shop.interior_decoration">Gwerthji Afinans Pervedhel</string>
+    <string name="type.shop.lottery">Toknys Gwari Dall</string>
+    <string name="type.shop.medical_supply">Gwerthji Gwara Medhegel</string>
+    <string name="type.shop.nutrition_supplements">Gwerthji Keworrans Megyans</string>
+    <string name="type.shop.paint">Gwerthji Liw</string>
+    <string name="type.shop.perfumery">Gwerthji Melyseth</string>
+    <string name="type.shop.sewing">Gwerthji Gwara Gwrias</string>
+    <string name="type.shop.storage_rental">Gwithva Gobrenek</string>
+    <string name="type.shop.tobacco">Gwerthji Tobacko</string>
+    <string name="type.shop.trade">Gwerthji Trad</string>
+    <string name="type.shop.watches">Gwerthji Euryor</string>
+    <string name="type.shop.wholesale">Gwerthji Kowlwerth</string>
+    <string name="type.shop.lighting">Gwerthji Golowyans</string>
+    <string name="type.disusedbusiness">Gwerthji Gwag</string>
+    <string name="type.sport">Sport</string>
+    <string name="type.sport.multi">Sportys Divers</string>
+    <string name="type.sport.9pin">Gwari Pelyow</string>
+    <string name="type.sport.10pin">Gwari Pelyow</string>
+    <string name="type.sport.american_football">Pel Droos Amerikanek</string>
+    <string name="type.sport.archery">Gwaregieth</string>
+    <string name="type.sport.athletics">Athletek</string>
+    <string name="type.sport.australian_football">Pel Droos Ostralek</string>
+    <string name="type.sport.badminton">Badminton</string>
+    <string name="type.sport.baseball">Pel Vas</string>
+    <string name="type.sport.basketball">Pel Ganstel</string>
+    <string name="type.sport.beachvolleyball">Pel Volli war an Treth</string>
+    <string name="type.sport.bowls">Pelva</string>
+    <string name="type.sport.chess">Gwydhbol</string>
+    <string name="type.sport.climbing">Krambla Kerrek</string>
+    <string name="type.sport.cricket">Krycket</string>
+    <string name="type.sport.curling">Hurlya</string>
+    <string name="type.sport.diving">Sedhi Ughel</string>
+    <string name="type.sport.equestrian">Sportys Marghek</string>
+    <string name="type.sport.field_hockey">Hocki</string>
+    <string name="type.sport.futsal">Futsal</string>
+    <string name="type.sport.golf">Golf</string>
+    <string name="type.sport.gymnastics">Gymnastek</string>
+    <string name="type.sport.handball">Pel Dhorn</string>
+    <string name="type.sport.ice_hockey">Hocki Yey</string>
+    <string name="type.sport.padel">Padel</string>
+    <string name="type.sport.pelota">Pelota</string>
+    <string name="type.sport.scuba_diving">Sedh Scuba</string>
+    <string name="type.sport.shooting">Setha Gonn</string>
+    <string name="type.sport.skateboard">Rostella</string>
+    <string name="type.sport.skiing">Skia</string>
+    <string name="type.sport.soccer">Pel Droos</string>
+    <string name="type.sport.swimming">Neuvya</string>
+    <string name="type.sport.table_tennis">Tennis Moos</string>
+    <string name="type.sport.tennis">Tennis</string>
+    <string name="type.sport.volleyball">Pen Volli</string>
+    <string name="type.sport.yoga">Yoga</string>
+    <string name="type.tourism">Tornyaseth</string>
+    <string name="type.tourism.aquarium">Pusketti</string>
+    <string name="type.tourism.alpine_hut">Ostyans war Venydh</string>
+    <string name="type.tourism.apartment">Chi Golyow</string>
+    <string name="type.tourism.artwork">Artweyth</string>
+    <string name="type.tourism.artwork.architecture">Artweyth Pennsernethel</string>
+    <string name="type.tourism.artwork.painting">Lymnans</string>
+    <string name="type.tourism.attraction">Tennvos</string>
+    <string name="type.attraction.amusement_ride">Marghogeth-Omdhidhana</string>
+    <string name="type.attraction.animal">Garth Eneval</string>
+    <string name="type.attraction.bumper_car">Kerri Bomm</string>
+    <string name="type.attraction.big_wheel">Ros Ferris</string>
+    <string name="type.attraction.carousel">Res a-Dro</string>
+    <string name="type.attraction.historic">Tennvos istorek</string>
+    <string name="type.attraction.maze">Milhyntal</string>
+    <string name="type.attraction.roller_coaster">Tren-Omdhidhana</string>
+    <string name="type.attraction.water_slide">Slynk Dowr</string>
+    <string name="type.tourism.attraction.specified">Tennvos</string>
+    <string name="type.tourism.camp_site">Kampva</string>
+    <string name="type.tourism.caravan_site">Kampva Karavan</string>
+    <string name="type.tourism.artwork.sculpture">Gravyans</string>
+    <string name="type.tourism.artwork.statue">Delow</string>
+    <string name="type.tourism.chalet">Krowji Golyow</string>
+    <string name="type.tourism.gallery">Mirva Art</string>
+    <string name="type.tourism.guest_house">Gwesti</string>
+    <string name="type.tourism.hostel">Ostel</string>
+    <string name="type.tourism.hotel">Ostel</string>
+    <string name="type.tourism.information">Kudhlow Tornyas</string>
+    <string name="type.tourism.information.board">Bordh Kudhlow</string>
+    <string name="type.tourism.information.guidepost">Post Arwodh</string>
+    <string name="type.tourism.information.map">Mappa Tornyas</string>
+    <string name="type.tourism.information.office">Buro Tornyas</string>
+    <string name="type.tourism.information.visitor_centre">Kres Godriger</string>
+    <string name="type.amenity.ranger_station">Poynt Ranger</string>
+    <string name="type.tourism.motel">Karrostel</string>
+    <string name="type.tourism.museum">Gwithti</string>
+    <string name="type.tourism.picnic_site">Le Kroust</string>
+    <string name="type.leisure.resort">Tyller-Havi</string>
+    <string name="type.tourism.theme_park">Park-Omdhidhana</string>
+    <string name="type.tourism.viewpoint">Gwelva</string>
+    <string name="type.tourism.wilderness_hut">Krow Gwylvos</string>
+    <string name="type.tourism.zoo">Milva</string>
+    <string name="type.tourism.zoo.petting">Milva Chersya</string>
+    <string name="type.traffic_calming">Koselheans Daromres</string>
+    <string name="type.traffic_calming.bump">Bomm Tooth</string>
+    <string name="type.traffic_calming.hump">Both Tooth</string>
+    <string name="type.waterway">Dowr</string>
+    <string name="type.waterway.canal">Chanel</string>
+    <string name="type.waterway.canal.tunnel">Kowfordh Chanel</string>
+    <string name="type.waterway.fish_pass">Porth Puskes</string>
+    <string name="type.waterway.dam">Arge</string>
+    <string name="type.barrier.ditch">Kleudh</string>
+    <string name="type.natural.water.ditch">Kleudh Dowrans</string>
+    <string name="type.waterway.ditch.tunnel">Kowfordh Kleudh</string>
+    <string name="type.waterway.dock">Kay</string>
+    <string name="type.waterway.drain">Kleys</string>
+    <string name="type.natural.water.drain">Kleys</string>
+    <string name="type.waterway.drain.tunnel">Kowfordh Kleys</string>
+    <string name="type.waterway.lock_gate">Yet Dhowr</string>
+    <string name="type.waterway.river">Avon</string>
+    <string name="type.waterway.river.tunnel">Avon</string>
+    <string name="type.waterway.stream">Gover</string>
+    <string name="type.waterway.stream.ephemeral">Gover Anparhus</string>
+    <string name="type.waterway.stream.intermittent">Tergover</string>
+    <string name="type.waterway.stream.tunnel">Gover</string>
+    <string name="type.waterway.waterfall">Dowrlam</string>
+    <string name="type.waterway.weir">Arge Byghan</string>
+    <string name="type.wheelchair">Kador Ros</string>
+    <string name="type.wheelchair.limited">Hedhas Kador Ros Strothys</string>
+    <string name="type.wheelchair.no">Hedhas Kador Ros Vyth</string>
+    <string name="type.wheelchair.yes">Hedhas Kador Ros Leun</string>
+    <string name="type.aerialway.j.bar">Yskynnell J-barr</string>
+    <string name="type.aerialway.magic_carpet">Leurlen Pystrek</string>
+    <string name="type.aerialway.platter">Yskynnell Tallyour</string>
+    <string name="type.aerialway.rope_tow">Halya Lovan</string>
+    <string name="type.aerialway.t.bar">Yskynnell T-barr</string>
+    <string name="type.piste_type.downhill">Hyns Skia yn-Nans</string>
+    <string name="type.piste_type.downhill.area">Hyns Skia yn-Nans</string>
+    <string name="type.piste_type.downhill.advanced">Hyns Skia yn-Nans Avonsys</string>
+    <string name="type.piste_type.downhill.advanced.area">Hyns Skia yn-Nans Avonsys</string>
+    <string name="type.piste_type.downhill.easy">Hyns Skia yn-Nans Es</string>
+    <string name="type.piste_type.downhill.easy.area">Hyns Skia yn-Nans Es</string>
+    <string name="type.piste_type.downhill.expert">Hyns Skia yn-Nans Skentel</string>
+    <string name="type.piste_type.downhill.expert.area">Hyns Skia yn-Nans Skentel</string>
+    <string name="type.piste_type.downhill.freeride">Hyns Skia yn-Nans Rydh</string>
+    <string name="type.piste_type.downhill.intermediate">Hyns Skia yn-Nans Kres</string>
+    <string name="type.piste_type.downhill.intermediate.area">Hyns Skia yn-Nans Kres</string>
+    <string name="type.piste_type.downhill.novice">Hyns Skia yn-Nans Dallether</string>
+    <string name="type.piste_type.downhill.novice.area">Hyns Skia yn-Nans Dallether</string>
+    <string name="type.piste_type.nordic">Ol Skia Nordek</string>
+    <string name="type.piste_type.sled">Hyns Karr Slynk</string>
+    <string name="type.piste_type.sled.area">Hyns Karr Slynk</string>
+    <string name="type.piste_type.snow_park">Park Ergh</string>
+    <string name="type.piste_type.hike">Ol Gwandrans Ergh</string>
+    <string name="type.piste_type.connection">Junyans Hyns Ergh</string>
+    <string name="type.piste_type.skitour">Ol Torn Ski</string>
+    <string name="type.amenity.events_venue">Le Kentelyow</string>
+    <string name="type.shop.auction">Strifwerth</string>
+    <string name="type.shop.collector">Kunteladow</string>
+    <string name="type.self_service.yes">Omgonis kavadow</string>
+    <string name="type.self_service.only">Omgonis hepken</string>
+    <string name="type.self_service.partially">Omgonis rannel</string>
+    <string name="type.self_service.no">Omgonis vyth</string>
+    <string name="type.amenity.social_facility">Komodyta Socyal</string>
+    <string name="type.social_facility.soup_kitchen">Kegin Disto</string>
+    <string name="type.social_facility.food_bank">Arghanti Boos</string>
+    <string name="type.amenity.food_sharing">Kevren Boos</string>
+    <string name="type.amenity.give_box">Boks Ri</string>
+    <string name="type.emergency.emergency_ward_entrance">Entrans Diberthva Goredhom</string>
+    <string name="type.amenity.dojo">Dojo</string>
+    <string name="type.leisure.sports_hall">Hel sport</string>
+    <string name="type.xmas.tree">Gwedhen Nadelik</string>
+    <string name="type.power.substation">Istredanva</string>
+    <string name="type.railway.miniature">Hyns Horn Munys</string>
+    <string name="type.railway.miniature.bridge">Pons Hyns Horn Munys</string>
+    <string name="type.railway.miniature.tunnel">Kowfordh Hyns Horn Munys</string>
+    <string name="type.railway.turntable">Tabel-Tro Hyns Horn</string>
+    <string name="type.tourism.information.tactile_map">Mappa rag Toch</string>
 </resources>

android/sdk/src/main/res/values-lt/types_strings.xml

@@ -138,7 +138,6 @@
     <string name="type.amenity.charging_station">Krovimo stotelė</string>
     <string name="type.amenity.charging_station.bicycle">Elektrinių dviračių krovimo stotelė</string>
     <string name="type.amenity.charging_station.motorcar">Elektromobilių krovimo stotelė</string>
-    <string name="type.amenity.charging_station.motorcar.small">Elektromobilių krovimo taškas</string>
     <string name="type.amenity.childcare">Lopšelis</string>
     <string name="type.amenity.cinema">Kino teatras</string>
     <string name="type.leisure.bowling_alley">Boulingo klubas</string>
@@ -850,8 +849,6 @@
     <string name="type.public_transport.platform">Platforma</string>
     <string name="type.railway">Geležinkelis</string>
     <string name="type.railway.abandoned">Dalinai išmontuotas geležinkelis</string>
-    <string name="type.railway.abandoned.bridge">Dalinai išmontuoto geležinkelio tiltas</string>
-    <string name="type.railway.abandoned.tunnel">Dalinai išmontuoto geležinkelio tunelis</string>
     <string name="type.railway.construction">Statomas geležinkelis</string>
     <string name="type.railway.crossing">Geležinkelio perėja</string>
     <string name="type.railway.disused">Apleistas geležinkelis</string>
@@ -1429,4 +1426,9 @@
     <string name="type.piste_type.sled.area">Rogučių trasa</string>
     <string name="type.leisure.sports_centre">Sporto centras</string>
     <string name="type.sport.tennis">Lauko tenisas</string>
+    <string name="type.railway.miniature">Mažasis geležinkelis</string>
+    <string name="type.railway.miniature.bridge">Mažojo geležinkelio tiltas</string>
+    <string name="type.railway.miniature.tunnel">Mažojo geležinkelio tunelis</string>
+    <string name="type.railway.turntable">Grįžratis</string>
+    <string name="type.tourism.information.tactile_map">Taktilinis žemėlapis</string>
 </resources>

android/sdk/src/main/res/values-lv/types_strings.xml

@@ -118,7 +118,6 @@
     <string name="type.leisure.sports_centre.sport.australian_football">Sporta centrs</string>
     <string name="type.leisure.sports_centre.sport.multi">Sporta centrs</string>
     <string name="type.leisure.sports_centre.sport.american_football">Sporta centrs</string>
-    <string name="type.amenity.charging_station.motorcar.small">Mašīnu uzlādes punkts</string>
     <string name="type.amenity.childcare">Bērnudārzs</string>
     <string name="type.leisure.bandstand">Estrāde</string>
     <string name="type.leisure.common">Valsts zemes īpašums</string>
@@ -182,4 +181,7 @@
     <string name="type.xmas.tree">Ziemassvētku egle</string>
     <string name="type.entrance.emergency">Ārkārtas izeja</string>
     <string name="type.lateral.port">Osta</string>
+    <string name="type.railway.disused.tunnel">Neizmantots dzelzceļa tunelis</string>
+    <string name="type.railway.funicular">Funikulieris</string>
+    <string name="type.railway.disused.bridge">Neizmantots dzelzceļa tilts</string>
 </resources>

android/sdk/src/main/res/values-nb/types_strings.xml

@@ -1319,7 +1319,6 @@
     <string name="type.leisure.fitness_centre.sport.yoga">Yogastudio</string>
     <string name="type.leisure.bandstand">Musikkpaviljong</string>
     <string name="type.cuisine.bubble_tea">Boblete</string>
-    <string name="type.amenity.charging_station.motorcar.small">Billadingspunkt</string>
     <string name="type.amenity.studio">Mediastudio</string>
     <string name="type.aerialway.magic_carpet">Teppeheis</string>
     <string name="type.barrier.ditch">Grøft</string>
@@ -1331,8 +1330,6 @@
     <string name="type.aerialway.platter">Tallerkentrekk</string>
     <string name="type.aerialway.j.bar">Skitrekk (J-krok)</string>
     <string name="type.aerialway.t.bar">Skitrekk (T-krok)</string>
-    <string name="type.railway.abandoned.tunnel">Nedlagt jernbanetunnel</string>
-    <string name="type.railway.abandoned.bridge">Nedlagt jernbanebru</string>
     <string name="type.railway.abandoned">Nedlagt jernbane</string>
     <string name="type.shop.lighting">Lampebutikk</string>
     <string name="type.leisure.sports_centre.sport.swimming">Svømmesenter</string>
@@ -1391,4 +1388,5 @@
     <string name="type.man_made.works">Fabrikk</string>
     <string name="type.man_made.mast.communication">Kommunikasjonsmast</string>
     <string name="type.man_made.wastewater_plant">Avløpsrenseanlegg</string>
+    <string name="type.tourism.information.tactile_map">Berøringskart</string>
 </resources>