[fdroid] Release version 2025.06.22-5

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
[strings] Update from Codeberg Translate
2026-01-11 23:04:18 +00:00 · 2025-06-22 12:19:07 +07:00 · 2025-06-22 05:13:50 +00:00 · 2025-06-22 04:05:40 +00:00 · 2025-06-22 11:04:10 +07:00 · 2025-06-22 04:47:19 +02:00
621 changed files with 19754 additions and 16531 deletions
--- a/.forgejo/workflows/dco.yml
+++ b/.forgejo/workflows/dco.yml
@@ -0,0 +1,8 @@
+name: dco
+on: [pull_request]
+
+jobs:
+  check:
+    runs-on: codeberg-tiny
+    steps:
+      - uses: https://github.com/KineticCafe/actions-dco@v1
--- a/.forgejo/workflows/ios-check.yaml
+++ b/.forgejo/workflows/ios-check.yaml
@@ -41,7 +41,7 @@ jobs:
      LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
      LANGUAGE: en_US.UTF-8
      LC_ALL: en_US.UTF-8
-      TEST_RESULTS_BUNDLE_NAME: OMaps-Test-Results
+      TEST_RESULTS_BUNDLE_NAME: CoMaps-Test-Results
    strategy:
      fail-fast: false
      matrix:
@@ -74,8 +74,8 @@ jobs:
        shell: bash
        run: |
          xcodebuild test \
-            -workspace xcode/omim.xcworkspace \
-            -scheme OMaps \
+            -workspace xcode/CoMaps.xcworkspace \
+            -scheme CoMaps \
            -configuration Debug \
            -sdk iphonesimulator \
            -destination 'platform=iOS Simulator,name=iPhone 16 Pro Max,OS=latest' \
@@ -97,8 +97,8 @@ jobs:
        shell: bash
        run: |
          xcodebuild build \
-            -workspace xcode/omim.xcworkspace \
-            -scheme OMaps \
+            -workspace xcode/CoMaps.xcworkspace \
+            -scheme CoMaps \
            -configuration Release \
            -destination 'generic/platform=iOS' \
            -quiet \
--- a/.github/workflows/ios-check.yaml
+++ b/.github/workflows/ios-check.yaml
@@ -15,6 +15,7 @@ jobs:
      LANGUAGE: en_US.UTF-8
      LC_ALL: en_US.UTF-8
      TEST_RESULTS_BUNDLE_NAME: CoMaps-Test-Results
+      SIMULATOR_DEVICE: 'iPhone 16 Pro Max'
    strategy:
      fail-fast: false
      matrix:
@@ -50,12 +51,15 @@ jobs:
        if: matrix.buildType == 'Debug'
        shell: bash
        run: |
+          # Start sim before the build to make sure it's booted when tests start.
+          xcrun simctl boot "${{ env.SIMULATOR_DEVICE }}" || true
+          xcrun simctl bootstatus "${{ env.SIMULATOR_DEVICE }}" -b
          xcodebuild test \
-            -workspace xcode/omim.xcworkspace \
-            -scheme OMaps \
+            -workspace xcode/CoMaps.xcworkspace \
+            -scheme CoMaps \
            -configuration Debug \
            -sdk iphonesimulator \
-            -destination 'platform=iOS Simulator,name=iPhone 16 Pro Max,OS=latest' \
+            -destination "platform=iOS Simulator,name=${{ env.SIMULATOR_DEVICE }},OS=latest" \
            -quiet \
            -resultBundlePath ${{ env.TEST_RESULTS_BUNDLE_NAME }}.xcresult \
            CODE_SIGNING_REQUIRED=NO \
@@ -74,8 +78,8 @@ jobs:
        shell: bash
        run: |
          xcodebuild build \
-            -workspace xcode/omim.xcworkspace \
-            -scheme OMaps \
+            -workspace xcode/CoMaps.xcworkspace \
+            -scheme CoMaps \
            -configuration Release \
            -destination 'generic/platform=iOS' \
            -quiet \
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,7 @@ iphone/*/build/*
 tools/emacsmode/build
 **/DerivedData/*
 **/xcshareddata/*
-!iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/OMaps.xcscheme
+!iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme
 **/xcuserdata
 **/xcschemes
 iphone/**/*.moved-aside
--- a/android/app/src/fdroid/play/listings/cs-CZ/short-description.txt
+++ b/android/app/src/fdroid/play/listings/cs-CZ/short-description.txt
@@ -1 +1 @@
-Jednoduchá navigace v mapě – Objevte více na své cestě – Vyvíjeno komunitou
+Jednoduchá navigace v mapě - Objevte více na své cestě ‐ Vyvíjeno komunitou
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,8 +1,8 @@
-• OpenStreetMap Daten vom 2. Juni
-• Neue Einstellungsoption zum Ändern oder Ausblenden der "Über CoMaps" Schaltfläche ganz links
-• Routen als GPS Track speichern
-• Qingdao Metro, Gärtnereien, Leitplanken, Leitern, Studios, Tanzsäle, Feuerstellen und Stundenhotels hinzugefügt
-• transparente Navigationsleiste im Light Mode
-• Mastodon und Bluesky Kontaktoptionen für POIs und im OSM-Editor hinzugefügt
-• Anzeige der Kompassgradzahl in der Richtungspfeilansicht
-• Übersetzungen aktualisiert
+• Kartenfarben aufgefrischt – heller, wärmer, freundlicher!
+• OSM-Editor: „Stockwerk“ Feld hinzugefügt
+• Symbole für Tankstellen und Ladestationen aktualisiert
+• Farben einiger UI Elemente überarbeitet
+• Funktionierende Links zum Teilen von Orten
+• Falsch angezeigte Kartengröße nach Downloadfehlern korrigiert
+• Kleine Sprünge des Standortpfeils in bestimmten Fällen behoben
+• Bugfixes für Android 5 & 6
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,8 +1,8 @@
-• OpenStreetMap data as of June 2
-• add a setting to change the leftmost button or hide it
-• save built routes as tracks
-• add Qingdao metro, plant nurseries, highway guard rails, ladders, studios, dance venues, firepits, love hotels
-• transparent system navigation bar in the light mode
-• add Mastodon and Bluesky contact options to POIs and OSM editor
-• display Azimuth angle in direction arrow view
-• update translations
+• refresh map colors - lighter, warmer, friendlier!
+• OSM editor: add a "level" field
+• update gas and charging stations icons
+• update colors of some UI elements
+• fix location sharing links
+• fix wrong displayed map size after download errors
+• fix small location arrow jumps in some cases
+• android 5&6 bugfixes
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -0,0 +1,8 @@
+• colores del mapa renovados - más claros, cálidos y amigables!
+• editor OSM: campo "nivel" agregado
+• actualización de íconos de carga de combustible y electricidad
+• actualización de colores de algunos elementos de IU
+• corrección de links para compartir ubicación
+• corrección de tamaño incorrecto del mapa luego de errores de descarga
+• corrección de pequeños saltos de flechas de posición en algunos casos
+• corrección de bugs en Android 5 y 6
--- a/android/app/src/fdroid/play/listings/fi-FI/full-description.txt
+++ b/android/app/src/fdroid/play/listings/fi-FI/full-description.txt
@@ -0,0 +1,32 @@
+Yhteisövetoinen, ilmainen ja avoimeen lähdekoodiin perustuva karttasovellus, jonka pohjalla käytetään OpenStreetMapin avointa karttadataa. Sovelluksen kehityksessä on sitouduttu läpinäkyvyyteen, yksityisyyteen ja voittoa tavoittelemattomuuteen. CoMapsin projekti on haarautunut Organic Mapsista, joka taas on haarautunut aiemmin Maps.ME:stä
+
+Lue lisää projektin tavotteista ja suunnasta osoitteesta <b><i>codeberg.org/comaps</i></b>.
+Liity yhteisöön ja auta kehittämään paras saatavilla oleva karttasovellus
+• Käytä sovellusta ja kerro siitä myös muille
+• Anna palautetta ja raportoi ongelmia
+• Päivitä karttoja, joko sovelluksessa tai OpenStreetMapin verkkosivuilla
+
+‣ <b>Offline-painotteinen</b>: Suunnittele ja navigoi ulkomailla ilman mobiiliverkkoja. Kaikki sovelluksen toiminnot on suunniteltu käytettäväksi ilman verkkoyhteyttä.
+‣ <b>Kunnioittaa yksityisyyttä</b>: Sovellus on suunniteltu yksilön yksityisyys silmälläpitäen. Sovellus ei tunnista tai kerää tietoja sinusta. Mainosvapaa.
+‣ <b>Yksinkertainen ja viimeistelty</b>: Olennaiset ominaisuudet, joita on helppo käyttää. 
+‣ <b>Säästä akkua ja tallennustilaa</b>: Ei kuluta akkua, kuten muut navigointisovellukset. Kompaktit kartat säästävät arvokasta tallennustilaa puhelimessasi. 
+‣ <b>Ilmainen ja yhteisön luoma</b>: Vapaaehtoiset, kuten sinä olette auttaneet sovelluksen kehityksessä lisäämällä paikkoja OpenStreetMap:iin, testaamalla sovellusta ja antamalla palautetta. Voit myös auttaa kehittämällä ominaisuuksia ja lahjoittamalla sovelluskehitykseen
+‣ <b>Avoin ja läpinäkyvä päätöksenteko sekä rahoitus. Voittoa tavoittelematon ja täysin avoimeen lähdekoodiin perustuva.</b>
+
+<b>Tärkeimmät ominaisuudet</b>:
+• Ladattavat yksityiskohtaiset kartat paikoista, joita ei löydy edes Google Maps:sta
+• Ulkoilutila, josta löytyy korostettuna reitit, leirintäpaikat, vesipisteet, huiput ja korkeuserot yms.
+• Kävely- ja pyörätiet
+• Kiinnostavat paikat, kuten ravintolat, huoltoasemat, hotellit, kaupat, nähtävyydet ja monta muuta
+• Etsi nimellä, osoitteella tai kiinnostavan paikan kategorialla
+• Navigointi ääni-ilmoituksilla kävellessä, pyöräillessä tai ajaessa
+• Tallenna suosikkipaikkasi yhdellä napautuksella
+• Offline Wikipedia-artikkelit
+• Maanalaisen liikenteen tasot ja ohjeet
+• Reittien tallennus
+• Tuo ja vie kirjanmerkkejä ja reittejä KML-, KMZ- ja GPX-formaateissa
+• Tumma tila iltaa ja yötä varten
+• Paranna karttadataa kaikille sisäänrakennetulla editorilla
+
+<b>Vapaus on täällä</b>
+Löydä matkasi ja navigoi maailmalla yksityisyyden ja yhteisön tukemana!
--- a/android/app/src/fdroid/play/listings/fi-FI/title.txt
+++ b/android/app/src/fdroid/play/listings/fi-FI/title.txt
@@ -1 +1 @@
-CoMaps - Vaella, pyöräile, autoile ilman verkkoyhteyttä, yksityisesti
+CoMaps - Navigoi ilman verkkoyhteyttä yksityisesti
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -1,8 +1,8 @@
-• Données OpenStreetMap du 02 juin
-• Ajout d'une option pour personnaliser le bouton tout à gauche sur l'écran principal
-• Ajout de la possibilité d'enregistrer un itinéraire en tant que traces GPS
-• Ajout du métro de Qingdao, et divers objets sur la carte
-• Support de la barre de navigation transparent en mode clair
-• Ajout des tags Mastodon et Bluesky sur les lieux et dans l'éditeur
-• Affichage de l'azimut
-• Mise à jour des traductions
+• Mise à jour des couleurs de la carte, plus claires, plus chaudes et plus conviviales
+• Editeur OSM: ajout du champ "level"
+• Mise à jour des icônes des stations-service et bornes de recharge
+• Mise à jour des couleurs de certains éléments d'interface
+• Correction de lien de partage
+• Correction de la taille d'une carte suite à une erreur de téléchargement
+• Correction de saut de la localisation dans certaines situations
+• Corrections de bug sur Android 5&6
--- a/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
@@ -1,8 +0,0 @@
-• Data di OpenStreetmap fino a giugno 2°
-• Nuova impostazione per cambiare o modificare la positione del tasto sinistra
-• Salvare i percorsi costruiti come tracce
-• È stato aggiunto: metropolitana di Qingdao, giardinaggi, guardrail, scale, studio,
-sala da ballo, focolari, love hotel
-• Barra di navigatione transparente di sisteme in moda luce
-• Aggiungi le opzioni di contatto Mastodon e Bluesky ai POI e all'editor di OSM
-• Visualizza l'angolo di azimut nella freccia di direzione
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,8 +1,8 @@
-• Dados do OSM de 2/06
-• Adicionada uma configuração para alterar ou ocultar o botão mais à esquerda
-• Salve rotas construídas como trilhas
-• Adicionado metrô de Qingdao, viveiros de plantas, guarda-corpos de rodovias, escadas, estúdios, casas de dança, fogueiras e motéis
-• Barra de navegação do sistema transparente no modo claro
-• Adicionadas opções de contato Mastodon e Bluesky aos POIs e ao editor OSM
-• Exibição de ângulo de azimute na visualização de seta de direção
-• Novas traduções
+• Atualizadas as cores do mapa - mais claras, quentes e amigáveis!
+• Editor OSM: adicionado um campo de "andar"
+• Atualizados ícones de postos de gasolina e recarga
+• Atualizadas cores de alguns elementos da interface do usuário
+• Correção de links de compartilhamento de localização
+• Correção de erros de tamanho de mapa exibidos incorretamente após download
+• Correção de pequenos saltos na seta de localização em alguns casos
+• Correções de bugs do Android 5 e 6
--- a/android/app/src/fdroid/play/listings/pt/full-description.txt
+++ b/android/app/src/fdroid/play/listings/pt/full-description.txt
@@ -0,0 +1,55 @@
+Um aplicativo de mapas gratuito e de código aberto, liderado pela comunidade, baseado em dados do OpenStreetMap e reforçado pelo compromisso com a transparência, privacidade e sem fins lucrativos. O CoMaps é um fork/spin-off do Organic Maps, que por sua vez é um fork do Maps.ME.
+
+Leia mais sobre os motivos do projeto e sua direção em <b><i>codeberg.org/comaps</i></b>.
+
+Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.
+
+• Use o aplicativo e divulgue-o.
+
+• Envie feedback e relate problemas.
+
+• Atualize os dados do mapa no aplicativo ou no site do OpenStreetMap.
+
+‣ <b>Foco offline</b>: Planeje e navegue em sua viagem ao exterior sem a necessidade de sinal de celular, pesquise pontos de referência durante uma caminhada distante, etc. Todas as funções do aplicativo foram projetadas para funcionar offline.
+
+‣ <b>Respeitando a privacidade</b>: O aplicativo foi projetado com a privacidade em mente - não identifica pessoas, não rastreia e não coleta informações pessoais. Sem anúncios.
+
+‣ <b>Simples e sofisticado</b>: recursos essenciais e fáceis de usar que simplesmente funcionam.
+
+‣ <b>Economiza bateria e espaço</b>: Não consome muita bateria como outros aplicativos de navegação. Mapas compactos economizam espaço precioso no seu celular.
+
+‣ <b>Gratuito e desenvolvido pela comunidade</b>: Pessoas como você ajudaram a desenvolver o aplicativo adicionando lugares ao OpenStreetMap, testando e dando feedback sobre os recursos e contribuindo com suas habilidades de desenvolvimento e dinheiro.
+
+‣ <b>Tomada de decisões e finanças abertas e transparentes, sem fins lucrativos e totalmente de código aberto.</b>
+
+<b>Principais recursos</b>:
+
+• Mapas detalhados para download com locais não disponíveis no Google Maps
+
+• Modo ao ar livre com trilhas em destaque, acampamentos, fontes de água, picos, curvas de nível, etc.
+
+• Trilhas para caminhada e ciclovias
+
+• Pontos de interesse como restaurantes, postos de gasolina, hotéis, lojas, pontos turísticos e muito mais
+
+• Pesquise por nome, endereço ou por categoria de ponto de interesse
+
+• Navegação com anúncios de voz para caminhadas, ciclismo ou direção
+
+• Marque seus lugares favoritos com um único toque
+
+• Artigos offline da Wikipédia
+
+• Camada e direções de transporte público do metrô
+
+• Gravação de trilhas
+
+• Exporte e importe favoritos e trilhas nos formatos KML, KMZ e GPX
+
+• Um modo escuro para usar à noite
+
+• Aprimore os dados do mapa para todos usando um editor básico integrado
+
+<b>A Liberdade Chegou</b>
+
+Descubra sua jornada, navegue pelo mundo com privacidade e comunidade em primeiro lugar!
--- a/android/app/src/fdroid/play/listings/pt/short-description.txt
+++ b/android/app/src/fdroid/play/listings/pt/short-description.txt
@@ -0,0 +1 @@
+Navegação fácil nos mapas - Descobre mais sobre o teu percurso - Feito por todos
--- a/android/app/src/fdroid/play/listings/pt/title.txt
+++ b/android/app/src/fdroid/play/listings/pt/title.txt
@@ -1 +1 @@
-CoMaps - Andar, Pedalar, Dirigir Offline com Privacidade
+CoMaps - Mapas e Navegação - Offline e Privada
--- a/android/app/src/fdroid/play/listings/ru-RU/full-description.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/full-description.txt
@@ -1,26 +1,33 @@
-Бесплатное картографическое приложение с открытым исходным кодом, основанное на данных OpenStreetMap и подкрепленное обязательствами по прозрачности, конфиденциальности и некоммерческому характеру. CoMaps - это форк/ответвление Organic Maps, который, в свою очередь, является форком Maps.ME.
+Бесплатное и свободное картографическое приложение, основанное на данных OpenStreetMap и подкреплённое обязательствами по прозрачности, конфиденциальности и некоммерческой направленности. CoMaps — это ответвление от Organic Maps, которое, в свою очередь, является ответвлением от Maps.ME.

-‣ <b>Приоритет на работу без интернета</b>: Планируйте и ориентируйтесь в путешествии за границей, не нуждаясь в сотовой связи и т.д. Все функции приложения рассчитаны на работу в автономном режиме.
-‣ <b>Соблюдение конфиденциальности</b>: Приложение разработано с учетом требований конфиденциальности - оно не идентифицирует людей, не отслеживает и не собирает личную информацию. Без рекламы.
-‣ <b>Простота и Элегантность</b>: Необходимые и легкие в использовании функции, которые просто работают.
+Подробнее о причинах проекта и его направлении читайте на <a href="https://codeberg.org/comaps">сайте</a>.
+
+Присоединяйтесь к сообществу и помогите создать лучшее приложение с картами
+• Используйте приложение и распространяйте информацию о нём
+• Оставляйте отзывы и сообщайте о проблемах
+• Обновляйте данные карт в приложении или на веб-сайте OpenStreetMap
+
+‣ <b>Приоритет на работу без интернета</b>: Планируйте и ориентируйтесь в путешествии за границей, не нуждаясь в сотовой связи и т.д. Всё в приложении рассчитано на работу в автономном режиме.
+‣ <b>Соблюдение конфиденциальности</b>: Приложение разработано с учётом требований конфиденциальности — оно не идентифицирует людей, не отслеживает и не собирает личную информацию. Без рекламы.
+‣ <b>Простота и отточенность</b>: Основные и простые в использовании функции, которые просто работают.
 ‣ <b>Экономия заряда батареи и места на устройстве</b>: Не разряжает аккумулятор, как другие приложения для навигации. Компактные карты экономят драгоценное место на вашем телефоне.
-‣ <b>Бесплатное и созданное сообществом</b>: Люди, подобные вам, помогали создавать приложение, добавляя места в OpenStreetMap, тестируя и оставляя отзывы о функциях, а также вкладывая свои навыки и деньги в разработку..
-‣ <b>Открытое и прозрачное принятие решений, финансовая отчетность, некоммерческая организация и полностью открытый исходный код.</b>
+‣ <b>Бесплатное и созданное сообществом</b>: Такие люди, как и вы, помогали создавать приложение, добавляя места в OpenStreetMap, протестировав и оставляя отзывы о функциях, а также вложив свои навыки и деньги в разработку.
+‣ <b>Открытое и прозрачное принятие решений, финансовая отчётность, некоммерческая организация и полностью открытый исходный код.</b>

-<b>Главные особенности</b>:
-• Загружаемые и подробные карты с местами, которые недоступны в Google Maps
-• Режим Outdoor с отмеченными туристическими тропами, кемпингами, источниками воды, вершинами, контурными линиями и т.д.
+<b>Главные возможности</b>:
+• Скачиваемые и подробные карты с местами, которые недоступны в Google Maps
+• Уличный режим с отмеченными туристическими тропами, кемпингами, источниками воды, вершинами, контурными линиями и т.д.
 • Пешеходные переходы и велодорожки
-• Точки интереса, такие как: рестораны, заправочные станции, отели, магазины, достопримечательности и многое другое
-• Поиск по имени, адресу или категории достопримечательностей
+• Интересные места, такие как: рестораны, заправочные станции, гостиницы, магазины, достопримечательности и многое другое
+• Поиск по названию или адресу или по категории достопримечательностей
 • Навигация с голосовыми уведомлениями для пешеходов, велосипедистов или водителей
-• Возможность добавлять любимые места в закладки одним касанием
-• Загружаемые страницы Википедии
+• Возможность добавлять любимые места в закладки одним нажатием
+• Скачиваемые страницы Википедии
 • Слой общественного транспорта (метро)
 • Запись маршрута
 • Экспорт и импорт закладок и маршрутов в форматах KML, KMZ, GPX
-• Темный режим для использования в ночное время
-• Улучшение картографических данных для всех с помощью базового встроенного редактора
-• Поддержка Android Auto и CarPlay
+• Тёмный режим для использования в ночное время
+• Улучшение данных карты для всех с помощью базового встроенного редактора

-<i>Свобода здесь - Открой для себя поездки, навигацию по миру, ставя приватность и сообщество во главе</i>
+<b>Свобода здесь</b>
+Откройте для себя путешествия, навигацию по миру, ставя во главе приватность и сообщество!
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,7 +1,8 @@
-• карты OpenStreetMap от 2 июня
-• настройка для изменения функции левой кнопки или её скрытия
-• сохранение построенных маршрутов в виде треков
-• добавлены: метро в Qingdao, питомники растений, отбойники на шоссе, постоянные лестницы-стремянки, студии, места для танцев, кострища, отели любви
-• прозрачная полоска с системными кнопками (в светлом режиме)
-• в объекты на карте (а также в их редактор) добавлены Mastodon и Bluesky контакты
-• к стрелке направления на выбранный объект добавлен азимут
+• обновлены цвета карты — теперь они светлее, теплее и дружелюбнее
+• редактор OSM: добавлено поле «этаж»
+• обновлены иконки заправок и зарядных станций
+• обновлены цвета некоторых элементов интерфейса
+• исправлена ссылка на карту при попытке поделиться местоположением
+• исправлено неверное отображение размера карты после ошибок загрузки
+• исправлены мелкие скачки стрелки местоположения в некоторых случаях
+• исправления ошибок для Android 5 и 6
--- a/android/app/src/fdroid/play/listings/ru-RU/short-description.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/short-description.txt
@@ -0,0 +1 @@
+Простая навигация по карте — Откройте больше за ваше путешествие. От сообщества
--- a/android/app/src/fdroid/play/listings/ru-RU/title.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/title.txt
@@ -0,0 +1 @@
+CoMaps - Карты и путешествия с приватностью
--- a/android/app/src/fdroid/play/listings/sr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/sr/release-notes.txt
@@ -0,0 +1,8 @@
+• освежене су боје мапе – светлије, топлије, пријатније!
+• у OSM едитору је додато поље „спрат“
+• ажуриране су иконице бензинских пумпи и станица за пуњење
+• ажуриране су боје неких елемената корисничког интерфејса
+• поправљени су линкови за дељење локације
+• поправљена је погрешно приказана величина мапе након грешака при преузимању
+• исправљена су мала поскакивања стрелице локације у неким случајевима
+• исправљене су грешке за Android 5 и 6
--- a/android/app/src/fdroid/play/listings/sr/short-description.txt
+++ b/android/app/src/fdroid/play/listings/sr/short-description.txt
@@ -1 +1 @@
-Једноставна навигација - Сазнајте више о свом путовању - Захваљујући заједници
+Једноставна навигација - Сазнајте више о свом путовању - Покреће је заједница
--- a/android/app/src/fdroid/play/listings/tr-TR/full-description.txt
+++ b/android/app/src/fdroid/play/listings/tr-TR/full-description.txt
@@ -1,2 +1,32 @@
-Gönüllüler tarafından yürütülen, OpenStreetMap harita verisini kullanan, şeffaf, mahremiyete saygılı, kamu yararına olma kararlılığıyla güçlendirilmiş bir özgür yazılım. CoMaps OrganicMaps isimli, esasen Maps.ME'nin çatalı olan bir özgür yazılımın çatalıdır.
-Projenin ortaya çıkma sebebini ve gidişatını <b><i>codeberg.org/comaps</i></b>'den okuyabilirsiniz.
+OpenStreetMap'in verilerine ve kar amacı gütmeyen olma taahhüdündeki topluluk liderliğine dayanan şeffaflık, gizlilik, ücretsiz ve açık kaynaklı haritalar uygulaması. Comaps, Organic Maps çatalı/düzenlemesidir, bu da bir Maps.ME çatalıdır.
+
+Projenin sebepleri ve rotası hakkında <b><i>codeberg.org/comaps</i></b> adresinden bilgi edinebilirsiniz.
+Oradaki topluluğa katılın ve en iyi harita uygulamasını yapmanıza yardımcı olun
+• Uygulamayı kullanın ve bu bilgiyi yayın
+• Geri bildirim verin ve sorunları bildirin
+• Uygulamada veya OpenStreetMap internet sitesinde harita verilerini güncelleyin
+
+‣ <b>Çevrimdışı odaklı</b>: Hücresel veriye ihtiyaç duymadan yurt dışında seyahatinizi planlayın ve gezin, uzak bir yürüyüş sırasında durak noktaları arama, vb. Tüm uygulama işlevleri çevrimdışı çalışacak şekilde tasarlanmıştır.
+‣ <b>Gizliliğe saygı gösterir</b>: Uygulama gizlilik göz önünde bulundurularak tasarlanmıştır - insanları fişlemez, izlemez ve kişisel bilgileri toplamaz. Reklamsızdır.
+‣ <b>Basit ve parlak</b>: Sadece işe yarayan kullanımı kolay özellikler.
+‣ <b>Pilinizi ve hafızanızı kurtarın</b>: Pilinizi diğer gezinme uygulamaları gibi boşaltmaz. Sıkıştırılmış haritalar telefonunuzdaki değerli hafızadan tasarruf eder.
+‣ <b>Özgür ve topluluk tarafından inşa edilmiştir</b>: Sizin gibi insanlar, OpenStreetMap'e yerler ekleyerek, özellikleri test edip hakkında geri bildirim vererek, geliştirme becerileri ve paralarıyla katkıda bulunarak uygulamanın oluşturulmasına yardımcı oldu.
+‣ <b>Açık, şeffaf finans ve karar verme, kar amacı gütmeyen ve tamamen açık kaynaklı.</b>
+
+<b>Ana Özellikler</b>:
+• Google Haritalarda mevcut olmayan yerlerle, indirilebilir ve ayrıntılı haritalar
+• Vurgulanmış yürüyüş parkurları, kamp alanları, su kaynakları, zirveler, yükseklik çizgileri, vb.
+• Yürüyüş ve bisiklet yolları
+• Lokantalar, benzin istasyonları, oteller, mağazalar, şahin tepeleri ve daha fazla ilgi çekici nokta
+• Ada, adrese veya ilgi alanına göre arayın
+• Yürüyüş, bisiklete binme veya sürüş için sesli bildirimlerle gezinme
+• En sevdiğiniz yerlere tek bir dokunuşla yer işareti koyun
+• Çevrimdışı Vikipedi makaleleri
+• Metro katmanı ve tarifler
+• Rota kaydı
+• KML, KMZ, GPX biçimlerindeki yer imlerini ve izlerini dışa veya içe aktarın
+• Gece boyunca kullanılacak karanlık kip
+• Temel yerleşik bir arayüz kullanan herkes için harita verilerini geliştirin
+
+<b>Özgürlük Burada</b>
+Yolculuğunuzu keşfedin, dünyayı gizlilik ve topluluk desteğiyle gezin!
--- a/android/app/src/fdroid/play/listings/zh-CN/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/zh-CN/release-notes.txt
@@ -0,0 +1,8 @@
+• 刷新地图颜色－更浅、更暖、更友好！
+• OSM 编辑器：添加“楼层”字段
+• 更新加油站和充电站图标
+• 更新部分用户界面组件的颜色
+• 修复位置共享的链接
+• 修复下载后错误显示地图大小的问题
+• 修复定位箭头偶尔轻微跳动的问题
+• Android 5&6 错误修复
--- a/android/app/src/fdroid/play/listings/zh-TW/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/zh-TW/release-notes.txt
@@ -0,0 +1,8 @@
+• 刷新地圖顏色－更淺、更暖、更友好！
+• OSM 編輯器：新增「樓層」欄位
+• 更新加油站和充電站圖示
+• 更新某些使用者介面元件的顏色
+• 修正位置分享的連結
+• 修正下載後錯誤顯示地圖尺寸的問題
+• 修正定位箭頭偶爾輕微跳動的問題
+• Android 5&6 錯誤修正
--- a/android/app/src/fdroid/play/version.yaml
+++ b/android/app/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.06.22-5-FDroid+25062205
--- a/android/app/src/google/play/listings/cs-CZ/short-description.txt
+++ b/android/app/src/google/play/listings/cs-CZ/short-description.txt
@@ -1 +1 @@
-Jednoduchá navigace v mapě – Objevte více na své cestě – Vyvíjeno komunitou
+Jednoduchá navigace v mapě - Objevte více na své cestě ‐ Vyvíjeno komunitou
--- a/android/app/src/google/play/listings/cs-CZ/title.txt
+++ b/android/app/src/google/play/listings/cs-CZ/title.txt
@@ -1 +1 @@
-CoMaps – Navigace se soukromím
+CoMaps - Navigace se soukromím
--- a/android/app/src/google/play/listings/de-DE/title.txt
+++ b/android/app/src/google/play/listings/de-DE/title.txt
@@ -1 +1 @@
-CoMaps: Navigation Datenschutz
+CoMaps
--- a/android/app/src/google/play/listings/it-IT/full-description.txt
+++ b/android/app/src/google/play/listings/it-IT/full-description.txt
@@ -1,4 +1,4 @@
-Una app sviluppata dalla comunità, gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy senza scopo di lucro. CoMaps è uno spin-off di Organic Maps, che a sua volta deriva da Maps.ME.
+Una app sviluppata dalla comunità, gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy senza scopo di lucro.

 Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
 • usa l'app e consigliala
--- a/android/app/src/google/play/listings/nl-NL/short-description.txt
+++ b/android/app/src/google/play/listings/nl-NL/short-description.txt
@@ -0,0 +1 @@
+Eenvoudige kaartnavigatie - Ontdek meer van je reis - Gemaakt door de community
--- a/android/app/src/google/play/listings/nl-NL/title.txt
+++ b/android/app/src/google/play/listings/nl-NL/title.txt
@@ -0,0 +1 @@
+CoMaps - Navigeer met privacy
--- a/android/app/src/google/play/listings/ru-RU/full-description.txt
+++ b/android/app/src/google/play/listings/ru-RU/full-description.txt
@@ -0,0 +1,38 @@
+Бесплатное и открытое приложение с картами, созданное сообществом на основе картографических данных OpenStreetMap и подкрепленное стремлением к прозрачности, уважению конфиденциальности и некоммерческой направленностью.
+
+Подробнее о причинах проекта и его направлении читайте на <a href="https://codeberg.org/comaps">сайте</a>.
+
+Присоединяйтесь к сообществу и помогите создать лучшее приложение с картами
+• Используйте приложение и распространяйте информацию о нём
+• Оставляйте отзывы и сообщайте о проблемах
+• Обновляйте данные карт в приложении или на веб-сайте OpenStreetMap
+
+<i>Ваши отзыв и звёздочки будут для нас лучшей поддержкой!</i>
+
+‣ <b>Приоритет на работу без интернета</b>: Планируйте и ориентируйтесь в путешествии за границей, не нуждаясь в сотовой связи и т.д. Всё в приложении рассчитано на работу в автономном режиме.
+‣ <b>Соблюдение конфиденциальности</b>: Приложение разработано с учётом требований конфиденциальности — оно не идентифицирует людей, не отслеживает и не собирает личную информацию. Без рекламы.
+‣ <b>Простота и отточенность</b>: Основные и простые в использовании функции, которые просто работают.
+‣ <b>Экономия заряда батареи и места на устройстве</b>: Не разряжает аккумулятор, как другие приложения для навигации. Компактные карты экономят драгоценное место на вашем телефоне.
+‣ <b>Бесплатное и созданное сообществом</b>: Такие люди, как и вы, помогали создавать приложение, добавляя места в OpenStreetMap, протестировав и оставляя отзывы о функциях, а также вложив свои навыки и деньги в разработку.
+‣ <b>Открытое и прозрачное принятие решений, финансовая отчётность, некоммерческая организация и полностью открытый исходный код.</b>
+
+<b>Главные возможности</b>:
+• Скачиваемые и подробные карты с местами, которые недоступны в Google Maps
+• Уличный режим с отмеченными туристическими тропами, кемпингами, источниками воды, вершинами, контурными линиями и т.д.
+• Пешеходные переходы и велодорожки
+• Интересные места, такие как: рестораны, заправочные станции, гостиницы, магазины, достопримечательности и многое другое
+• Поиск по названию или адресу или по категории достопримечательностей
+• Навигация с голосовыми уведомлениями для пешеходов, велосипедистов или водителей
+• Возможность добавлять любимые места в закладки одним нажатием
+• Скачиваемые страницы Википедии
+• Слой общественного транспорта (метро)
+• Запись маршрута
+• Экспорт и импорт закладок и маршрутов в форматах KML, KMZ, GPX
+• Тёмный режим для использования в ночное время
+• Улучшение данных карты для всех с помощью базового встроенного редактора
+• Поддержка Андроид Авто
+
+Пожалуйста сообщайте о ошибках, предлагайте идеи и присоединяйтесь к сообществу на сайте <a href="https://comaps.app">comaps.app</a>.
+
+<b>Свобода!</b>
+Откройте для себя путешествия, навигацию по миру, ставя во главе приватность и сообщество!
--- a/android/app/src/google/play/listings/ru-RU/short-description.txt
+++ b/android/app/src/google/play/listings/ru-RU/short-description.txt
@@ -0,0 +1 @@
+Простая навигация по карте — Откройте больше за ваше путешествие. От сообщества
--- a/android/app/src/google/play/listings/ru-RU/title.txt
+++ b/android/app/src/google/play/listings/ru-RU/title.txt
@@ -0,0 +1 @@
+CoMaps - Оффлайн навигация
--- a/android/app/src/google/play/listings/sr/full-description.txt
+++ b/android/app/src/google/play/listings/sr/full-description.txt
@@ -1,6 +1,6 @@
 Бесплатна апликација за мапе отвореног кода коју води заједница заснована на OpenStreetMap подацима и ојачана посвећеношћу транспарентности, приватности и непрофитности.

-Придружите се заједници и помозите да направите најбољу навигацију
+Придружите се заједници и помозите да направимо најбољу навигацију
 • Користите апликацију и ширите информације о њој
 • Оставите повратне информације и пријавите проблеме
 • Ажурирајте мапе из апликације или на сајту OpenStreetMap
@@ -32,5 +32,5 @@

 Молимо Вас да пријавите проблеме са апликацијом, предложите идеје и придружите се нашој заједници на <b><i>comaps.app</i></b> страни.

-<b>Сад је слободно</b>
+<b>Сад је слободна</b>
 Откријте своје путовање, путујте светом с приватношћу и заједницом на челу!
--- a/android/app/src/google/play/listings/sr/short-description.txt
+++ b/android/app/src/google/play/listings/sr/short-description.txt
@@ -1 +1 @@
-Једноставна навигација - Сазнајте више о свом путовању - Захваљујући заједници
+Једноставна навигација - Сазнајте више о свом путовању - Покреће је заједница
--- a/android/app/src/google/play/listings/sr/title.txt
+++ b/android/app/src/google/play/listings/sr/title.txt
@@ -1 +1 @@
-CoMaps - навигација
+CoMaps - Navigacija
--- a/android/app/src/google/play/listings/tr-TR/title.txt
+++ b/android/app/src/google/play/listings/tr-TR/title.txt
@@ -1 +1 @@
-CoMaps - Mahremiyetli Seyahat
+CoMaps - Gizlilikle Gezin
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -482,7 +482,10 @@ public class MapButtonsController extends Fragment
        .build();
    ViewCompat.setOnApplyWindowInsetsListener(mFrame, insetsListener);
    // Fixes insets on older Androids and with a search opened via API on all Androids.
-    mFrame.post(() -> ViewCompat.requestApplyInsets(mFrame));
+    if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.Q)
+      mFrame.postDelayed(() -> ViewCompat.requestApplyInsets(mFrame), 1250);
+    else
+      mFrame.post(() -> ViewCompat.requestApplyInsets(mFrame));
  }

  @Override
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
@@ -38,15 +38,17 @@ public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment
        ResultCodesHelper.getDialogTitleSubtitle(requireContext(), mResultCode, mMissingMaps.size());
    Pair<String, String> titleMessage = resHolder.getTitleMessage();

-    TextView titleView = new TextView(requireContext());
-    titleView.setText(titleMessage.first);
-    titleView.setPadding(65, 32, 32, 16);
-    titleView.setTextSize(18);
-    titleView.setMaxLines(4);
-    titleView.setEllipsize(TextUtils.TruncateAt.END);
-    titleView.setTypeface(null, Typeface.BOLD);
-    builder.setCustomTitle(titleView);
-
+    if (!TextUtils.isEmpty(titleMessage.first))
+    {
+      TextView titleView = new TextView(requireContext());
+      titleView.setText(titleMessage.first);
+      titleView.setPadding(65, 32, 32, 16);
+      titleView.setTextSize(18);
+      titleView.setMaxLines(4);
+      titleView.setEllipsize(TextUtils.TruncateAt.END);
+      titleView.setTypeface(null, Typeface.BOLD);
+      builder.setCustomTitle(titleView);
+    }
    mMessage = titleMessage.second;
    builder.setNegativeButton(resHolder.getCancelBtnResId(), null);
    if (ResultCodesHelper.isDownloadable(mResultCode, mMissingMaps.size()))
--- a/android/app/src/main/res/layout/dialog_missed_maps.xml
+++ b/android/app/src/main/res/layout/dialog_missed_maps.xml
@@ -15,6 +15,7 @@
    android:paddingEnd="@dimen/margin_base_plus"
    android:textAppearance="@style/MwmTextAppearance.Body2"
    android:visibility="gone"
+    tools:text="Select maps to download"
    tools:visibility="visible"/>

  <View
--- a/android/app/src/main/res/values-af/types_strings.xml
+++ b/android/app/src/main/res/values-af/types_strings.xml
@@ -567,7 +567,6 @@
    <string name="type.landuse.education">Opvoedkundige fasiliteit</string>
    <string name="type.landuse.farmland">Landbougrond</string>
    <string name="type.landuse.farmyard">Plaaswerf</string>
-    <string name="type.landuse.field">Veld</string>
    <string name="type.landuse.forest">Woud</string>
    <string name="type.landuse.forest.coniferous">Naaldwoud</string>
    <string name="type.landuse.forest.deciduous">Loofwoud</string>
--- a/android/app/src/main/res/values-ar/types_strings.xml
+++ b/android/app/src/main/res/values-ar/types_strings.xml
@@ -594,7 +594,6 @@
    <string name="type.landuse.construction">منطقة بناء</string>
    <string name="type.landuse.education">مؤسسة تعليمية</string>
    <string name="type.landuse.farmland">حقل</string>
-    <string name="type.landuse.field">حقل</string>
    <string name="type.landuse.flowerbed">مشتل أزهار</string>
    <string name="type.landuse.forest">غابة</string>
    <string name="type.landuse.forest.coniferous">غابة صنوبرية</string>
--- a/android/app/src/main/res/values-az/types_strings.xml
+++ b/android/app/src/main/res/values-az/types_strings.xml
@@ -585,7 +585,6 @@
    <string name="type.landuse.construction">Struktur</string>
    <string name="type.landuse.farmland">Kənd Təsərrüfatı Torpaqları</string>
    <string name="type.landuse.farmyard">Ferma rayonu</string>
-    <string name="type.landuse.field">Ərazi</string>
    <string name="type.landuse.flowerbed">Çiçəklik</string>
    <string name="type.landuse.forest">Meşə</string>
    <string name="type.landuse.forest.coniferous">Şam meşəsi</string>
--- a/android/app/src/main/res/values-ca/types_strings.xml
+++ b/android/app/src/main/res/values-ca/types_strings.xml
@@ -872,7 +872,6 @@
    <string name="type.cuisine.french">Francesa</string>
    <string name="type.cuisine.russian">Rusa</string>
    <string name="type.landuse.forest.coniferous">Bosc de coníferes</string>
-    <string name="type.landuse.field">Camp</string>
    <string name="type.man_made.works">Fàbrica</string>
    <string name="type.cuisine.georgian">Georgiana</string>
    <string name="type.cuisine.german">Alemanya</string>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -460,7 +460,7 @@
    <string name="editor_profile_changes">Oveřené změny</string>
    <string name="editor_focus_map_on_location">Přetažením mapy umístěte křížek na místo, kde se nachází místo nebo podnik.</string>
    <string name="editor_edit_place_title">Probíhají úpravy</string>
-    <string name="editor_add_place_title">Probíhá přidávání</string>
+    <string name="editor_add_place_title">Přidávání</string>
    <string name="editor_edit_place_name_hint">Název místa</string>
    <!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
    <string name="editor_default_language_hint">Jak je napsáno v místním jazyce</string>
--- a/android/app/src/main/res/values-cs/types_strings.xml
+++ b/android/app/src/main/res/values-cs/types_strings.xml
@@ -1212,7 +1212,6 @@
    <string name="type.internet_access">Internet</string>
    <string name="type.junction.roundabout">Kruhový objezd</string>
    <string name="type.landuse.brownfield">Brownfield</string>
-    <string name="type.landuse.field">Pole</string>
    <string name="type.landuse.greenfield">Nezastavěná plocha</string>
    <string name="type.landuse.greenhouse_horticulture">Skleník</string>
    <string name="type.landuse.industrial">Průmyslová oblast</string>
@@ -1391,11 +1390,12 @@
    <string name="type.piste_type.downhill.intermediate.area">Středně těžká sjezdovka</string>
    <string name="type.piste_type.sled">Sáňkařská dráha</string>
    <string name="type.piste_type.sled.area">Sáňkařská dráha</string>
-    <string name="type.sport.diving">Potápění se</string>
+    <string name="type.sport.diving">Skoky do vody z velkých výšek</string>
    <string name="type.amenity.studio">Studio</string>
    <string name="type.barrier.guard_rail">Svodidla</string>
    <string name="type.amenity.love_hotel">Love Hotel</string>
    <string name="type.highway.ladder">Žebřík</string>
    <string name="type.landuse.plant_nursery">Pěstitelská školka</string>
    <string name="type.leisure.firepit">Ohniště</string>
+    <string name="type.man_made.crane">Jeřáb</string>
 </resources>
--- a/android/app/src/main/res/values-da/types_strings.xml
+++ b/android/app/src/main/res/values-da/types_strings.xml
@@ -1233,7 +1233,6 @@
    <string name="type.landuse.construction">Byggeplads</string>
    <string name="type.landuse.education">Uddannelsesområde</string>
    <string name="type.landuse.farmyard">Gårdanlæg</string>
-    <string name="type.landuse.field">Mark</string>
    <string name="type.landuse.garages">Garager</string>
    <string name="type.landuse.greenfield">Ubebygget område</string>
    <string name="type.landuse.industrial">Industriområde</string>
--- a/android/app/src/main/res/values-de/types_strings.xml
+++ b/android/app/src/main/res/values-de/types_strings.xml
@@ -583,7 +583,6 @@
    <string name="type.landuse.education">Bildungseinrichtung</string>
    <string name="type.landuse.farmland">Agrarland</string>
    <string name="type.landuse.farmyard">Bauernhof</string>
-    <string name="type.landuse.field">Feld</string>
    <string name="type.landuse.flowerbed">Blumenbeet</string>
    <string name="type.landuse.forest">Wald</string>
    <string name="type.landuse.forest.coniferous">Nadelwald</string>
@@ -1392,11 +1391,12 @@
    <string name="type.boundary.administrative.3">Regionale Grenze</string>
    <string name="type.power.pole">Strommast</string>
    <string name="type.man_made.pipeline.overground">Oberirdische Rohrleitung</string>
-    <string name="type.sport.diving">Tauchen</string>
+    <string name="type.sport.diving">Turmspringen</string>
    <string name="type.amenity.love_hotel">Stundenhotel</string>
    <string name="type.landuse.plant_nursery">Gartenbau</string>
    <string name="type.leisure.firepit">Feuerstelle</string>
    <string name="type.barrier.guard_rail">Leitplanke</string>
    <string name="type.highway.ladder">Leiter</string>
    <string name="type.amenity.studio">Studio</string>
+    <string name="type.man_made.crane">Kran</string>
 </resources>
--- a/android/app/src/main/res/values-en-rGB/strings.xml
+++ b/android/app/src/main/res/values-en-rGB/strings.xml
@@ -43,4 +43,10 @@
    <string name="downloader_no_space_message">Please delete any unnecessary data</string>
    <string name="login_osm">Login to OpenStreetMap</string>
    <string name="dialog_routing_location_turn_on">Enable location services</string>
+    <string name="back">Back</string>
+    <string name="download_has_failed">Download has failed. Tap to try again.</string>
+    <string name="downloading">Downloading…</string>
+    <string name="cancel">Cancel</string>
+    <string name="delete">Delete</string>
+    <string name="download_maps">Download Maps</string>
 </resources>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -895,4 +895,7 @@
    <string name="telegram_url">https://t.me/CoMapsApp/</string>
    <string name="pref_left_button_title">Configurar botón izquierdo</string>
    <string name="pref_left_button_disable">Desactivar</string>
+    <string name="editor_level">Planta (0 es la planta baja)</string>
+    <string name="editor_building_levels">Plantas (incl. planta baja, excl. tejado)</string>
+    <string name="error_enter_correct_level">Introduce un número de planta válido</string>
 </resources>
--- a/android/app/src/main/res/values-es/types_strings.xml
+++ b/android/app/src/main/res/values-es/types_strings.xml
@@ -600,7 +600,6 @@
    <string name="type.landuse.education">Instalaciones educativas</string>
    <string name="type.landuse.farmland">Tierras agrícolas</string>
    <string name="type.landuse.farmyard">Granja</string>
-    <string name="type.landuse.field">Campo</string>
    <string name="type.landuse.flowerbed">Cama de flores</string>
    <string name="type.landuse.forest">Bosque</string>
    <string name="type.landuse.forest.coniferous">Bosque de coníferas</string>
@@ -1399,7 +1398,8 @@
    <string name="type.amenity.studio">Estudio</string>
    <string name="type.landuse.plant_nursery">Vivero de plantas</string>
    <string name="type.barrier.guard_rail">Guardarraíl</string>
-    <string name="type.sport.diving">Buceo</string>
+    <string name="type.sport.diving">Salto de trampolín</string>
    <string name="type.leisure.firepit">Fogón</string>
    <string name="type.amenity.love_hotel">Hotel del amor</string>
+    <string name="type.man_made.crane">Grúa</string>
 </resources>
--- a/android/app/src/main/res/values-et/types_strings.xml
+++ b/android/app/src/main/res/values-et/types_strings.xml
@@ -598,7 +598,6 @@
    <string name="type.landuse.education">Haridusasutuse maaala</string>
    <string name="type.landuse.farmland">Põllumaa</string>
    <string name="type.landuse.farmyard">Taluõu</string>
-    <string name="type.landuse.field">Põld</string>
    <string name="type.landuse.flowerbed">Lillepeenar</string>
    <string name="type.landuse.forest">Majandusmets</string>
    <string name="type.landuse.forest.coniferous">Okaspuumets</string>
@@ -1394,7 +1393,7 @@
    <string name="type.hwtag.toll">hwtag-toll</string>
    <string name="type.hwtag.yescar">hwtag-yescar</string>
    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
-    <string name="type.sport.diving">Sukeldumine</string>
+    <string name="type.sport.diving">Vettehüpped</string>
    <string name="type.leisure.firepit">Tulease</string>
    <string name="type.amenity.love_hotel">Armuhotell</string>
    <string name="type.landuse.plant_nursery">Puukool</string>
--- a/android/app/src/main/res/values-eu/types_strings.xml
+++ b/android/app/src/main/res/values-eu/types_strings.xml
@@ -1249,7 +1249,6 @@
    <string name="type.landuse.brownfield">Industrialde ohia</string>
    <string name="type.landuse.education">Hezkuntza-azpiegitura</string>
    <string name="type.landuse.farmyard">Eskorta</string>
-    <string name="type.landuse.field">Soroa</string>
    <string name="type.landuse.greenfield">Eraikitzeko eremua</string>
    <string name="type.landuse.greenhouse_horticulture">Negutegia</string>
    <string name="type.landuse.industrial">Industria-gunea</string>
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -588,7 +588,6 @@
    <string name="type.landuse.education">Koulutuslaitos</string>
    <string name="type.landuse.farmland">Maatalousmaa</string>
    <string name="type.landuse.farmyard">Maatila</string>
-    <string name="type.landuse.field">Kenttä</string>
    <string name="type.landuse.flowerbed">Kukkapenkki</string>
    <string name="type.landuse.forest">Metsä</string>
    <string name="type.landuse.forest.coniferous">Havumetsä</string>
@@ -1301,7 +1300,7 @@
    <string name="type.railway.subway.bridge">Metrolinjan silta</string>
    <string name="type.attraction.bumper_car">Törmäilyauto</string>
    <string name="type.railway.tram">Raitiovaunulinja</string>
-    <string name="type.sport.diving">Sukellus</string>
+    <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>
@@ -1313,7 +1312,7 @@
    <string name="type.boundary.administrative.3">Alueellinen raja</string>
    <string name="type.boundary.administrative.4">Alueellinen raja</string>
    <string name="type.aeroway">Airspace Infrastructure</string>
-    <string name="type.aeroway.apron">Apron</string>
+    <string name="type.aeroway.apron">Lentokentän asemataso</string>
    <string name="type.amenity.vending_machine.excrement_bags">Koirankakkapussiautomaatti</string>
    <string name="type.hwtag.yescar">hwtag-yescar</string>
    <string name="type.amenity.biergarten">Olutpuutarha</string>
@@ -1353,4 +1352,52 @@
    <string name="type.man_made">Man Made</string>
    <string name="type.fee.yes">$</string>
    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
+    <string name="type.organic.yes">Luomu</string>
+    <string name="type.mapswithme">mapswithme</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.leisure.common">Julkinen paikka</string>
+    <string name="type.leisure.track">Juoksurata</string>
+    <string name="type.leisure.track.area">Juoksurata</string>
+    <string name="type.man_made.survey_point">Maanmittauspiste</string>
+    <string name="type.man_made.wastewater_plant">Jätevedenpuhdistamo</string>
+    <string name="type.power.station">Voimalaitos</string>
+    <string name="type.power.pole">Sähköpylväs</string>
+    <string name="type.man_made.crane">Nosturi</string>
+    <string name="type.man_made.works">Tehdas</string>
+    <string name="type.organic.only">Luomu</string>
+    <string name="type.power">Virta</string>
+    <string name="type.power.minor_line">Pienjännitelinja</string>
+    <string name="type.man_made.utility_pole">Pylväs</string>
+    <string name="type.public_transport.platform">Joukkoliikenteen pysäkki/laituri</string>
+    <string name="type.railway.construction">Ratatyö</string>
+    <string name="type.railway.crossing">Raiteiden risteyskohta</string>
+    <string name="type.railway.disused">Käytöstä poistettu rautatie</string>
+    <string name="type.railway.funicular.tunnel">Köysiradan tunneli</string>
+    <string name="type.railway.funicular.bridge">Köysiradan silta</string>
+    <string name="type.railway.light_rail">Pikaraitiotie</string>
+    <string name="type.railway.light_rail.bridge">Pikaraitiotien silta</string>
+    <string name="type.railway.light_rail.tunnel">Pikaraitiotien tunneli</string>
+    <string name="type.railway.monorail.bridge">Yksikiskoisen rautatien silta</string>
+    <string name="type.railway.monorail.tunnel">Yksikiskoisen rautatien tunneli</string>
+    <string name="type.railway.narrow_gauge">Kapearaiteinen rata</string>
+    <string name="type.railway.narrow_gauge.tunnel">Kapearaiteisen radan tunneli</string>
+    <string name="type.railway.preserved">Museorata</string>
+    <string name="type.railway.preserved.bridge">Museoradan silta</string>
+    <string name="type.railway.preserved.tunnel">Museoradan tunneli</string>
+    <string name="type.waterway.drain">Sadevesikaivo</string>
+    <string name="type.natural.water.drain">Sadevesikaivo</string>
+    <string name="type.waterway.weir">Pohjapato</string>
+    <string name="type.aerialway.j.bar">J-tanko vetohissi</string>
+    <string name="type.aerialway.magic_carpet">Mattohissi</string>
+    <string name="type.power.generator">Generaattori</string>
+    <string name="type.railway.narrow_gauge.bridge">Kapearaiteisen radan silta</string>
+    <string name="type.traffic_calming">Hidaste</string>
+    <string name="type.traffic_calming.hump">Hidastustöyssy</string>
+    <string name="type.mountain_pass">Vuoristosola</string>
+    <string name="type.attraction.big_wheel">Maailmanpyörä</string>
 </resources>
--- a/android/app/src/main/res/values-fr/types_strings.xml
+++ b/android/app/src/main/res/values-fr/types_strings.xml
@@ -582,7 +582,6 @@
    <string name="type.landuse.education">Établissements éducatifs</string>
    <string name="type.landuse.farmland">Terrains agricoles</string>
    <string name="type.landuse.farmyard">Ferme</string>
-    <string name="type.landuse.field">Champ</string>
    <string name="type.landuse.flowerbed">Plate-bande</string>
    <string name="type.landuse.forest">Forêt</string>
    <string name="type.landuse.forest.coniferous">Forêt de conifères</string>
--- a/android/app/src/main/res/values-gl/types_strings.xml
+++ b/android/app/src/main/res/values-gl/types_strings.xml
@@ -548,7 +548,6 @@
    <string name="type.landuse.education">Instalacións educativas</string>
    <string name="type.landuse.farmland">Terras agrícolas</string>
    <string name="type.landuse.farmyard">Granja</string>
-    <string name="type.landuse.field">Campo</string>
    <string name="type.landuse.flowerbed">Cama de flores</string>
    <string name="type.landuse.forest">Bosque</string>
    <string name="type.landuse.forest.coniferous">Bosque de coníferas</string>
--- a/android/app/src/main/res/values-hi/types_strings.xml
+++ b/android/app/src/main/res/values-hi/types_strings.xml
@@ -350,7 +350,6 @@
    <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
    <string name="type.landuse.cemetery.christian">ईसाई कब्रिस्तान</string>
    <string name="type.landuse.commercial">वाणिज्य क्षेत्र</string>
-    <string name="type.landuse.field">क्षेत्र</string>
    <string name="type.landuse.forest">वन</string>
    <string name="type.landuse.forest.mixed">मिश्रित वन</string>
    <string name="type.landuse.grass">घास</string>
--- a/android/app/src/main/res/values-hu/types_strings.xml
+++ b/android/app/src/main/res/values-hu/types_strings.xml
@@ -1247,7 +1247,6 @@
    <string name="type.landuse.allotments">Kiskertek</string>
    <string name="type.landuse.brownfield">Barnamezős terület</string>
    <string name="type.landuse.construction">Építési terület</string>
-    <string name="type.landuse.field">Mező</string>
    <string name="type.landuse.garages">Garázssor</string>
    <string name="type.landuse.greenfield">Zöldmezős terület</string>
    <string name="type.landuse.greenhouse_horticulture">Üvegház</string>
--- a/android/app/src/main/res/values-is/types_strings.xml
+++ b/android/app/src/main/res/values-is/types_strings.xml
@@ -1050,7 +1050,6 @@
    <string name="type.highway.footway.area">Svæði fyrir fótgangandi</string>
    <string name="type.highway.pedestrian.area">Svæði fyrir fótgangandi</string>
    <string name="type.historic.tank">Sögulegur skriðdreki</string>
-    <string name="type.landuse.field">Akur</string>
    <string name="type.place.ocean">Úthaf</string>
    <string name="type.shop.bathroom_furnishing">Baðherbergisinnréttingar</string>
    <string name="type.shop.garden_centre">Garðvöruverslun</string>
--- a/android/app/src/main/res/values-it/types_strings.xml
+++ b/android/app/src/main/res/values-it/types_strings.xml
@@ -1331,7 +1331,6 @@
    <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.landuse.field">Campo</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>
--- a/android/app/src/main/res/values-iw/types_strings.xml
+++ b/android/app/src/main/res/values-iw/types_strings.xml
@@ -610,7 +610,6 @@
    <string name="type.landuse.education">קריית חינוך</string>
    <string name="type.landuse.farmland">אדמה חקלאית</string>
    <string name="type.landuse.farmyard">חצר חקלאית</string>
-    <string name="type.landuse.field">שדה</string>
    <string name="type.landuse.flowerbed">ערוגת פרחים</string>
    <string name="type.landuse.forest">יער</string>
    <string name="type.landuse.forest.coniferous">יער מחטניים</string>
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -354,7 +354,7 @@
    <string name="dialog_routing_disclaimer_priority">— 道路の状況や道路交通法、道路標識をナビゲーションよりも常に優先してください;</string>
    <string name="dialog_routing_disclaimer_precision">— マップは必ずしも正確であるとは限らず、また案内ルートが常に目的地までの最適なルートであるとは限りません。;</string>
    <string name="dialog_routing_disclaimer_recommendations">— 表示されるルートはあくまでも推奨ルートとしてご利用ください。;</string>
-    <string name="dialog_routing_disclaimer_borders">— 国境付近のルートにご注意ください。アプリの作成したルートは時々入国の許可されていない国への国境を超える場合があります;</string>
+    <string name="dialog_routing_disclaimer_borders">— 国境付近のルートにご注意ください。アプリの作成したルートは時々入国の許可されていない国への国境を超える場合があります。</string>
    <string name="dialog_routing_disclaimer_beware">よく注意して安全運転を心がけましょう！</string>
    <string name="dialog_routing_check_gps">GPS信号をご確認ください</string>
    <string name="dialog_routing_error_location_not_found">案内ルートを作成できません。現在のGPS座標が認識できません。</string>
@@ -781,7 +781,7 @@
    <!-- App tip #01 -->
    <string name="app_tip_01">あなたの寄付とサポートがあれば、世界で最高の地図を作成できます！</string>
    <!-- App tip #02 -->
-    <string name="app_tip_02">私たちのアプリは気に入っていますか？開発をサポートするために寄付をお願いします！ まだ気に入らないですか？ お知らせください。修正させていただきます！</string>
+    <string name="app_tip_02">私たちのアプリは気に入っていますか? 開発をサポートするために寄付をお願いします！ まだ気に入らないですか？ お知らせください。修正させていただきます！</string>
    <!-- App tip #03 -->
    <string name="app_tip_03">ソフトウェア開発者を知っている場合は、必要な機能を実装するように依頼できます。</string>
    <!-- App tip #04 -->
@@ -799,7 +799,7 @@
    <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
    <string name="car_used_on_the_phone_screen">端末の画面でCoMapsを使用している</string>
    <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">あなたは今、車の画面でオーガニック・マップを使用している</string>
+    <string name="car_used_on_the_car_screen">あなたは今、車の画面でCoMapsを使用している</string>
    <!-- Displayed on the phone screen. Android Auto connected -->
    <string name="aa_connected_title">アンドロイド・オートに接続している</string>
    <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -824,7 +824,7 @@
    <!-- 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. -->
-    <string name="pref_tts_no_system_tts">音声合成の設定が見つからなかった。</string>
+    <string name="pref_tts_no_system_tts">音声合成の設定が見つからなかった、お使いのデバイスがサポートしていますか？</string>
    <string name="drive_through">ドライブスルー</string>
    <string name="clear_the_search">検索をクリアする</string>
    <string name="zoom_in">ズームイン</string>
--- a/android/app/src/main/res/values-ja/types_strings.xml
+++ b/android/app/src/main/res/values-ja/types_strings.xml
@@ -628,7 +628,7 @@
    <string name="type.leisure.water_park">ウォーターパーク</string>
    <string name="type.man_made">構造物</string>
    <string name="type.man_made.breakwater">防波堤</string>
-    <string name="type.man_made.cairn">ケルン</string>
+    <string name="type.man_made.cairn">ケアン</string>
    <string name="type.man_made.chimney">工場煙突</string>
    <string name="type.man_made.cutline">森林の切れ目</string>
    <string name="type.man_made.survey_point">測量標</string>
@@ -673,7 +673,7 @@
    <string name="type.natural.earth_bank">崖</string>
    <string name="type.man_made.embankment">盛土</string>
    <string name="type.natural.coastline">海岸線</string>
-    <string name="type.natural.desert">荒野</string>
+    <string name="type.natural.desert">砂漠</string>
    <string name="type.natural.geyser">間欠泉</string>
    <string name="type.natural.glacier">氷河</string>
    <string name="type.natural.grassland">草原</string>
@@ -787,7 +787,7 @@
    <string name="type.railway.monorail.tunnel">モノレール(トンネル)</string>
    <string name="type.railway.narrow_gauge">狭軌鉄道</string>
    <string name="type.railway.narrow_gauge.bridge">狭軌鉄道(橋)</string>
-    <string name="type.railway.narrow_gauge.tunnel">ja = 狭軌鉄道(トンネル)</string>
+    <string name="type.railway.narrow_gauge.tunnel">狭軌鉄道(トンネル)</string>
    <string name="type.railway.platform">プラットホーム</string>
    <string name="type.railway.preserved">保存鉄道</string>
    <string name="type.railway.preserved.bridge">保存鉄道(橋)</string>
@@ -1327,7 +1327,7 @@
    <string name="type.barrier.guard_rail">防護柵</string>
    <string name="type.highway.ladder">階子</string>
    <string name="type.attraction.bumper_car">バンパーカー</string>
-    <string name="type.sport.diving">飛込</string>
+    <string name="type.sport.diving">ハイダイビング</string>
    <string name="type.recycling.cartons">紙箱</string>
    <string name="type.organic.only">有機</string>
    <string name="type.organic.yes">有機</string>
@@ -1336,4 +1336,66 @@
    <string name="type.amenity.vending_machine.excrement_bags">うんち袋の自販機</string>
    <string name="type.amenity.parcel_locker">宅配ロッカー</string>
    <string name="type.amenity.waste_transfer_station">ゴミ処理場</string>
+    <string name="type.mapswithme">mapswithme</string>
+    <string name="type.man_made.utility_pole">ユーティリティポール</string>
+    <string name="type.route.shuttle_train">シャトル列車</string>
+    <string name="type.attraction.big_wheel">観覧車</string>
+    <string name="type.man_made.crane">クレーン</string>
+    <string name="type.mapswithme.grid">mapswithme-グリッド</string>
+    <string name="type.barrier.chain">チェーンポール</string>
+    <string name="type.cuisine.bubble_tea">タピオカティー</string>
+    <string name="type.piste_type.downhill.area">ダウンヒルスキー場</string>
+    <string name="type.railway.subway.bridge">地下鉄路線（橋）</string>
+    <string name="type.shop.caravan">RVディーラー</string>
+    <string name="type.highway.world_level">高速道路（世界レベル）</string>
+    <string name="type.railway.subway">地下鉄路線</string>
+    <string name="type.highway.elevator">エレベーター</string>
+    <string name="type.hwtag.private">私道タグ</string>
+    <string name="type.boundary.administrative.3">行政界</string>
+    <string name="type.boundary.administrative.4">行政界</string>
+    <string name="type.building.warehouse">倉庫</string>
+    <string name="type.emergency">緊急サービス</string>
+    <string name="type.highway.world_towns_level">高速道路（町レベル）</string>
+    <string name="type.hwtag">交通特性タグ</string>
+    <string name="type.hwtag.bidir_bicycle">双方向の自転車レーンタグ</string>
+    <string name="type.hwtag.onedir_bicycle">一方通行の自転車レーンタグ</string>
+    <string name="type.hwtag.lit">道路照明タグ</string>
+    <string name="type.hwtag.nobicycle">自転車通行禁止タグ</string>
+    <string name="type.hwtag.nocar">自動車通行禁止タグ</string>
+    <string name="type.hwtag.nofoot">歩行者通行禁止タグ</string>
+    <string name="type.hwtag.oneway">一方通行の道路タグ</string>
+    <string name="type.hwtag.toll">有料道路タグ</string>
+    <string name="type.hwtag.yesbicycle">自転車通行許可タグ</string>
+    <string name="type.hwtag.yescar">自動車通行許可タグ</string>
+    <string name="type.hwtag.yesfoot">歩行者通行許可タグ</string>
+    <string name="type.man_made.storage_tank">貯蔵タンク</string>
+    <string name="type.leisure.beach_resort">ビーチリゾート</string>
+    <string name="type.aerialway.j.bar">Jバーリフト</string>
+    <string name="type.aerialway.magic_carpet">スノーエスカレーター</string>
+    <string name="type.aerialway.platter">シュレップリフト</string>
+    <string name="type.aerialway.rope_tow">ロープトウ</string>
+    <string name="type.aerialway.t.bar">Tバーリフト</string>
+    <string name="type.piste_type.nordic">ノルディックスキーコース</string>
+    <string name="type.piste_type.sled">トボガンコース</string>
+    <string name="type.psurface">路面</string>
+    <string name="type.psurface.paved_bad">舗装路面（悪い）</string>
+    <string name="type.psurface.paved_good">舗装路面（良い）</string>
+    <string name="type.psurface.unpaved_bad">未舗装路面（悪い）</string>
+    <string name="type.psurface.unpaved_good">未舗装路面（良い）</string>
+    <string name="type.railway.subway.tunnel">地下鉄路線（トンネル）</string>
+    <string name="type.piste_type.downhill">ダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill.easy.area">初級者向けのダウンヒルスキー場</string>
+    <string name="type.piste_type.downhill.intermediate">中級者向けのダウンヒルスキーコース</string>
+    <string name="type.boundary.administrative.2">国境</string>
+    <string name="type.fee.yes">￥</string>
+    <string name="type.piste_type.downhill.novice">初心者向けのダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill.novice.area">初心者向けのダウンヒルスキー場</string>
+    <string name="type.mountain_pass">峠</string>
+    <string name="type.piste_type.downhill.advanced">上級者向けのダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill.advanced.area">上級者向けのダウンヒルスキー場</string>
+    <string name="type.piste_type.downhill.easy">初級者向けのダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill.expert">エキスパート向けのダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill.expert.area">エキスパート向けのダウンヒルスキー場</string>
+    <string name="type.piste_type.downhill.freeride">フリーライド用のダウンヒルスキーコース</string>
+    <string name="type.piste_type.downhill.intermediate.area">中級者向けのダウンヒルスキー場</string>
 </resources>
--- a/android/app/src/main/res/values-mr/types_strings.xml
+++ b/android/app/src/main/res/values-mr/types_strings.xml
@@ -502,7 +502,6 @@
    <string name="type.landuse.construction">बांधकाम</string>
    <string name="type.landuse.education">शैक्षणिक सुविधा</string>
    <string name="type.landuse.farmland">शेतजमीन</string>
-    <string name="type.landuse.field">क्षेत्र</string>
    <string name="type.landuse.flowerbed">फ्लॉवरबेड</string>
    <string name="type.landuse.forest">वन</string>
    <string name="type.landuse.forest.coniferous">शंकुमंत जंगल</string>
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -38,15 +38,15 @@
    <string name="try_again">Probeer opnieuw</string>
    <string name="about_menu_title">Over CoMaps</string>
    <!-- Text in About screen -->
-    <string name="about_headline">Gratis voor iedereen, met liefde gemaakt</string>
+    <string name="about_headline">Open project, gemaakt door de community</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_1">• Geen advertenties, geen tracking, geen gegevensverzameling</string>
+    <string name="about_proposition_1">• Gebruiksvriendelijk en gestroomlijnd</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_2">• Geen batterijverlies, werkt offline</string>
+    <string name="about_proposition_2">• Privacygericht en vrij van advertenties</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• Snel, minimalistisch, ontwikkeld door de gemeenschap</string>
+    <string name="about_proposition_3">• Offline, snel en compact</string>
    <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Open-source applicatie gemaakt door enthousiastelingen en vrijwilligers.</string>
+    <string name="about_developed_by_enthusiasts">Volledig open source, non-profit, transparante besluitvorming en financiën.</string>
    <!-- The button that opens system location settings -->
    <string name="location_settings">Locatie-instellingen</string>
    <string name="close">Sluit</string>
@@ -300,9 +300,9 @@
    <!-- Item in context menu. -->
    <string name="downloader_update_map">Update kaart</string>
    <!-- Preference title -->
-    <string name="google_play_services">Google Play-locatieservices</string>
+    <string name="google_play_services">Google Fused-locatieservices</string>
    <!-- Preference text -->
-    <string name="pref_use_google_play">Bepaal snel je locatie bij benadering via Bluetooth, WiFi of een mobiel netwerk</string>
+    <string name="pref_use_google_play">Een propriëtaire dienst die GPS, Wi-Fi, mobiele netwerken, enzovoort combineert om je locatie nauwkeuriger te bepalen. Het kan verbinding maken met Google-servers.</string>
    <!-- Preference title -->
    <!-- Preference description -->
    <!-- Text for routing error dialog -->
@@ -883,4 +883,12 @@
    <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
    <string name="app_site_url">https://comaps.app/</string>
    <string name="bluesky">Bluesky</string>
+    <string name="saved">Opgeslagen</string>
+    <string name="codeberg">Codeberg</string>
+    <string name="pref_left_button_disable">Schakel uit</string>
+    <string name="error_enter_correct_fediverse_page">Voer een geldige Mastodon-gebruikersnaam of webadres in</string>
+    <string name="editor_level">Verdieping (0 is begane grond)</string>
+    <string name="editor_building_levels">Verdiepingen (incl. begane grond, excl. dak)</string>
+    <string name="error_enter_correct_level">Voer een geldig verdiepingnummer in</string>
+    <string name="error_enter_correct_bluesky_page">Voer een geldige Bluesky-gebruikersnaam of webadres in</string>
 </resources>
--- a/android/app/src/main/res/values-nl/types_strings.xml
+++ b/android/app/src/main/res/values-nl/types_strings.xml
@@ -594,7 +594,6 @@
    <string name="type.landuse.education">Educatieve voorzieningen</string>
    <string name="type.landuse.farmland">Landbouwgrond</string>
    <string name="type.landuse.farmyard">Boerenerf</string>
-    <string name="type.landuse.field">Veld</string>
    <string name="type.landuse.flowerbed">Bloemenbed</string>
    <string name="type.landuse.forest">Bos</string>
    <string name="type.landuse.forest.coniferous">Naaldbos</string>
@@ -1396,6 +1395,9 @@
    <string name="type.amenity.food_court">Food court</string>
    <string name="type.highway.ladder">ladder</string>
    <string name="type.leisure.firepit">vuurplaats</string>
-    <string name="type.sport.diving">duiken</string>
    <string name="type.landuse.plant_nursery">plantenkwekerij</string>
+    <string name="type.man_made.crane">Kraan</string>
+    <string name="type.barrier.guard_rail">Vangrail</string>
+    <string name="type.amenity.love_hotel">Love Hotel</string>
+    <string name="type.amenity.studio">Studio</string>
 </resources>
--- a/android/app/src/main/res/values-pl/types_strings.xml
+++ b/android/app/src/main/res/values-pl/types_strings.xml
@@ -594,7 +594,6 @@
    <string name="type.landuse.education">Placówki oświatowe</string>
    <string name="type.landuse.farmland">Grunt rolny</string>
    <string name="type.landuse.farmyard">Obejście gospodarskie</string>
-    <string name="type.landuse.field">Pole</string>
    <string name="type.landuse.flowerbed">Kwietnik</string>
    <string name="type.landuse.forest">Las</string>
    <string name="type.landuse.forest.coniferous">Las iglasty</string>
@@ -1373,4 +1372,7 @@
    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
    <string name="type.route.shuttle_train">route-shuttle_train</string>
+    <string name="type.man_made.crane">Dźwig</string>
+    <string name="type.highway.ladder">Drabina</string>
+    <string name="type.leisure.firepit">Ognisko</string>
 </resources>
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -866,4 +866,7 @@
    <string name="prefs_languages_information_off">Para alguns idiomas, você precisará instalar um sintetizador de voz ou um pacote de idiomas adicional da loja de aplicativos (Google Play, Galaxy Store, App Gallery, FDroid).\nAbra as configurações do seu dispositivo → Idioma e entrada → Fala → Saída de texto para fala.\nAqui, você pode gerenciar as configurações de síntese de voz (por exemplo, baixar o pacote de idiomas para uso offline) e selecionar outro mecanismo de conversão de texto para fala.</string>
    <string name="codeberg">Codeberg</string>
    <string name="instagram_url">https://www.instagram.com/comapscommunity/</string>
+    <string name="editor_building_levels">Andares (incl. térreo, excl. sótão)</string>
+    <string name="error_enter_correct_level">Digite um número de andares válido</string>
+    <string name="editor_level">Andar (0 é o térreo)</string>
 </resources>
--- a/android/app/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml
@@ -516,7 +516,6 @@
    <string name="type.landuse.education">Instituições educacionais</string>
    <string name="type.landuse.farmland">Campo agrícola</string>
    <string name="type.landuse.farmyard">Pátio de fazenda</string>
-    <string name="type.landuse.field">Campo</string>
    <string name="type.landuse.flowerbed">Canteiro de flores</string>
    <string name="type.landuse.forest">Floresta</string>
    <string name="type.landuse.forest.coniferous">Floresta de coníferas</string>
@@ -1206,8 +1205,189 @@
    <string name="type.amenity.love_hotel">Motel</string>
    <string name="type.leisure.firepit">Fogueira</string>
    <string name="type.landuse.plant_nursery">Viveiro de plantas</string>
-    <string name="type.sport.diving">Mergulho</string>
+    <string name="type.sport.diving">Mergulho em altura</string>
    <string name="type.amenity.studio">Estúdio de gravação</string>
    <string name="type.barrier.guard_rail">Guarda-corpo</string>
    <string name="type.highway.ladder">Escada</string>
+    <string name="type.man_made.crane">Guindaste</string>
+    <string name="type.place.locality">Localidade</string>
+    <string name="type.historic.pillory">Pelourinho</string>
+    <string name="type.railway.rail.utility">Ferrovia Utilitária</string>
+    <string name="type.natural.shingle">Telha</string>
+    <string name="type.railway.rail.highspeed">Ferrovia de alta velocidade</string>
+    <string name="type.route.shuttle_train">rota-ônibus_trem</string>
+    <string name="type.historic.memorial.plaque">Placa Comemorativa</string>
+    <string name="type.natural.saddle">Sela de montanha</string>
+    <string name="type.place.country">País</string>
+    <string name="type.sport.beachvolleyball">Vôlei de praia</string>
+    <string name="type.historic.wayside_cross">Cruz à beira da estrada</string>
+    <string name="type.leisure.outdoor_seating">Assentos ao ar livre</string>
+    <string name="type.place.island">Ilha</string>
+    <string name="type.natural.heath">Charneca</string>
+    <string name="type.natural.wetland">Zona úmida</string>
+    <string name="type.historic.memorial.sculpture">Escultura</string>
+    <string name="type.historic.memorial.statue">Estátua</string>
+    <string name="type.historic.memorial.war_memorial">Memorial de Guerra</string>
+    <string name="type.historic.monument">Monumento</string>
+    <string name="type.historic.ruins">Ruínas Históricas</string>
+    <string name="type.historic.ship">Navio</string>
+    <string name="type.historic.tomb">Túmulo</string>
+    <string name="type.historic.wayside_shrine">Santuário à beira da estrada</string>
+    <string name="type.hwtag.toll">hwtag-pedágio</string>
+    <string name="type.hwtag.yesbicycle">hwtag-simbicicleta</string>
+    <string name="type.leisure.miniature_golf">Minigolfe</string>
+    <string name="type.man_made.petroleum_well">Poço de petróleo ou gás</string>
+    <string name="type.railway.rail.branch">Ramal Ferroviário</string>
+    <string name="type.railway.rail.spur">Ramal Ferroviário</string>
+    <string name="type.mountain_pass">Passo da Montanha</string>
+    <string name="type.natural">Natureza</string>
+    <string name="type.natural.bare_rock">Apenas Rock</string>
+    <string name="type.natural.bay">Baía</string>
+    <string name="type.natural.beach">Praia</string>
+    <string name="type.natural.beach.sand">Praia de areia</string>
+    <string name="type.natural.beach.gravel">Praia de cascalho</string>
+    <string name="type.natural.cape">Cabo</string>
+    <string name="type.natural.cave_entrance">Entrada da Caverna</string>
+    <string name="type.natural.cliff">Penhasco</string>
+    <string name="type.natural.earth_bank">Banco de Terras</string>
+    <string name="type.man_made.embankment">Aterro</string>
+    <string name="type.natural.coastline">Litoral</string>
+    <string name="type.natural.desert">Deserto</string>
+    <string name="type.natural.grassland">Pastagem</string>
+    <string name="type.natural.hot_spring">Fonte termal</string>
+    <string name="type.natural.water.lake">Lago</string>
+    <string name="type.natural.water.lock">Câmara de eclusa</string>
+    <string name="type.natural.water.pond">Lago</string>
+    <string name="type.natural.water.reservoir">Reservatório</string>
+    <string name="type.natural.water.basin">Bacia</string>
+    <string name="type.natural.water.river">Rio</string>
+    <string name="type.natural.land">Terra</string>
+    <string name="type.natural.meadow">Prado</string>
+    <string name="type.natural.orchard">Pomar</string>
+    <string name="type.natural.peak">Pico</string>
+    <string name="type.natural.rock">Pedra</string>
+    <string name="type.natural.scrub">Esfregar</string>
+    <string name="type.natural.spring">Fonte Natural</string>
+    <string name="type.natural.spring.drinking_water_no">Fonte Natural</string>
+    <string name="type.natural.strait">Estreito</string>
+    <string name="type.natural.tree_row">Fileira de árvores</string>
+    <string name="type.natural.vineyard">Vinhedo</string>
+    <string name="type.natural.volcano">Vulcão</string>
+    <string name="type.natural.water">Água</string>
+    <string name="type.natural.wetland.bog">Jardim</string>
+    <string name="type.natural.wetland.marsh">Pântano</string>
+    <string name="type.place.city">Cidade</string>
+    <string name="type.place.city.capital">Capital</string>
+    <string name="type.place.city.capital.10">Cidade</string>
+    <string name="type.place.city.capital.11">Cidade</string>
+    <string name="type.place.city.capital.6">Cidade</string>
+    <string name="type.place.continent">Continente</string>
+    <string name="type.place.county">Condado</string>
+    <string name="type.place.islet">Ilhota</string>
+    <string name="type.place.isolated_dwelling">Moradia Isolada</string>
+    <string name="type.place.ocean">Oceano</string>
+    <string name="type.railway.rail.tourism">Ferrovia Turística</string>
+    <string name="type.railway.rail.main">Ferrovia</string>
+    <string name="type.railway.rail.service">Trilho de serviço</string>
+    <string name="type.railway.rail.main.bridge">Ponte Ferroviária</string>
+    <string name="type.railway.rail.tunnel">Túnel Ferroviário</string>
+    <string name="type.sport.bowls">Tigelas</string>
+    <string name="type.sport.chess">Xadrez</string>
+    <string name="type.sport.gymnastics">Ginástica</string>
+    <string name="type.sport.skiing">Esqui</string>
+    <string name="type.sport.ice_hockey">Hóquei no gelo</string>
+    <string name="type.sport.pelota">Pelota Basca</string>
+    <string name="type.barrier.ditch">Fosso</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.tourism.chalet">Casa de férias</string>
+    <string name="type.railway.rail.main.tunnel">Túnel ferroviário</string>
+    <string name="type.tourism.attraction">Atração turística</string>
+    <string name="type.tourism.motel">Motel</string>
+    <string name="type.sport.golf">Golfe</string>
+    <string name="type.place.square">Praça ou largo</string>
+    <string name="type.sport.skateboard">Skate</string>
+    <string name="type.tourism.wilderness_hut">Cabana</string>
+    <string name="type.tourism.artwork.sculpture">Escultura</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
+    <string name="type.attraction.big_wheel">Roda-gigante</string>
+    <string name="type.attraction.carousel">Carrossel</string>
+    <string name="type.attraction.historic">Atração histórica</string>
+    <string name="type.attraction.maze">Labirinto</string>
+    <string name="type.place.city.capital.2">Capital</string>
+    <string name="type.place.city.capital.3">Cidade</string>
+    <string name="type.place.city.capital.4">Cidade</string>
+    <string name="type.place.city.capital.7">Cidade</string>
+    <string name="type.place.city.capital.8">Cidade</string>
+    <string name="type.place.city.capital.9">Cidade</string>
+    <string name="type.place.region">Região</string>
+    <string name="type.place.state">Estado</string>
+    <string name="type.place.state.USA">Estado</string>
+    <string name="type.place.town">Cidade</string>
+    <string name="type.place.village">Vila</string>
+    <string name="type.railway.rail.bridge">Ponte ferroviária</string>
+    <string name="type.railway.rail.highspeed.bridge">Ponte ferroviária</string>
+    <string name="type.railway.rail.tourism.bridge">Ponte ferroviária</string>
+    <string name="type.railway.rail.branch.bridge">Ponte ferroviária</string>
+    <string name="type.railway.rail.utility.bridge">Ponte ferroviária</string>
+    <string name="type.railway.rail.spur.bridge">Ponte ferroviária</string>
+    <string name="type.railway.rail.highspeed.tunnel">Túnel ferroviário</string>
+    <string name="type.railway.rail.tourism.tunnel">Túnel ferroviário</string>
+    <string name="type.railway.rail.branch.tunnel">Túnel ferroviário</string>
+    <string name="type.railway.rail.utility.tunnel">Túnel ferroviário</string>
+    <string name="type.railway.rail.spur.tunnel">Túnel ferroviário</string>
+    <string name="type.railway.rail.service.tunnel">Túnel ferroviário</string>
+    <string name="type.sport.cricket">Críquete</string>
+    <string name="type.sport.shooting">Tiro desportivo</string>
+    <string name="type.sport.soccer">Futebol</string>
+    <string name="type.sport.volleyball">Voleibol</string>
+    <string name="type.sport.10pin">Boliche</string>
+    <string name="type.sport.9pin">Boliche</string>
+    <string name="type.sport.field_hockey">Hóquei em campo</string>
+    <string name="type.tourism.aquarium">Aquário</string>
+    <string name="type.tourism.artwork">Obra de arte</string>
+    <string name="type.tourism.artwork.painting">Pintura</string>
+    <string name="type.tourism.artwork.statue">Estátua</string>
+    <string name="type.attraction.amusement_ride">Atração de parque de diversão</string>
+    <string name="type.attraction.animal">Recinto para animais</string>
+    <string name="type.attraction.roller_coaster">Montanha-russa</string>
+    <string name="type.tourism.attraction.specified">Atração turística</string>
+    <string name="type.tourism.gallery">Galeria de arte</string>
+    <string name="type.tourism.hostel">Hostel</string>
+    <string name="type.tourism.hotel">Hotel</string>
+    <string name="type.tourism.information.board">Painel de informações</string>
+    <string name="type.tourism.information.guidepost">Poste com direções</string>
+    <string name="type.tourism.information.map">Mapa turístico</string>
+    <string name="type.tourism.museum">Museu</string>
+    <string name="type.tourism.picnic_site">Local de piqueniques</string>
+    <string name="type.tourism.theme_park">Parque de diversão</string>
+    <string name="type.traffic_calming">Redutor de velocidade</string>
+    <string name="type.waterway">Curso de água</string>
+    <string name="type.waterway.canal.tunnel">Túnel de canal</string>
+    <string name="type.waterway.fish_pass">Escada de peixes</string>
+    <string name="type.waterway.dam">Barragem</string>
+    <string name="type.waterway.ditch.tunnel">Bueiro</string>
+    <string name="type.waterway.dock">Doca</string>
+    <string name="type.waterway.drain">Valeta de drenagem</string>
+    <string name="type.natural.water.drain">Valeta de drenagem</string>
+    <string name="type.waterway.drain.tunnel">Bueiro</string>
+    <string name="type.waterway.lock_gate">Comporta de eclusa</string>
+    <string name="type.piste_type.snow_park">Parque de neve</string>
+    <string name="type.shop.auction">Leilão</string>
+    <string name="type.place.sea">Mar</string>
+    <string name="type.place.city.capital.5">Cidade</string>
+    <string name="type.shop.pasta">Loja de massas</string>
+    <string name="type.railway.rail.service.bridge">Ponte ferroviária</string>
+    <string name="type.shop.hearing_aids">Loja de aparelhos auditivos</string>
 </resources>
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -38,15 +38,15 @@
    <string name="try_again">Tentar novamente</string>
    <string name="about_menu_title">Sobre o CoMaps</string>
    <!-- Text in About screen -->
-    <string name="about_headline">Grátis para todos, feito com amor</string>
+    <string name="about_headline">Projeto aberto desenvolvido pela comunidade</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_1">• Sem anúncios, rastreamento ou coleta de dados</string>
+    <string name="about_proposition_1">• Fácil de usar e polido</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_2">• Não gasta a bateria, funciona offline</string>
+    <string name="about_proposition_2">• Focado na privacidade e sem anúncios</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• Rápido, minimalista, desenvolvido pela comunidade</string>
+    <string name="about_proposition_3">• Offline, rápido e compacto</string>
    <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Aplicativo de código aberto criado por entusiastas e voluntários.</string>
+    <string name="about_developed_by_enthusiasts">Totalmente open source, sem fins lucrativos, decisões e finanças transparentes.</string>
    <!-- The button that opens system location settings -->
    <string name="location_settings">Definições de localização</string>
    <string name="close">Fechar</string>
@@ -88,9 +88,9 @@
    <!-- Header of settings activity where user defines storage path -->
    <string name="maps_storage">Guardar mapas em</string>
    <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Selecione o local onde os mapas devem ser descarregados</string>
+    <string name="maps_storage_summary">Selecione uma pasta para onde os mapas devem ser descarregados.</string>
    <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
-    <string name="maps_storage_downloaded">Mapas</string>
+    <string name="maps_storage_downloaded">Mapas Descarregados</string>
    <!-- Question dialog for transferring maps from one storage to another -->
    <string name="move_maps">Mover mapas?</string>
    <!-- Ask user to wait several minutes (some long process in modal dialog). -->
@@ -288,9 +288,9 @@
    <!-- Item in context menu. -->
    <string name="downloader_update_map">Atualizar mapa</string>
    <!-- Preference title -->
-    <string name="google_play_services">Serviços de localização do Google Play</string>
+    <string name="google_play_services">Serviços de localização fundidos da Google</string>
    <!-- Preference text -->
-    <string name="pref_use_google_play">Determina rapidamente a tua localização aproximada através de Bluetooth, WiFi ou rede móvel</string>
+    <string name="pref_use_google_play">Um serviço proprietário que combina GPS, Wi-Fi, Dados moveis etc. para determinar a tua localização com maior exatidão. Pode conectar-se aos Servidores da Google.</string>
    <!-- Preference title -->
    <!-- Preference description -->
    <!-- Text for routing error dialog -->
@@ -822,10 +822,63 @@
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">O trajeto está vazio - não há nada para guardar</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
-    <string name="error_no_file_manager_app">Não é possível apresentar a caixa de diálogo de seleção de pastas porque não está instalada nenhuma aplicação adequada no seu dispositivo. Instale uma aplicação de gestão de ficheiros e tente novamente</string>
+    <string name="error_no_file_manager_app">Não é possível apresentar a caixa de diálogo de seleção de pastas porque não está instalada nenhuma aplicação adequada no seu dispositivo. Instale uma aplicação de gestão de ficheiros e tente novamente.</string>
    <string name="choose_color">Escolher cor</string>
    <string name="edit_track">Editar trajeto</string>
    <string name="uri_open_location_failed">Nenhuma aplicação instalada que possa abrir a localização</string>
    <!-- preference string for using auto theme only in navigation mode -->
    <string name="nav_auto">Auto na navegação</string>
+    <string name="menu">Menu</string>
+    <string name="app_site_url">https://comaps.app/</string>
+    <string name="maps_storage_external">Armazenamento externo partilhado</string>
+    <string name="mb">MB</string>
+    <string name="editor_level">Piso (0 é o rés de chão)</string>
+    <string name="maps_storage_internal">Armazenamento interno privado</string>
+    <string name="instagram">Instagram</string>
+    <string name="gb">GB</string>
+    <string name="maps_storage_shared">Armazenamento interno partilhado</string>
+    <string name="maps_storage_removable">Cartão SD</string>
+    <string name="maps_storage_free_size">%1$s disponíveis de %2$s</string>
+    <string name="move_maps_error">Erro ao mover os ficheiros dos mapas</string>
+    <string name="github">GitHub</string>
+    <string name="telegram">Telegram</string>
+    <string name="matrix">[Matrix]</string>
+    <string name="mastodon">Mastodon</string>
+    <string name="facebook">Facebook</string>
+    <string name="twitter">X (Twitter)</string>
+    <string name="vk">VK</string>
+    <string name="bluesky">Bluesky</string>
+    <string name="editor_line_social_network">LINE</string>
+    <string name="openstreetmap">OpenStreetMap</string>
+    <string name="wikimedia_commons">Wikimedia Commons</string>
+    <string name="opens_in">Abre em %s</string>
+    <string name="closes_in">Fecha em %s</string>
+    <string name="empty_street_name_error">Por favor introduza o nome da rua</string>
+    <string name="editor_add_phone">Adicionar Telefone</string>
+    <string name="level_value_generic">Piso: %s</string>
+    <string name="delete_place_empty_comment_error">Por favor indique a razão para apagar este local</string>
+    <string name="editor_building_levels">Pisos (inc. rés de chão, excl. telhado)</string>
+    <string name="error_enter_correct_level">Introduza um número de piso válido</string>
+    <string name="saved">Guardado</string>
+    <string name="codeberg">Codeberg</string>
+    <string name="disk_error">Não foi possível criar a pasta e mover os ficheiros no Armazenamento Interno do dispositivo ou no Cartão SD</string>
+    <string name="enable_show_on_lock_screen_description">Quando ativado, a aplicação irá funcionar sobre o ecrã de bloqueio mesmo quando o dispositivo estiver bloqueado.</string>
+    <string name="pref_left_button_disable">Desativar</string>
+    <string name="error_enter_correct_facebook_page">Introduza um endereço web válido para uma conta ou página de Facebook</string>
+    <string name="error_enter_correct_instagram_page">Introduza um nome de utilizador ou endereço web de Instagram válido</string>
+    <string name="error_enter_correct_twitter_page">Introduza um nome de utilizador ou endereço web do Twitter válido</string>
+    <string name="error_enter_correct_vk_page">Introduza um nome de utilizador ou endereço web de VK válido</string>
+    <string name="error_enter_correct_fediverse_page">Introduza um nome de utilizador ou endereço web do Mastodon válido</string>
+    <string name="error_enter_correct_bluesky_page">Introduza um nome de utilizador ou endereço web de Bluesky válido</string>
+    <string name="disk_error_title">Erro no disco</string>
+    <string name="disconnect_usb_cable_title">Desconecte o cabo USB</string>
+    <string name="enable_show_on_lock_screen">Mostrar no ecrã de bloqueio</string>
+    <string name="change_map_locale">Idioma do mapa</string>
+    <string name="telegram_url">https://t.me/CoMapsApp/</string>
+    <string name="instagram_url">https://www.instagram.com/comapscommunity</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="comma_separated_pair">%1$s, %2$s</string>
+    <string name="pref_left_button_title">Configuração do botão esquerdo</string>
+    <string name="error_enter_correct_line_page">Insira um ID de linha ou endereço da web válido</string>
 </resources>
--- a/android/app/src/main/res/values-pt/types_strings.xml
+++ b/android/app/src/main/res/values-pt/types_strings.xml
@@ -582,7 +582,6 @@
    <string name="type.landuse.construction">Construção</string>
    <string name="type.landuse.farmland">Campo agrícola</string>
    <string name="type.landuse.farmyard">Pátio de quinta</string>
-    <string name="type.landuse.field">Campo</string>
    <string name="type.landuse.flowerbed">Canteiro de flores</string>
    <string name="type.landuse.forest">Floresta</string>
    <string name="type.landuse.forest.coniferous">Floresta de coníferas</string>
@@ -1342,4 +1341,65 @@
    <string name="type.amenity.dojo">Dojo</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
    <string name="type.leisure.sports_hall">Pavilhão desportivo</string>
+    <string name="type.cuisine.bubble_tea">Chá de bolhas</string>
+    <string name="type.man_made.crane">Guindaste</string>
+    <string name="type.power.pole">Poste de energia</string>
+    <string name="type.highway.elevator">Elevador</string>
+    <string name="type.landuse.plant_nursery">Viveiro de plantas</string>
+    <string name="type.recycling.cardboard">Cartão</string>
+    <string name="type.highway.ladder">Escada</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.amenity.studio">Estúdio</string>
+    <string name="type.amenity.vending_machine.sweets">Dispensador de doces</string>
+    <string name="type.psurface.unpaved_bad">psurface-não pavimentado_ruim</string>
+    <string name="type.route.shuttle_train">rota-ônibus_trem</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicicleta</string>
+    <string name="type.recycling.cans">Latas</string>
+    <string name="type.amenity.love_hotel">Hotel do Amor</string>
+    <string name="type.recycling.shoes">Sapato</string>
+    <string name="type.recycling.green_waste">Resíduos Verdes/Orgânicos</string>
+    <string name="type.recycling.cartons">Caixas</string>
+    <string name="type.amenity.sanitary_dump_station">Estação de despejo de tanques de retenção</string>
+    <string name="type.amenity.vending_machine.coffee">Dispensador de café</string>
+    <string name="type.amenity.vending_machine.condoms">Distribuidor de preservativos</string>
+    <string name="type.amenity.vending_machine.food">Distribuidor de alimentos</string>
+    <string name="type.amenity.vending_machine.newspapers">Distribuidor de jornais</string>
+    <string name="type.amenity.vending_machine.excrement_bags">Dispensador de sacos de excrementos</string>
+    <string name="type.amenity.vending_machine.fuel">Bomba de combustível</string>
+    <string name="type.amenity.waste_transfer_station">Estação de Transferência de Resíduos</string>
+    <string name="type.barrier.chain">Corrente</string>
+    <string name="type.barrier.guard_rail">Guarda-corpo</string>
+    <string name="type.fee.yes">$</string>
+    <string name="type.highway.world_level">nível mundial de rodovias</string>
+    <string name="type.highway.world_towns_level">nível_das_cidades_do_mundo_das_rodovias</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicicleta</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
+    <string name="type.hwtag.yesbicycle">hwtag-simbicicleta</string>
+    <string name="type.leisure.hackerspace">Hackerspace</string>
+    <string name="type.leisure.firepit">Fogueira</string>
+    <string name="type.leisure.beach_resort">Resort de praia</string>
+    <string name="type.man_made.survey_point">Ponto de Levantamento</string>
+    <string name="type.man_made.flagpole">Mastro de bandeira</string>
+    <string name="type.man_made.mast">Mastro</string>
+    <string name="type.man_made.silo">Silo</string>
+    <string name="type.man_made.storage_tank">Tanque de armazenamento</string>
+    <string name="type.mapswithme">mapascomigo</string>
+    <string name="type.mapswithme.grid">mapascom-me-grade</string>
+    <string name="type.mountain_pass">Passo da Montanha</string>
+    <string name="type.man_made.utility_pole">Poste de serviço público</string>
+    <string name="type.psurface">superfície p</string>
+    <string name="type.psurface.paved_bad">superfície pavimentada ruim</string>
+    <string name="type.psurface.paved_good">superfície pavimentada_boa</string>
+    <string name="type.shop.caravan">Concessionária de RV</string>
+    <string name="type.sport.diving">Mergulho alto</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.landuse.education">Instalação Educativa</string>
 </resources>
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -898,4 +898,10 @@
    <string name="app_site_url">https://comaps.app/ru/</string>
    <string name="bluesky">Bluesky</string>
    <string name="codeberg">Codeberg</string>
+    <string name="saved">Сохранено</string>
+    <string name="pref_left_button_disable">Выключить</string>
+    <string name="pref_left_button_title">Настройки левой кнопки</string>
+    <string name="editor_building_levels">Этажей (вкл. подвалы искл. крышу)</string>
+    <string name="editor_level">Этаж (0 это первый этаж)</string>
+    <string name="error_enter_correct_level">Введите правильный номер этажа</string>
 </resources>
--- a/android/app/src/main/res/values-ru/types_strings.xml
+++ b/android/app/src/main/res/values-ru/types_strings.xml
@@ -600,7 +600,6 @@
    <string name="type.landuse.education">Образовательные учреждения</string>
    <string name="type.landuse.farmland">Сельскохозяйственная земля</string>
    <string name="type.landuse.farmyard">Сельскохозяйственная земля</string>
-    <string name="type.landuse.field">Поле</string>
    <string name="type.landuse.flowerbed">Клумба</string>
    <string name="type.landuse.forest">Лес</string>
    <string name="type.landuse.forest.coniferous">Хвойный лес</string>
@@ -1391,6 +1390,16 @@
    <string name="type.amenity.studio">Студия</string>
    <string name="type.leisure.firepit">Место разведения костра</string>
    <string name="type.highway.ladder">Лестница-лаз</string>
-    <string name="type.sport.diving">Подводное плавание</string>
+    <string name="type.sport.diving">Высотные прыжки в воду</string>
    <string name="type.amenity.love_hotel">Любовный отель</string>
+    <string name="type.man_made.crane">Кран</string>
+    <string name="type.hwtag.nofoot">Не пешая</string>
+    <string name="type.hwtag.nocar">Не для машин</string>
+    <string name="type.hwtag">Дорожный знак</string>
+    <string name="type.hwtag.yesbicycle">Велосипедам можно</string>
+    <string name="type.hwtag.yescar">Машинам можно</string>
+    <string name="type.hwtag.yesfoot">Пешком можно</string>
+    <string name="type.mapswithme">mapswithme</string>
+    <string name="type.mapswithme.grid">mapswithme-сетка</string>
+    <string name="type.route.shuttle_train">Челночный поезд</string>
 </resources>
--- a/android/app/src/main/res/values-sk/types_strings.xml
+++ b/android/app/src/main/res/values-sk/types_strings.xml
@@ -587,7 +587,6 @@
    <string name="type.landuse.education">Vzdelávacia inštitúcia</string>
    <string name="type.landuse.farmland">Poľnohospodárska pôda</string>
    <string name="type.landuse.farmyard">Poľnohospodárske budovy</string>
-    <string name="type.landuse.field">Pole</string>
    <string name="type.landuse.flowerbed">Záhon</string>
    <string name="type.landuse.forest">Les</string>
    <string name="type.landuse.forest.coniferous">Ihličnatý les</string>
--- a/android/app/src/main/res/values-sr/types_strings.xml
+++ b/android/app/src/main/res/values-sr/types_strings.xml
@@ -599,7 +599,6 @@
    <string name="type.landuse.education">Образовна установа</string>
    <string name="type.landuse.farmland">Пољопривредно земљиште</string>
    <string name="type.landuse.farmyard">Пољопривредно земљиште</string>
-    <string name="type.landuse.field">Поље</string>
    <string name="type.landuse.flowerbed">Цветно острво</string>
    <string name="type.landuse.forest">Шума</string>
    <string name="type.landuse.forest.coniferous">Четинарска шума</string>
@@ -1394,7 +1393,7 @@
    <string name="type.shop.hearing_aids">Продавница слушног апарата</string>
    <string name="type.railway.funicular.tunnel">Тунел успињаче</string>
    <string name="type.railway.narrow_gauge.tunnel">Тунел уског колосека</string>
-    <string name="type.sport.diving">Роњење</string>
+    <string name="type.sport.diving">Слободни скокови</string>
    <string name="type.amenity.love_hotel">Ljubavni hotel</string>
    <string name="type.leisure.firepit">Ognjište</string>
    <string name="type.landuse.plant_nursery">Расадник</string>
--- a/android/app/src/main/res/values-sv/types_strings.xml
+++ b/android/app/src/main/res/values-sv/types_strings.xml
@@ -1210,7 +1210,6 @@
    <string name="type.landuse">Markanvändning</string>
    <string name="type.landuse.construction">Byggarbetsplats</string>
    <string name="type.landuse.farmyard">Gård</string>
-    <string name="type.landuse.field">Åkermark</string>
    <string name="type.landuse.garages">Garage</string>
    <string name="type.landuse.greenhouse_horticulture">Växthus</string>
    <string name="type.landuse.industrial">Industriområde</string>
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -892,4 +892,7 @@
    <string name="saved">Kaydedildi</string>
    <string name="bluesky">Bluesky</string>
    <string name="error_enter_correct_bluesky_page">Gireceğiniz Bluesky kullanıcı adı ve adresi halihazırda mevcut olmalı</string>
+    <string name="editor_building_levels">Katlar (zemin kat dahil, çatı hariç)</string>
+    <string name="editor_level">Giriş (0 zemin kattır)</string>
+    <string name="error_enter_correct_level">Geçerli kat numarası girin</string>
 </resources>
--- a/android/app/src/main/res/values-tr/types_strings.xml
+++ b/android/app/src/main/res/values-tr/types_strings.xml
@@ -591,7 +591,6 @@
    <string name="type.landuse.construction">Yapı</string>
    <string name="type.landuse.farmland">Tarım Arazileri</string>
    <string name="type.landuse.farmyard">Çiftlik Bölgesi</string>
-    <string name="type.landuse.field">Alan</string>
    <string name="type.landuse.flowerbed">Çiçeklik</string>
    <string name="type.landuse.forest">Orman</string>
    <string name="type.landuse.forest.coniferous">Çam Ormanı</string>
@@ -1370,4 +1369,9 @@
    <string name="type.amenity.studio">Stüdyo</string>
    <string name="type.sport.diving">Dalış Sporu</string>
    <string name="type.man_made.survey_point">Anket Noktası</string>
+    <string name="type.highway.ladder">Merdiven</string>
+    <string name="type.man_made.crane">Vinç</string>
+    <string name="type.leisure.firepit">Ateş çukuru</string>
+    <string name="type.landuse.plant_nursery">Fidanlık</string>
+    <string name="type.barrier.guard_rail">Korkuluk</string>
 </resources>
--- a/android/app/src/main/res/values-uk/types_strings.xml
+++ b/android/app/src/main/res/values-uk/types_strings.xml
@@ -597,7 +597,6 @@
    <string name="type.landuse.education">Освітній заклади</string>
    <string name="type.landuse.farmland">Сільськогосподарська земля</string>
    <string name="type.landuse.farmyard">Сільськогосподарська земля</string>
-    <string name="type.landuse.field">Поле</string>
    <string name="type.landuse.flowerbed">Квітник</string>
    <string name="type.landuse.forest">Ліс</string>
    <string name="type.landuse.forest.coniferous">Хвойний ліс</string>
--- a/android/app/src/main/res/values-zh-rHK/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rHK/types_strings.xml
@@ -595,7 +595,6 @@
    <string name="type.landuse.education">教育設施</string>
    <string name="type.landuse.farmland">農業用地</string>
    <string name="type.landuse.farmyard">農家庭院</string>
-    <string name="type.landuse.field">田地</string>
    <string name="type.landuse.flowerbed">花壇</string>
    <string name="type.landuse.forest">樹林</string>
    <string name="type.landuse.forest.coniferous">樹林</string>
@@ -1282,4 +1281,18 @@
    <string name="type.leisure.sports_hall">體育館</string>
    <string name="type.attraction.bumper_car">碰碰車</string>
    <string name="type.leisure.track">賽道</string>
+    <string name="type.mapswithme">mapswithme</string>
+    <string name="type.leisure.track.area">賽道</string>
+    <string name="type.railway">鐵路要素</string>
+    <string name="type.amenity.studio">影樓</string>
+    <string name="type.fee.yes">$</string>
+    <string name="type.amenity.love_hotel">情侶酒店</string>
+    <string name="type.recycling.cardboard">卡紙</string>
+    <string name="type.recycling.cans">金屬罐</string>
+    <string name="type.recycling.shoes">鞋</string>
+    <string name="type.recycling.green_waste">園林/有機廢物</string>
+    <string name="type.recycling.cartons">紙皮箱</string>
+    <string name="type.barrier.guard_rail">安全護欄</string>
+    <string name="type.highway.ladder">梯</string>
+    <string name="type.route.ferry">航線</string>
 </resources>
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -168,7 +168,7 @@
    <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>
    <!-- Kml file loading failed -->
@@ -675,7 +675,7 @@
    <!-- Speed camera settings menu option - Never warn (about speedcams) -->
    <string name="pref_tts_speedcams_never">永遠不會對測速照相機發出警告</string>
    <string name="power_managment_title">省電模式</string>
-    <string name="power_managment_description">如果開啟省電模式，本應用將根據手機的當前電量關閉耗電功能。</string>
+    <string name="power_managment_description">如果開啟省電模式，應用程序將根據手機的當前電量關閉耗電功能。</string>
    <string name="power_managment_setting_never">從不</string>
    <string name="power_managment_setting_auto">當電量低時</string>
    <string name="power_managment_setting_manual_max">最大程度省電</string>
@@ -690,7 +690,7 @@
    <string name="avoid_ferry">避開渡輪</string>
    <string name="avoid_motorways">避開高速公路</string>
    <string name="unable_to_calc_alert_title">無法規劃路線</string>
-    <string name="unable_to_calc_alert_subtitle">很遺憾，我們無法使用所選的繞行設定規劃路線。這可能是由於您的繞行設定或 OpenStreetMap 資料不完整所造成的。請更改設定，然後重試。</string>
+    <string name="unable_to_calc_alert_subtitle">很遺憾，我們無法使用所選的繞行設定規劃路線。請更改設定，然後重試。</string>
    <string name="define_to_avoid_btn">選擇要避開的道路</string>
    <string name="change_driving_options_btn">繞行設定已開啟</string>
    <string name="toll_road">收費公路</string>
@@ -893,4 +893,7 @@
    <string name="bluesky">Bluesky</string>
    <string name="pref_left_button_disable">停用</string>
    <string name="pref_left_button_title">左側按鈕設定</string>
+    <string name="editor_level">樓層（0 為地面層）</string>
+    <string name="editor_building_levels">樓層（含地面層，不含屋頂）</string>
+    <string name="error_enter_correct_level">請輸入有效的樓層數</string>
 </resources>
--- a/android/app/src/main/res/values-zh-rTW/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/types_strings.xml
@@ -12,7 +12,7 @@
    <string name="type.landuse.plant_nursery">苗圃</string>
    <string name="type.leisure.bowling_alley">保齡球館</string>
    <string name="type.amenity.clinic">診所</string>
-    <string name="type.sport.diving">跳水</string>
+    <string name="type.sport.diving">高台跳水</string>
    <string name="type.railway.narrow_gauge.bridge">窄軌鐵路軌道</string>
    <string name="type.craft.photographer">攝影棚</string>
    <string name="type.amenity.parking.lane.private">私人車道停車場</string>
@@ -35,4 +35,93 @@
    <string name="type.amenity.waste_transfer_station">垃圾轉運站</string>
    <string name="type.amenity.vending_machine.excrement_bags">撿便袋販賣機</string>
    <string name="type.amenity.parcel_locker">智取櫃</string>
+    <string name="type.mapswithme">mapswithme</string>
+    <string name="type.hwtag.nocar">禁止汽車標籤</string>
+    <string name="type.hwtag.yesfoot">允許行人標籤</string>
+    <string name="type.hwtag">交通屬性標籤</string>
+    <string name="type.hwtag.bidir_bicycle">雙向自行車道標籤</string>
+    <string name="type.noexit">死胡同</string>
+    <string name="type.railway.subway">捷運路線</string>
+    <string name="type.railway.platform">鐵路月台</string>
+    <string name="type.route.ferry">航線</string>
+    <string name="type.leisure">休閒元素</string>
+    <string name="type.power">電力元素</string>
+    <string name="type.power.line.underground">地下輸電線</string>
+    <string name="type.psurface.unpaved_bad">未鋪築路面—較差</string>
+    <string name="type.railway.funicular.bridge">纜索鐵路橋軌道</string>
+    <string name="type.traffic_calming">交通寧靜化</string>
+    <string name="type.piste_type.downhill.area">速降滑雪區</string>
+    <string name="type.hwtag.onedir_bicycle">單向自行車道標籤</string>
+    <string name="type.hwtag.nobicycle">禁止自行車標籤</string>
+    <string name="type.hwtag.nofoot">禁止行人標籤</string>
+    <string name="type.hwtag.oneway">單行道標籤</string>
+    <string name="type.hwtag.private">私人道路標籤</string>
+    <string name="type.hwtag.toll">收費道路標籤</string>
+    <string name="type.hwtag.yesbicycle">允許自行車標籤</string>
+    <string name="type.hwtag.yescar">允許汽車標籤</string>
+    <string name="type.hwtag.lit">照明設備標籤</string>
+    <string name="type.leisure.slipway">船坡道</string>
+    <string name="type.leisure.track">賽道</string>
+    <string name="type.man_made.breakwater">防波堤</string>
+    <string name="type.man_made">人造元素</string>
+    <string name="type.man_made.cairn">人造石堆</string>
+    <string name="type.man_made.cutline">樹林界線</string>
+    <string name="type.man_made.survey_point">測量點</string>
+    <string name="type.man_made.mast">桅杆</string>
+    <string name="type.man_made.pier">碼頭</string>
+    <string name="type.man_made.pipeline">管線</string>
+    <string name="type.man_made.pipeline.overground">地上管線</string>
+    <string name="type.man_made.storage_tank">儲槽</string>
+    <string name="type.man_made.wastewater_plant">污水處理廠</string>
+    <string name="type.military">軍事</string>
+    <string name="type.power.minor_line">小型輸電線</string>
+    <string name="type.piste_type.downhill">速降滑雪道</string>
+    <string name="type.man_made.crane">起重機</string>
+    <string name="type.man_made.works">工廠</string>
+    <string name="type.mapswithme.grid">mapswithme-網格</string>
+    <string name="type.natural.desert">沙漠</string>
+    <string name="type.power.generator">發電機</string>
+    <string name="type.power.line">輸電線</string>
+    <string name="type.power.station">發電廠</string>
+    <string name="type.man_made.utility_pole">公共設施桿</string>
+    <string name="type.railway.light_rail">輕軌軌道</string>
+    <string name="type.railway.light_rail.bridge">輕軌軌道橋</string>
+    <string name="type.railway.light_rail.tunnel">輕軌隧道</string>
+    <string name="type.public_transport.platform">大眾運輸月台</string>
+    <string name="type.psurface">路面</string>
+    <string name="type.psurface.paved_bad">鋪築路面—較差</string>
+    <string name="type.psurface.paved_good">鋪築路面—良好</string>
+    <string name="type.psurface.unpaved_good">未鋪築路面—良好</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>
+    <string name="type.railway.funicular.tunnel">纜索鐵路隧道軌道</string>
+    <string name="type.railway.narrow_gauge">窄軌鐵路軌道</string>
+    <string name="type.railway.narrow_gauge.tunnel">窄軌鐵路隧道軌道</string>
+    <string name="type.railway.preserved">保留鐵路</string>
+    <string name="type.railway.preserved.bridge">保留鐵路橋</string>
+    <string name="type.railway.preserved.tunnel">保留鐵路隧道</string>
+    <string name="type.railway.subway.bridge">捷運線橋</string>
+    <string name="type.railway.subway.tunnel">捷運線路隧道</string>
+    <string name="type.route.shuttle_train">巡迴列車</string>
+    <string name="type.tourism">観光元素</string>
+    <string name="type.attraction.big_wheel">摩天輪</string>
+    <string name="type.traffic_calming.bump">減速帶</string>
+    <string name="type.traffic_calming.hump">減速丘</string>
+    <string name="type.waterway">水域元素</string>
+    <string name="type.waterway.dock">船塢</string>
+    <string name="type.waterway.drain">渠</string>
+    <string name="type.natural.water.drain">渠</string>
+    <string name="type.waterway.weir">堰</string>
+    <string name="type.wheelchair">輪椅</string>
+    <string name="type.piste_type.nordic">北歐滑雪道</string>
+    <string name="type.piste_type.sled.area">雪橇滑道區</string>
+    <string name="type.piste_type.sled">雪橇滑道</string>
+    <string name="type.fee.no">免費</string>
+    <string name="type.healthcare.laboratory">醫學實驗室</string>
+    <string name="type.fee.yes">$</string>
 </resources>
--- a/android/app/src/main/res/values-zh/types_strings.xml
+++ b/android/app/src/main/res/values-zh/types_strings.xml
@@ -596,7 +596,6 @@
    <string name="type.landuse.education">教育设施</string>
    <string name="type.landuse.farmland">农业用地</string>
    <string name="type.landuse.farmyard">农家庭院</string>
-    <string name="type.landuse.field">田地</string>
    <string name="type.landuse.flowerbed">花坛</string>
    <string name="type.landuse.forest">森林</string>
    <string name="type.landuse.forest.coniferous">针叶林</string>
@@ -651,7 +650,7 @@
    <string name="type.leisure.stadium">体育场</string>
    <string name="type.leisure.swimming_pool">游泳池</string>
    <string name="type.leisure.swimming_pool.private">游泳池</string>
-    <string name="type.leisure.track">賽道</string>
+    <string name="type.leisure.track">赛道</string>
    <string name="type.leisure.track.area">赛道</string>
    <string name="type.leisure.water_park">水上乐园</string>
    <string name="type.leisure.beach_resort">海滨度假区</string>
@@ -794,24 +793,24 @@
    <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.abandoned.bridge">铁路桥遗迹</string>
+    <string name="type.railway.abandoned.tunnel">铁路隧道遗迹</string>
    <string name="type.railway.construction">在建铁路</string>
    <string name="type.railway.disused">废弃铁路</string>
    <string name="type.railway.funicular">缆车</string>
-    <string name="type.railway.funicular.bridge">缆索铁路轨道</string>
-    <string name="type.railway.funicular.tunnel">缆索铁路轨道</string>
+    <string name="type.railway.funicular.bridge">缆索铁路桥轨道</string>
+    <string name="type.railway.funicular.tunnel">缆索铁路隧道轨道</string>
    <string name="type.railway.halt">小站</string>
    <string name="type.railway.level_crossing">铁路道口</string>
    <string name="type.railway.light_rail">轻轨轨道</string>
-    <string name="type.railway.light_rail.bridge">轻轨轨道</string>
-    <string name="type.railway.light_rail.tunnel">轻轨轨道</string>
+    <string name="type.railway.light_rail.bridge">轻轨轨道桥</string>
+    <string name="type.railway.light_rail.tunnel">轻轨隧道</string>
    <string name="type.railway.monorail">单轨轨道</string>
    <string name="type.railway.monorail.bridge">单轨轨道</string>
    <string name="type.railway.monorail.tunnel">单轨轨道</string>
    <string name="type.railway.narrow_gauge">窄轨铁路轨道</string>
    <string name="type.railway.narrow_gauge.bridge">窄轨铁路轨道</string>
-    <string name="type.railway.narrow_gauge.tunnel">窄轨铁路轨道</string>
+    <string name="type.railway.narrow_gauge.tunnel">窄轨铁路隧道轨道</string>
    <string name="type.railway.platform">火车站台</string>
    <string name="type.railway.rail">铁路轨道</string>
    <string name="type.railway.rail.highspeed">高速铁路</string>
@@ -1277,7 +1276,7 @@
    <string name="type.tourism.wilderness_hut">野外住宿小屋</string>
    <string name="type.tourism.zoo">动物园</string>
    <string name="type.tourism.zoo.petting">宠物动物园</string>
-    <string name="type.waterway">航道要素</string>
+    <string name="type.waterway">水域要素</string>
    <string name="type.waterway.canal">运河</string>
    <string name="type.waterway.canal.tunnel">运河</string>
    <string name="type.waterway.fish_pass">鱼梯</string>
@@ -1385,7 +1384,7 @@
    <string name="type.railway.preserved">保留铁路</string>
    <string name="type.railway.preserved.bridge">保留铁路桥</string>
    <string name="type.railway.subway">地铁线路</string>
-    <string name="type.traffic_calming">交通静化</string>
+    <string name="type.traffic_calming">交通稳静化</string>
    <string name="type.piste_type.downhill">速降滑雪道</string>
    <string name="type.highway.world_level">高速公路—世界级</string>
    <string name="type.hwtag">交通属性标签</string>
@@ -1395,7 +1394,7 @@
    <string name="type.man_made.utility_pole">公共设施杆</string>
    <string name="type.route.shuttle_train">穿梭列车</string>
    <string name="type.attraction.bumper_car">碰碰车</string>
-    <string name="type.sport.diving">跳水</string>
+    <string name="type.sport.diving">高台跳水</string>
    <string name="type.landuse.plant_nursery">苗圃</string>
    <string name="type.amenity.love_hotel">情侣酒店</string>
    <string name="type.barrier.guard_rail">交通护栏</string>
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -30,6 +30,7 @@
  <color name="black_16">#29000000</color> <!-- 16% black -->
  <color name="black_20">#33000000</color> <!-- 20% black -->
  <color name="black_24">#3D000000</color> <!-- 24% black -->
+  <color name="black_30">#4D000000</color>  <!-- 30% black -->
  <color name="black_38">#61000000</color>  <!-- 38% black -->
  <color name="black_40">#66000000</color>  <!-- 40% black -->
  <color name="black_50">#80000000</color> <!-- 50% black -->
@@ -124,8 +125,8 @@
  <!-- LanesView -->
  <color name="nav_lane_arrow_active_light">@color/white_primary</color>
  <color name="nav_lane_arrow_active_night">@color/black_primary</color>
-  <color name="nav_lane_arrow_inactive_light">@color/black_20</color>
-  <color name="nav_lane_arrow_inactive_night">@color/black_20</color>
+  <color name="nav_lane_arrow_inactive_light">@color/black_30</color>
+  <color name="nav_lane_arrow_inactive_night">@color/black_30</color>

  <!-- Editor -->
  <color name="bg_editor_light">#FFF2F6F6</color>
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -54,11 +54,13 @@
    <item name="android:fontFamily">@string/robotoMedium</item>
    <item name="android:textAllCaps">true</item>
    <item name="android:letterSpacing">0.04</item>
+    <item name="backgroundTint">@null</item>
  </style>

  <style name="MwmWidget.Button.Accent">
    <item name="android:background">?accentButtonBackground</item>
    <item name="android:textColor">?accentButtonTextColor</item>
+    <item name="backgroundTint">@null</item>
  </style>

  <style name="MwmWidget.Button.StackedButtonsDialog">
@@ -100,6 +102,7 @@
    <item name="android:paddingEnd">@dimen/margin_base</item>
    <item name="textAllCaps">true</item>
    <item name="android:gravity">center</item>
+    <item name="backgroundTint">@null</item>
  </style>

  <style name="MwmWidget.ProgressWheel.RoutingPlan">
--- a/android/app/src/main/res/values/types_strings.xml
+++ b/android/app/src/main/res/values/types_strings.xml
@@ -620,7 +620,6 @@
    <string name="type.landuse.education">Educational Facility</string>
    <string name="type.landuse.farmland">Farmland</string>
    <string name="type.landuse.farmyard">Farmyard</string>
-    <string name="type.landuse.field">Field</string>
    <string name="type.landuse.flowerbed">Flowerbed</string>
    <string name="type.landuse.forest">Forest</string>
    <string name="type.landuse.forest.coniferous">Coniferous Forest</string>
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -627,7 +627,6 @@ world  +
        education  -
        farmland  -
        farmyard  -
-        field  -
        flowerbed  -
        forest  +
            coniferous  -
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -59,6 +59,7 @@
 2236962
 2301728
 2302755
+2364429
 2367520
 2374579
 2399474
@@ -66,6 +67,7 @@
 2498323
 2499106
 2500128
+2592674
 2631706
 2695475
 2706568
@@ -87,7 +89,6 @@
 3434779
 3542630
 3552308
-3584191
 3629602
 3677972
 3681605
@@ -95,6 +96,7 @@
 3684408
 3773998
 3832097
+3874837
 3881273
 3881787
 3968060
@@ -144,6 +146,7 @@
 6164237
 6173981
 6247213
+6272197
 6291544
 6381914
 6381921
@@ -187,15 +190,25 @@
 8487025
 8505220
 8550167
+8561591
 8916559
 8947848
+9099495
+9145087
+9153470
 9163744
 9211020
+9326109
 9404166
+9482692
+9614535
 9682745
 9718290
-9868678
+9746121
+9815480
+9868939
 9868950
+9877964
 10066329
 10167040
 10167474
@@ -205,142 +218,171 @@
 10340289
 10395294
 10426903
-10506258
 10592406
 10790054
 11053224
 11057133
+11058780
 11112295
 11184810
-11190117
 11250586
-11453035
-11584112
-11710882
+11387999
+11579812
+11585379
 11711154
+11716458
 11720246
 11720952
 11770767
-11781233
 11836942
 11841150
 11898395
+11979115
 12000284
 12039862
 12105912
-12372094
+12504182
 12517551
-12700809
-12763315
+12837073
 12895428
-13029267
+12898689
 13031851
-13155550
+13161612
 13163437
-13224123
 13229526
 13407549
 13420474
-13484259
 13538264
-13615592
-13620648
-13746411
-13749671
-13942770
+13555607
+13685196
 13947850
-14144428
+13952918
+14014162
 14209512
 14275263
-14539184
+14560552
 14802147
 14934482
 14951168
-14999213
-15000299
+14999725
+15001506
 15014691
 15022389
 15037299
-15062700
 15066325
+15066596
 15086900
 15094016
+15128239
 15214341
 15260347
 15263452
-15591638
+15263939
+15265772
+15524822
 15592411
 15592899
 15656370
 15658734
 15690752
 15754290
+15763456
 15790320
-15920858
-15921852
+15898392
+15900208
+15902016
 15921870
 16027569
+16049608
 16056407
 16064048
+16087552
 16088855
+16103246
+16113596
+16115926
+16116442
+16117459
 16118756
 16119285
-16308697
-16311482
-16316664
+16169823
+16173957
+16248287
+16372627
 16391736
+16431936
+16433750
+16440736
+16445666
 16557154
-16575614
 16579778
 16579836
 16728450
 16733986
 16740096
-16741158
-16742950
-16746278
 16746306
 16747109
 16748864
-16749632
 16750080
 16750592
-16752972
 16756055
-16757286
 16760320
-16760658
 16762880
 16763432
 16763913
+16764506
 16765952
+16766323
+16767702
 16774560
+16775925
+16776958
 16777215
+221978645
+222898459
+223300167
+233867264
+234004016
+234881023
 436602368
 437326080
+438572045
+438705939
 439885588
+441002267
 441140803
 441199131
-441925171
+441272132
+441403975
 442905727
+443115881
+443432263
+445352703
+445533725
+445925906
+447655326
 451800027
-452524280
+452107824
+452109632
+452321212
+452377439
 452764770
-452968274
+452983541
+452984574
 452984831
+575358531
+587201269
 609045837
 654706176
 655629312
+658186261
 659106075
 659244611
-659375940
-659507783
-660157219
-666683518
-670628088
-671054374
-671057702
-671061056
+666290539
+670074880
+670211632
+670398976
+671088382
 671088639
 856032768
 856756480
@@ -349,20 +391,23 @@
 857223704
 857282841
 857551774
+858002445
 858401316
 858466343
 858532890
+858992429
 859315988
 859519289
 859519803
 859645463
 860111940
+860432667
 860571203
 860629531
+860834375
 861027891
 861097451
-861295871
-861355571
+861483811
 861690961
 861690972
 861885229
@@ -374,24 +419,34 @@
 863664762
 863850275
 864585864
+864783103
 864835622
-864925824
+864964125
 865356306
+865445970
 865871792
-866144274
+867350728
 868514559
-868862139
-869387687
 869585866
+869590934
+869652178
 870704341
 871230427
-871954680
+871536408
+871540032
+871741262
+871807839
+871811973
 872195170
-872395302
+872215006
+872413941
+872414974
 872415231
 1074136576
-1078675011
-1090058488
+1077616661
+1078536475
+1089642032
+1089829376
 1090519039
 1216522952
 1291845632
@@ -406,6 +461,7 @@
 1293490457
 1293753629
 1294082594
+1294210061
 1294608932
 1294673959
 1294738992
@@ -414,14 +470,12 @@
 1295200561
 1295201075
 1295397940
-1295429823
 1295523604
 1295527997
 1295658816
 1295727419
 1295853079
 1295855912
-1296187970
 1296316234
 1296319556
 1296381741
@@ -432,18 +486,18 @@
 1296845900
 1296910148
 1296977469
-1297041991
 1297109072
 1297235507
 1297305067
 1297438037
 1297563187
-1297691427
 1297898577
 1297898588
 1298019613
 1298092845
+1298117829
 1298131758
+1298227553
 1298283903
 1298356016
 1298359132
@@ -455,40 +509,47 @@
 1300267136
 1300332657
 1300793480
+1300990719
 1301043238
 1301056384
-1301133440
+1301171741
 1301433013
 1301563922
+1301653586
+1301661112
 1301714310
+1301714571
 1302101349
-1302185921
-1302351890
+1302438038
+1303425444
 1303556514
 1304148906
-1304608947
 1304722175
 1304938175
-1305069755
-1305595303
 1305793482
+1305798550
+1305859794
+1306645694
 1306647779
 1306780114
 1307438043
 1307504366
+1307744024
+1307747648
+1307961558
+1307962074
 1307964388
-1308162296
-1308402786
+1308015455
+1308019589
+1308218259
+1308422622
 1308425468
 1308576652
-1308586790
-1308588582
 1308591910
 1308594496
-1308595264
 1308601687
 1308604747
-1308606290
+1308622590
 1308622847
 1511594265
 1523897290
@@ -508,11 +569,12 @@
 1715283479
 1715287582
 1715749956
-1715771835
+1716070683
 1716276300
 1716665907
 1716868437
 1716933887
+1717150383
 1717328977
 1717523245
 1717714303
@@ -524,13 +586,15 @@
 1720223880
 1720473638
 1720486784
+1720602141
 1720994322
 1721144710
 1721782290
 1724152575
 1724368575
-1724500155
-1724896680
+1724437644
+1725290194
+1727174424
 1728053247
 1931024665
 1943327690
@@ -545,9 +609,7 @@
 2149720610
 2150377008
 2150839091
-2151067839
 2151296832
-2151365435
 2151493928
 2151825986
 2151957572
@@ -556,12 +618,11 @@
 2152483916
 2152615485
 2153076053
-2153141503
 2153536593
+2153755845
 2153769774
 2153921919
 2153997148
-2154708295
 2154984050
 2155510394
 2155695907
@@ -570,20 +631,20 @@
 2156431496
 2156681254
 2156694400
-2156771456
+2157291602
 2157352326
 2157739365
 2159194530
 2159483932
-2160246963
 2160360191
-2160707771
+2161168844
+2162044200
 2162418130
 2162506037
 2163123456
-2163800312
 2164002331
 2164214668
+2164260606
 2164260863
 2370396489
 2371253590
@@ -601,22 +662,20 @@
 2571387972
 2571723081
 2571847235
-2572571903
 2572580182
 2573200174
 2573352319
-2574138695
 2575126307
 2575861896
 2576111654
-2576201856
+2576722002
 2576782726
 2579790591
 2580006591
-2580534696
+2580075660
 2582553856
-2583230712
 2583432731
+2583691006
 2583691263
 2787649562
 2789826889
@@ -633,18 +692,16 @@
 3006477107
 3006694172
 3007595588
-3007916315
+3008054851
 3008113177
-3008779519
 3009559935
-3010346311
 3012069512
 3015998207
 3016153515
 3018761472
 3019640347
-3019862822
 3019870528
+3019898622
 3019898879
 3226034505
 3226891606
@@ -655,6 +712,7 @@
 3427361097
 3428218198
 3428990335
+3430649653
 3431500856
 3432785840
 3435428607
@@ -667,7 +725,7 @@
 3645464905
 3646322006
 3647094143
-3649819616
+3649755367
 3653532415
 3657174555
 3942645760
--- a/data/conf/isolines/add_missing_countries.py
+++ b/data/conf/isolines/add_missing_countries.py
@@ -19,7 +19,7 @@ with open('countries-to-generate.json') as f1:
      entry = {
            "key": c,
            "value": {
-                "profileName": "normal",
+                "profileName": "poor",
                "tileCoordsSubset": list(),
                "tilesAreBanned": False
            }
--- a/data/conf/isolines/countries-to-generate.json
+++ b/data/conf/isolines/countries-to-generate.json
@@ -9691,6 +9691,262 @@
                "tileCoordsSubset": [],
                "tilesAreBanned": false
            }
+        },
+        {
+            "key": "Angola",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Australia_Northern Territory",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Australia_Queensland",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Australia_Western Australia",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Brazil_Mato Grosso",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Brazil_North Region_East",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Brazil_North Region_West",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Cameroon_Central",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Canada_Nunavut_North",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Canada_Nunavut_South",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "China_Gansu",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "China_Sichuan",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Colombia_East",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Congo-Kinshasa_West",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Indonesia_Central",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Indonesia_West",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Iran_East",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Kenya",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Libya",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Madagascar",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Malaysia",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Mali",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Mongolia",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Mozambique",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Myanmar",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Vietnam",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Nigeria_South",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Russia_Krasnoyarsk Krai_North",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Russia_Sakha Republic",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Tanzania",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Zambia",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
+        },
+        {
+            "key": "Zimbabwe",
+            "value": {
+                "profileName": "poor",
+                "tileCoordsSubset": [],
+                "tilesAreBanned": false
+            }
        }
    ]
-}
+}
--- a/data/conf/isolines/isolines-profiles.json
+++ b/data/conf/isolines/isolines-profiles.json
@@ -63,22 +63,10 @@
        {
            "key": "poor",
            "value": {
-                "alitudesStep": 500,
+                "alitudesStep": 100,
                "gaussianFilterRFactor": 1.0,
                "gaussianFilterStDev": 2.0,
-                "latLonStepFactor": 2,
-                "maxIsolinesLength": 500,
-                "medianFilterR": 1,
-                "simplificationZoom": 14
-            }
-        },
-        {
-            "key": "extra_poor",
-            "value": {
-                "alitudesStep": 1000,
-                "gaussianFilterRFactor": 1.0,
-                "gaussianFilterStDev": 2.0,
-                "latLonStepFactor": 2,
+                "latLonStepFactor": 4,
                "maxIsolinesLength": 500,
                "medianFilterR": 1,
                "simplificationZoom": 14
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
--- a/data/drules_proto_default_dark.bin
+++ b/data/drules_proto_default_dark.bin
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
--- a/data/drules_proto_default_light.bin
+++ b/data/drules_proto_default_light.bin
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
--- a/data/drules_proto_outdoors_dark.bin
+++ b/data/drules_proto_outdoors_dark.bin
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Navegação fácil nos mapas - Descobre mais sobre o teu percurso - Feito por todos`
				`@@ -0,0 +1 @@`
				`Простая навигация по карте — Откройте больше за ваше путешествие. От сообщества`
				`@@ -0,0 +1 @@`
				`CoMaps - Карты и путешествия с приватностью`
				`@@ -0,0 +1 @@`
				`Eenvoudige kaartnavigatie - Ontdek meer van je reis - Gemaakt door de community`