[generator] Reduce coastlines detalisation on World map z6-9

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

.github/workflows/android-check.yaml

@@ -6,7 +6,7 @@ on:
       - main
 
 env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
+  JAVA_HOME: /usr/lib/jvm/temurin-21-jdk-amd64  # Java 21 is required for Android Gradle 8 plugin
   SKIP_MAP_DOWNLOAD: true
 
 jobs:

CMakeLists.txt

@@ -120,7 +120,7 @@ if (PLATFORM_LINUX AND (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_BUILD_T
   add_compile_options(-fno-fat-lto-objects)
   # To fix ar and ranlib "plugin needed to handle lto object".
   string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
-  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}/liblto_plugin.so)
+  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}*/liblto_plugin.so)
   set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
   set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
   set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")

android/app/build.gradle

@@ -29,12 +29,12 @@ def getCommitMessage() {
 project.ext.appId = 'app.comaps'
 project.ext.appName = 'CoMaps'
 
-// I have Java 21 installed, but this doesn't work on MacOS.
-//java {
-//  toolchain {
-//    languageVersion.set(JavaLanguageVersion.of(17))
-//  }
-//}
+
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(21))
+  }
+}
 
 android {
   namespace = 'app.organicmaps'
@@ -311,8 +311,8 @@ android {
   compileOptions {
     coreLibraryDesugaringEnabled = true
 
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
+    sourceCompatibility JavaVersion.VERSION_21
+    targetCompatibility JavaVersion.VERSION_21
   }
 }
 

android/app/src/fdroid/play/listings/bn-BD/short-description.txt

@@ -0,0 +1 @@
+মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত

android/app/src/fdroid/play/listings/bn-BD/title.txt

@@ -0,0 +1 @@
+কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং ও ড্রাইভিং

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

@@ -1 +0,0 @@
-সহজ মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত

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

@@ -1 +0,0 @@
-কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং এবং ড্রাইভিং করুন গোপনীয়তা সহ

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

@@ -1,7 +0,0 @@
-• Data OpenStreetMap k 4. 8.
-• vylepšené barvy mapy pro vodu, lesy, křoviny, různé vybavení, pěší zóny atd.
-• přidány stanice lesní stráže, krytých parkovišť pro jízdní kola, únikových her, úschoven zavazadel, partnerských pošt
-• vylepšeny výškové vrstevnice na 20 m pro některé oblíbené turistické oblasti
-• podpora více zkratek a aliasů pro vyhledávání
-• přidání ikon pro vyhledávání a záložky pro rychlé občerstvení, jízdní kola a dobíjecí stanice
-• plynulejší pohyb šipky pro určení polohy

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

@@ -1,7 +1,8 @@
-• OpenStreetMap-Daten vom 4. August
-• Verbesserte Farben für Wasser, Wälder, Gestrüpp, verschiedene Einrichtungen, Fussgängerbereiche etc.
-• Besucherstationen, überdachte Fahrradparkplätze, Escaperooms, Gepäckschließfächer, und Postpartner hinzugefügt
-• Konturhöhenlinien aktualisiert, bis zu 20m für beliebte Wanderregionen
-• Unterstützung für mehr Such-Abkürzungen und Synonyme
-• Such- und Lesezeichen-Symbole für Fast Food, Rad- und Lade-Stationen
-• Der Positionspfeil bewegt sich gleichmässiger
+• OpenStreetMap-Daten vom 22. August
+• Neue Geschwindigkeitsanzeige & Details aufgezeichneter Strecken
+• Besserer dunkler Modus, neue farbige Labels 
+• Anzeige wann Orte & Öffnungszeiten überprüft wurden
+• Routenplanung berücksichtigt Stoppschilder, Ampeln & bedingte Einschränkungen.
+• GPS-Peilung wird statt Kompass bevorzugt & höhere GPS-Frequenz.
+• Adressen & Notizen im OSM-Editor unterstützt.
+• Mehr Verbesserungen an UI-Elementen & Kartenstil, alle Details in den Codeberg-Versionshinweisen!

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

@@ -1,7 +1,9 @@
-• OpenStreetMap data as of August 4
-• improve map colors for water, forests, scrubs, various amenities, pedestrian areas etc.
-• add ranger stations, covered bicycle parkings, escape games, luggage lockers, post office partners
-• upgrade altitude contour lines to 20m step for some popular hiking regions
-• support more search abbreviations and aliases
-• add search and bookmark icons for fast food, bicycle and charging stations
-• more smooth position arrow movements
+• OpenStreetMap data as of August 22
+• New current speed indicator, display track info
+• Improved dark map style, added coloured labels
+• Display when places & opening hours were last checked
+• Routing now considers turns, stop signs, lights & conditional restrictions
+• Prefer GPS bearing over compass and increase location poll rate
+• Enable adding standalone addresses & notes in the editor
+• Various UI element & map style improvements
+Check our Codeberg release notes for more changes!

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

@@ -1,7 +1,9 @@
-• Datos de OpenStreetMap a fecha 2025.08.04
-• Mejora de colores del mapa para agua, bosques, matorrales, servicios, zonas peatonales, etc.
-• Añadidas estaciones de guardabosques, aparcamientos cubiertos de bicis, juegos de escape, consignas y oficinas de correo
-• Nuevas curvas de nivel (20 m) en regiones populares para senderismo
-• Más abreviaturas y alias de búsqueda
-• Iconos de búsqueda y marcadores para comida rápida, bicicletas y estaciones de recarga
-• Más fluidez de la flecha de posición
+• Datos de OSM a 22-08-2025
+• Nuevo indicador de velocidad e información de pista
+• Modo oscuro mejorado y nombres de POI coloreados
+• Indicador de última revisión de lugares y horarios de apertura
+• Rutas mejoradas teniendo en cuenta giros, señales de STOP, semáforos y restricciones
+• Mayor precisión para determinar tu localización y sentido
+• Añade direcciones y notas con el editor
+• Otras mejoras en elementos de la interfaz y estilo del mapa
+Entra en nuestro Codeberg para más cambios!

android/app/src/fdroid/play/listings/fa-IR/title.txt

@@ -1 +1 @@
-CoMaps - کوه نوردی، دوچرخه سواری و رانندگی افلاین و خصوصی
+CoMaps - کوه‌نوردی، دوچرخه‌سواری و رانندگی آفلاین

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

@@ -0,0 +1,9 @@
+• Données OSM du 22 août
+• Nouvel indicateur de vitesse et détails des pistes
+• Amélioration du style sombre, ajout de labels colorées
+• Affichage de la date de dernière vérification d'un lieu
+• Support dans le routage des virages, signalisations et restrictions
+• Amélioration de la boussole et de la précision GPS
+• Support des adresses et des notes dans l'éditeur
+• Diverses améliorations d'UI et du style de la carte
+Plus d'informations sur notre Codeberg

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

@@ -1 +1 @@
-CoMaps - Pješačite, biciklirajte, vozite Offline i privatno
+CoMaps - Pješačite, biciklirajte, vozite Offline

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

@@ -1 +0,0 @@
-Navigation facile del mappa – Discoperi tu viage – Alimentate per le communitate

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

@@ -1,7 +0,0 @@
-• Dati di OpenStreetMap aggiornati al 4 Agosto
-• Migliorati i colori per acqua, foreste, servizi etc
-• Aggiunte le stazioni delle guardie forestali, i parcheggi coperti per bici, gli escape games e altri servizi
-• Aggiornato l'intervallo delle isolinee a 20 m per le zone escursionistiche più popolari
-• Aggiunto il supporto per un maggior numero di alias
-• Aggiunte le icone per i fast food, i punti di ricarica e le biciclette
-• Resi più fluidi i movimenti della freccia di posizione

android/app/src/fdroid/play/listings/no-NO/title.txt

@@ -0,0 +1 @@
+CoMaps - Gå tur, sykkel, kjør - med personvern

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

@@ -1,7 +1,8 @@
-• Dados OSM de 4/08
-• Melhoria nas cores para água, florestas, matagais, serviços, áreas de pedestres, etc.
-• Adição de guarda-florestais, estacionamentos cobertos para bicicletas, jogos de fuga, armários para bagagem e parceiros postais
-• Melhoria na precisão de curvas de nível para 20 m em algumas regiões populares
-• Suporte a mais abreviações para busca
-• Adição de ícones de pesquisa e favoritos para fast food, bicicletas e estações de recarga
-• Movimentos mais suaves para seta de posição
+• Dados OSM de 22/08
+• Novo indicador de velocidade e tela de informações de trilha
+• Melhor estilo de mapa escuro, rótulos coloridos adicionados
+• Exibição da última atualização de locais e horários de funcionamento
+• O roteamento agora considera conversões, PARE, semáforos, e restrições condicionais
+• Preferência por orientação GPS em vez de bússola e aumento da frequência de localização
+• Editor: adição de endereços e notas independentes
+• Melhorias em elementos da interface e estilo de mapa

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

@@ -1,32 +0,0 @@
-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!

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

@@ -1 +0,0 @@
-Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos

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

@@ -1 +0,0 @@
-CoMaps - Mapas e Navegação - Offline e Privada

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

@@ -1 +1 @@
-CoMaps - Drumeții, Ciclism, Condus Offline în confidențialitate
+CoMaps - călătorește offline cu confidențialitate

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

@@ -1,7 +1,9 @@
-• Карты OpenStreetMap от 4 августа
-• Улучшен цвет воды, леса, кустарников, различных объектов инфраструктуры, пешеходных зон и т.д.
-• Добавлены лесничества, крытые велопарковки, квесты, камеры хранения
-• Для некоторых популярных туристических регионов добавлены линии высот 20м
-• Поддержка дополнительных поисковых сокращений и синонимов
-• Добавлены иконки меток и результатов поиска для фастфуда, велопарковок и зарядных станций
-• Более плавное движение стрелки местоположения
+• Данные 22 августа
+• Новый спидометр,информация о маршруте
+• Улучшен тёмный стиль,цветные метки
+• Время последней проверки часов работы
+• Построении маршрута учитывает повороты, знак «Стоп»,светофоры и ограничения
+• Предпочтение отдается GPS-координатам,а не компасу,увеличена частота опроса местоположения
+• Можно добавлять отдельные адреса и заметки в редакторе
+• Улучшены различные элементы пользовательского интерфейса и стиль карты
+Ознакомьтесь с примечания к релизу про изменения!

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

@@ -1,32 +1,32 @@
-Бесплатна апликација отвореног кода коју је обављала заједница и заснива се на ОpenStreetMap-у подацима, усмерени транспарентност, приватност и непрофитни. CoMaps је Апликације за органске карте виљушка, које је пак форк Maps.ME.
+Бесплатна апликација отвореног кода коју одржава заједница, која се заснива на ОpenStreetMap подацима. Непрофитна, транспарентна и цени вашу приватност. CoMaps је настала од апликације Organic Maps,  које је настала од апликације Maps.ME.
 
 Прочитајте о разлозима пројекта и његовог правца на <b><i>codeberg.org/comaps</i></b>
 Придружите се отвореној заједници и помозите да направимо најбољу апликацију за мапе
 • Користите апликацију и проширите глас о томе
 • Дајте повратне информације и пријавите проблеме
-• Ажурирајте податке на мапи у апликацији или на веб локацији OpenStreetMap
+• Ажурирајте податке на мапи у апликацији или на сајту OpenStreetMap
 
-‣ <b> фокусирано на офлајн Вар </b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним услугама, тражите путне тачке док је на даљинском покрету, итд. Све апликације су дизајниране за рад ван мреже.
-‣ <b> Поштовање приватности </b>: Апликација је осмишљена задржавања у уму приватност - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
-‣ <b> Једноставно и елегантно </b>: Апликација је тривијална за употребу и једноставно функционише.
-‣ <b> Чува вашу батерију и простор </b>: не конзумира батерију као остале навигационе апликације. Компактне картице сачувајте драгоцени простор на вашем телефону.
-‣ <b> Отворено и направио је заједницу </b>: Људи попут вас је помогли да додају апликацију додавањем локација на OpenStreetMap-у, тестирању и давање повратних информација о апликацији и доприносе вашим развојним вештинама и новцу.
-‣ <b> Отворено и транспарентно доношење одлука и употреба финансија, непрофитна и потпуно отворена извора. </b>
+‣ <b>Фокусирано на офлајн рад</b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним интернетом, тражите успутне тачке док сте на забаченом планинском путу, итд. Све функционалности су дизајниране за рад без интернета.
+‣ <b>Поштовање приватности</b>: Апликација је осмишљена са приватношћу корисника на уму - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
+‣ <b>Једноставно и елегантно</b>: Апликација је лака за употребу и једноставно функционише.
+‣ <b>Чува вашу батерију и простор</b>: Не троши батерију као остале апликације за навигацију. Компактне мапе чувају драгоцени простор на вашем телефону.
+‣ <b>Отворено и направљено од стране заједнице</b>: Људи попут вас су допринели развоју апликације додавањем локација на OpenStreetMap, тестирањем, давањем повратних информација о апликацији и помогли су својим програмерским вештинама  и донацијама.
+‣ <b>Отворено и транспарентно доношење одлука и употреба донација, непрофитна и потпуно отвореног кода.</b>
 
 <b> Главне карактеристике </b>:
-• Преузмите детаљне мапе са локацијама које нису доступне са Гоогле мапама
-• Улазнице за излете са истакнутим планинарским стазама, камповима, изворима воде, планинске врхове, контурне линије итд.
+• Преузмимање детаљне мапе са локацијама које нису доступне са Google мапама
+• Режим за излете са истакнутим планинарским стазама, камповима, изворима воде, планинским врховима, изохипсама итд.
 • Стазе за планинарење и бицикле
-• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, погледа и још много тога
-• Претражите име или адресу или по категоријама камате
-• навигација са гласовним најавама за ходање, бициклизам или аутомобил
-• Означите своја омиљена места једним додиром
+• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, знаменитости и још много тога
+• Претрага по називу, адреси или категоријама
+• Навигација са гласовним инструкцијама за ходање, вожњу бицикла или аутомобила
+• Означивање омиљених места једним додиром
 • Офлајн чланци Википедије
-• транзитни слој подземне пруге са навигацијом
-• Снимање ГПС трагова
-• Ознака и увоз и увоз у KML, KMZ, GPX формате
+• Транзитни слој подземне железнице са навигацијом
+• Снимање ГПС путања
+• Увоз и увоз маркера и путања у KML, KMZ, GPX формате
 • Тамни режим за употребу током ноћи
-• Побољшајте карту за све кориснике, користећи основни уредни уредник мапе
+• Побољшајте карту за све кориснике, користећи основни едитор за мапе
 
 <b> Слобода је овде </b>
-Откријте своје путовање, крећете се са свијетом са приватношћу и заједницом на првом месту!
+Откријте своје путовање, крећете се са светом са приватношћу и заједницом на првом месту!

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

@@ -1,7 +0,0 @@
-• подаци из OpenStreetMap-а од 4. августа
-• побољшане боје на мапи за воду, шуме, жбуње, разне објекте, пешачке зоне итд.
-• додате станице ренџера, наткривена паркинг места за бицикле, escape room-ови, ормарићи за пртљаг
-• унапређене изохипсе на кораке од 20 м за популарне планинарске регионе
-• подршка за више скраћеница и алтернативних назива у претрази
-• додате иконе за претрагу и обележавање за брзу храну, бицикле и станице за пуњење
-• равномерније кретање стрелице која приказује позицију

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

@@ -9,7 +9,6 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
@@ -27,6 +26,7 @@ import app.organicmaps.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.divider.MaterialDividerItemDecoration;
 import java.util.ArrayList;
 
@@ -42,10 +42,10 @@ public class ManageRouteBottomSheet
   {
     View v = inflater.inflate(R.layout.manage_route_bottom_sheet, container, false);
 
-    Button cancelButton = v.findViewById(R.id.btn__cancel);
+    MaterialButton cancelButton = v.findViewById(R.id.btn__cancel);
     cancelButton.setOnClickListener(this);
 
-    Button planButton = v.findViewById(R.id.btn__plan);
+    MaterialButton planButton = v.findViewById(R.id.btn__plan);
     planButton.setOnClickListener(this);
 
     mMyLocationImageView = v.findViewById(R.id.image_my_location);

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

@@ -26,6 +26,7 @@ import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
+import app.organicmaps.widget.CurrentSpeedView;
 import app.organicmaps.widget.LanesView;
 import app.organicmaps.widget.SpeedLimitView;
 import app.organicmaps.widget.menu.NavMenu;
@@ -51,6 +52,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
   private final LanesView mLanesView;
   @NonNull
   private final SpeedLimitView mSpeedLimit;
+  @NonNull
+  private final CurrentSpeedView mCurrentSpeed;
 
   private final MapButtonsViewModel mMapButtonsViewModel;
 
@@ -94,6 +97,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mLanesView = topFrame.findViewById(R.id.lanes);
 
     mSpeedLimit = topFrame.findViewById(R.id.nav_speed_limit);
+    mCurrentSpeed = topFrame.findViewById(R.id.nav_current_speed);
 
     // Show a blank view below the navbar to hide the menu content
     final View navigationBarBackground = mFrame.findViewById(R.id.nav_bottom_sheet_nav_bar);
@@ -128,7 +132,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
 
     mLanesView.setLanes(info.lanes);
 
-    updateSpeedLimit(info);
+    updateSpeedWidgets(info);
   }
 
   private void updatePedestrian(@NonNull RoutingInfo info)
@@ -136,6 +140,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mNextTurnDistance.setText(Utils.formatDistance(mFrame.getContext(), info.distToTurn));
 
     info.pedestrianTurnDirection.setTurnDrawable(mNextTurnImage);
+    updateSpeedWidgets(info);
   }
 
   public void updateNorth()
@@ -261,16 +266,18 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     RoutingController.get().cancel();
   }
 
-  private void updateSpeedLimit(@NonNull final RoutingInfo info)
+  private void updateSpeedWidgets(@NonNull final RoutingInfo info)
   {
     final Location location = MwmApplication.from(mFrame.getContext()).getLocationHelper().getSavedLocation();
     if (location == null)
     {
-      mSpeedLimit.setSpeedLimit(0, false);
+      mSpeedLimit.setSpeedLimit(-1, false);
+      mCurrentSpeed.setCurrentSpeed(-1);
       return;
     }
     final int fSpeedLimit = StringUtils.nativeFormatSpeed(info.speedLimitMps);
     final boolean speedLimitExceeded = fSpeedLimit < StringUtils.nativeFormatSpeed(location.getSpeed());
     mSpeedLimit.setSpeedLimit(fSpeedLimit, speedLimitExceeded);
+    mCurrentSpeed.setCurrentSpeed(location.getSpeed());
   }
 }

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

@@ -68,7 +68,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
   @NonNull
   private final MaterialTextView mError;
   @NonNull
-  private final Button mStart;
+  private final MaterialButton mStart;
   @NonNull
   private final ImageView mAltitudeChart;
   @NonNull
@@ -101,7 +101,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
     View timeElevationLine = getViewById(activity, frame, R.id.time_elevation_line);
     View transitFrame = getViewById(activity, frame, R.id.transit_panel);
     MaterialTextView error = (MaterialTextView) getViewById(activity, frame, R.id.error);
-    Button start = (Button) getViewById(activity, frame, R.id.start);
+    MaterialButton start = (MaterialButton) getViewById(activity, frame, R.id.start);
     ImageView altitudeChart = (ImageView) getViewById(activity, frame, R.id.altitude_chart);
     MaterialTextView time = (MaterialTextView) getViewById(activity, frame, R.id.time);
     TextView timeVehicle = (TextView) getViewById(activity, frame, R.id.time_vehicle);
@@ -123,7 +123,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
 
   private RoutingBottomMenuController(@NonNull Activity context, @NonNull View altitudeChartFrame,
                                       @NonNull View timeElevationLine, @NonNull View transitFrame,
-                                      @NonNull MaterialTextView error, @NonNull Button start,
+                                      @NonNull MaterialTextView error, @NonNull MaterialButton start,
                                       @NonNull ImageView altitudeChart, @NonNull MaterialTextView time,
                                       @NonNull MaterialTextView altitudeDifference, @NonNull TextView timeVehicle,
                                       @Nullable MaterialTextView arrival, @NonNull View actionFrame,

android/app/src/main/java/app/organicmaps/util/UiUtils.java

@@ -220,9 +220,6 @@ public final class UiUtils
                                           : ContextCompat.getColor(layout.getContext(), R.color.base_red));
   }
 
-  /*
-   * Hide the Android UI elements 
-   */
   public static void setFullscreen(@NonNull Activity activity, boolean fullscreen)
   {
     final Window window = activity.getWindow();

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

@@ -0,0 +1,172 @@
+package app.organicmaps.widget;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public abstract class BaseSignView extends View
+{
+    private float mBorderWidthRatio = 0.1f;
+    protected void setBorderWidthRatio(float ratio) {
+        mBorderWidthRatio = ratio;
+    }
+
+    private float mBorderInsetRatio = 0f;
+    protected void setBorderInsetRatio(float ratio) {
+        mBorderInsetRatio = ratio;
+    }
+
+    // colors
+    protected int mBackgroundColor;
+    protected int mBorderColor;
+    protected int mAlertColor;
+    protected int mTextColor;
+    protected int mTextAlertColor;
+
+    // paints
+    protected final Paint mBackgroundPaint;
+    protected final Paint mBorderPaint;
+    protected final Paint mTextPaint;
+
+    // geometry
+    protected float mWidth;
+    protected float mHeight;
+    protected float mRadius;
+    protected float mBorderWidth;
+    protected float mBorderRadius;
+
+    public BaseSignView(Context ctx, @Nullable AttributeSet attrs)
+    {
+        super(ctx, attrs);
+        mBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mBorderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mBorderPaint.setStyle(Paint.Style.STROKE);
+        mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mTextPaint.setTextAlign(Paint.Align.CENTER);
+        mTextPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
+    }
+
+    protected void setColors(int backgroundColor,
+                             int borderColor,
+                             int alertColor,
+                             int textColor,
+                             int textAlertColor)
+    {
+        mBackgroundColor   = backgroundColor;
+        mBorderColor       = borderColor;
+        mAlertColor        = alertColor;
+        mTextColor         = textColor;
+        mTextAlertColor    = textAlertColor;
+
+        mBackgroundPaint.setColor(mBackgroundColor);
+        mBorderPaint.setColor(mBorderColor);
+        mTextPaint.setColor(mTextColor);
+    }
+
+    @Override
+    protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
+        super.onSizeChanged(width, height, oldWidth, oldHeight);
+        final float paddingX = getPaddingLeft() + getPaddingRight();
+        final float paddingY = getPaddingTop()  + getPaddingBottom();
+        mWidth  = width - paddingX;
+        mHeight = height - paddingY;
+        mRadius = Math.min(mWidth, mHeight) / 2f;
+        mBorderWidth  = mRadius * mBorderWidthRatio;
+        // subtract half the stroke PLUS the extra inset
+        final float gap = mRadius * mBorderInsetRatio;
+        mBorderRadius = mRadius - (mBorderWidth / 2f) - gap;
+        configureTextSize();
+    }
+
+    @Override
+    protected void onDraw(@NonNull Canvas canvas)
+    {
+        super.onDraw(canvas);
+        final String str = getValueString();
+        if (str == null) return;
+
+        final float cx = mWidth / 2f;
+        final float cy = mHeight / 2f;
+
+        // background & border
+        boolean alert = isAlert();
+        mBackgroundPaint.setColor(alert ? mAlertColor : mBackgroundColor);
+        canvas.drawCircle(cx, cy, mRadius, mBackgroundPaint);
+        if (!alert)
+        {
+            mBorderPaint.setStrokeWidth(mBorderWidth);
+            mBorderPaint.setColor(mBorderColor);
+            canvas.drawCircle(cx, cy, mBorderRadius, mBorderPaint);
+        }
+
+        // text
+        mTextPaint.setColor(alert ? mTextAlertColor : mTextColor);
+        drawValueString(canvas, cx, cy, str);
+    }
+
+    @Override
+    public boolean onTouchEvent(@NonNull MotionEvent e)
+    {
+        final float cx = mWidth / 2f, cy = mHeight / 2f;
+        final float dx = e.getX() - cx, dy = e.getY() - cy;
+        if ((dx * dx) + (dy * dy) <= (mRadius * mRadius))
+        {
+            performClick();
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean performClick()
+    {
+        super.performClick();
+        return false;
+    }
+
+    private void drawValueString(Canvas c, float cx, float cy, String str)
+    {
+        Rect b = new Rect();
+        mTextPaint.getTextBounds(str, 0, str.length(), b);
+        final float y = cy - b.exactCenterY();
+        c.drawText(str, cx, y, mTextPaint);
+    }
+
+    void configureTextSize()
+    {
+        String text = getValueString();
+        if (text == null) return;
+        final float textRadius = mBorderRadius - mBorderWidth;
+        final float maxTextSize = 2f * textRadius;
+        final float maxTextSize2 = maxTextSize * maxTextSize;
+        float lo = 0f, hi = maxTextSize, sz = maxTextSize;
+        Rect b = new Rect();
+        while (lo <= hi)
+        {
+            sz = (lo + hi) / 2f;
+            mTextPaint.setTextSize(sz);
+            mTextPaint.getTextBounds(text, 0, text.length(), b);
+            float area = b.width()*b.width() + b.height()*b.height();
+            if (area <= maxTextSize2)
+                lo = sz + 1f;
+            else
+                hi = sz - 1f;
+        }
+        mTextPaint.setTextSize(Math.max(1f, sz));
+    }
+
+    /** child must return the string to draw, or null if nothing */
+    @Nullable
+    protected abstract String getValueString();
+
+    /** child decides if this is in “alert” state */
+    protected abstract boolean isAlert();
+}

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

@@ -0,0 +1,77 @@
+package app.organicmaps.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.util.Pair;
+
+import androidx.annotation.Nullable;
+
+import app.organicmaps.R;
+import app.organicmaps.sdk.util.StringUtils;
+
+public class CurrentSpeedView extends BaseSignView
+{
+  private double mSpeedMps = -1.0;
+  private String mSpeedStr = "--";
+
+  public CurrentSpeedView(Context ctx, @Nullable AttributeSet attrs)
+  {
+    super(ctx, attrs);
+
+    setBorderWidthRatio(0.1f);
+    setBorderInsetRatio(0.05f);
+
+    try (TypedArray a = ctx.getTheme()
+            .obtainStyledAttributes(attrs, R.styleable.CurrentSpeedView /* reuse same attrs or define new */ , 0, 0))
+    {
+      int bg   = a.getColor(R.styleable.CurrentSpeedView_currentSpeedBackgroundColor, DefaultValues.BACKGROUND_COLOR);
+      int bd   = a.getColor(R.styleable.CurrentSpeedView_currentSpeedBorderColor,     DefaultValues.BORDER_COLOR);
+      int tc   = a.getColor(R.styleable.CurrentSpeedView_currentSpeedTextColor,       DefaultValues.TEXT_COLOR);
+      setColors(bg, bd, 0, tc, 0);
+
+      if (isInEditMode())
+      {
+        mSpeedMps = a.getInt(R.styleable.CurrentSpeedView_currentSpeedEditModeCurrentSpeed,  50);
+        mSpeedStr = Integer.toString((int)mSpeedMps);
+      }
+    }
+  }
+
+  public void setCurrentSpeed(double mps)
+  {
+    mSpeedMps = mps;
+    if (mps < 0)
+    {
+      mSpeedStr = "--";
+    }
+    else
+    {
+      Pair<String,String> su = StringUtils.nativeFormatSpeedAndUnits(mps);
+      mSpeedStr = su.first;
+    }
+    requestLayout();
+    configureTextSize();
+    invalidate();
+  }
+
+  @Nullable
+  @Override
+  protected String getValueString()
+  {
+    return mSpeedStr;
+  }
+
+  @Override
+  protected boolean isAlert()
+  {
+    return false;
+  }
+
+  private interface DefaultValues
+  {
+    int BACKGROUND_COLOR    = 0xFFFFFFFF;
+    int BORDER_COLOR        = 0xFF000000;
+    int TEXT_COLOR          = 0xFF000000;
+  }
+}

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

@@ -3,225 +3,134 @@ package app.organicmaps.widget;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.Typeface;
 import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
+
 import androidx.annotation.Nullable;
+
 import app.organicmaps.R;
 
-public class SpeedLimitView extends View
+public class SpeedLimitView extends BaseSignView
 {
-  private interface DefaultValues
+  private int    mSpeedLimit = -1;
+  private boolean mAlert     = false;
+  private String mSpeedStr   = "-1";
+  private final int unlimitedBorderColor;
+  private final int unlimitedStripeColor;
+
+  public SpeedLimitView(Context ctx, @Nullable AttributeSet attrs)
   {
-    @ColorInt
-    int BACKGROUND_COLOR = Color.WHITE;
-    @ColorInt
-    int BORDER_COLOR = Color.RED;
-    @ColorInt
-    int ALERT_COLOR = Color.RED;
-    @ColorInt
-    int TEXT_COLOR = Color.BLACK;
-    @ColorInt
-    int TEXT_ALERT_COLOR = Color.WHITE;
+    super(ctx, attrs);
 
-    float BORDER_WIDTH_RATIO = 0.1f;
-  }
+    setBorderWidthRatio(0.2f);
+    setBorderInsetRatio(0.05f);
 
-  @ColorInt
-  private final int mBackgroundColor;
-
-  @ColorInt
-  private final int mBorderColor;
-
-  @ColorInt
-  private final int mAlertColor;
-
-  @ColorInt
-  private final int mTextColor;
-
-  @ColorInt
-  private final int mTextAlertColor;
-
-  @NonNull
-  private final Paint mSignBackgroundPaint;
-  @NonNull
-  private final Paint mSignBorderPaint;
-  @NonNull
-  private final Paint mTextPaint;
-
-  private float mWidth;
-  private float mHeight;
-  private float mBackgroundRadius;
-  private float mBorderRadius;
-  private float mBorderWidth;
-
-  private int mSpeedLimit = 0;
-  @NonNull
-  private String mSpeedLimitStr = "0";
-  private boolean mAlert = false;
-
-  public SpeedLimitView(Context context, @Nullable AttributeSet attrs)
-  {
-    super(context, attrs);
-
-    try (TypedArray data = context.getTheme().obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
+    try (TypedArray styleAttrs = ctx.getTheme().obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
     {
-      mBackgroundColor =
-          data.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
-      mBorderColor = data.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor, DefaultValues.BORDER_COLOR);
-      mAlertColor = data.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor, DefaultValues.ALERT_COLOR);
-      mTextColor = data.getColor(R.styleable.SpeedLimitView_speedLimitTextColor, DefaultValues.TEXT_COLOR);
-      mTextAlertColor =
-          data.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor, DefaultValues.TEXT_ALERT_COLOR);
+      final int bgColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
+      final int borderColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor, DefaultValues.BORDER_COLOR);
+      final int alertColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor, DefaultValues.ALERT_COLOR);
+      final int textColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitTextColor, DefaultValues.TEXT_COLOR);
+      final int txtAlertColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor, DefaultValues.TEXT_ALERT_COLOR);
+      setColors(bgColor, borderColor, alertColor, textColor, txtAlertColor);
+
+      unlimitedBorderColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedBorderColor, DefaultValues.UNLIMITED_BORDER_COLOR);
+      unlimitedStripeColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedStripeColor, DefaultValues.UNLIMITED_STRIPE_COLOR);
+
       if (isInEditMode())
       {
-        mSpeedLimit = data.getInt(R.styleable.SpeedLimitView_speedLimitEditModeSpeedLimit, 60);
-        mSpeedLimitStr = Integer.toString(mSpeedLimit);
-        mAlert = data.getBoolean(R.styleable.SpeedLimitView_speedLimitEditModeAlert, false);
+        mSpeedLimit = styleAttrs.getInt(R.styleable.SpeedLimitView_speedLimitEditModeSpeedLimit, 60);
+        mAlert = styleAttrs.getBoolean(R.styleable.SpeedLimitView_speedLimitEditModeAlert, false);
+        mSpeedStr = Integer.toString(mSpeedLimit);
       }
     }
-
-    mSignBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    mSignBackgroundPaint.setColor(mBackgroundColor);
-
-    mSignBorderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    mSignBorderPaint.setColor(mBorderColor);
-    mSignBorderPaint.setStrokeWidth(mBorderWidth);
-    mSignBorderPaint.setStyle(Paint.Style.STROKE);
-
-    mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    mTextPaint.setColor(mTextColor);
-    mTextPaint.setTextAlign(Paint.Align.CENTER);
-    mTextPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
   }
 
-  public void setSpeedLimit(final int speedLimit, boolean alert)
+  public void setSpeedLimit(int limit, boolean alert)
   {
-    final boolean speedLimitChanged = mSpeedLimit != speedLimit;
-
-    mSpeedLimit = speedLimit;
-    mAlert = alert;
-
-    if (speedLimitChanged)
+    if (mSpeedLimit != limit)
     {
-      mSpeedLimitStr = Integer.toString(mSpeedLimit);
-      configureTextSize();
+      mSpeedLimit = limit;
+      mSpeedStr   = Integer.toString(limit);
+      requestLayout();
     }
-
+    mAlert = alert;
+    configureTextSize();
     invalidate();
   }
 
+  @Nullable
   @Override
-  protected void onDraw(@NonNull Canvas canvas)
+  protected String getValueString()
   {
-    super.onDraw(canvas);
-
-    final boolean validSpeedLimit = mSpeedLimit > 0;
-    if (!validSpeedLimit)
-      return;
-
-    final float cx = mWidth / 2;
-    final float cy = mHeight / 2;
-
-    drawSign(canvas, cx, cy, mAlert);
-    drawText(canvas, cx, cy, mAlert);
+    return (mSpeedLimit > 0 ? mSpeedStr : null);
   }
 
-  private void drawSign(@NonNull Canvas canvas, float cx, float cy, boolean alert)
+  @Override
+  protected boolean isAlert()
   {
-    if (alert)
-      mSignBackgroundPaint.setColor(mAlertColor);
+    return mAlert;
+  }
+
+  @Override
+  protected void onDraw(Canvas canvas)
+  {
+    final float cx = mWidth/2f, cy = mHeight/2f;
+
+    if (mSpeedLimit == 0) // 0 means unlimited speed (maxspeed=none)
+    {
+      // background
+      mBackgroundPaint.setColor(mBackgroundColor);
+      canvas.drawCircle(cx, cy, mRadius, mBackgroundPaint);
+
+      // black border
+      mBorderPaint.setColor(unlimitedBorderColor);
+      mBorderPaint.setStrokeWidth(mBorderWidth);
+      canvas.drawCircle(cx, cy, mBorderRadius, mBorderPaint);
+
+      // draw 5 diagonal stripes
+      drawUnlimitedStripes(canvas, cx, cy);
+    }
     else
-      mSignBackgroundPaint.setColor(mBackgroundColor);
-
-    canvas.drawCircle(cx, cy, mBackgroundRadius, mSignBackgroundPaint);
-    if (!alert)
     {
-      mSignBorderPaint.setStrokeWidth(mBorderWidth);
-      canvas.drawCircle(cx, cy, mBorderRadius, mSignBorderPaint);
+      // delegate to BaseSignView’s onDraw
+      super.onDraw(canvas);
     }
   }
 
-  private void drawText(@NonNull Canvas canvas, float cx, float cy, boolean alert)
+  private void drawUnlimitedStripes(Canvas c, float cx, float cy)
   {
-    if (alert)
-      mTextPaint.setColor(mTextAlertColor);
-    else
-      mTextPaint.setColor(mTextColor);
+    final Paint stripe = new Paint(Paint.ANTI_ALIAS_FLAG);
+    stripe.setColor(unlimitedStripeColor);
+    stripe.setStrokeWidth(mBorderWidth * 0.4f);
 
-    final Rect textBounds = new Rect();
-    mTextPaint.getTextBounds(mSpeedLimitStr, 0, mSpeedLimitStr.length(), textBounds);
-    final float textY = cy - textBounds.exactCenterY();
-    canvas.drawText(mSpeedLimitStr, cx, textY, mTextPaint);
-  }
+    final float radius = mRadius * 0.8f; // Shorten to 80% of full radius
+    final float diag = (float) (1/Math.sqrt(2)); // 45 degrees
+    final float dx = -diag, dy = +diag;
+    final float px = -dy, py = +dx; // Perpendicular
+    final float step = radius * 0.15f; // Spacing
 
-  @Override
-  public boolean onTouchEvent(@NonNull MotionEvent event)
-  {
-    final float cx = mWidth / 2;
-    final float cy = mHeight / 2;
-    if (Math.pow(event.getX() - cx, 2) + Math.pow(event.getY() - cy, 2) <= Math.pow(mBackgroundRadius, 2))
+    for (int i = -2; i <= 2; i++)
     {
-      performClick();
-      return true;
+      final float ox = px * step * i;
+      final float oy = py * step * i;
+      final float sx = cx + dx * radius + ox;
+      final float sy = cy + dy * radius + oy;
+      final float ex = cx - dx * radius + ox;
+      final float ey = cy - dy * radius + oy;
+      c.drawLine(sx, sy, ex, ey, stripe);
     }
-    return false;
   }
 
-  @Override
-  public boolean performClick()
+
+  private interface DefaultValues
   {
-    super.performClick();
-    return false;
-  }
-
-  @Override
-  protected void onSizeChanged(int w, int h, int oldw, int oldh)
-  {
-    super.onSizeChanged(w, h, oldw, oldh);
-
-    final float paddingX = (float) (getPaddingLeft() + getPaddingRight());
-    final float paddingY = (float) (getPaddingTop() + getPaddingBottom());
-
-    mWidth = (float) w - paddingX;
-    mHeight = (float) h - paddingY;
-    mBackgroundRadius = Math.min(mWidth, mHeight) / 2;
-    mBorderWidth = mBackgroundRadius * 2 * DefaultValues.BORDER_WIDTH_RATIO;
-    mBorderRadius = mBackgroundRadius - mBorderWidth / 2;
-    configureTextSize();
-  }
-
-  // Apply binary search to determine the optimal text size that fits within the circular boundary.
-  private void configureTextSize()
-  {
-    final String text = mSpeedLimitStr;
-    final float textRadius = mBorderRadius - mBorderWidth;
-    final float textMaxSize = 2 * textRadius;
-    final float textMaxSizeSquared = (float) Math.pow(textMaxSize, 2);
-
-    float lowerBound = 0;
-    float upperBound = textMaxSize;
-    float textSize = textMaxSize;
-    final Rect textBounds = new Rect();
-
-    while (lowerBound <= upperBound)
-    {
-      textSize = (lowerBound + upperBound) / 2;
-      mTextPaint.setTextSize(textSize);
-      mTextPaint.getTextBounds(text, 0, text.length(), textBounds);
-
-      if (Math.pow(textBounds.width(), 2) + Math.pow(textBounds.height(), 2) <= textMaxSizeSquared)
-        lowerBound = textSize + 1;
-      else
-        upperBound = textSize - 1;
-    }
-
-    mTextPaint.setTextSize(Math.max(1, textSize));
+    int BACKGROUND_COLOR       = 0xFFFFFFFF;
+    int BORDER_COLOR           = 0xFFFF0000;
+    int ALERT_COLOR            = 0xFFFF0000;
+    int TEXT_COLOR             = 0xFF000000;
+    int TEXT_ALERT_COLOR       = 0xFFFFFFFF;
+    int UNLIMITED_BORDER_COLOR = 0xFF000000;
+    int UNLIMITED_STRIPE_COLOR = 0xFF000000;
   }
 }

android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java

@@ -1,18 +1,14 @@
 package app.organicmaps.widget.menu;
 
-import android.location.Location;
-import android.util.Pair;
 import android.view.View;
+import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
-import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.sound.TtsPlayer;
-import app.organicmaps.sdk.util.StringUtils;
+import app.organicmaps.sdk.util.DateUtils;
 import app.organicmaps.util.Graphics;
-import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.button.MaterialButton;
@@ -30,14 +26,12 @@ public class NavMenu
   private final View mHeaderFrame;
 
   private final ShapeableImageView mTts;
-  private final View mSpeedViewContainer;
-  private final MaterialTextView mSpeedValue;
-  private final MaterialTextView mSpeedUnits;
+  private final MaterialTextView mEtaValue;
+  private final MaterialTextView mEtaAmPm;
   private final MaterialTextView mTimeHourValue;
   private final MaterialTextView mTimeHourUnits;
   private final MaterialTextView mTimeMinuteValue;
   private final MaterialTextView mTimeMinuteUnits;
-  private final MaterialTextView mTimeEstimate;
   private final MaterialTextView mDistanceValue;
   private final MaterialTextView mDistanceUnits;
   private final LinearProgressIndicator mRouteProgress;
@@ -92,14 +86,12 @@ public class NavMenu
     });
 
     // Bottom frame
-    mSpeedViewContainer = bottomFrame.findViewById(R.id.speed_view_container);
-    mSpeedValue = bottomFrame.findViewById(R.id.speed_value);
-    mSpeedUnits = bottomFrame.findViewById(R.id.speed_dimen);
+    mEtaValue = bottomFrame.findViewById(R.id.eta_value);
+    mEtaAmPm = bottomFrame.findViewById(R.id.eta_am_pm);
     mTimeHourValue = bottomFrame.findViewById(R.id.time_hour_value);
     mTimeHourUnits = bottomFrame.findViewById(R.id.time_hour_dimen);
     mTimeMinuteValue = bottomFrame.findViewById(R.id.time_minute_value);
     mTimeMinuteUnits = bottomFrame.findViewById(R.id.time_minute_dimen);
-    mTimeEstimate = bottomFrame.findViewById(R.id.time_estimate);
     mDistanceValue = bottomFrame.findViewById(R.id.distance_value);
     mDistanceUnits = bottomFrame.findViewById(R.id.distance_dimen);
     mRouteProgress = bottomFrame.findViewById(R.id.navigation_progress);
@@ -125,6 +117,8 @@ public class NavMenu
 
   private void onTtsClicked()
   {
+    if (!TtsPlayer.isReady())
+      Toast.makeText(mActivity, R.string.pref_tts_no_system_tts_short, Toast.LENGTH_SHORT).show();
     TtsPlayer.setEnabled(!TtsPlayer.isEnabled());
     refreshTts();
   }
@@ -195,38 +189,34 @@ public class NavMenu
 
   private void updateTimeEstimate(int seconds)
   {
-    final String format =
-        android.text.format.DateFormat.is24HourFormat(mTimeMinuteValue.getContext()) ? "HH:mm" : "h:mm a";
+    // Calculate ETA from current local time and remaining seconds.
     final LocalTime localTime = LocalTime.now().plusSeconds(seconds);
-    mTimeEstimate.setText(localTime.format(DateTimeFormatter.ofPattern(format)));
-  }
 
-  private void updateSpeedView(@NonNull RoutingInfo info)
-  {
-    final Location last = MwmApplication.from(mActivity).getLocationHelper().getSavedLocation();
-    if (last == null)
-      return;
+    // String to set the format of the ETA value (24h or AM/PM).
+    final String etaValueFormat;
 
-    Pair<String, String> speedAndUnits = StringUtils.nativeFormatSpeedAndUnits(last.getSpeed());
-    mSpeedValue.setText(speedAndUnits.first);
+    // Text of the AM/PM view.
+    final String etaAmPmText;
 
-    if (info.speedLimitMps > 0.0 && last.getSpeed() > info.speedLimitMps)
+    if (DateUtils.is24HourFormat(mTimeMinuteValue.getContext()))
     {
-      if (info.isSpeedCamLimitExceeded())
-        mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.white_primary));
-      else
-        mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.base_red));
+      // 24 hours time format.
+      etaValueFormat = "HH:mm";
+      etaAmPmText = "";
     }
     else
-      mSpeedValue.setTextColor(ThemeUtils.getColor(mActivity, android.R.attr.textColorPrimary));
+    {
+      // AM/PM time format.
+      etaValueFormat = "h:mm";
+      etaAmPmText = localTime.format(DateTimeFormatter.ofPattern("a"));
+    }
 
-    mSpeedUnits.setText(speedAndUnits.second);
-    mSpeedViewContainer.setActivated(info.isSpeedCamLimitExceeded());
+    mEtaValue.setText(localTime.format(DateTimeFormatter.ofPattern(etaValueFormat)));
+    mEtaAmPm.setText(etaAmPmText);
   }
 
   public void update(@NonNull RoutingInfo info)
   {
-    updateSpeedView(info);
     updateTime(info.totalTimeInSeconds);
     mDistanceValue.setText(info.distToTarget.mDistanceStr);
     mDistanceUnits.setText(info.distToTarget.getUnitsStr(mActivity.getApplicationContext()));

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

@@ -675,9 +675,6 @@ public class PlacePageController
     mPlacePageBehavior.addBottomSheetCallback(mDefaultBottomSheetCallback);
     mViewModel.getMapObject().observe(requireActivity(), this);
     mViewModel.getPlacePageDistanceToTop().observe(requireActivity(), mPlacePageDistanceToTopObserver);
-
-    // Re-enable UI when POI tapped if in fullscreen mode
-    UiUtils.setFullscreen(false);
   }
 
   @Override

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

@@ -16,18 +16,22 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
+import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
+import app.organicmaps.widget.placepage.EditBookmarkFragment;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
 import com.google.android.material.textview.MaterialTextView;
 
-public class PlacePageBookmarkFragment extends Fragment implements View.OnLongClickListener, Observer<MapObject>
+public class PlacePageBookmarkFragment extends Fragment implements View.OnClickListener, View.OnLongClickListener,
+                                                                   Observer<MapObject>, EditBookmarkFragment.EditBookmarkListener
 {
   private View mFrame;
   private MaterialTextView mTvBookmarkNote;
@@ -55,6 +59,8 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnLongCl
     mFrame = view;
     mTvBookmarkNote = mFrame.findViewById(R.id.tv__bookmark_notes);
     mTvBookmarkNote.setOnLongClickListener(this);
+    final View editBookmarkBtn = mFrame.findViewById(R.id.tv__bookmark_edit);
+    editBookmarkBtn.setOnClickListener(this);
   }
 
   private void initWebView()
@@ -112,6 +118,14 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnLongCl
     }
   }
 
+  @Override
+  public void onClick(View v)
+  {
+    final FragmentActivity activity = requireActivity();
+    EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(), currentBookmark.getBookmarkId(), activity,
+                                      getChildFragmentManager(), PlacePageBookmarkFragment.this);
+  }
+
   @Override
   public boolean onLongClick(View v)
   {
@@ -141,4 +155,13 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnLongCl
       updateBookmarkDetails();
     }
   }
+
+  @Override
+  public void onBookmarkSaved(long bookmarkId, boolean movedFromCategory)
+  {
+    Bookmark updatedBookmark = BookmarkManager.INSTANCE.updateBookmarkPlacePage(bookmarkId);
+    if (updatedBookmark == null)
+      return;
+    mViewModel.setMapObject(updatedBookmark);
+  }
 }

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

@@ -166,7 +166,7 @@
         android:orientation="horizontal">
         <com.google.android.material.button.MaterialButton
           android:id="@+id/donate"
-          style="@style/MwmWidget.Button.Accent"
+          style="@style/MwmWidget.M3.Button.Primary"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:padding="@dimen/margin_quarter"
@@ -182,10 +182,9 @@
           app:layout_constraintVertical_bias="0.5" />
         <com.google.android.material.button.MaterialButton
           android:id="@+id/report"
-          style="@style/MwmWidget.Button"
+          style="@style/MwmWidget.M3.Button"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
-          android:background="@color/light_gray"
           android:text="@string/report_a_bug"
           android:textAlignment="center"
           android:textColor="@color/text_dark"
@@ -195,7 +194,8 @@
           app:layout_constraintHorizontal_bias="0.5"
           app:layout_constraintStart_toEndOf="@+id/donate"
           app:layout_constraintTop_toTopOf="parent"
-          app:layout_constraintVertical_bias="0.5" />
+          app:layout_constraintVertical_bias="0.5"
+          app:backgroundTint="@color/light_gray"/>
       </androidx.constraintlayout.widget.ConstraintLayout>
 
       <com.google.android.material.textview.MaterialTextView

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

@@ -69,9 +69,10 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="6dp"
-      style="@style/MwmWidget.Button"
+      style="@style/Widget.Material3.Button.TextButton"
       android:text="@string/planning_route_manage_route"
       android:textColor="?android:textColorPrimary"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
       app:icon="@drawable/ic_manage_route"
       app:iconTint="?android:textColorPrimary"
       app:iconPadding="6dp"/>
@@ -84,13 +85,14 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/margin_base"
         android:minHeight="@dimen/primary_button_min_height"
-        style="@style/MwmWidget.Button"
+        style="@style/Widget.Material3.Button.TextButton"
         android:text="@string/save"
-        android:textColor="?android:textColorPrimary"/>
+        android:textColor="?android:textColorPrimary"
+        android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
       android:id="@+id/start"
-      style="@style/MwmWidget.Button.Primary"
+      style="@style/MwmWidget.M3.Button.Primary"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_weight="0"

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

@@ -110,11 +110,10 @@
             android:layout_marginBottom="@dimen/margin_base">
             <com.google.android.material.button.MaterialButton
               android:id="@+id/login"
-              style="@style/MwmWidget.Button.Accent"
+              style="@style/MwmWidget.M3.Button.Primary"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:text="@string/login_osm"
-              android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
+              android:text="@string/login_osm" />
             <ProgressBar
               android:id="@+id/osm_login_progress"
               android:layout_width="@dimen/editor_auth_btn_height"
@@ -147,15 +146,14 @@
             android:textColor="?android:textColorPrimary" />
           <com.google.android.material.button.MaterialButton
             android:id="@+id/register"
-            style="@style/MwmWidget.Button.Accent"
+            style="@style/MwmWidget.M3.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin_base"
-            android:background="@drawable/button_editor_light"
             android:padding="@dimen/margin_quarter"
             android:text="@string/register_at_openstreetmap"
-            android:textAppearance="@style/MwmTextAppearance.Body2"
-            android:textColor="@color/text_dark" />
+            android:textColor="@color/text_dark"
+            app:backgroundTint="@color/bg_editor_light"/>
         </LinearLayout>
       </LinearLayout>
     </LinearLayout>

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

@@ -123,12 +123,24 @@
       app:lanesEditModeLanesCount="10"
       tools:visibility="visible" />
 
+  <app.organicmaps.widget.CurrentSpeedView
+      android:id="@+id/nav_current_speed"
+      style="@style/MwmWidget.CurrentSpeed"
+      android:layout_width="60dp"
+      android:layout_height="60dp"
+      android:layout_margin="@dimen/margin_half"
+      app:layout_constraintStart_toEndOf="@id/nav_next_turn_container"
+      app:layout_constraintTop_toBottomOf="@id/street_frame"/>
+
   <app.organicmaps.widget.SpeedLimitView
     android:id="@+id/nav_speed_limit"
     style="@style/MwmWidget.SpeedLimit"
-    android:layout_width="60dp"
-    android:layout_height="60dp"
+    android:layout_width="50dp"
+    android:layout_height="50dp"
     android:layout_margin="@dimen/margin_half"
     app:layout_constraintStart_toEndOf="@id/nav_next_turn_container"
-    app:layout_constraintTop_toBottomOf="@id/street_frame" />
+    app:layout_constraintTop_toBottomOf="@id/nav_current_speed"
+    android:translationY="-21dp"
+    android:translationX="-12dp"
+    android:translationZ="1dp"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -60,7 +60,7 @@
         android:clipChildren="false">
         <com.google.android.material.button.MaterialButton
           android:id="@+id/downloader_button"
-          style="@style/MwmWidget.Button.Primary"
+          style="@style/MwmWidget.M3.Button.Primary"
           android:layout_width="180dp"
           android:layout_gravity="center"
           android:visibility="gone"

android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml

@@ -88,9 +88,10 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="6dp"
-      style="@style/MwmWidget.Button"
+      style="@style/Widget.Material3.Button.TextButton"
       android:text="@string/planning_route_manage_route"
       android:textColor="?android:textColorPrimary"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
       app:icon="@drawable/ic_manage_route"
       app:iconTint="?android:textColorPrimary"
       app:iconPadding="6dp"/>
@@ -100,14 +101,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_base"
-        style="@style/MwmWidget.Button"
+        style="@style/Widget.Material3.Button.TextButton"
         android:minHeight="@dimen/primary_button_min_height"
         android:text="@string/save"
-        android:textColor="?android:textColorPrimary"/>
+        android:textColor="?android:textColorPrimary"
+        android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
       android:id="@+id/start"
-      style="@style/MwmWidget.Button.Primary"
+      style="@style/MwmWidget.M3.Button.Primary"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_weight="0"

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

@@ -112,7 +112,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/donate"
-        style="@style/MwmWidget.Button.Accent"
+        style="@style/MwmWidget.M3.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
@@ -121,13 +121,13 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/report"
-        style="@style/MwmWidget.Button"
+        style="@style/MwmWidget.M3.Button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_base"
-        android:background="@color/light_gray"
+        android:layout_marginTop="@dimen/margin_half"
         android:text="@string/report_a_bug"
-        android:textColor="@color/text_dark" />
+        android:textColor="@color/text_dark"
+        app:backgroundTint="@color/light_gray"/>
 
     <com.google.android.material.textview.MaterialTextView
       android:id="@+id/faq"

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

@@ -41,7 +41,7 @@
 
   <com.google.android.material.button.MaterialButton
       android:id="@+id/btn_continue"
-      style="@style/MwmWidget.Button.Accent"
+      style="@style/MwmWidget.M3.Button.Primary"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginEnd="32dp"

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

@@ -25,7 +25,7 @@
 
   <com.google.android.material.button.MaterialButton
       android:id="@+id/btn_grant_permissions"
-      style="@style/MwmWidget.Button.Accent"
+      style="@style/MwmWidget.M3.Button.Primary"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginEnd="32dp"

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

@@ -71,9 +71,9 @@
               tools:visibility="visible" />
         </LinearLayout>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
           android:id="@+id/start"
-          style="@style/MwmWidget.Button.Primary"
+          style="@style/MwmWidget.M3.Button.Primary"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_weight="0"
@@ -94,10 +94,11 @@
           android:id="@+id/btn__manage_route"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          style="@style/MwmWidget.Button"
+          style="@style/Widget.Material3.Button.TextButton"
           android:text="@string/planning_route_manage_route"
           android:textColor="?android:textColorPrimary"
           android:textAlignment="viewStart"
+          android:textAppearance="@style/MwmTextAppearance.Body1"
           app:icon="@drawable/ic_manage_route"
           app:iconTint="?android:textColorPrimary"
           app:iconPadding="@dimen/margin_quarter_plus"/>
@@ -107,11 +108,12 @@
           android:id="@+id/btn__save"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          style="@style/MwmWidget.Button"
+          style="@style/Widget.Material3.Button.TextButton"
           android:layout_marginStart="@dimen/margin_base"
           android:minHeight="@dimen/primary_button_min_height"
           android:text="@string/save"
-          android:textColor="?android:textColorPrimary"/>
+          android:textColor="?android:textColorPrimary"
+          android:textAppearance="@style/MwmTextAppearance.Body1"/>
     </LinearLayout>
 
 </LinearLayout>

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

@@ -31,7 +31,7 @@
     app:trackColor="@color/bg_routing_progress"/>
   <com.google.android.material.button.MaterialButton
     android:id="@+id/btn_download_resources"
-    style="@style/MwmWidget.Button.Primary"
+    style="@style/MwmWidget.M3.Button.Primary"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/margin_base_plus"

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

@@ -94,11 +94,10 @@
         android:layout_marginBottom="@dimen/margin_base">
         <com.google.android.material.button.MaterialButton
           android:id="@+id/login"
-          style="@style/MwmWidget.Button.Accent"
+          style="@style/MwmWidget.M3.Button.Primary"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:text="@string/login_osm"
-          android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
+          android:text="@string/login_osm" />
         <ProgressBar
           android:id="@+id/osm_login_progress"
           android:layout_width="@dimen/editor_auth_btn_height"
@@ -109,14 +108,16 @@
       </FrameLayout>
       <com.google.android.material.button.MaterialButton
         android:id="@+id/lost_password"
-        style="@style/MwmWidget.Button"
+        style="@style/MwmWidget.M3.Button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:background="?clickableBackground"
         android:padding="@dimen/margin_half"
         android:text="@string/forgot_password"
-        android:textAppearance="@style/MwmTextAppearance.Body3" />
+        android:textAppearance="@style/MwmTextAppearance.Body3"
+        android:textColor="@color/text_dark"
+          tools:visibility="invisible"/>
       <com.google.android.material.divider.MaterialDivider
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -130,15 +131,14 @@
         android:textColor="?android:textColorPrimary" />
       <com.google.android.material.button.MaterialButton
         android:id="@+id/register"
-        style="@style/MwmWidget.Button.Accent"
+        style="@style/MwmWidget.M3.Button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
-        android:background="@drawable/button_editor_light"
         android:padding="@dimen/margin_quarter"
         android:text="@string/register_at_openstreetmap"
-        android:textAppearance="@style/MwmTextAppearance.Body2"
-        android:textColor="@color/text_dark" />
+        android:textColor="@color/text_dark"
+        app:backgroundTint="@color/bg_editor_light"/>
     </LinearLayout>
   </ScrollView>
 </LinearLayout>

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

@@ -60,7 +60,7 @@
 
       <com.google.android.material.button.MaterialButton
         android:id="@+id/btn__download_map"
-        style="@style/MwmWidget.Button.Primary"
+        style="@style/MwmWidget.M3.Button.Primary"
         android:layout_marginTop="@dimen/margin_half"
         android:text="@string/downloader_download_map"/>
     </LinearLayout>
@@ -85,7 +85,7 @@
 
       <com.google.android.material.button.MaterialButton
         android:id="@+id/btn__select_map"
-        style="@style/MwmWidget.Button.Primary"
+        style="@style/MwmWidget.M3.Button.Primary"
         android:layout_marginTop="@dimen/margin_half"
         android:text="@string/search_select_map"/>
     </LinearLayout>

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

@@ -45,13 +45,15 @@
       android:maxLines="6" />
   </com.google.android.material.textfield.TextInputLayout>
   
-  <Button
+  <com.google.android.material.button.MaterialButton
     android:id="@+id/send_note_button"
-    style="@style/MwmWidget.Button.Accent"
+    style="@style/MwmWidget.M3.Button.Primary"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
+    android:background="?accentButtonBackground"
     android:layout_marginTop="@dimen/margin_base"
-    android:enabled="false"
-    android:text="@string/editor_report_problem_send_button" />
+    android:enabled="true"
+    android:text="@string/editor_report_problem_send_button"
+    app:backgroundTint="@null"/>
 </LinearLayout>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:paddingBottom="@dimen/margin_base_plus"
@@ -8,10 +9,12 @@
 
   <com.google.android.material.button.MaterialButton
     android:id="@+id/btn__add_time"
-    style="@style/MwmWidget.Button.Primary"
+    style="@style/MwmWidget.M3.Button.Primary"
     android:layout_gravity="center"
     android:enabled="false"
+    android:background="?accentButtonBackground"
     android:padding="@dimen/margin_base"
-    android:text="@string/editor_time_add"/>
+    android:text="@string/editor_time_add"
+    app:backgroundTint="@null"/>
 
 </FrameLayout>

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

@@ -13,35 +13,35 @@
     android:layout_height="match_parent"
     android:layout_weight="0.5"/>
 
-  <!-- Speed -->
+  <!-- ETA (Estimated Time of Arrival) -->
   <LinearLayout
-    android:id="@+id/speed_view_container"
+    android:id="@+id/eta_view_container"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@drawable/speed_cams_bg"
     android:gravity="center"
     android:minWidth="@dimen/nav_numbers_side_min_width">
 
+    <!-- ETA value -->
     <com.google.android.material.textview.MaterialTextView
-      android:id="@+id/speed_value"
+      android:id="@+id/eta_value"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:includeFontPadding="false"
       android:lines="1"
       android:textAppearance="@style/MwmTextAppearance.NavMenu.Number"
-      tools:text="999" />
+      tools:text="99:99" />
 
-    <!-- Speed -->
+    <!-- ETA AM/PM -->
     <com.google.android.material.textview.MaterialTextView
-      android:id="@+id/speed_dimen"
+      android:id="@+id/eta_am_pm"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:includeFontPadding="false"
       android:lines="1"
       android:textAppearance="@style/MwmTextAppearance.NavMenu.Number.Dimension"
       tools:background="#20FF0000"
-      tools:text="km/h" />
+      tools:text="AM/PM" />
   </LinearLayout>
 
   <Space
@@ -103,14 +103,14 @@
     </LinearLayout>
 
     <com.google.android.material.textview.MaterialTextView
-      android:id="@+id/time_estimate"
+      android:id="@+id/disused_text_view"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:includeFontPadding="false"
       android:lines="1"
       android:textAlignment="center"
       android:textAppearance="@style/MwmTextAppearance.NavMenu.Number.Dimension"
-      tools:text="99:99 AM" />
+      tools:text="----" />
   </LinearLayout>
 
   <Space

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

@@ -124,13 +124,26 @@
       app:lanesEditModeLanesCount="5"
       tools:visibility="visible" />
 
+  <app.organicmaps.widget.CurrentSpeedView
+      android:id="@+id/nav_current_speed"
+      style="@style/MwmWidget.CurrentSpeed"
+      android:layout_width="60dp"
+      android:layout_height="60dp"
+      android:layout_margin="@dimen/margin_half"
+      app:layout_constraintEnd_toEndOf="@id/nav_next_turn_container"
+      app:layout_constraintStart_toStartOf="@id/nav_next_turn_container"
+      app:layout_constraintTop_toBottomOf="@id/nav_next_turn_container"/>
+
   <app.organicmaps.widget.SpeedLimitView
     android:id="@+id/nav_speed_limit"
     style="@style/MwmWidget.SpeedLimit"
-    android:layout_width="60dp"
-    android:layout_height="60dp"
+    android:layout_width="50dp"
+    android:layout_height="50dp"
     android:layout_margin="@dimen/margin_half"
     app:layout_constraintEnd_toEndOf="@id/nav_next_turn_container"
     app:layout_constraintStart_toStartOf="@id/nav_next_turn_container"
-    app:layout_constraintTop_toBottomOf="@id/nav_next_turn_container" />
+    app:layout_constraintTop_toBottomOf="@id/nav_current_speed"
+    android:translationY="-23dp"
+    android:translationX="-23dp"
+    android:translationZ="1dp"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -89,21 +89,22 @@
     android:paddingStart="0dp"
     android:paddingEnd="@dimen/altitude_chart_container_padding_left">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
       android:id="@+id/btn__cancel"
-      style="@style/MwmWidget.Button"
+      style="@style/Widget.Material3.Button.TextButton"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_vertical"
       android:text="@string/cancel"
-      android:textColor="?android:attr/textColorPrimary"
+      android:textColor="?android:textColorPrimary"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
       android:id="@+id/btn__plan"
-      style="@style/MwmWidget.Button.Primary"
+      style="@style/MwmWidget.M3.Button.Primary"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_vertical"

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

@@ -53,7 +53,7 @@
       android:clipChildren="false">
       <com.google.android.material.button.MaterialButton
         android:id="@+id/downloader_button"
-        style="@style/MwmWidget.Button.Primary"
+        style="@style/MwmWidget.M3.Button.Primary"
         android:layout_width="180dp"
         android:layout_gravity="center"
         android:visibility="gone"

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

@@ -11,9 +11,23 @@
     android:id="@+id/tv__bookmark_notes"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/margin_base"
+    android:layout_marginBottom="@dimen/margin_half"
     android:layout_marginEnd="@dimen/margin_base"
     android:layout_marginStart="@dimen/margin_base"
+    android:layout_marginTop="@dimen/margin_base"
     android:textAppearance="?android:attr/textAppearance"
     tools:text="Long, long text Long, long text Long, long text Long, long text Long, long text Long, long text "/>
+
+  <com.google.android.material.textview.MaterialTextView
+      android:id="@+id/tv__bookmark_edit"
+      style="@style/PlacePageMetadataText.Button"
+      android:gravity="center"
+      android:layout_height="@dimen/height_block_base"
+      android:background="?clickableBackground"
+      android:paddingEnd="@dimen/margin_base"
+      android:paddingStart="@dimen/margin_base"
+      android:text="@string/placepage_edit_bookmark_button"/>
+
+  <include
+    layout="@layout/divider_horizontal"/>
 </LinearLayout>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button
+<com.google.android.material.button.MaterialButton
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/start"
-  style="@style/MwmWidget.Button.Primary"
+  style="@style/MwmWidget.M3.Button.Primary"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
   android:minWidth="@dimen/start_button_width"

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

@@ -216,7 +216,7 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Език на инструкциите</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Тестване на гласови указания (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Тестване на гласови указания</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Проверете силата на звука или системните настройки за преобразуване на текст в реч, ако сега не чувате гласа.</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -804,4 +804,5 @@
     <string name="editor_line_social_network">LINE</string>
     <string name="app_site_url">https://comaps.app/</string>
     <string name="saved">Запазено</string>
+    <string name="about_headline">Отворен проект, захранван от общността</string>
 </resources>

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

@@ -884,4 +884,5 @@
     <string name="delete_track_dialog_title">Odstranit %s?</string>
     <string name="hours_confirmed_time_ago">Potvrzeno %s</string>
     <string name="existence_confirmed_time_ago">Existence potvrzena %s</string>
+    <string name="pref_tts_no_system_tts_short">Nenalezen žádný modul pro převod textu na řeč, zkontrolujte nastavení aplikace</string>
 </resources>

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

@@ -889,4 +889,5 @@
     <string name="delete_track_dialog_title">%s löschen?</string>
     <string name="existence_confirmed_time_ago">Existenz bestätigt %s</string>
     <string name="hours_confirmed_time_ago">Bestätigt %s</string>
+    <string name="pref_tts_no_system_tts_short">Kein Text-zu-Sprache Modul gefunden, überprüfe die App-Einstellungen</string>
 </resources>

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

@@ -884,4 +884,5 @@
     <string name="delete_track_dialog_title">Kas kustutame: %s?</string>
     <string name="existence_confirmed_time_ago">Olemasolu on kontrollitud %s</string>
     <string name="hours_confirmed_time_ago">Kontrollitud %s</string>
+    <string name="pref_tts_no_system_tts_short">Ühtegi kõnesünteesimootorit ei leidu, palun kontrolli rakenduse seadistusi</string>
 </resources>

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

@@ -165,7 +165,7 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Votre position n\'a pas encore été déterminée</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Désolé, les paramètres de stockage dee cartes sont actuellement désactivés.</string>
+    <string name="cant_change_this_setting">Désolé, les paramètres de stockage de cartes sont actuellement désactivés</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Le téléchargement de la carte est en cours</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
@@ -337,7 +337,7 @@
     <string name="dialog_routing_disclaimer_priority">— Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur les conseils de navigation ;</string>
     <string name="dialog_routing_disclaimer_precision">— La carte peut être erronée et l\'itinéraire proposé n\'est pas forcément optimal pour arriver à destination ;</string>
     <string name="dialog_routing_disclaimer_recommendations">— L\'itinéraire proposé doit être considéré comme une simple recommandation ;</string>
-    <string name="dialog_routing_disclaimer_borders">— Soyez vigilants à proximité des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir les frontières entre états dans des zones interdites ;</string>
+    <string name="dialog_routing_disclaimer_borders">— Faites attention à proximité des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir les frontières entre états dans des zones interdites ;</string>
     <string name="dialog_routing_disclaimer_beware">Restez vigilants et soyez prudents sur la route !</string>
     <string name="dialog_routing_check_gps">Vérifiez le signal GPS</string>
     <string name="dialog_routing_error_location_not_found">Impossible de créer l\'itinéraire. Les coordonnées GPS actuelles n\'ont pas pu être déterminées.</string>
@@ -346,10 +346,10 @@
     <string name="dialog_routing_location_unknown_turn_on">Impossible de déterminer les coordonnées GPS actuelles. Activez les services de localisation pour calculer l\'itinéraire.</string>
     <string name="dialog_routing_unable_locate_route">Impossible de localiser l\'itinéraire</string>
     <string name="dialog_routing_cant_build_route">Impossible de créer l\'itinéraire</string>
-    <string name="dialog_routing_change_start_or_end">Veuillez ajuster votre point de départ ou votre destination</string>
+    <string name="dialog_routing_change_start_or_end">Veuillez ajuster votre point de départ ou votre destination.</string>
     <string name="dialog_routing_change_start">Modifiez votre point de départ</string>
     <string name="dialog_routing_start_not_determined">Impossible de localiser le point de départ. L\'itinéraire n\'a pas pu être créé.</string>
-    <string name="dialog_routing_select_closer_start">Choisissez un point de départ à proximité d\'une route</string>
+    <string name="dialog_routing_select_closer_start">Choisissez un point de départ à proximité d\'une route.</string>
     <string name="dialog_routing_change_end">Ajustez la destination</string>
     <string name="dialog_routing_end_not_determined">Impossible de localiser la destination. L\'itinéraire n\'a pas pu être créé.</string>
     <string name="dialog_routing_select_closer_end">Choisissez un lieu de destination à proximité d\'une route</string>
@@ -372,7 +372,7 @@
     <string name="history">Historique</string>
     <string name="search_not_found">Oups, aucun résultat trouvé</string>
     <!-- The message when user did not find anything in the search. -->
-    <string name="search_not_found_query">Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche</string>
+    <string name="search_not_found_query">Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche.</string>
     <string name="search_history_title">Historique de recherche</string>
     <string name="search_history_text">Affichez vos dernières recherches</string>
     <string name="clear_search">Effacer l\'historique de recherche</string>
@@ -461,7 +461,7 @@
     <string name="downloader_no_space_message">Veuillez supprimer les données inutiles</string>
     <string name="editor_login_error_dialog">Erreur de connexion</string>
     <string name="editor_profile_changes">Modifications vérifiées</string>
-    <string name="editor_focus_map_on_location">Déplacez la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise</string>
+    <string name="editor_focus_map_on_location">Déplacez la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise.</string>
     <string name="editor_edit_place_title">Modification</string>
     <string name="editor_add_place_title">Ajout</string>
     <string name="editor_edit_place_name_hint">Nom du lieu</string>
@@ -476,7 +476,7 @@
     <string name="osm_presentation">Données OpenStreetMap créées par la communauté en date du %s. Pour en savoir plus sur la façon de modifier et de mettre à jour la carte, consultez le site OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) est un projet communautaire visant à créer une carte libre et ouverte. C\'est la principale source de données cartographiques de CoMaps et son fonctionnement est similaire à celui de Wikipédia. Vous pouvez ajouter ou modifier des lieux et ils deviennent accessibles à des millions d\'utilisateurs dans le monde entier. \nRejoignez la communauté et aidez-nous à créer une meilleure carte pour tout le monde !</string>
-    <string name="login_to_make_edits_visible">Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de carte dans le monde entier.</string>
+    <string name="login_to_make_edits_visible">Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de carte dans le monde entier</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d de %2$d</string>
     <string name="download_over_mobile_header">Télécharger avec une connexion réseau cellulaire ?</string>
@@ -534,7 +534,7 @@
     <string name="editor_share_to_all_dialog_title">Souhaitez-vous l’envoyer à tous les utilisateurs ?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
     <string name="editor_share_to_all_dialog_message_1">Assurez-vous de n’avoir pas saisi de données personnelles</string>
-    <string name="editor_share_to_all_dialog_message_2">Les contributeurs d\'OpenStreetMap vérifieront vos modifications et vous contacteront s\'ils ont des questions.</string>
+    <string name="editor_share_to_all_dialog_message_2">Les cartographes OpenStreetMap vérifieront vos modifications et vous contacteront en cas de questions</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Enregistreur de traces</string>
     <!-- For the first routing -->
@@ -550,7 +550,7 @@
     <string name="mobile_data_description">Une connexion Internet est nécessaire pour recevoir les mises à jour de cartes et pour envoyer vos modifications</string>
     <string name="mobile_data_option_never">Ne jamais utiliser</string>
     <string name="mobile_data_option_ask">Toujours demander</string>
-    <string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être mises à jour.</string>
+    <string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être mises à jour</string>
     <string name="big_font">Augmenter la taille de police sur la carte</string>
     <string name="traffic_update_app">Veuillez mettre à jour CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -647,7 +647,7 @@
     <string name="avoid_ferry">Éviter les ferries</string>
     <string name="avoid_motorways">Éviter les autoroutes</string>
     <string name="unable_to_calc_alert_title">Impossible de calculer l\'itinéraire</string>
-    <string name="unable_to_calc_alert_subtitle">Malheureusement, nous n\'avons pas pu créer l\'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez</string>
+    <string name="unable_to_calc_alert_subtitle">Malheureusement, nous n\'avons pas pu créer l\'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez.</string>
     <string name="define_to_avoid_btn">Définissez les routes à éviter</string>
     <string name="change_driving_options_btn">Paramètres d\'itinéraire activés</string>
     <string name="toll_road">Route à péage</string>
@@ -824,7 +824,7 @@
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">L\'itinéraire est vide - il n\'y a rien à sauvegarder</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">Impossible d\'afficher la boîte de dialogue de sélection des dossiers car aucune application appropriée n\'est installée sur votre appareil. Veuillez installer une application de gestion de fichiers et réessayer</string>
+    <string name="error_no_file_manager_app">Impossible d\'afficher la boîte de dialogue de sélection des dossiers car aucune application appropriée n\'est installée sur votre appareil. Veuillez installer une application de gestion de fichiers et réessayer.</string>
     <string name="choose_color">Choisir la couleur</string>
     <string name="edit_track">Modifier la trace</string>
     <string name="uri_open_location_failed">Aucune application installée ne permet d\'ouvrir l\'emplacement</string>
@@ -894,4 +894,5 @@
     <string name="delete_track_dialog_title">Supprimer %s ?</string>
     <string name="existence_confirmed_time_ago">Existance confirmée %s</string>
     <string name="hours_confirmed_time_ago">Confirmé %s</string>
+    <string name="pref_tts_no_system_tts_short">Pas de synthèse vocale disponible, vérifiez les paramètres de l\'application</string>
 </resources>

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

@@ -9,7 +9,7 @@
     <string name="delete">Törlés</string>
     <string name="download_maps">Térképek letöltése</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Nem sikerült letölteni, próbáld meg újra</string>
+    <string name="download_has_failed">Nem sikerült letölteni, próbálja újra</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Letöltés…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -23,7 +23,7 @@
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
     <string name="search_map">Keresés a térképen</string>
     <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">Jelenleg az eszköz vagy alkalmazás helymeghatározási szolgáltatásai le vannak tiltva. Engedélyezze őket a Beállításokban.</string>
+    <string name="location_is_disabled_long_text">Jelenleg az eszköz vagy alkalmazás helymeghatározási szolgáltatásai le vannak tiltva. Engedélyezze őket a beállításokban.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Korlátozott pontosság</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
@@ -70,7 +70,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Könyvjelzők</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Könyvjelzők és nyomvonalak</string>
+    <string name="bookmarks_and_tracks">Könyvjelzők és útvonalak</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Név</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -259,7 +259,7 @@
     <!-- Downloaded maps list header -->
     <string name="downloader_downloaded_subtitle">Letöltve</string>
     <!-- Country queued for download -->
-    <string name="downloader_queued">Sorbaállítva</string>
+    <string name="downloader_queued">Várólistához adva</string>
     <string name="downloader_near_me_subtitle">A közelben</string>
     <!-- In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" -->
     <string name="downloader_status_maps">Térképek</string>
@@ -459,12 +459,12 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">A közösségi OpenStreetMap adatok frissítésének időpontja: %s. Tudjon meg többet a térkép szerkesztéséről és frissítéséről az OpenStreetMap.org oldalon</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">Az OpenStreetMap.org (OSM) egy közösségi projekt, amelynek célja egy ingyenes és nyílt térkép létrehozása. Ez az CoMaps alkalmazás térképadatainak fő forrása, és a Wikipédiához hasonlóan működik. Helyeket adhat hozzá vagy szerkeszthet, és azok világszerte felhasználók milliói számára válnak elérhetővé. \nCsatlakozzon a közösséghez, és segítsen egy jobb térképet készíteni mindenki számára!</string>
+    <string name="login_osm_presentation">Az OpenStreetMap.org (OSM) egy közösségi projekt, amelynek célja egy ingyenes és nyílt térkép létrehozása. Ez az CoMaps alkalmazás térképadatainak fő forrása, és a Wikipédiához hasonlóan működik. Helyeket adhat hozzá vagy szerkeszthet, és azok világszerte felhasználók milliói számára válnak elérhetővé. \nCsatlakozzon a közösséghez, és segítsen jobb térképet készíteni mindenki számára!</string>
     <string name="login_to_make_edits_visible">Hozzon létre egy OpenStreetMap-fiókot, vagy jelentkezzen be, hogy a világ számára közzétehesse az Ön térképszerkesztéseit</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d / %2$d</string>
     <string name="download_over_mobile_header">Biztosan letölti mobilhálózati kapcsolaton keresztül?</string>
-    <string name="download_over_mobile_message">Ez egyes díjcsomagok vagy roaming esetén jelentős költségekkel járhat.</string>
+    <string name="download_over_mobile_message">Ez egyes díjcsomagok vagy roaming esetén jelentős költségekkel járhat</string>
     <string name="error_enter_correct_house_number">Adjon meg egy érvényes házszámot</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Ez az épület legfeljebb %d emeletes lehet</string>
@@ -473,7 +473,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Megjegyzés az OpenStreetMap önkénteseinek (nem kötelező)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Írja le a térképen található hibákat vagy olyan dolgokat, amelyeket nem lehet az CoMaps segítségével szerkeszteni</string>
+    <string name="editor_note_hint">Írja le a térképen található hibákat vagy olyan dolgokat, amelyeket nem lehet a CoMaps segítségével szerkeszteni</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">A szerkesztései feltöltődnek a nyilvános <a href="https://wiki.openstreetmap.org/wiki/Hu:Névjegy">OpenStreetMap</a> adatbázisba. Ne adjon hozzá személyes vagy szerzői jogvédelem alatt álló információkat.</string>
     <string name="editor_more_about_osm">További részletek az OpenStreetMap adatbázisról</string>
@@ -485,7 +485,7 @@
     <string name="editor_category_unsuitable_title">Nem találja a megfelelő kategóriát?</string>
     <string name="editor_category_unsuitable_text">Az CoMaps csak egyszerű pontkategóriák hozzáadását teszi lehetővé, azaz nem tartalmaz városokat, utakat, tavakat, épületek körvonalait stb., az ilyen kategóriákat közvetlenül az <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> oldalon adhatja hozzá. A részletes, lépésről lépésre történő útmutatásért tekintse meg az <a href="https://www.comaps.app/support/advanced-map-editing/">útmutatónkat</a>.</string>
     <string name="downloader_no_downloaded_maps_title">Még nem töltött le térképet</string>
-    <string name="downloader_no_downloaded_maps_message">Térkép letöltése offline kereséshez és navigáláshoz.</string>
+    <string name="downloader_no_downloaded_maps_message">Térképek letöltése internetkapcsolat nélküli kereséshez és navigáláshoz</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
     <string name="miles_per_hour">mf/h</string>
@@ -509,8 +509,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Szeretné elküldeni az összes felhasználónak?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Győződjön meg arról, hogy nem ad meg semmilyen személyes információt.</string>
-    <string name="editor_share_to_all_dialog_message_2">Az OpenStreetMap szerkesztői ellenőrzik a változásokat, és felveszik Önnel a kapcsolatot, ha kérdéseik vannak.</string>
+    <string name="editor_share_to_all_dialog_message_1">Győződjön meg arról, hogy nem ad meg semmilyen magánjellegű vagy személyes adatokat</string>
+    <string name="editor_share_to_all_dialog_message_2">Az OpenStreetMap szerkesztői ellenőrzik a változásokat, és felveszik Önnel a kapcsolatot, ha bármilyen kérdésük van</string>
     <string name="navigation_stop_button">Megállítás</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Nyomvonal rögzítése</string>
@@ -524,10 +524,10 @@
     <string name="mobile_data_option_not_today">Ma ne használja</string>
     <string name="mobile_data">Mobilinternet</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Mobilinternet szükséges a térképfrissítési értesítésekhez, valamint a helyszínekre és könyvjelzőkre vonatkozó részletes információk megjelenítéséhez.</string>
+    <string name="mobile_data_description">A térképfrissítési értesítésekhez és a szerkesztések feltöltéséhez mobilinternetre van szükség</string>
     <string name="mobile_data_option_never">Soha ne használja</string>
     <string name="mobile_data_option_ask">Mindig kérdezzen rá</string>
-    <string name="traffic_update_maps_text">Forgalmi adatok megjelenítéséhez frissíteni kell a térképeket.</string>
+    <string name="traffic_update_maps_text">A forgalmi adatok megjelenítéséhez frissíteni kell a térképeket</string>
     <string name="big_font">Betűméret növelése a térképen</string>
     <string name="traffic_update_app">Frissítse az CoMaps alkalmazást</string>
     <!-- "traffic" as in "road congestion" -->
@@ -537,7 +537,7 @@
     <string name="feedback_general">Általános visszajelzés</string>
     <string name="prefs_languages_information">Az CoMaps TTS-rendszert használ a hangnavigációhoz. Sok androidos eszköz használja a Google TTS-t; töltse le vagy frissítse a Google Play áruházból (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Egyes nyelveknél másik beszédszintetizátort vagy további nyelvi csomagot kell telepítenie az alkalmazás-áruházból (Google Play, Galaxy Store, App Gallery, FDroid). \nNyissa meg az eszköz beállításait → Nyelv és bevitel → Beszéd → Szöveg-beszéd átalakító kimenet. \nItt kezelheti a beszédszintézis beállításokat (például: nyelvi csomag letöltése a kapcsolat nélküli használathoz) és másik szövegfelolvasót jelölhet ki.</string>
-    <string name="prefs_languages_information_off_link">További tájékoztatást találhat még ebben az útmutatóban.</string>
+    <string name="prefs_languages_information_off_link">Ebben az útmutatóban további tájékoztatást talál</string>
     <string name="transliteration_title">Átírás latin betűkre</string>
     <string name="learn_more">Tudjon meg többet</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
@@ -562,7 +562,7 @@
     </plurals>
     <string name="bookmarks_create_new_group">Új lista létrehozása</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Könyvjelzők és nyomvonalak importálása</string>
+    <string name="bookmarks_import">Könyvjelzők és útvonalak importálása</string>
     <string name="bookmarks_error_message_share_general">Nem lehet megosztani egy alkalmazáshiba miatt</string>
     <string name="bookmarks_error_title_share_empty">Megosztási hiba</string>
     <string name="bookmarks_error_message_share_empty">Üres lista nem osztható meg</string>
@@ -580,8 +580,8 @@
     </plurals>
     <string name="restore">Visszaállítás</string>
     <plurals name="tracks">
-        <item quantity="one">%d nyomvonal</item>
-        <item quantity="other">%d nyomvonal</item>
+        <item quantity="one">%d útvonal</item>
+        <item quantity="other">%d útvonal</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Adatvédelem</string>
@@ -607,11 +607,11 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Soha ne figyelmeztessen</string>
     <string name="power_managment_title">Energiatakarékos mód</string>
-    <string name="power_managment_description">Próbálja meg csökkenteni az energiafelhasználást bizonyos funkciók rovására.</string>
+    <string name="power_managment_description">Megpróbálja csökkenteni az energiafelhasználást bizonyos funkciók rovására</string>
     <string name="power_managment_setting_never">Soha</string>
     <string name="power_managment_setting_auto">Amikor az akkumulátor lemerül</string>
     <string name="power_managment_setting_manual_max">Mindig</string>
-    <string name="enable_logging_warning_message">Ha ideiglenesen engedélyezi ezt az opciót, akkor a „Súgó” párbeszédpanel „Hibajelentés” menüpontjának használatával rögzítheti és kézzel küldheti el nekünk a problémával kapcsolatos részletes diagnosztikai naplókat. A naplók tartalmazhatnak helyadatokat.</string>
+    <string name="enable_logging_warning_message">Ha ideiglenesen engedélyezi ezt a lehetőséget, akkor rögzítheti, és a „A CoMaps névjegye” képernyőn a „HIBA JELENTÉSE” gombra katintva elküldheti nekünk a hibával, problémával kapcsolatos részletes diagnosztikai naplókat. A naplók tartalmazhatnak helyadatokat.</string>
     <string name="driving_options_title">Útvonaltervezési beállítások</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Díjköteles utak elkerülése</string>
@@ -753,7 +753,7 @@
     <string name="browser_not_available">A webböngésző nem érhető el</string>
     <string name="volume">Hangerő</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Az összes könyvjelző és nyomvonal exportálása</string>
+    <string name="bookmarks_export">Az összes könyvjelző és útvonal exportálása</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Beszédszintézis-beállítások</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -785,9 +785,9 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Rögzítés folytatása</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Elmenti a könyvjelzők és nyomvonalakba?</string>
+    <string name="track_recording_alert_title">Elmenti a könyvjelzők és útvonalak közé?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
-    <string name="track_recording_toast_nothing_to_save">A nyomvonal üres – nincs mit menteni</string>
+    <string name="track_recording_toast_nothing_to_save">Az útvonal üres – nincs mit menteni</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">Nem lehet megjeleníteni a mappaválasztó párbeszédpanelt, mert nincs megfelelő alkalmazás telepítve az eszközén. Telepítsen egy fájlkezelő alkalmazást, és próbálja meg újra.</string>
     <string name="choose_color">Válasszon színt</string>
@@ -810,7 +810,7 @@
     <string name="facebook">Facebook</string>
     <string name="closes_in">Bezár %s múlva</string>
     <string name="opens_in">Kinyit %s múlva</string>
-    <string name="current_location_unknown_error_title">A jelenlegi helyzet ismeretlen.</string>
+    <string name="current_location_unknown_error_title">A jelenlegi helyzet ismeretlen</string>
     <string name="disk_error">Nem lehet mappát létrehozni és fájlokat áthelyezni az eszköz belső memóriájában vagy az SD-kártyán</string>
     <string name="disk_error_title">Lemezhiba</string>
     <string name="twitter">X (Twitter)</string>
@@ -839,4 +839,46 @@
     <string name="closed_now">Most zárva van</string>
     <string name="existence_confirmed_time_ago">A létezése ellenőrizve és megerősítve %s</string>
     <string name="hours_confirmed_time_ago">Ellenőrizve és megerősítve %s</string>
+    <string name="editor_level">Emelet (0 a földszint)</string>
+    <string name="error_enter_correct_level">Adja meg az emeletek számát</string>
+    <string name="editor_building_levels">Emeletek (beleértve a földszintet, kivéve a tetőt)</string>
+    <string name="error_enter_correct_fediverse_page">Adjon meg egy érvényes Mastodon felhasználónevet vagy webcímet</string>
+    <string name="osm_note_hint">Vagy írjon egy feljegyzést az OpenStreetMap közösségnek, hogy valaki más hozzáadhassa vagy kijavíthassa itt a helyet.</string>
+    <string name="error_enter_correct_bluesky_page">Adjon meg egy érvényes Bluesky felhasználónevet vagy webcímet</string>
+    <string name="osm_note_toast">A feljegyzés elküldésre kerül az OpenStreetMap közösséghez</string>
+    <string name="pref_left_button_disable">Letiltás</string>
+    <string name="codeberg">Codeberg</string>
+    <string name="pref_backup_now_summary_progress">A biztonsági mentés folyamatban van…</string>
+    <string name="pref_backup_now_summary">Készítsen biztonsági mentést most</string>
+    <string name="pref_backup_now_summary_ok">A biztonsági mentés sikeresen befejeződött</string>
+    <string name="pref_backup_now_summary_empty_lists">Nincsenek könyvjelzők és útvonalak a biztonsági mentéshez</string>
+    <string name="pref_backup_now_title">Biztonsági mentés most</string>
+    <string name="pref_backup_location_summary_initial">Válasszon ki egy mappát és adja meg az írási/olvasási engedélyt</string>
+    <string name="pref_left_button_title">A bal oldali gomb beállítása</string>
+    <string name="pref_backup_title">Könyvjelzők és útvonalak mentése</string>
+    <string name="pref_backup_summary">Automatikus biztonsági mentés az eszközön lévő mappába</string>
+    <string name="pref_backup_now_summary_folder_unavailable">A biztonsági mentés mappája nem elérhető</string>
+    <string name="pref_backup_status_summary_success">Az utolsó sikeres biztonsági mentés</string>
+    <string name="pref_backup_location_title">A biztonsági mentés mappája</string>
+    <string name="pref_backup_history_title">A megőrzendő biztonsági mentések száma</string>
+    <string name="backup_interval_every_week">Hetente</string>
+    <string name="pref_backup_interval_title">Automatikus biztonsági mentés</string>
+    <string name="backup_interval_every_day">Naponta</string>
+    <string name="pref_backup_now_summary_failed">Nem sikerült a biztonsági mentés</string>
+    <string name="backup_interval_manual_only">Ki (csak kézileg)</string>
+    <string name="dialog_report_error_missing_folder">A biztonsági mentés kiválasztott mappája nem érhető el, vagy nem írható. Válasszon másik mappát.</string>
+    <string name="at">ekkor: %s</string>
+    <string name="open_now">Most nyitva van</string>
+    <string name="delete_track_dialog_title">%s törlése?</string>
+    <string name="clear">Törlés</string>
+    <string name="route_type">Az útvonal típusa</string>
+    <string name="vehicle">Gépjármű</string>
+    <string name="pedestrian">Gyalogos</string>
+    <string name="bicycle">Kerékpár</string>
+    <string name="ruler">Vonalzó</string>
+    <string name="bookmark_color">A könyvjelző színe</string>
+    <string name="about_help">Névjegy és segítség</string>
+    <string name="share_track">Útvonal megosztása</string>
+    <string name="pref_tts_no_system_tts_short">Nem található szövegfelovasási szolgáltatás (TTS), ellenőrizze az alkalmazás beállításait a „Hangutasítások” müpontban</string>
+    <string name="dialog_report_error_with_logs">Kérjük, küldjön hibajelentést:\n - „Naplózás engedélyezése” a beállításokban\n - reprodukálja a hibát, problémát\n - „A CoMaps névjegye” képernyőn nyomja meg a „HIBA JELENTÉSE” gombot, és küldje el e-mailben vagy chaten keresztül.\n - naplózás kikapcsolása</string>
 </resources>

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

@@ -36,24 +36,24 @@
     <string name="try_again">Riprova</string>
     <string name="about_menu_title">Informazioni su CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Progetto Aperto e sviluppato dalla comunità</string>
+    <string name="about_headline">Progetto aperto e sviluppato dalla comunità</string>
     <!-- Text in About screen -->
     <string name="about_proposition_1">• Facile da usare e curata</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Attenta alla Privacy e senza pubblicità</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• Usabile senza connessione, veloce e occupa poco spazio</string>
+    <string name="about_proposition_3">• Utilizzabile senza connessione, veloce e occupa poco spazio</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Applicazione open-source, senza scopo di lucro e trasparente nel processo decisionale e nelle gestione delle finanze.</string>
+    <string name="about_developed_by_enthusiasts">Applicazione open-source, senza scopo di lucro e trasparente nel processo decisionale e nella gestione delle finanze.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">Impostazioni della posizione</string>
     <string name="close">Chiudi</string>
     <string name="unsupported_phone">L\'app necessita di OpenGL con accelerazione hardware. Purtroppo, il tuo dispositivo non è supportato.</string>
     <string name="download">Scarica</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Scollega il cavo USB o inserisci la scheda di memoria per poter utilizzare CoMaps</string>
+    <string name="disconnect_usb_cable">Scollega il cavo USB o inserisci la scheda SD per poter utilizzare CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">Libera prima dello spazio sulla scheda SD/ memoria USB per utilizzare l\'app</string>
+    <string name="not_enough_free_space_on_sdcard">Libera prima dello spazio sulla scheda SD/memoria USB per utilizzare l\'app</string>
     <string name="download_resources">Prima di iniziare è necessario scaricare la mappa generale del mondo sul tuo dispositivo. \nLa dimensione del download è di %s.</string>
     <string name="download_resources_continue">Vai alla mappa</string>
     <string name="downloading_country_can_proceed">Sto scaricando %1$s (%2$s). Ora puoi \nprocedere con la mappa.</string>
@@ -117,11 +117,11 @@
     <!-- Search category for entertainment; any changes should be duplicated in categories.txt @category_entertainment! -->
     <string name="category_entertainment">Intrattenimento</string>
     <!-- Search category for ATMs; any changes should be duplicated in categories.txt @category_atm! -->
-    <string name="category_atm">Bancomat</string>
+    <string name="category_atm">Bancomat ATM</string>
     <!-- Search category for nightclubs/bars; any changes should be duplicated in categories.txt @category_nightlife! -->
     <string name="category_nightlife">Vita notturna</string>
     <!-- Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @category_children! -->
-    <string name="category_children">Divertimento in famiglia</string>
+    <string name="category_children">Vacanza in famiglia</string>
     <!-- Search category for banks; any changes should be duplicated in categories.txt @category_bank! -->
     <string name="category_bank">Banca</string>
     <!-- Search category for pharmacies; any changes should be duplicated in categories.txt @category_pharmacy! -->
@@ -139,7 +139,7 @@
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
     <string name="category_water">Acqua</string>
     <!-- Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! -->
-    <string name="category_rv">Per camper</string>
+    <string name="category_rv">Struttura per camper</string>
     <!-- SECTION: Other translations -->
     <!-- Notes field in Bookmarks view -->
     <string name="description">Informazioni</string>
@@ -159,7 +159,7 @@
     <!-- resource for context menu -->
     <string name="edit">Modifica</string>
     <!-- Warning message when doing search around current position -->
-    <string name="unknown_current_position">La tua posizione non è stata ancora determinata</string>
+    <string name="unknown_current_position">La tua posizione non è stata ancora stabilita</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Le impostazioni di archiviazione delle mappe sono disabilitate al momento</string>
     <!-- Alert message that downloading is in progress. -->
@@ -232,7 +232,7 @@
     <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Notizie</string>
     <!-- Settings: Send feedback button and dialog title -->
-    <string name="feedback">Feedback</string>
+    <string name="feedback">Opinioni</string>
     <!-- Text in menu -->
     <string name="rate_the_app">Vota l\'app</string>
     <!-- Text in menu -->
@@ -242,7 +242,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Dona</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Sostieni il progetto</string>
+    <string name="how_to_support_us">Volontariato e migliorare CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Copyright</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -325,7 +325,7 @@
     <!-- gray color -->
     <string name="gray">Grigio</string>
     <!-- blue gray color -->
-    <string name="blue_gray">Grigiazzurro</string>
+    <string name="blue_gray">Grigio azzurro</string>
     <!-- SECTION: Routing dialogs strings -->
     <string name="dialog_routing_disclaimer_title">Quando segui il percorso, ricorda che:</string>
     <string name="dialog_routing_disclaimer_priority">— Le condizioni stradali, il codice della strada e la segnaletica hanno sempre la precedenza sulle indicazioni del navigatore;</string>
@@ -885,4 +885,9 @@
     <string name="at">alle %s</string>
     <string name="osm_note_hint">In alternativa lascia una nota per la community di OpenStreetMap, così un altro utente potrà aggiungere o sistemare questo posto.</string>
     <string name="osm_note_toast">La nota verrà mandata a OpenStreetMap</string>
+    <string name="hours_confirmed_time_ago">Confermato %s</string>
+    <string name="existence_confirmed_time_ago">Esistenza confermata %s</string>
+    <string name="share_track">Traccia condivisa</string>
+    <string name="delete_track_dialog_title">Eliminare %s?</string>
+    <string name="pref_tts_no_system_tts_short">Motore testo - parlato non trovato, controlla le impostazioni dell\'app</string>
 </resources>

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

@@ -554,7 +554,7 @@
     <!-- Settings: "Send general feedback" button -->
     <string name="feedback_general">Algemene feedback</string>
     <string name="prefs_languages_information">We gebruiken het TTS-systeem voor gesproken instructies. Vele Android toestellen gebruiken Google TTS, u kunt het downloaden of bijwerken in Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
-    <string name="prefs_languages_information_off">Voor sommige talen dient u een andere spraaksynthesesoftware of een aanvullende taalpakket te installeren van de app store (Google Play, Galaxy Store, App Gallery, FDroid). \nOpen de instellingen van uw toestel → Taal en invoer → Spraak → Uitvoer voor tekst-naar-spraak. \nHier kunt u instellingen voor spraaksynthese beheren (bijvoorbeeld taalpakket downloaden voor offline gebruik) en een andere tekst-naar-spraak engine selecteren.</string>
+    <string name="prefs_languages_information_off">Voor sommige talen dient u een andere spraaksynthesesoftware of een aanvullende taalpakket te installeren van de app store (Google Play, Galaxy Store, App Gallery, FDroid). \nOpen de instellingen van uw toestel → Taal en invoer → Spraak → Uitvoer voor tekst-naar-spraak. \nHier kunt u instellingen voor spraaksynthese beheren (bijvoorbeeld taalpakket downloaden voor offline gebruik) en een andere tekst-naar-spraak processor selecteren.</string>
     <string name="prefs_languages_information_off_link">Gelieve deze handleiding te lezen voor meer informatie</string>
     <string name="transliteration_title">Transliteratie in het Latijnse alfabet</string>
     <string name="learn_more">Meer informatie</string>
@@ -888,4 +888,5 @@
     <string name="delete_track_dialog_title">%s verwijderen?</string>
     <string name="existence_confirmed_time_ago">Bestaan bevestigd %s</string>
     <string name="hours_confirmed_time_ago">Bevestigd %s</string>
+    <string name="pref_tts_no_system_tts_short">Geen tekst-naar-spraak processor gevonden, controleer de app-instellingen</string>
 </resources>

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

@@ -25,7 +25,7 @@
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">No momento, todos os Serviços de Localização deste dispositivo ou aplicativo estão desativados. Ative-os nas Configurações.</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Para garantir uma navegação precisa, ative a opção \"Melhorar Precisão de local\" nas configurações</string>
+    <string name="precise_location_is_disabled_long_text">Para garantir uma navegação precisa, ative a Localização Precisa nas configurações</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Mostrar no mapa</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -159,9 +159,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">A sua localização ainda não foi determinada</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Lamentamos, as configurações do armazenamento do mapa estão desativadas</string>
+    <string name="cant_change_this_setting">Desculpe, as configurações de armazenamento de mapas estão desabilitadas no momento</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">O download do mapa está atualmente em progresso</string>
+    <string name="downloading_is_active">O download do mapa está em andamento</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Veja onde estou agora. Abra o link: %1$s ou %2$s Não tem mapas offline instalados? Baixe aqui: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -211,7 +211,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Testar orientação por voz</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Verifique o volume ou as configurações de conversão de texto em fala do sistema se você não estiver ouvindo a voz agora</string>
+    <string name="pref_tts_playing_test_voice">Verifique o volume ou as configurações do sistema de conversão de texto em fala se você não estiver ouvindo a voz agora</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Não disponível</string>
     <string name="pref_map_auto_zoom">Zoom automático</string>
@@ -249,7 +249,7 @@
     <string name="downloader_download_all_button">Baixar tudo</string>
     <string name="downloader_downloading">Baixando:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Favor parar a navegação para apagar o mapa</string>
+    <string name="downloader_delete_map_while_routing_dialog">Para apagar o mapa, pare a navegação</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Só podem ser criadas rotas que estejam completamente contidas em um único mapa.</string>
     <!-- Context menu item for downloader. -->
@@ -436,12 +436,12 @@
     <string name="error_enter_correct_zip_code">Insira um CEP válido</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">As suas edições são enviadas à base de dados pública <a href="https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap">OpenStreetMap</a>. Não adicione informações pessoais ou protegidas por direitos autorais.</string>
-    <string name="editor_more_about_osm">Mais sobre OpenStreetMap</string>
+    <string name="editor_more_about_osm">Mais sobre o OpenStreetMap</string>
     <string name="editor_osm_history">Seu histórico de edição</string>
     <string name="editor_osm_notes">Suas notas de dados do mapa</string>
-    <string name="editor_category_unsuitable_title">Você não encontra uma categoria adequada?</string>
+    <string name="editor_category_unsuitable_title">Não encontra uma categoria adequada?</string>
     <string name="editor_category_unsuitable_text">O CoMaps permite que você adicione apenas categorias de pontos simples, o que significa que não há cidades, estradas, lagos, contornos de edifícios etc. Por favor, adicione essas categorias diretamente no <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte nosso <a href="https://www.comaps.app/support/advanced-map-editing/">guia</a> para obter instruções detalhadas passo a passo.</string>
-    <string name="downloader_no_downloaded_maps_title">Você não fez o download de nenhum mapa</string>
+    <string name="downloader_no_downloaded_maps_title">Você não baixou nenhum mapa</string>
     <string name="downloader_no_downloaded_maps_message">Baixe mapas para pesquisar e navegar offline</string>
     <string name="current_location_unknown_error_title">A localização atual é desconhecida</string>
     <!-- abbreviation for kilometers per hour -->
@@ -570,7 +570,7 @@
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Evitar pedágios</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
-    <string name="avoid_unpaved">Evitar não-pavimentadas</string>
+    <string name="avoid_unpaved">Evitar não pavimentadas</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_ferry">Evitar balsas</string>
     <string name="avoid_motorways">Evitar rodovias</string>
@@ -579,7 +579,7 @@
     <string name="define_to_avoid_btn">Definir as estradas a serem evitadas</string>
     <string name="change_driving_options_btn">Opções de direção ativadas</string>
     <string name="toll_road">Pedágio</string>
-    <string name="unpaved_road">Pista não pavimentada</string>
+    <string name="unpaved_road">Via não pavimentada</string>
     <string name="ferry_crossing">Balsa</string>
     <!-- A generic "Yes" button in dialogs -->
     <string name="yes">Sim</string>
@@ -855,7 +855,7 @@
     <string name="backup_interval_manual_only">Desligado (apenas manual)</string>
     <string name="dialog_report_error_missing_folder">A localização de backup selecionada está indisponível ou não permite escrita. Por favor, selecione outra localização.</string>
     <string name="dialog_report_error_with_logs">Por favor, nos envie um relatório de erro:\n - Habilite \"Ativar registros de execução\" nas configurações\n - reproduza o problema\n - na tela \"Sobre &amp; Ajuda\", pressione o botão \"Relatar um problema\" e envie via email ou chat\n - desative os registros de execução</string>
-    <string name="panoramax">Imagem Panoramax</string>
+    <string name="panoramax">Imagem do Panoramax</string>
     <string name="open_now">Aberto agora</string>
     <string name="closed_now">Fechado agora</string>
     <string name="at">às %s</string>
@@ -865,4 +865,5 @@
     <string name="share_track">Compartilhar trilha</string>
     <string name="existence_confirmed_time_ago">Existência confirmada %s</string>
     <string name="hours_confirmed_time_ago">Confirmado %s</string>
+    <string name="pref_tts_no_system_tts_short">Nenhum mecanismo de conversão de texto em voz encontrado, verifique as configurações do aplicativo</string>
 </resources>

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

@@ -881,4 +881,5 @@
     <string name="delete_track_dialog_title">Apagar %s?</string>
     <string name="existence_confirmed_time_ago">Existência confirmada %s</string>
     <string name="hours_confirmed_time_ago">Confirmado %s</string>
+    <string name="pref_tts_no_system_tts_short">Nenhuma máquina de ‘text-to-speech’ foi encnotrada, verifique as definições da aplicação</string>
 </resources>

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

@@ -167,7 +167,7 @@
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Извините, выбор места размещения карт сейчас недоступен</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Идет процесс загрузки карты.</string>
+    <string name="downloading_is_active">Идет процесс скачивание карты</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Смотри где я сейчас! Жми %1$s или %2$s Нету автономных карт? Скачай тут https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -248,7 +248,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Поддержать деньгами</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Помочь проекту</string>
+    <string name="how_to_support_us">Помочь и улучшить CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Копирайт</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -273,7 +273,7 @@
     <string name="downloader_download_all_button">Загрузить все</string>
     <string name="downloader_downloading">Загружается:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Чтобы удалить карту, пожалуйста, остановите навигацию.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Чтобы удалить карту, пожалуйста, остановите ведение</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Маршрут может быть проложен только внутри карты одного региона.</string>
     <!-- Context menu item for downloader. -->
@@ -345,18 +345,18 @@
     <string name="dialog_routing_location_turn_on">Включите режим определения геопозиции</string>
     <string name="dialog_routing_location_unknown_turn_on">Текущая геопозиция не определена. Для построения маршрута включите режим определения геопозиции.</string>
     <string name="dialog_routing_unable_locate_route">Маршрут не найден</string>
-    <string name="dialog_routing_cant_build_route">Не получилось построить маршрут.</string>
+    <string name="dialog_routing_cant_build_route">Не получилось построить путь</string>
     <string name="dialog_routing_change_start_or_end">Пожалуйста, измените начальную или конечную точку маршрута.</string>
     <string name="dialog_routing_change_start">Измените начальную точку маршрута</string>
     <string name="dialog_routing_start_not_determined">Маршрут не построен. Не определена начальная точка маршрута.</string>
     <string name="dialog_routing_select_closer_start">Пожалуйста, выберите начальную точку маршрута ближе к дороге.</string>
     <string name="dialog_routing_change_end">Измените конечную точку маршрута</string>
     <string name="dialog_routing_end_not_determined">Маршрут не построен. Не определена конечная точка маршрута.</string>
-    <string name="dialog_routing_select_closer_end">Пожалуйста, выберите конечную точку маршрута ближе к дороге.</string>
-    <string name="dialog_routing_change_intermediate">Не определена промежуточная точка маршрута.</string>
-    <string name="dialog_routing_intermediate_not_determined">Пожалуйста, измените промежуточную точку маршрута.</string>
+    <string name="dialog_routing_select_closer_end">Пожалуйста, выберите конечную точку пути ближе к дороге</string>
+    <string name="dialog_routing_change_intermediate">Не определена промежуточная точка пути</string>
+    <string name="dialog_routing_intermediate_not_determined">Пожалуйста, измените промежуточную точку пути</string>
     <string name="dialog_routing_system_error">Системная ошибка</string>
-    <string name="dialog_routing_application_error">Не удалось проложить маршрут из-за ошибки приложения.</string>
+    <string name="dialog_routing_application_error">Не удалось проложить путь из-за ошибки приложения</string>
     <string name="dialog_routing_try_again">Попробуйте снова</string>
     <string name="not_now">Не сейчас</string>
     <string name="dialog_routing_download_and_build_cross_route">Загрузить карту и построить более оптимальный маршрут с пересечением границы карты?</string>
@@ -456,7 +456,7 @@
     <string name="downloader_update_maps">Обновите карты</string>
     <string name="downloader_mwm_migration_dialog">Для построения маршрутов необходимо обновить все карты и построить маршрут заново.</string>
     <string name="downloader_search_field_hint">Найти карту</string>
-    <string name="common_check_internet_connection_dialog">Проверьте настройки и убедитесь, что устройство подключено к интернету.</string>
+    <string name="common_check_internet_connection_dialog">Проверьте настройки и убедитесь, что устройство подключено к интернету</string>
     <string name="downloader_no_space_title">Недостаточно места</string>
     <string name="downloader_no_space_message">Удалите ненужные данные</string>
     <string name="editor_login_error_dialog">Не удалось войти</string>
@@ -476,11 +476,11 @@
     <string name="osm_presentation">Созданные сообществом данные OpenStreetMap по состоянию на %s. Узнайте больше о том, как редактировать и обновлять карту на сайте OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) - это открытый проект сообщества по созданию бесплатной карты. Он является основным источником картографических данных в CoMaps и работает как Википедия. Кто угодно может добавлять или редактировать места, которые позже увидят миллионы пользователей по всему миру. \nПрисоединяйтесь к сообществу и помогите сделать лучшую карту для всех!</string>
-    <string name="login_to_make_edits_visible">Создайте учетную запись OpenStreetMap или войдите в нее, чтобы опубликовать свои правки на карте для всего мира.</string>
+    <string name="login_to_make_edits_visible">Создайте учётную запись OpenStreetMap или войдите в неё, чтобы опубликовать свои правки на карте для всего мира</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d из %2$d</string>
     <string name="download_over_mobile_header">Загрузить через сотовую связь?</string>
-    <string name="download_over_mobile_message">На некоторых тарифных планах или в роуминге это может привести к значительным расходам.</string>
+    <string name="download_over_mobile_message">На некоторых тарифных планах или в роуминге это может привести к значительным расходам</string>
     <string name="error_enter_correct_house_number">Введите корректный номер дома</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Количество этажей не должно превышать %d</string>
@@ -501,7 +501,7 @@
     <string name="editor_category_unsuitable_title">Нет подходящей категории?</string>
     <string name="editor_category_unsuitable_text">CoMaps позволяет добавлять на карту только простые типы объектов, то есть никаких городов, дорог, озер, контуров зданий. Пожалуйста, добавляйте такие категории на сайте <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Также рекомендуем ознакомиться с нашими <a href="https://www.comaps.app/support/advanced-map-editing/">подробными пошаговыми инструкциями и другими приложениями для редактирования карты</a>.</string>
     <string name="downloader_no_downloaded_maps_title">У вас нет загруженных карт</string>
-    <string name="downloader_no_downloaded_maps_message">Загрузите необходимые карты, чтобы находить места и пользоваться навигацией без интернета.</string>
+    <string name="downloader_no_downloaded_maps_message">Скачайте необходимые карты, чтобы находить места и пользоваться ведением без интернета</string>
     <string name="current_location_unknown_error_title">Текущее местоположение неизвестно</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">км/ч</string>
@@ -534,7 +534,7 @@
     <string name="editor_share_to_all_dialog_title">Отправить всем пользователям?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
     <string name="editor_share_to_all_dialog_message_1">Убедитесь, что вы не указали никаких личных данных</string>
-    <string name="editor_share_to_all_dialog_message_2">Редакторы OpenStreetMap проверят изменения и свяжутся с вами, если у них возникнут вопросы.</string>
+    <string name="editor_share_to_all_dialog_message_2">Редакторы OpenStreetMap проверят изменения и свяжутся с вами, если у них возникнут вопросы</string>
     <string name="navigation_stop_button">Cтоп</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Запись трека</string>
@@ -548,10 +548,10 @@
     <string name="mobile_data_option_not_today">Не использовать сегодня</string>
     <string name="mobile_data">Мобильный интернет</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Мобильный интернет требуется для уведомлений об обновлении карты и для отображения более подробной информации о местах и метках.</string>
+    <string name="mobile_data_description">Мобильный интернет требуется для уведомлений об обновлении карты и для отображения более подробной информации о местах и метках</string>
     <string name="mobile_data_option_never">Никогда не использовать</string>
     <string name="mobile_data_option_ask">Всегда спрашивать</string>
-    <string name="traffic_update_maps_text">Для отображения пробок необходимо обновить карты.</string>
+    <string name="traffic_update_maps_text">Для отображения пробок необходимо обновить карты</string>
     <string name="big_font">Увеличить шрифт на карте</string>
     <string name="traffic_update_app">Обновите CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -637,7 +637,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>

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

@@ -843,7 +843,7 @@
     <string name="app_site_url">https://comaps.app/tr/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="codeberg">Codeberg</string>
-    <string name="telegram_url">https://t.me/CoMapsApp/</string>
+    <string name="telegram_url">https://t.me/CoMaps_TR</string>
     <string name="pref_left_button_title">Sol alt tuş ataması</string>
     <string name="pref_left_button_disable">Devre dışı</string>
     <string name="error_enter_correct_fediverse_page">Gireceğiniz Mastodon kullanıcı adı ve adresi halihazırda mevcut olmalı</string>

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

@@ -225,7 +225,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">测试语音指令</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">如果您现在听不到声音，请检查音量或系统文本转语音设置</string>
+    <string name="pref_tts_playing_test_voice">如果您现在听不到声音，请检查音量或系统文字转语音设置</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">不可用</string>
     <string name="pref_map_auto_zoom">自动缩放</string>
@@ -891,4 +891,5 @@
     <string name="delete_track_dialog_title">是否删除%s？</string>
     <string name="hours_confirmed_time_ago">已于%s确认</string>
     <string name="share_track">分享轨迹</string>
+    <string name="pref_tts_no_system_tts_short">未找到文字转语音引擎，请检查应用设置</string>
 </resources>

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

@@ -3,6 +3,8 @@
   <declare-styleable name="SpeedLimitView">
     <attr name="speedLimitBackgroundColor" format="color" />
     <attr name="speedLimitBorderColor" format="color" />
+    <attr name="speedLimitUnlimitedBorderColor" format="color" />
+    <attr name="speedLimitUnlimitedStripeColor" format="color" />
     <attr name="speedLimitAlertColor" format="color" />
     <attr name="speedLimitTextColor" format="color" />
     <attr name="speedLimitTextAlertColor" format="color" />
@@ -11,6 +13,14 @@
     <attr name="speedLimitEditModeAlert" format="boolean" />
   </declare-styleable>
 
+  <declare-styleable name="CurrentSpeedView">
+    <attr name="currentSpeedBackgroundColor" format="color" />
+    <attr name="currentSpeedBorderColor" format="color" />
+    <attr name="currentSpeedTextColor" format="color" />
+    <!-- These values are used only in edit mode -->
+    <attr name="currentSpeedEditModeCurrentSpeed" format="integer" />
+  </declare-styleable>
+
   <declare-styleable name="LanesView">
     <attr name="lanesActiveLaneTintColor" format="reference" />
     <attr name="lanesInactiveLaneTintColor" format="color" />

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

@@ -941,4 +941,5 @@
     <!-- Title of the bottom sheet when sharing the track -->
     <string name="share_track">Share Track</string>
     <string name="delete_track_dialog_title">Delete %s?</string>
+    <string name="pref_tts_no_system_tts_short">No text-to-speech engine found, check the app settings</string>
 </resources>

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

@@ -10,6 +10,10 @@
     <item name="speedLimitBorderColor">@color/base_red</item>
   </style>
 
+  <style name="MwmWidget.CurrentSpeed">
+    <item name="speedLimitBorderColor">@color/black_primary</item>
+  </style>
+
   <style name="MwmWidget.FrameLayout"/>
 
   <style name="MwmWidget.Downloader"/>
@@ -386,4 +390,18 @@
   <style name="MwmWidget.SwitchPreferenceCompat" parent="Preference.SwitchPreferenceCompat.Material">
     <item name="android:widgetLayout">@layout/preference_switch</item>
   </style>
+
+  <style name="MwmWidget.M3.Button" parent="Widget.Material3.Button">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:textColor">?accentButtonTextColor</item>
+    <item name="backgroundTint">@null</item>
+    <item name="android:textAllCaps">false</item>
+    <item name="cornerRadius">20dp</item>
+    <item name="android:textSize">16sp</item>
+  </style>
+
+  <style name="MwmWidget.M3.Button.Primary" parent="@style/MwmWidget.M3.Button">
+    <item name="backgroundTint">?colorSecondary</item>
+  </style>
 </resources>

android/sdk/build.gradle

@@ -144,7 +144,7 @@ project.afterEvaluate {
 
   final taskName = gradle.startParameter.taskNames
 
-  if (['assemble', 'bundle', 'compile', 'install'].any{taskName.any{task->task.startsWith(it)}}) {
+  if (['assemble', 'bundle', 'compile', 'install', 'run'].any{taskName.any{task->task.startsWith(it)}}) {
     exec {
       workingDir '../..'
 

android/sdk/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java

@@ -220,7 +220,7 @@ public enum TtsPlayer
     }
   }
 
-  private static boolean isReady()
+  public static boolean isReady()
   {
     return (INSTANCE.mTts != null && !INSTANCE.mUnavailable && !INSTANCE.mInitializing);
   }

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

@@ -32,4 +32,12 @@
     <string name="maps_storage_internal">Interní soukromé úložiště</string>
     <string name="maps_storage_external">Externí sdílené úložiště</string>
     <string name="today">Dnes</string>
+    <string name="yesterday">Včera</string>
+    <string name="days_ago">před %s dny</string>
+    <string name="week_ago">před %s týdnem</string>
+    <string name="weeks_ago">před %s týdny</string>
+    <string name="month_ago">před %s měsícem</string>
+    <string name="months_ago">před %s měsíci</string>
+    <string name="year_ago">před %s rokem</string>
+    <string name="years_ago">před %s lety</string>
 </resources>

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

@@ -1195,7 +1195,7 @@
     <string name="type.barrier">Bariéra</string>
     <string name="type.barrier.yes">Bariéra</string>
     <string name="type.barrier.cycle_barrier">Cyklistická bariéra</string>
-    <string name="type.cuisine.bubble_tea">Bubble Tea</string>
+    <string name="type.cuisine.bubble_tea">Bublinkový čaj</string>
     <string name="type.emergency">Nouzová stanice</string>
     <string name="type.highway">Dálnice</string>
     <string name="type.highway.bridleway">Hipostezka</string>
@@ -1369,7 +1369,7 @@
     <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.amenity.love_hotel">Hodinový 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>

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

@@ -37,4 +37,12 @@
     <string name="not_shared">Privé</string>
     <string name="access_rules_author_only">Édition en ligne</string>
     <string name="today">Aujourd\'hui</string>
+    <string name="yesterday">Hier</string>
+    <string name="days_ago">Il y a %s jours</string>
+    <string name="week_ago">Il y a %s semaine</string>
+    <string name="weeks_ago">Il y a %s semaines</string>
+    <string name="month_ago">Il y a %s mois</string>
+    <string name="months_ago">Il y a %s mois</string>
+    <string name="year_ago">Il y a %s an</string>
+    <string name="years_ago">Il y a %s ans</string>
 </resources>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Saját helyzet</string>
+    <string name="core_my_position">Saját helyzetem</string>
     <!-- Default bookmark list name -->
     <string name="core_my_places">Saját helyek</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -36,4 +36,12 @@
     <string name="mb">MB</string>
     <string name="gb">GB</string>
     <string name="today">Ma</string>
+    <string name="yesterday">Tegnap</string>
+    <string name="days_ago">%s nappal ezelőtt</string>
+    <string name="week_ago">%s héttel ezelőtt</string>
+    <string name="weeks_ago">%s héttel ezelőtt</string>
+    <string name="months_ago">%s hónappal ezelőtt</string>
+    <string name="year_ago">%s évvel ezelőtt</string>
+    <string name="years_ago">%s évvel ezelőtt</string>
+    <string name="month_ago">%s hónappal ezelőtt</string>
 </resources>

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

@@ -31,4 +31,12 @@
     <string name="mb">MB</string>
     <string name="gb">GB</string>
     <string name="today">Oggi</string>
+    <string name="yesterday">Ieri</string>
+    <string name="week_ago">%s settimana fa</string>
+    <string name="weeks_ago">%s settimane fa</string>
+    <string name="month_ago">%s mese fa</string>
+    <string name="months_ago">%s mesi fa</string>
+    <string name="year_ago">%s anno fa</string>
+    <string name="years_ago">%s anni fa</string>
+    <string name="days_ago">%s giorni fa</string>
 </resources>

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

@@ -10,10 +10,10 @@
     <string name="type.aerialway.drag_lift">Ski-lift</string>
     <string name="type.aerialway.gondola">Cabinovia</string>
     <string name="type.aerialway.mixed_lift">Impianto misto</string>
-    <string name="type.aerialway.station">Stazione</string>
+    <string name="type.aerialway.station">Stazione aerea</string>
     <string name="type.aeroway">Infrastruttura aeroportuale</string>
     <string name="type.aeroway.aerodrome">Aeroporto</string>
-    <string name="type.aeroway.aerodrome.international">Aeroporto Internazionale</string>
+    <string name="type.aeroway.aerodrome.international">Aeroporto internazionale</string>
     <string name="type.aeroway.apron">Area di stazionamento per aeromobili</string>
     <string name="type.aeroway.gate">Cancello aeroportuale</string>
     <string name="type.aeroway.helipad">Piattaforma per elicotteri</string>
@@ -22,14 +22,14 @@
     <string name="type.aeroway.terminal">Terminal aeroportuale</string>
     <string name="type.amenity">Struttura</string>
     <string name="type.amenity.arts_centre">Centro artistico</string>
-    <string name="type.amenity.atm">Bancomat</string>
+    <string name="type.amenity.atm">Bancomat ATM</string>
     <string name="type.amenity.bank">Banca</string>
-    <string name="type.amenity.bar">Bar alcolico</string>
+    <string name="type.amenity.bar">Bar</string>
     <string name="type.amenity.bbq">Griglia per barbecue</string>
     <string name="type.amenity.bench">Panchina</string>
     <string name="type.amenity.bicycle_parking">Parcheggio biciclette</string>
     <string name="type.amenity.bicycle_rental">Noleggio biciclette</string>
-    <string name="type.amenity.bicycle_repair_station">Stazione di riparazione biciclette</string>
+    <string name="type.amenity.bicycle_repair_station">Centro di riparazione biciclette</string>
     <string name="type.amenity.biergarten">Biergarten</string>
     <string name="type.amenity.brothel">Bordello</string>
     <string name="type.amenity.bureau_de_change">Cambio valute</string>
@@ -51,7 +51,7 @@
     <string name="type.leisure.bowling_alley">Sala da bowling</string>
     <string name="type.amenity.clinic">Clinica</string>
     <string name="type.amenity.college">Collegio</string>
-    <string name="type.amenity.community_centre">Centro ricreativo</string>
+    <string name="type.amenity.community_centre">Centro comunitario</string>
     <string name="type.amenity.compressed_air">Aria compressa</string>
     <string name="type.amenity.conference_centre">Centro conferenze</string>
     <string name="type.amenity.courthouse">Tribunale</string>
@@ -70,7 +70,7 @@
     <string name="type.amenity.fire_station">Squadra antincendio</string>
     <string name="type.amenity.food_court">Area ristorazione</string>
     <string name="type.amenity.fountain">Fontana</string>
-    <string name="type.amenity.fuel">Stazione di rifornimento</string>
+    <string name="type.amenity.fuel">Distributore di carburante</string>
     <!-- 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.amenity.grave_yard">Cimitero</string>
     <!-- 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. -->
@@ -297,7 +297,7 @@
     <string name="type.cuisine.german">Cucina tedesca</string>
     <string name="type.cuisine.greek">Cucina greca</string>
     <string name="type.cuisine.grill">Cucina alla griglia</string>
-    <string name="type.cuisine.heuriger">Heuriger</string>
+    <string name="type.cuisine.heuriger">Vino Heuriger</string>
     <string name="type.cuisine.hotdog">Hot dog</string>
     <string name="type.cuisine.hungarian">Cucina ungherese</string>
     <string name="type.cuisine.ice_cream">Gelateria</string>
@@ -382,7 +382,7 @@
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.busway.bridge">Ponte</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.busway.tunnel">Tunnel</string>
+    <string name="type.highway.busway.tunnel">Galleria</string>
     <string name="type.highway.bus_stop">Fermata dell\'autobus</string>
     <string name="type.highway.construction">Strada in costruzione</string>
     <string name="type.highway.cycleway">Pista ciclabile</string>
@@ -1381,7 +1381,7 @@
     <string name="type.natural.wetland.swamp">Palude</string>
     <string name="type.natural.wetland.mangrove">Mangrovie</string>
     <string name="type.amenity.luggage_locker">Deposito Bagagli</string>
-    <string name="type.amenity.bicycle_parking.covered">Parcheggio Biciclette Coperto</string>
+    <string name="type.amenity.bicycle_parking.covered">Parcheggio biciclette coperto</string>
     <string name="type.post_office.post_partner">Partner Postale</string>
     <string name="type.natural.wetland.saltmarsh">Palude Salmastra</string>
     <string name="type.natural.wetland.saltmarsh.tidal">Palude Salmastra di Marea</string>
@@ -1391,4 +1391,6 @@
     <string name="type.leisure.escape_game">Escape Room</string>
     <string name="type.amenity.ranger_station">Stazione delle guardie forestali</string>
     <string name="type.landuse.religious">Terreno Religioso</string>
+    <string name="type.amenity.animal_shelter">Rifugio per Animali</string>
+    <string name="type.barrier.wicket_gate">Cancello pedonale</string>
 </resources>

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

@@ -36,4 +36,12 @@
     <string name="mb">MB</string>
     <string name="gb">GB</string>
     <string name="today">Hoje</string>
+    <string name="yesterday">Ontem</string>
+    <string name="days_ago">Há %s dias</string>
+    <string name="week_ago">Há %s semana</string>
+    <string name="weeks_ago">Há %s semanas</string>
+    <string name="month_ago">Há %s mês</string>
+    <string name="months_ago">Há %s meses</string>
+    <string name="year_ago">Há %s ano</string>
+    <string name="years_ago">Há %s anos</string>
 </resources>

android/sdk/src/main/res/values-pt-rBR/types_strings.xml

@@ -1381,5 +1381,5 @@
     <string name="type.post_office.post_partner">Parceiro postal</string>
     <string name="type.amenity.ranger_station">Posto de guardas florestais</string>
     <string name="type.barrier.wicket_gate">Postigo</string>
-    <string name="type.amenity.animal_shelter">Abrigo para animais</string>
+    <string name="type.amenity.animal_shelter">Abrigo de animais</string>
 </resources>

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

@@ -32,4 +32,12 @@
     <string name="maps_storage_shared">Armazenamento interno partilhado</string>
     <string name="maps_storage_removable">Cartão SD</string>
     <string name="today">Hoje</string>
+    <string name="yesterday">Ontem</string>
+    <string name="days_ago">à %s dias</string>
+    <string name="week_ago">à %s semana</string>
+    <string name="weeks_ago">à %s semanas</string>
+    <string name="month_ago">à %s mês</string>
+    <string name="months_ago">à %s meses</string>
+    <string name="year_ago">à %s ano</string>
+    <string name="years_ago">à %s anos</string>
 </resources>

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

@@ -37,4 +37,12 @@
     <string name="not_shared">Личный</string>
     <string name="access_rules_author_only">Редактируется онлайн</string>
     <string name="today">Сегодня</string>
+    <string name="yesterday">Вчера</string>
+    <string name="days_ago">%s дней тому назад</string>
+    <string name="weeks_ago">%s недель тому назад</string>
+    <string name="week_ago">%s неделю тому назад</string>
+    <string name="month_ago">%s месяц тому назад</string>
+    <string name="months_ago">%s месяцев тому назад</string>
+    <string name="year_ago">%s год тому назад</string>
+    <string name="years_ago">%s лет тому назад</string>
 </resources>

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

@@ -1167,7 +1167,7 @@
     <string name="type.shop.laundry">Прачечная</string>
     <string name="type.shop.mall">Торговый центр</string>
     <string name="type.shop.massage">Массажный салон</string>
-    <string name="type.shop.mobile_phone">Мобильные телефоны</string>
+    <string name="type.shop.mobile_phone">Магазин мобильных телефонов</string>
     <string name="type.shop.money_lender">Ростовщик</string>
     <string name="type.shop.motorcycle">Магазин мотоциклов</string>
     <string name="type.shop.motorcycle_repair">Ремонт мотоциклов</string>
@@ -1390,4 +1390,8 @@
     <string name="type.landuse.religious">Церковный двор</string>
     <string name="type.railway.station.subway.qingdao">Станция метро</string>
     <string name="type.amenity.ranger_station">Пост лесников</string>
+    <string name="type.amenity.luggage_locker">Камера хранения</string>
+    <string name="type.amenity.bicycle_parking.covered">Крытая велосипедная парковка</string>
+    <string name="type.post_office.post_partner">Почтовое отделение</string>
+    <string name="type.leisure.escape_game">Квест-комната</string>
 </resources>

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

@@ -35,4 +35,12 @@
     <string name="mb">МБ</string>
     <string name="core_placepage_unknown_place">Тачка на мапи</string>
     <string name="today">Данас</string>
+    <string name="yesterday">Јуче</string>
+    <string name="days_ago">Пре %s дана</string>
+    <string name="week_ago">Пре %s недеља</string>
+    <string name="month_ago">Пре %s месец</string>
+    <string name="months_ago">Пре %s месеци</string>
+    <string name="weeks_ago">Пре %s недеља</string>
+    <string name="year_ago">Пре %s године</string>
+    <string name="years_ago">Пре %s година</string>
 </resources>

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

@@ -68,6 +68,9 @@
     <string name="type.amenity.music_school">Music School</string>
     <string name="type.amenity.language_school">Language School</string>
     <string name="type.office.diplomatic">Embassy</string>
+    <string name="type.office.security">Security Guards Office</string>
+    <string name="type.building.guardhouse">Security Booth</string>
+    <string name="type.power.portal">Power Portal</string>
     <string name="type.amenity.fast_food">Fast Food</string>
     <string name="type.amenity.ferry_terminal">Ferry</string>
     <string name="type.amenity.fire_station">Fire Station</string>

configure.sh

@@ -5,9 +5,9 @@
 
 echo "Configuring the repository for development..."
 
-SKIP_MAP_DOWNLOAD=$SKIP_MAP_DOWNLOAD
-SKIP_GENERATE_SYMBOLS=$SKIP_GENERATE_SYMBOLS
-SKIP_GENERATE_DRULES=$SKIP_GENERATE_DRULES
+SKIP_MAP_DOWNLOAD="${SKIP_MAP_DOWNLOAD:-}"
+SKIP_GENERATE_SYMBOLS="${SKIP_GENERATE_SYMBOLS:-}"
+SKIP_GENERATE_DRULES="${SKIP_GENERATE_DRULES:-}"
 
 DRULES_NOT_GENERATED=
 SYMBOLS_NOT_GENERATED=
@@ -68,10 +68,10 @@ Diff() {
   fi
 }
 
-if [ ! -d 3party/boost/tools ]; then
-  echo "Cloning all submodules..."
-  git submodule update --init --recursive --depth 1
-fi
+
+echo "Checking submodules..."
+git submodule update --init --recursive --depth 1
+
 if [ ! -d 3party/boost/boost ]; then
   echo "Bootstrapping the boost C++ library..."
   pushd 3party/boost/

data/categories.txt

@@ -1074,7 +1074,7 @@ ja:ガスステーション|ガス|燃料|軽油|給油
 lv:3DUS
 mr:पेट्रोल|इंधन|डिझेल|पेट्रोल पंप|पंप
 nb:3Bensinstasjon
-pl:3Stacja paliw
+pl:3Stacja paliw|Stacja benzynowa
 pt:3Posto de combustível|3Bomba de combustível|3gasolina|3gasóleo
 pt-BR:3Posto de combustível|3gasolina
 ro:3Benzinărie
@@ -1444,7 +1444,7 @@ ko:휴대폰 대리점|핸드폰|전자제품 상점|전자제품
 lv:Mobilie tālruņi|Telefoni|Viedtālruņi|Elektronikas veikali
 mr:मोबाईल|मोबाईलचे दुकान|स्मार्टफोन|इलेट्रॉनिक
 nb:4Mobiltelefonbutikk|elektronikkbutikk
-pl:Sklep z elektroniką|sklep elektroniczny
+pl:Sklep z telefonami komórkowymi|smartfony|telefony komórkowe
 pt:Loja de telemóveis|Telemóveis|loja de aparelhos eletrónicos
 pt-BR:Loja de celulares|celulares|telefone
 ro:Magazin de telefoane mobile|magazin de electronice
@@ -1485,7 +1485,7 @@ ko:꽃|꽃집|꽃가게|플로리스트
 lv:Florists|floristika|U+1F337|U+1F338|U+1F339|U+1F33A|U+1F33B|U+1F33C|U+1F490|U+1F33E|ziedi|dāvanas
 mr:फुलवला|पुष्पविक्रेता|फुलवाला
 nb:Blomsterhandler
-pl:Kwiaciarnia|towary
+pl:Kwiaciarnia|kwiaty|wiązanki|towary
 pt:4Florista
 pt-BR:4Florista|Floricultura|flores
 ro:4Florărie
@@ -1687,7 +1687,7 @@ lv:Grāmatnīca|3grāmatas|U+1F4D6|U+1F4DA|U+1F4D9|U+1F4D8|U+1F4D7|U+1F4D5
 mr:ग्रंथ विक्रेता|पुस्तक विक्रेता|पुस्तकाचे दुकान
 nb:Bokhandel
 nl:Boeken|Boekenwinkel|boekwinkel|boekhandel
-pl:Księgarnia|towary
+pl:Księgarnia|książki|towary
 pt:4Livraria
 pt-BR:4Livraria
 ro:4Librărie
@@ -2012,7 +2012,7 @@ ko:미용실|미용원|미장실|미장원|헤어샵|헤어살롱
 lv:Skaistumkopšanas salons|frizētava|U+1F484
 mr:शृंगार|मेकअप|सौन्दर्य|ब्युटी|सौंदर्य प्रसाधनगृह
 nb:Skjønnhetssalong
-pl:Salon piękności
+pl:Salon piękności|paznokcie|Salon kosmetyczny
 pt:Salão de beleza|cabeleireiro|cabeleireira|brabeiro
 pt-BR:Salão de beleza
 ro:Salon de înfrumusețare
@@ -2175,7 +2175,7 @@ lv:Tirdzniecības centrs
 mr:मॉल
 nb:Kjøpesenter
 nl:Winkelcentrum
-pl:Centrum handlowe
+pl:Centrum handlowe|Galeria handlowa
 pt:Centro comercia|3Shopping
 pt-BR:Shopping center
 ro:Mall
@@ -2499,7 +2499,7 @@ lv:Valūtas maiņa
 mr:पैसे हस्तांतरण
 nb:Pengeoverføring
 nl:Overschrijving
-pl:Transfer pieniędzy
+pl:Transfer pieniędzy|przelewy
 pt:Transferência de dinheiro
 pt-BR:Transferência de dinheiro
 ro:Transfer de bani
@@ -2566,6 +2566,7 @@ et:Haagiselamute müük
 fr:Concessionnaire de caravanes et camping-cars
 hi:4कैंपर डीलर
 lv:5kemperu veikals|5treileru veikals
+pl:Sklep z kamperami|przyczepy kempingowe
 ru:Автодом|Продажа автодомов
 tr:Karavan galerisi|Karavan Bayiliği
 uk:Продаж автобудинків
@@ -2792,7 +2793,7 @@ ko:버스 터미널|버스 정류장|버스
 lv:Autoosta|autobusi|autobuss|U+1F68C|U+1F68F|U+1F68D
 mr:बस स्थानक
 nb:3Busstasjon
-pl:2Stacja autobusowa|Zajezdnia
+pl:2Stacja autobusowa|3Dworzec autobusowy|Zajezdnia
 pt:2Estação rodoviária|2autocarros|2rodoviária
 pt-BR:2Rodoviária|estação BRT
 ro:3Gara de autobuz
@@ -2832,7 +2833,7 @@ ko:1기차역|철도역
 lv:Vilcienu stacija|stacija|vilcieni|U+1F684|U+1F685|U+1F689|U+1F682|U+1F686|U+1F688|U+1F68A|U+1F68B
 mr:रेल्वे स्थानक|रेल्वे स्टेशन
 nb:Togstasjon
-pl:Dworzec kolejowy|stacja kolejowa|pociąg|kolej
+pl:3Dworzec kolejowy|3stacja kolejowa|pociąg|kolej
 pt:Estação de comboios|2caminhos-de-ferro|2Comboios|2Apeadeiro
 pt-BR:Estação de trem|ferrovia|Ponto de parada
 ro:Feroviar|Gară
@@ -2953,7 +2954,7 @@ ko:페리|페리 터미널
 lv:Prāmis|terminālis|U+1F6A2|U+1F6A4|U+2693
 mr:तर|तरी|नाव|बोट|फेरी
 nb:3Ferje|terminal
-pl:2Prom
+pl:2Prom|8Terminal promowy
 pt:2Terminal de ferry|2Balsa|2Ferry
 pt-BR:2Estação de barcas|balsa
 ro:3Feribot|terminal
@@ -4551,7 +4552,7 @@ lv:Kuģis|laiva
 mr:जहाज
 nb:Skip|båt
 nl:Schip|boot
-pl:Łódź|okręt
+pl:Łódź|okręt|statek
 pt:2Barco|2Navio
 ro:Navă
 ru:Корабль|судно|лодка
@@ -4871,6 +4872,7 @@ ja:ドッグラン
 
 leisure-dance|@category_entertainment
 en:4Dance|Dancing school
+pl:Taniec|Szkoła tańca
 
 leisure-garden
 en:3Garden
@@ -4913,6 +4915,7 @@ fa:باغ تفریحی|گردشگری
 
 leisure-firepit
 en:5Firepit
+pl:Palenisko|miejsce na ognisko
 
 amenity-bench
 en:Bench
@@ -5012,6 +5015,7 @@ ja:自転車修理
 ko:자전거 수리
 lv:Veloremonta stacija|Veloremonta punkts|divriteņu remonts|velosipēdu remonts|veloremonts
 nl:4Fiets reparatie
+pl:Stacja naprawy rowerów
 pt:Conserto de bicicleta|4bicicleta
 pt-BR:Oficina de bicicletas|4bicicleta
 ru:4Велоремонт|велосипед|ремонт|ремонт велосипедов
@@ -5926,7 +5930,7 @@ lv:Medicīniskā laboratorija|laboratorija
 mr:वैद्यकीय प्रयोगशाळा
 nb:Medisinsk laboratorium
 nl:Medisch laboratorium
-pl:Laboratorium Medyczne
+pl:Laboratorium medyczne
 pt:Laboratório médico
 pt-BR:Laboratório médico
 ro:Laborator medical
@@ -6235,6 +6239,7 @@ en:Sample collection
 be:Аналізы
 de:Probenahme
 hi:नमूना संग्रह केंद्र
+pl:Punkt pobrań krwi
 ru:Анализы
 uk:Аналізи
 
@@ -6846,7 +6851,7 @@ ko:낡은 옷|낡은 옷 재활|낡은 옷 재활용
 lv:Tekstila konteiners|apģērba pārstrāde|drēbju pārsrāde|apģērba nodošana|drēbju nodošana|apģērba ziedošana
 mr:कपडे भंगारवाला|कपडे
 nb:Gamle klær|Levere gamle klær
-pl:Stare ubrania|Przekaz niepotrzebne rzeczy
+pl:Stare ubrania|Przekaż niepotrzebne rzeczy
 pt:Reciclagem de roupas|Roupas velhas
 pt-BR:Roupas velhas|Reciclar roupas velhas
 ro:Haine vechi|Înmânarea lucrurilor inutile
@@ -7146,7 +7151,7 @@ sr:Рециклажа обуће|Reciklaža obuće
 recycling-green_waste|@category_recycling
 en:4Recycling of Green Waste|5Organic Waste Recycling|5Green Waste Recycling|Food Waste|Garden Waste
 be:5Прыём арганічных адходаў|Прыём харчовых адходаў|5Здаць арганічныя адходы|4Збор арганічных адходаў|Збор харчовых адходаў|5Харчовыя адходы|6Садовыя адходы
-fr:Déchets verts
+fr:4Déchets verts|biodéchets|alimentaires|organiques|valorisation
 ru:5Приём органических отходов|Приём пищевых отходов|5Сдать органические отходы|4Сбор органических отходов|Сбор пищевых отходов|5Пищевые отходы|6Садовые отходы
 lv:Bioloģiskie atkritumi|bioloģisko atkritumu nodošana
 tr:5Yeşil Atıkların Geri Dönüşümü
@@ -7171,6 +7176,7 @@ fr:Station de vidange|4Vidange
 es:Estación de vaciado para caravanas
 it:4Camper service
 lv:Mobilo māju apkalpošana|kemperu apkalpošana
+pl:Opróżnianie toalet kamperów|Punkt odbioru ścieków|ścieki kamperów
 ru:4Слив нечистот|слив туалета|слив для туалета|нечистоты|канализация
 tr:6Karavan Çöplüğü|Karavanlar için çöplük
 uk:4Злив нечистот|слив туалету|слив для туалету|нечистоти|каналізація
@@ -8253,6 +8259,7 @@ en:Lift|Elevator
 fr:Ascenseur
 hi:उत्थापक
 lv:lifts
+pl:winda
 ru:Лифт
 sr:Лифт|Lift
 tr:Asansör
@@ -8309,6 +8316,7 @@ et:Sadul
 fr:Col
 it:4Sella
 lv:Pāreja|Kalnu pāreja
+pl:Przełęcz|Punkt siodłowy
 ru:4Седловина|5Перевал
 sr:Седло|Sedlo
 tr:Sırt|geçit|Dağ Eyeri
@@ -8683,7 +8691,7 @@ ja:1美容師|床屋|髪|パーマ|散髪|理髪|美容院/理容店
 ko:이발사|미용실|이발소|바버샵
 lv:Frizētava|U+2702|U+1F488|
 nb:Frisør
-pl:4Fryzjer
+pl:4Fryzjer|barber|włosy
 pt:Cabeleireiro|Cabeleireira|barbeiro
 pt-BR:Cabeleireiro|barbeiro
 ro:Coafor
@@ -10067,7 +10075,7 @@ lv:Volejbols
 mr:व्हॉलीबॉल
 nb:Volleyball
 nl:Volleyball
-pl:Piłka siatkowa
+pl:Piłka siatkowa|Siatkówka
 pt:Voleibol
 ro:Volei
 ru:Волейбол
@@ -10428,7 +10436,7 @@ ja:1水飲み場|飲料水|飲水
 ko:음수대|식수|분수식 물마시는 곳
 lv:4Dzeramais ūdens|U+1F6B0
 nb:4Drikkevann
-pl:4Picie wody|woda pitna
+pl:4Picie wody|woda pitna|poidełko
 pt:2Água potável|4bebedouro|bebedoiro
 pt-BR:2Água potável|4bebedouro
 ro:Apă de băut|apă potabilă
@@ -10639,7 +10647,7 @@ ko:수도꼭지|수마개
 lv:Ūdens krāns
 nb:Vannkran
 nl:Waterkraan
-pl:Dotknięcie wody
+pl:Kran
 pt:Torneira de água
 pt-BR:Torneira de água
 ro:Robinet cu apă
@@ -12996,6 +13004,7 @@ mr:पशुवैद्यकीय डॉक्टर|प्राण्या
 
 amenity-animal_shelter
 en:Animal Shelter
+pl:Schronisko dla zwierząt
 ru:Приют для животных
 
 @charging_station
@@ -13018,7 +13027,7 @@ ja:充電ステーション|充電
 ko:충전 역|전기 자동차 충전소|전기차 충전소
 lv:4Uzlādes stacija|uzlāde
 nb:Ladestasjon|lading
-pl:Stacja ładowania|ładowanie
+pl:3Stacja ładowania|ładowanie
 pt:Posto de carregamento elétrico|Estação de carregamento elétrico|Ponto de carregamento elétrico|4carregamento elétrico
 pt-BR:Eletroposto|recarga|abastecimento
 ro:Stație încărcare|încărcare
@@ -13781,6 +13790,7 @@ fr:Distributeur de café|Café
 hi:4कॉफ़ी वितरक
 it:Distributore automatico di caffè|Caffè
 lv:4Kafijas automāts|kafija
+pl:Automat z kawą|kawa
 ru:3Кофейный автомат|кофе|кофемат
 sr:Аутомат за кафу|Automat za kafu
 tr:4Kahve Dispenseri|Kahve Makinesi
@@ -13799,6 +13809,7 @@ hi:4कंडोम वितरक मशीन
 it:Distributore di profilattici|Preservativi
 lv:4Prezervatīvu automāts|prezervatīvi
 sr:Аутомат за кондоме|Automat za kondome
+pl:Automat z prezerwatywami|prezerwatywy|kondomy
 ru:Автомат с презервативами|5презервативы|5кондомат
 tr:5Prezervatif Dispenseri|Kondom dispenseri
 uk:Автомат з презервативами|5презервативи|5кондомат
@@ -13855,6 +13866,7 @@ fr:Distributeur d'aliments|Aliments
 hi:4खाद्य वितरक
 it:Distributore automatico di alimenti|Macchinetta automatica|Snack
 lv:4Pārtikas automāts|4ēdiena automāts|uzkodas
+pl:Automat z przekąskami|jedzenie|przekąski
 ru:Автомат с едой|5перекус|4снэки
 sr:Аутомат за храну|Automat za hranu
 tr:Otomat|Yiyecek dispenseri|atıştırmalık
@@ -13886,7 +13898,7 @@ ko:주차티켓판매기|주차 티켓
 lv:Autostāvvietas apmaksa
 nb:4Parkeringsautomat
 nl:4Parkeerautomaat|Betaalautomaat parkeergarage
-pl:4Parkometr|Parkomat
+pl:4Parkometr|Parkomat|Bilety parkingowe
 pt:Máquina de pagamento de estacionamento|Máquina de bilhetes de estacionamento|bilhete de estacionamento|talão de estacionamento|Parcómetro|Parquíntemo
 pt-BR:Máquina venda de tíquetes de estacionamento
 ro:4Parcomat
@@ -13925,7 +13937,7 @@ ko:대중교통표 자동판매기
 lv:Biļešu automāts|biļetes
 nb:Billettmaskin for offentlig transport
 nl:Kaartjesautomaat voor openbaar vervoer
-pl:Automat biletowy do transportu publicznego
+pl:Automat biletowy do transportu publicznego|Biletomat
 pt:Máquina venda de bilhetes de transporte público
 pt-BR:Máquinas automáticas de venda de passagens de transporte público
 ro:Automat de vânzare a biletelor pentru transportul public
@@ -13953,6 +13965,7 @@ fr:Distributeur de journaux|Journaux
 hi:4समाचार पत्र वितरक
 it:Distributore automatico di giornali|Riviste
 lv:4Avīžu automāts|avīzes|4prese
+pl:Automat z gazetami|prasa
 ru:Газетный автомат|газетомат|3газеты|4пресса
 tr:4Gazete dispenseri|Gazetelik
 uk:Газетний автомат|газетомат|3газети|4преса
@@ -13970,6 +13983,7 @@ fr:Distributeur de bonbons|Bonbons
 hi:4मिठाई वितरक
 it:Distributore di dolci|Caramelle
 lv:4Saldumu automāts|saldumi
+pl:Automat ze słodyczami
 ru:Автомат со сладостями|4сладости|4конфеты
 tr:Tatlı dispenseri|şekerler
 uk:Автомат із солодощами|4солодощі|4цукерки
@@ -13983,6 +13997,7 @@ et:4Koeraväljaheidete kottide automaat|Loomade väljaheited
 fr:5Distributeur de sacs à excréments
 hi:4मलमूत्र थैली वितरक
 lv:Suņu izkārnījumu maisiņu automāts|maisiņi suņu izkārnījumiem|suņu higiēnas maisiņi
+pl:Automat z workami na odchody|ekskrementy|psie odchody
 ru:5Пакеты для экскрементов|Какашки|Пакеты для какашек
 tr:5Dışkı torbası dispenseri
 uk:5Мішки для екскрементів|Какашки|5Пакети для какашок
@@ -13997,6 +14012,7 @@ et:4Pakiautomaat
 fr:Consigne automatique pour colis|3locker
 hi:4पार्सल भंड़ार
 lv:4Pakomāts|paku skapis
+pl:Paczkomat|Automat paczkowy
 ru:3Почтомат|Постамат|5Получение посылок
 sr:Пакетомат|Paketomat
 tr:4kilitli dolap|4kitli dolap|kasa
@@ -14190,6 +14206,7 @@ mr:कारखाना चिमणी
 
 man_made-crane
 en:Crane
+pl:Żuraw
 ru:Кран
 
 man_made-tower|man_made-flare
@@ -14331,7 +14348,7 @@ ko:중고 판매점
 lv:Lietotu preču veikals|lietotas mantas
 nb:Bruktbutikk
 nl:Tweedehandswinkel
-pl:Sklep z używaną ręką
+pl:Sklep z używaną odzieżą
 pt:Loja de segunda mão
 pt-BR:Loja de segunda mão
 ro:Magazin second-hand
@@ -15384,7 +15401,7 @@ ko:운전학원|자동차 운전학원
 lv:4Autoskola
 nb:Kjøreskole
 nl:Rijschool
-pl:Szkoła jazdy
+pl:Szkoła jazdy|Nauka jazdy
 pt:Escola de condução
 pt-BR:4Autoescola|CFC
 ru:4Автошкола|курсы вождения
@@ -15506,7 +15523,7 @@ ko:아이스크림 스탠드|아이스크림 가판대
 lv:Saldējums
 nb:4Iskrem
 nl:4Ijskraam|Ijsstand
-pl:Stoisko z lodami|lody
+pl:Lodziarnia|Stoisko z lodami|lody
 pt:4Gelados|gelataria|geladaria|3banca de gelados
 pt-BR:Sorveteria
 ro:Chioșc cu înghețată
@@ -15830,7 +15847,7 @@ lv:Pulcēšanās punkts
 mr:आपत्कालीन विधानसभा पॉइंट
 nb:Nødsamlingssted
 nl:Verzamelpunt voor noodgevallen
-pl:Punkt Zgromadzeń Awaryjnych
+pl:Punkt zborny|Miejsce zbiórki do ewakuacji
 pt:Ponto de Reunião de Emergência
 ro:Punct de adunare de urgență
 ru:Пункт аварийного сбора
@@ -15993,7 +16010,7 @@ lv:4Ārkārtas kalnu glābšana
 mr:आपत्कालीन पर्वतीय बचाव
 nb:4Nød-fjellredning
 nl:4Nood-bergredding
-pl:4Ratownictwo górskie awaryjne
+pl:4Ratownictwo górskie
 pt:Resgate de montanha de emergência
 pt-BR:4Resgate de montanha de emergência
 ro:4Salvare montană de urgență
@@ -16032,7 +16049,7 @@ ko:피트니스 스테이션
 lv:Vingrošanas iekārtas|fitnesa stacija
 nb:Treningsstasjon
 nl:3Fitness-Station
-pl:Stacja fitness|Przyrządy do ćwiczeń
+pl:6Stacja fitness|Przyrządy do ćwiczeń
 pt:Estação de fitness|Máquina de exercícios pública
 pt-BR:Estação de fitness
 ro:Sală de fitness
@@ -17020,7 +17037,7 @@ it:Negozio di caffè
 ja:コーヒー屋
 lv:Kafijas veikals|kafija
 nl:Koffiewinkel
-pl:Sklep z kawą
+pl:Sklep z kawą|kawa
 pt:Loja de café
 pt-BR:Loja de café
 ru:Кофе
@@ -17036,6 +17053,7 @@ hi:3कपड़े की दुकान
 it:Merceria
 lv:Auduma veikals|tekstilu veikals
 nl:Stoffenwinkel
+pl:Tkaniny
 pt:Loja de tecidos
 pt-BR:Loja de aviamentos
 ru:Текстиль|Ткани
@@ -17050,7 +17068,7 @@ de:4Geldverleiher
 et:Rahalaenutus
 hi:4हवलदार|4साहूकार
 lv:Naudas aizdevējs
-pl:ożyczkodawca
+pl:Pożyczkodawca
 pt:Prestamista
 pt-BR:Prestamista
 ru:Ростовщик
@@ -17070,7 +17088,7 @@ ja:CDショップ
 lv:mūzikas veikals
 nb:Platebutikk|vinyl
 nl:Muziekwinkel
-pl:Sklep muzyczny
+pl:Sklep muzyczny|winyle
 pt:Loja de música
 pt-BR:Loja de música
 ru:Музыка
@@ -17267,7 +17285,7 @@ ko:가방 판매점
 lv:Somas
 nb:Veskerbutikk
 nl:Tassenwinkel
-pl:Sklep z torbami
+pl:Sklep z torbami|torebki
 pt:Loja de bolsas
 pt-BR:Loja de bolsas
 ro:Magazin de genti
@@ -17640,7 +17658,7 @@ ko:그림 물감
 lv:Krāsas
 nb:Maling
 nl:Verfwinkel
-pl:Malatura
+pl:Malatura|farby
 pt:Tintas
 pt-BR:Tintas
 ro:Vopsele
@@ -17959,6 +17977,7 @@ ja:トラック
 lv:Skrejceļš|Skriešanas celiņš
 mr:ट्रॅक
 nl:Parcours
+pl:Tor wyścigowy|bieżnia
 pt:Pista para desportos não motorizados
 pt-BR:Pista para esportes não motorizados
 ru:Беговая дорожка
@@ -18629,7 +18648,7 @@ ko:애완동물 미용
 mr:पाळीव प्राणी ग्रूमिंग
 nb:Kjæledyrpleie
 nl:Huisdierverzorging
-pl:Pielęgnacja zwierząt
+pl:Pielęgnacja zwierząt|Groomer
 pt:Salão de banhos e tosquia
 pt-BR:Banho e tosa
 ro:Îngrijirea animalelor de companie
@@ -19055,3 +19074,13 @@ uk:5Камера схову|4багаж
 vi:Tủ khóa hành lý
 zh-Hans:行李寄存柜
 zh-Hant:行李寄存櫃
+
+office-security
+en:4Security Office
+pl:Biuro ochrony|ochrona
+ru:ЧОП|4Охрана
+
+building-guardhouse
+en:4Guard
+pl:Budka ochrony|Wartownia|ochrona
+ru:4Сторож|4Охрана

data/categories_cuisines.txt

@@ -502,7 +502,7 @@ ja:アイスクリーム
 ko:아이스크림
 nb:Iskrem
 nl:Ijs
-pl:Lodziarnia
+pl:Lody
 pt:Gelados
 pt-BR:Sorvete
 ro:Înghețată
@@ -612,7 +612,7 @@ ja:ホットケーキ|クレープ
 ko:팬케이크|크레이프
 nb:Pannekake|Crepe
 nl:Pannenkoek
-pl:Naleśnik|Naleśnikarnia
+pl:Naleśniki|Naleśnikarnia
 pt:Panqueca|panquecas|crepes|crepe
 pt-BR:Panqueca|panquecas|crepes|crepe
 ro:Clătită|Crep
@@ -681,7 +681,7 @@ it:Pizza
 ja:ピザ
 ko:피자
 nb:Pizza
-pl:Pizzeria
+pl:Pizza|pizzeria
 pt:Pizza|piza|pizaria
 pt-BR:Pizza|pizzaria|pizaria
 ro:Pizza
@@ -716,7 +716,7 @@ it:Ramen
 ja:ラーメン
 ko:라면
 nb:Ramen
-pl:Zupa ramen
+pl:Ramen
 pt:Lámen|rāmen
 pt-BR:Lámen|rāmen
 ro:Ramen
@@ -788,7 +788,7 @@ it:Salsicce
 ja:ソーセージ
 ko:소시지
 nb:Pølse
-pl:Kiełbasiarnia
+pl:Kiełbasa|Kiełbasiarnia
 pt:Salsicha|salsichas
 pt-BR:Linguiça
 ro:Cârnat
@@ -1004,7 +1004,7 @@ it:Tè
 ja:紅茶
 ko:차
 nb:Te
-pl:Herbaciarnia
+pl:Herbata|Herbaciarnia
 pt:Chá
 pt-BR:Chá
 ro:Ceai
@@ -1419,7 +1419,7 @@ sr:Веганска|Вегетаријанска|Вегетаријанци|Ве
 # ja:牛丼|ビーフボウル
 # ko:쇠고기 덮밥
 # nb:Biffbolle
-# pl:Gyūdon
+# pl:Gyūdon|Gyudon
 # pt:Tigela com carne bovina|Gyudon
 # pt-BR:Tigela com carne bovina|Gyudon
 # ro:Ciorbă de văcuță
@@ -1487,7 +1487,7 @@ sr:Веганска|Вегетаријанска|Вегетаријанци|Ве
 # ja:ブッシェンシャンク
 # ko:와인 레스토랑
 # nb:Buschenschank
-# pl:Winiarnia
+# pl:Buschenschank|Heuriger
 # pt:Buschenschank|Heuriger
 # pt-BR:Buschenschank|Heuriger
 # ro:Tavernă

data/countries-strings/hu.json/localize.json

@@ -971,7 +971,7 @@
 "Switzerland":"Svájc",
 "Switzerland_Central":"Közép-Svájc",
 "Switzerland_Eastern":"Kelet-Svájc",
-"Switzerland_Espace Mittelland":"Espace Mittelland",
+"Switzerland_Espace Mittelland":"Középfennsík térsége",
 "Switzerland_Lake Geneva region":"Genfi tó régió",
 "Switzerland_Northwestern":"Észak-nyugat",
 "Switzerland_Ticino":"Ticino kanton",
@@ -1281,8 +1281,8 @@
 "Sudan_East":"Szudán — Kelet",
 "Sudan_West":"Szudán — Nyugat",
 "Sweden_Stockholm":"Stockholm",
-"Switzerland_Espace Mittelland_Bern":"Espace Mittelland — Bern",
-"Switzerland_Espace Mittelland_East":"Espace Mittelland — Kelet",
+"Switzerland_Espace Mittelland_Bern":"Középfennsík térsége — Bern",
+"Switzerland_Espace Mittelland_East":"Középfennsík térsége — Kelet",
 "Taiwan_North":"Kínai Köztársaság — Észak",
 "Taiwan_South":"Kínai Köztársaság — Dél",
 "Thailand_Central":"Thaiföld — Középpont",
@@ -1356,7 +1356,7 @@
 "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell",
 "Argentina_Buenos Aires_South Description":"Bahía Blanca, Miramar, Tandil",
 "Argentina_Cuyo Description":"San Juan, San Rafael, San Luis",
-"Argentina_Mesopotamia Description":"Federación, Paraná, Alvear",
+"Argentina_Mesopotamia Description":"Paraná, Alvear föderáció",
 "Argentina_Northwest Description":"San Miguel de Tucumán, San Fernando del Valle de Catamarca, San Salvador de Jujuy",
 "Argentina_Pampas Description":"Córdoba, Santa Rosa, Río Cuarto",
 "Argentina_Patagonia Description":"Cutral Co, Viedma, Comodoro Rivadavia",
@@ -1393,7 +1393,7 @@
 "Belarus_Maglieu Region Description":"Mahilyow, Babruysk, Čerykaŭ",
 "Belarus_Minsk Region Description":"Minszk, Szalihorszk",
 "Belarus_Vitebsk Region Description":"Orsa",
-"Belgium_Antwerp Description":"Antwerp, Zwijndrecht, Berchem",
+"Belgium_Antwerp Description":"Antwerpen, Zwijndrecht, Berchem",
 "Belgium_East Flanders Description":"Ghent, Deinze, Sint-Martens-Latem",
 "Belgium_Flemish Brabant Description":"Brüsszel",
 "Belgium_Hainaut Description":"Charleroi",
@@ -2549,5 +2549,5 @@
 "Spain_Castile and Leon_West Short":"Kasztília és León",
 "Spain_Galicia_North Short":"Galicia",
 "Spain_Galicia_South Short":"Galicia",
-"Switzerland_Espace Mittelland_East Short":"Espace Mittelland"
+"Switzerland_Espace Mittelland_East Short":"Középfennsík térsége"
 }

data/countries-strings/it.json/localize.json

@@ -12,11 +12,11 @@
 "Antarctica":"Antartide",
 "Antigua and Barbuda":"Antigua e Barbuda",
 "Argentina":"Argentina",
-"Argentina_Buenos Aires_North":"provincia di Buenos Aires — Nord",
-"Argentina_Buenos Aires_South":"provincia di Buenos Aires — Sud",
+"Argentina_Buenos Aires_North":"Provincia di Buenos Aires — Nord",
+"Argentina_Buenos Aires_South":"Provincia di Buenos Aires — Sud",
 "Argentina_Cuyo":"Cuyo (Argentina)",
 "Argentina_Mesopotamia":"Mesopotamia",
-"Argentina_Northwest":"Ande del nordovest",
+"Argentina_Northwest":"Argentina Nord-Ovest",
 "Argentina_Pampas":"Pampa",
 "Argentina_Patagonia":"Patagonia",
 "Arizona":"Arizona",
@@ -26,16 +26,16 @@
 "Australia_New South Wales":"Nuovo Galles del Sud",
 "Australia_Northern Territory":"Territorio del Nord",
 "Australia_Queensland":"Queensland",
-"Australia_South Australia":"Australia Meridionale",
+"Australia_South Australia":"Australia del Sud",
 "Australia_Tasmania":"Tasmania",
 "Australia_Victoria":"Victoria",
-"Australia_Western Australia":"Australia Occidentale",
+"Australia_Western Australia":"Australia Ovest",
 "Austria":"Austria",
 "Austria_Burgenland":"Burgenland",
 "Austria_Carinthia":"Carinzia",
 "Austria_Lower Austria_West":"Bassa Austria — Ovest",
 "Austria_Lower Austria_Wien":"Vienna e Bassa Austria — Est",
-"Austria_Salzburg":"Salisburghese",
+"Austria_Salzburg":"Salisburgo",
 "Austria_Styria":"Stiria",
 "Austria_Tyrol":"Tirolo",
 "Austria_Upper Austria":"Alta Austria",
@@ -51,25 +51,25 @@
 "Belarus_Hrodna Region":"Regione di Hrodna",
 "Belarus_Maglieu Region":"Regione di Mahilëŭ",
 "Belarus_Minsk Region":"Regione di Minsk",
-"Belarus_Vitebsk Region":"Regione di Vicebsk",
+"Belarus_Vitebsk Region":"Regione di Vitebsk",
 "Belgium":"Belgio",
-"Belgium_Antwerp":"provincia d'Anversa",
-"Belgium_East Flanders":"provincia delle Fiandre Orientali",
-"Belgium_Flemish Brabant":"provincia del Brabante Fiammingo",
-"Belgium_Hainaut":"provincia dell'Hainaut",
-"Belgium_Liege":"provincia di Liegi",
-"Belgium_Limburg":"Limburgo",
-"Belgium_Luxembourg":"provincia del Lussemburgo",
-"Belgium_Namur":"provincia di Namur",
-"Belgium_Walloon Brabant":"provincia del Brabante Vallone",
-"Belgium_West Flanders":"provincia delle Fiandre Occidentali",
+"Belgium_Antwerp":"Provincia d'Anversa",
+"Belgium_East Flanders":"Provincia Fiandre dell'est",
+"Belgium_Flemish Brabant":"Provincia del Brabante Fiammingo",
+"Belgium_Hainaut":"Provincia dell'Hainaut",
+"Belgium_Liege":"Provincia di Liegi",
+"Belgium_Limburg":"Provincia di Limburgo",
+"Belgium_Luxembourg":"Provincia del Lussemburgo",
+"Belgium_Namur":"Provincia di Namur",
+"Belgium_Walloon Brabant":"Provincia del Brabante Vallone",
+"Belgium_West Flanders":"Provincia Ovest delle Fiandre",
 "Belize":"Belize",
 "Benin":"Benin",
 "Bermuda":"Bermuda",
 "Bhutan":"Bhutan",
 "Bolivia":"Bolivia",
-"Bolivia_North":"Nord della Bolivia",
-"Bolivia_South":"Sud della Bolivia",
+"Bolivia_North":"Bolivia del Nord",
+"Bolivia_South":"Bolivia del Sud",
 "Bosnia and Herzegovina":"Bosnia ed Erzegovina",
 "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina":"Distretto di Brčko",
 "Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina":"Federazione di Bosnia ed Erzegovina",
@@ -94,7 +94,7 @@
 "Brazil_Southeast Region_Sao Paulo_Campinas":"San Paolo — Campinas",
 "Brazil_Southeast Region_Sao Paulo_City":"San Paolo — Santos",
 "Brazil_Southeast Region_Sao Paulo_West":"San Paolo — Ribeirão Preto",
-"British Indian Ocean Territory":"Territorio britannico dell'oceano Indiano",
+"British Indian Ocean Territory":"Territorio britannico dell'Oceano Indiano",
 "British Virgin Islands":"Isole Vergini britanniche",
 "Brunei":"Brunei",
 "Bulgaria":"Bulgaria",
@@ -105,7 +105,7 @@
 "Cameroon":"Camerun",
 "Cameroon_Central":"Camerun — Centro",
 "Cameroon_West":"Camerun — Ovest",
-"Campo de Hielo Sur":"Hielos Continentales",
+"Campo de Hielo Sur":"Territori ghiacciati della Patagonia del Sud",
 "Canada":"Canada",
 "Canada_Alberta":"Alberta",
 "Canada_Alberta_Edmonton":"Edmonton",
@@ -140,7 +140,7 @@
 "Canada_Northwest Territories_Yellowknife":"Yellowknife",
 "Canada_Nova Scotia":"Nuova Scozia",
 "Canada_Nova Scotia_Halifax":"Halifax",
-"Canada_Nova Scotia_Sydney":"Sydney",
+"Canada_Nova Scotia_Sydney":"Sydney - Nuova Scozia",
 "Canada_Nunavut":"Nunavut",
 "Canada_Nunavut_North":"Nunavut — Nord",
 "Canada_Nunavut_South":"Nunavut — Sud",
@@ -207,7 +207,7 @@
 "China_Shanghai":"Shanghai",
 "China_Shanxi":"Shanxi",
 "China_Sichuan":"Sichuan",
-"China_Tibet Autonomous Region":"regione autonoma del Tibet",
+"China_Tibet Autonomous Region":"Regione Autonoma del Tibet",
 "China_Xinjiang":"Sinkiang",
 "China_Yunnan":"Yunnan",
 "China_Zhejiang":"Zhejiang",
@@ -228,26 +228,26 @@
 "Cyprus":"Cipro",
 "Czech Republic":"Repubblica Ceca",
 "Czech_Jihovychod_Jihomoravsky kraj":"Moravia meridionale",
-"Czech_Jihovychod_Kraj Vysocina":"regione di Vysočina",
+"Czech_Jihovychod_Kraj Vysocina":"Regione di Vysočina",
 "Czech_Jihozapad_Jihocesky kraj":"Boemia meridionale",
-"Czech_Jihozapad_Plzensky kraj":"regione di Plzeň",
-"Czech_Karlovasky kraj":"regione di Karlovy Vary",
-"Czech_Moravskoslezsko":"regione di Moravia-Slesia",
-"Czech_Olomoucky kraj":"regione di Olomouc",
+"Czech_Jihozapad_Plzensky kraj":"Regione di Plzeň",
+"Czech_Karlovasky kraj":"Regione di Karlovy Vary",
+"Czech_Moravskoslezsko":"Regione di Moravia-Slesia",
+"Czech_Olomoucky kraj":"Regione di Olomouc",
 "Czech_Praha":"Praga",
-"Czech_Severovychod_Kralovehradecky kraj":"regione di Hradec Králové",
-"Czech_Severovychod_Liberecky kraj":"regione di Liberec",
-"Czech_Severovychod_Pardubicky kraj":"regione di Pardubice",
+"Czech_Severovychod_Kralovehradecky kraj":"Regione di Hradec Králové",
+"Czech_Severovychod_Liberecky kraj":"Regione di Liberec",
+"Czech_Severovychod_Pardubicky kraj":"Regione di Pardubice",
 "Czech_Stredni Cechy_East":"Boemia centrale — Est",
 "Czech_Stredni Cechy_West":"Boemia centrale — Ovest",
-"Czech_Ustecky kraj":"regione di Ústí nad Labem",
-"Czech_Zlinsky Kraj":"regione di Zlín",
+"Czech_Ustecky kraj":"Regione di Ústí nad Labem",
+"Czech_Zlinsky Kraj":"Regione di Zlín",
 "Denmark":"Danimarca",
 "Denmark_Capital Region of Denmark":"Hovedstaden",
-"Denmark_Central Denmark Region":"Jutland centrale",
-"Denmark_North Denmark Region":"Jutland settentrionale",
+"Denmark_Central Denmark Region":"Regione della Danimarca Centrale",
+"Denmark_North Denmark Region":"Regione della Danimarca del Nord",
 "Denmark_Region Zealand":"Selandia",
-"Denmark_Region of Southern Denmark":"Danimarca meridionale",
+"Denmark_Region of Southern Denmark":"Regione della Danimarca meridionale",
 "Djibouti":"Gibuti",
 "Dominica":"Dominica",
 "Dominican Republic":"Repubblica Dominicana",
@@ -270,7 +270,7 @@
 "Finland_Northern Finland":"Finlandia settentrionale",
 "Finland_Southern Finland_Helsinki":"Finlandia meridionale — Helsinki",
 "Finland_Southern Finland_Lappeenranta":"Finlandia meridionale — Lappeenranta",
-"Finland_Southern Finland_West":"Varsinais-Suomi",
+"Finland_Southern Finland_West":"Finlandia - Sud-Ovest (Varsinais-Suomi)",
 "Finland_Western Finland":"Finlandia occidentale",
 "Florida":"Florida",
 "France":"Francia",
@@ -298,7 +298,7 @@
 "France_Burgundy_Nievre":"Nièvre",
 "France_Burgundy_Saone-et-Loire":"Saona e Loira",
 "France_Burgundy_Yonne":"Yonne",
-"France_Centre-Val de Loire":"Centro",
+"France_Centre-Val de Loire":"Centro - Val della Loira",
 "France_Centre-Val de Loire_Cher":"Cher",
 "France_Centre-Val de Loire_Eure-et-Loir":"Eure-et-Loir",
 "France_Centre-Val de Loire_Indre":"Indre",
@@ -346,7 +346,7 @@
 "France_New Caledonia":"Nuova Caledonia",
 "France_Nord-Pas-de-Calais":"Nord-Passo di Calais",
 "France_Nord-Pas-de-Calais_Lille":"Lilla",
-"France_Nord-Pas-de-Calais_Nord":"Nord",
+"France_Nord-Pas-de-Calais_Nord":"Nord - Passo di Calais",
 "France_Nord-Pas-de-Calais_Pas-de-Calais":"Passo di Calais",
 "France_Pays de la Loire":"Paesi della Loira",
 "France_Pays de la Loire_Loire-Atlantique":"Loira Atlantica",
@@ -366,11 +366,11 @@
 "France_Provence-Alpes-Cote dAzur":"Provenza-Alpi-Costa Azzurra",
 "France_Provence-Alpes-Cote dAzur_Alpes-de-Haute-Provence":"Alpi dell'Alta Provenza",
 "France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone":"Bocche del Rodano",
-"France_Provence-Alpes-Cote dAzur_Hautes-Alpes":"Alte Alpi",
-"France_Provence-Alpes-Cote dAzur_Maritime Alps":"Alpi Marittime",
+"France_Provence-Alpes-Cote dAzur_Hautes-Alpes":"Provenza - Alte Alpi",
+"France_Provence-Alpes-Cote dAzur_Maritime Alps":"Provenza - Alpi Marittime",
 "France_Provence-Alpes-Cote dAzur_Var":"Var",
 "France_Provence-Alpes-Cote dAzur_Vaucluse":"Vaucluse",
-"France_Rhone-Alpes":"Rodano-Alpi",
+"France_Rhone-Alpes":"Alpi del Rodano",
 "France_Rhone-Alpes_Ain":"Ain",
 "France_Rhone-Alpes_Ardeche":"Ardèche",
 "France_Rhone-Alpes_Drome":"Drôme",
@@ -430,7 +430,7 @@
 "Germany_Rhineland-Palatinate_Koblenz":"Renania-Palatinato — Coblenza",
 "Germany_Rhineland-Palatinate_South":"Renania-Palatinato — Magonza",
 "Germany_Saarland":"Saarland",
-"Germany_Saxony-Anhalt":"Sassonia-Anhalt",
+"Germany_Saxony-Anhalt":"Sassonia - Anhalt",
 "Germany_Saxony_Dresden":"Sassonia — Dresda",
 "Germany_Saxony_Leipzig":"Sassonia — Lipsia",
 "Germany_Schleswig-Holstein":"Schleswig-Holstein",
@@ -525,46 +525,46 @@
 "Italy_Calabria":"Calabria",
 "Italy_Campania":"Campania",
 "Italy_Emilia":"Emilia-Romagna",
-"Italy_Emilia-Romagna_Bologna":"provincia di Bologna",
-"Italy_Emilia-Romagna_Ferrara":"provincia di Ferrara",
-"Italy_Emilia-Romagna_Forli-Cesena":"provincia di Forlì-Cesena",
-"Italy_Emilia-Romagna_Modena":"provincia di Modena",
-"Italy_Emilia-Romagna_Parma":"provincia di Parma",
-"Italy_Emilia-Romagna_Piacenza":"provincia di Piacenza",
-"Italy_Emilia-Romagna_Ravenna":"provincia di Ravenna",
-"Italy_Emilia-Romagna_Reggio Emilia":"provincia di Reggio nell'Emilia",
-"Italy_Emilia-Romagna_Rimini":"provincia di Rimini",
+"Italy_Emilia-Romagna_Bologna":"Provincia di Bologna",
+"Italy_Emilia-Romagna_Ferrara":"Provincia di Ferrara",
+"Italy_Emilia-Romagna_Forli-Cesena":"Provincia di Forlì-Cesena",
+"Italy_Emilia-Romagna_Modena":"Provincia di Modena",
+"Italy_Emilia-Romagna_Parma":"Provincia di Parma",
+"Italy_Emilia-Romagna_Piacenza":"Provincia di Piacenza",
+"Italy_Emilia-Romagna_Ravenna":"Provincia di Ravenna",
+"Italy_Emilia-Romagna_Reggio Emilia":"Provincia di Reggio nell'Emilia",
+"Italy_Emilia-Romagna_Rimini":"Provincia di Rimini",
 "Italy_Friuli":"Friuli-Venezia Giulia",
-"Italy_Friuli-Venezia Giulia_Gorizia":"provincia di Gorizia",
-"Italy_Friuli-Venezia Giulia_Pordenone":"provincia di Pordenone",
-"Italy_Friuli-Venezia Giulia_Trieste":"provincia di Trieste",
-"Italy_Friuli-Venezia Giulia_Udine":"provincia di Udine",
+"Italy_Friuli-Venezia Giulia_Gorizia":"Provincia di Gorizia",
+"Italy_Friuli-Venezia Giulia_Pordenone":"Provincia di Pordenone",
+"Italy_Friuli-Venezia Giulia_Trieste":"Provincia di Trieste",
+"Italy_Friuli-Venezia Giulia_Udine":"Provincia di Udine",
 "Italy_Lazio":"Lazio",
 "Italy_Liguria":"Liguria",
 "Italy_Lombardy":"Lombardia",
-"Italy_Lombardy_Bergamo":"provincia di Bergamo",
-"Italy_Lombardy_Brescia":"provincia di Brescia",
-"Italy_Lombardy_Como":"provincia di Como",
-"Italy_Lombardy_Cremona":"provincia di Cremona",
-"Italy_Lombardy_Lecco":"provincia di Lecco",
-"Italy_Lombardy_Lodi":"provincia di Lodi",
-"Italy_Lombardy_Mantua":"provincia di Mantova",
-"Italy_Lombardy_Milan":"provincia di Milano",
-"Italy_Lombardy_Monza and Brianza":"provincia di Monza e della Brianza",
-"Italy_Lombardy_Pavia":"provincia di Pavia",
-"Italy_Lombardy_Sondrio":"provincia di Sondrio",
-"Italy_Lombardy_Varese":"provincia di Varese",
+"Italy_Lombardy_Bergamo":"Provincia di Bergamo",
+"Italy_Lombardy_Brescia":"Provincia di Brescia",
+"Italy_Lombardy_Como":"Provincia di Como",
+"Italy_Lombardy_Cremona":"Provincia di Cremona",
+"Italy_Lombardy_Lecco":"Provincia di Lecco",
+"Italy_Lombardy_Lodi":"Provincia di Lodi",
+"Italy_Lombardy_Mantua":"Provincia di Mantova",
+"Italy_Lombardy_Milan":"Provincia di Milano",
+"Italy_Lombardy_Monza and Brianza":"Provincia di Monza - Brianza",
+"Italy_Lombardy_Pavia":"Provincia di Pavia",
+"Italy_Lombardy_Sondrio":"Provincia di Sondrio",
+"Italy_Lombardy_Varese":"Provincia di Varese",
 "Italy_Marche":"Marche",
 "Italy_Molise":"Molise",
 "Italy_Piemont":"Piemonte",
-"Italy_Piemont_Alessandria":"provincia di Alessandria",
-"Italy_Piemont_Asti":"provincia di Asti",
-"Italy_Piemont_Biella":"provincia di Biella",
-"Italy_Piemont_Cuneo":"provincia di Cuneo",
-"Italy_Piemont_Novara":"provincia di Novara",
-"Italy_Piemont_Torino":"provincia di Torino",
-"Italy_Piemont_Verbano-Cusio-Ossola":"provincia del Verbano-Cusio-Ossola",
-"Italy_Piemont_Vercelli":"provincia di Vercelli",
+"Italy_Piemont_Alessandria":"Provincia di Alessandria",
+"Italy_Piemont_Asti":"Provincia di Asti",
+"Italy_Piemont_Biella":"Provincia di Biella",
+"Italy_Piemont_Cuneo":"Provincia di Cuneo",
+"Italy_Piemont_Novara":"Provincia di Novara",
+"Italy_Piemont_Torino":"Provincia di Torino",
+"Italy_Piemont_Verbano-Cusio-Ossola":"Provincia del Verbano-Cusio-Ossola",
+"Italy_Piemont_Vercelli":"Provincia di Vercelli",
 "Italy_Sardinia":"Sardegna",
 "Italy_Sicily":"Sicilia",
 "Italy_Trentino-Alto Adige Sudtirol":"Trentino-Alto Adige",
@@ -572,70 +572,70 @@
 "Italy_Tuscany_Massa e Carrara":"Toscana - Nord Ovest",
 "Italy_Umbria":"Umbria",
 "Italy_Veneto":"Veneto",
-"Italy_Veneto_Belluno":"provincia di Belluno",
-"Italy_Veneto_Padova":"provincia di Padova",
-"Italy_Veneto_Rovigo":"provincia di Rovigo",
-"Italy_Veneto_Treviso":"provincia di Treviso",
-"Italy_Veneto_Venezia":"provincia di Venezia",
-"Italy_Veneto_Verona":"provincia di Verona",
-"Italy_Veneto_Vicenza":"provincia di Vicenza",
+"Italy_Veneto_Belluno":"Provincia di Belluno",
+"Italy_Veneto_Padova":"Provincia di Padova",
+"Italy_Veneto_Rovigo":"Provincia di Rovigo",
+"Italy_Veneto_Treviso":"Provincia di Treviso",
+"Italy_Veneto_Venezia":"Provincia di Venezia",
+"Italy_Veneto_Verona":"Provincia di Verona",
+"Italy_Veneto_Vicenza":"Provincia di Vicenza",
 "Jamaica":"Giamaica",
 "Japan":"Giappone",
 "Japan_Chubu Region":"Regione di Chūbu",
-"Japan_Chubu Region_Aichi":"prefettura di Aichi",
-"Japan_Chubu Region_Fukui":"prefettura di Fukui",
-"Japan_Chubu Region_Gifu":"prefettura di Gifu",
-"Japan_Chubu Region_Ishikawa":"prefettura di Ishikawa",
-"Japan_Chubu Region_Nagano":"prefettura di Nagano",
-"Japan_Chubu Region_Niigata":"prefettura di Niigata",
-"Japan_Chubu Region_Shizuoka":"prefettura di Shizuoka",
-"Japan_Chubu Region_Toyama":"prefettura di Toyama",
-"Japan_Chubu Region_Yamanashi":"prefettura di Yamanashi",
-"Japan_Chugoku Region":"Chūgoku",
-"Japan_Chugoku Region_Hiroshima":"prefettura di Hiroshima",
-"Japan_Chugoku Region_Okayama":"prefettura di Okayama",
-"Japan_Chugoku Region_Shimane":"prefettura di Shimane",
-"Japan_Chugoku Region_Tottori":"prefettura di Tottori",
-"Japan_Chugoku Region_Yamaguchi":"prefettura di Yamaguchi",
-"Japan_Hokkaido Region":"prefettura di Hokkaidō",
-"Japan_Hokkaido Region_East":"prefettura di Hokkaidō — Est",
-"Japan_Hokkaido Region_North":"prefettura di Hokkaidō — Nord",
-"Japan_Hokkaido Region_West":"prefettura di Hokkaidō — Ovest",
-"Japan_Kanto":"Kantō",
-"Japan_Kanto_Chiba":"prefettura di Chiba",
-"Japan_Kanto_Gunma":"prefettura di Gunma",
-"Japan_Kanto_Ibaraki":"prefettura di Ibaraki",
-"Japan_Kanto_Kanagawa":"prefettura di Kanagawa",
-"Japan_Kanto_Saitama":"prefettura di Saitama",
-"Japan_Kanto_Tochigi":"prefettura di Tochigi",
-"Japan_Kanto_Tokyo":"Tokyo",
-"Japan_Kinki Region":"Kansai",
-"Japan_Kinki Region_Mie":"prefettura di Mie",
-"Japan_Kinki Region_Nara":"prefettura di Nara",
-"Japan_Kinki Region_Osaka":"prefettura di Osaka",
-"Japan_Kinki Region_Wakayama":"prefettura di Wakayama",
+"Japan_Chubu Region_Aichi":"Prefettura di Aichi",
+"Japan_Chubu Region_Fukui":"Prefettura di Fukui",
+"Japan_Chubu Region_Gifu":"Prefettura di Gifu",
+"Japan_Chubu Region_Ishikawa":"Prefettura di Ishikawa",
+"Japan_Chubu Region_Nagano":"Prefettura di Nagano",
+"Japan_Chubu Region_Niigata":"Prefettura di Niigata",
+"Japan_Chubu Region_Shizuoka":"Prefettura di Shizuoka",
+"Japan_Chubu Region_Toyama":"Prefettura di Toyama",
+"Japan_Chubu Region_Yamanashi":"Prefettura di Yamanashi",
+"Japan_Chugoku Region":"Regione di Chūgoku",
+"Japan_Chugoku Region_Hiroshima":"Prefettura di Hiroshima",
+"Japan_Chugoku Region_Okayama":"Prefettura di Okayama",
+"Japan_Chugoku Region_Shimane":"Prefettura di Shimane",
+"Japan_Chugoku Region_Tottori":"Prefettura di Tottori",
+"Japan_Chugoku Region_Yamaguchi":"Prefettura di Yamaguchi",
+"Japan_Hokkaido Region":"Prefettura di Hokkaidō",
+"Japan_Hokkaido Region_East":"Prefettura di Hokkaidō — Est",
+"Japan_Hokkaido Region_North":"Prefettura di Hokkaidō — Nord",
+"Japan_Hokkaido Region_West":"Prefettura di Hokkaidō — Ovest",
+"Japan_Kanto":"Regione di Kantō",
+"Japan_Kanto_Chiba":"Prefettura di Chiba",
+"Japan_Kanto_Gunma":"Prefettura di Gunma",
+"Japan_Kanto_Ibaraki":"Prefettura di Ibaraki",
+"Japan_Kanto_Kanagawa":"Prefettura di Kanagawa",
+"Japan_Kanto_Saitama":"Prefettura di Saitama",
+"Japan_Kanto_Tochigi":"Prefettura di Tochigi",
+"Japan_Kanto_Tokyo":"Prefettura di Tokyo",
+"Japan_Kinki Region":"Regione di Kansai",
+"Japan_Kinki Region_Mie":"Prefettura di Mie",
+"Japan_Kinki Region_Nara":"Prefettura di Nara",
+"Japan_Kinki Region_Osaka":"Prefettura di Osaka",
+"Japan_Kinki Region_Wakayama":"Prefettura di Wakayama",
 "Japan_Kyushu Region":"Kyūshū",
-"Japan_Kyushu Region_Fukuoka":"prefettura di Fukuoka",
-"Japan_Kyushu Region_Kagoshima":"prefettura di Kagoshima",
-"Japan_Kyushu Region_Kumamoto":"prefettura di Kumamoto",
-"Japan_Kyushu Region_Miyazaki":"prefettura di Miyazaki",
-"Japan_Kyushu Region_Nagasaki":"prefettura di Nagasaki",
-"Japan_Kyushu Region_Oita":"prefettura di Ōita",
-"Japan_Kyushu Region_Okinawa":"prefettura di Okinawa",
+"Japan_Kyushu Region_Fukuoka":"Prefettura di Fukuoka",
+"Japan_Kyushu Region_Kagoshima":"Prefettura di Kagoshima",
+"Japan_Kyushu Region_Kumamoto":"Prefettura di Kumamoto",
+"Japan_Kyushu Region_Miyazaki":"Prefettura di Miyazaki",
+"Japan_Kyushu Region_Nagasaki":"Prefettura di Nagasaki",
+"Japan_Kyushu Region_Oita":"Prefettura di Ōita",
+"Japan_Kyushu Region_Okinawa":"Prefettura di Okinawa",
 "Japan_Kyushu Region_Saga":"Prefettura di Saga",
 "Japan_Shikoku Region":"Shikoku",
-"Japan_Shikoku Region_Ehime":"prefettura di Ehime",
-"Japan_Shikoku Region_Kagawa":"prefettura di Kagawa",
-"Japan_Shikoku Region_Kochi":"prefettura di Kōchi",
-"Japan_Shikoku Region_Kyoto":"prefettura di Kyoto",
-"Japan_Shikoku Region_Tokushima":"prefettura di Tokushima",
+"Japan_Shikoku Region_Ehime":"Prefettura di Ehime",
+"Japan_Shikoku Region_Kagawa":"Prefettura di Kagawa",
+"Japan_Shikoku Region_Kochi":"Prefettura di Kōchi",
+"Japan_Shikoku Region_Kyoto":"Prefettura di Kyoto",
+"Japan_Shikoku Region_Tokushima":"Prefettura di Tokushima",
 "Japan_Tohoku":"Regione di Tōhoku",
-"Japan_Tohoku_Akita":"prefettura di Akita",
-"Japan_Tohoku_Aomori":"prefettura di Aomori",
-"Japan_Tohoku_Fukushima":"prefettura di Fukushima",
-"Japan_Tohoku_Iwate":"prefettura di Iwate",
-"Japan_Tohoku_Miyagi":"prefettura di Miyagi",
-"Japan_Tohoku_Yamagata":"prefettura di Yamagata",
+"Japan_Tohoku_Akita":"Prefettura di Akita",
+"Japan_Tohoku_Aomori":"Prefettura di Aomori",
+"Japan_Tohoku_Fukushima":"Prefettura di Fukushima",
+"Japan_Tohoku_Iwate":"Prefettura di Iwate",
+"Japan_Tohoku_Miyagi":"Prefettura di Miyagi",
+"Japan_Tohoku_Yamagata":"Prefettura di Yamagata",
 "Jersey":"Baliato di Jersey",
 "Jerusalem":"Gerusalemme",
 "Jordan":"Giordania",
@@ -726,10 +726,10 @@
 "New Jersey":"New Jersey",
 "New York":"New York",
 "New Zealand":"Nuova Zelanda",
-"New Zealand North_Auckland":"Nord — Auckland",
-"New Zealand North_Wellington":"Nord — Wellington",
-"New Zealand South_Canterbury":"Sud — Canterbury",
-"New Zealand South_Southland":"Sud — Southland",
+"New Zealand North_Auckland":"Auckland - Nord",
+"New Zealand North_Wellington":"Wellington - Nord",
+"New Zealand South_Canterbury":"Canterbury - Sud",
+"New Zealand South_Southland":"Southland - Sud",
 "Nicaragua":"Nicaragua",
 "Niger":"Niger",
 "Nigeria":"Nigeria",
@@ -742,12 +742,12 @@
 "Norway_Central":"Oslo",
 "Norway_Hedmark":"Hedmark",
 "Norway_Jan Mayen":"Jan Mayen",
-"Norway_Northern":"Nord-Norge",
+"Norway_Northern":"Norvegia del Nord",
 "Norway_Oppland":"Oppland",
-"Norway_Southern":"Sørlandet",
+"Norway_Southern":"Sørlandet (Norvegia del Sud)",
 "Norway_Svalbard":"Isole Svalbard",
 "Norway_Trondelag":"Trøndelag",
-"Norway_Western":"Vestlandet",
+"Norway_Western":"Vestlandet (Norvegia dell'Ovest)",
 "Ohio":"Ohio",
 "Oklahoma":"Oklahoma",
 "Oman":"Oman",
@@ -765,42 +765,42 @@
 "Peru_North":"Perù — Nord",
 "Peru_South":"Perù — Sud",
 "Philippines":"Filippine",
-"Philippines_Luzon_Manila":"Regione Capitale Nazionale",
+"Philippines_Luzon_Manila":"Regione di Manila",
 "Philippines_Luzon_North":"Luzon — Nord",
 "Philippines_Luzon_South":"Luzon — Sud",
 "Philippines_Mindanao":"Mindanao",
 "Philippines_Visayas":"Visayas",
-"Pitcairn Islands":"isole Pitcairn",
+"Pitcairn Islands":"Isole Pitcairn",
 "Poland":"Polonia",
-"Poland_Greater Poland Voivodeship":"voivodato della Grande Polonia",
-"Poland_Kuyavian-Pomeranian Voivodeship":"voivodato della Cuiavia-Pomerania",
-"Poland_Lesser Poland Voivodeship":"voivodato della Piccola Polonia",
-"Poland_Lodz Voivodeship":"voivodato di Łódź",
-"Poland_Lower Silesian Voivodeship":"voivodato della Bassa Slesia",
-"Poland_Lublin Voivodeship":"voivodato di Lublino",
-"Poland_Lubusz Voivodeship":"voivodato di Lubusz",
-"Poland_Masovian Voivodeship":"voivodato della Masovia",
-"Poland_Opole Voivodeship":"voivodato di Opole",
-"Poland_Podlaskie Voivodeship":"voivodato della Podlachia",
-"Poland_Pomeranian Voivodeship":"voivodato della Pomerania",
-"Poland_Silesian Voivodeship":"voivodato della Slesia",
-"Poland_Subcarpathian Voivodeship":"voivodato della Precarpazia",
-"Poland_Swietokrzyskie Voivodeship":"voivodato della Santacroce",
-"Poland_Warmian-Masurian Voivodeship":"voivodato della Varmia-Masuria",
-"Poland_West Pomeranian Voivodeship":"voivodato della Pomerania Occidentale",
+"Poland_Greater Poland Voivodeship":"Voivodato della Grande Polonia",
+"Poland_Kuyavian-Pomeranian Voivodeship":"Voivodato della Cuiavia-Pomerania",
+"Poland_Lesser Poland Voivodeship":"Voivodato della Piccola Polonia",
+"Poland_Lodz Voivodeship":"Voivodato di Łódź",
+"Poland_Lower Silesian Voivodeship":"Voivodato della Bassa Slesia",
+"Poland_Lublin Voivodeship":"Voivodato di Lublino",
+"Poland_Lubusz Voivodeship":"Voivodato di Lubusz",
+"Poland_Masovian Voivodeship":"Voivodato della Masovia",
+"Poland_Opole Voivodeship":"Voivodato di Opole",
+"Poland_Podlaskie Voivodeship":"Voivodato della Podlachia",
+"Poland_Pomeranian Voivodeship":"Voivodato della Pomerania",
+"Poland_Silesian Voivodeship":"Voivodato della Slesia",
+"Poland_Subcarpathian Voivodeship":"Voivodato della Precarpazia",
+"Poland_Swietokrzyskie Voivodeship":"Voivodato della Santacroce",
+"Poland_Warmian-Masurian Voivodeship":"Voivodato della Varmia-Masuria",
+"Poland_West Pomeranian Voivodeship":"Voivodato della Pomerania Occidentale",
 "Portugal":"Portogallo",
 "Portugal_North":"Portogallo — Nord",
 "Portugal_South":"Portogallo — Sud",
 "Qatar":"Qatar",
 "Republic of Kosovo":"Kosovo",
 "Romania":"Romania",
-"Romania_Centre":"Centru",
-"Romania_North_East":"Nord-Est",
-"Romania_North_West":"Nord-Ovest",
-"Romania_South":"Sud",
-"Romania_South_East":"Sud-Est",
-"Romania_South_West":"Sud-Ovest",
-"Romania_West":"Ovest",
+"Romania_Centre":"Romania - Centro",
+"Romania_North_East":"Romania - Nord-Est",
+"Romania_North_West":"Romania - Nord-Ovest",
+"Romania_South":"Romania - Sud",
+"Romania_South_East":"Romania - Sud-Est",
+"Romania_South_West":"Romania - Sud-Ovest",
+"Romania_West":"Romania - Ovest",
 "Russia_Altai Krai":"Territorio dell'Altaj",
 "Russia_Altai Republic":"Repubblica dell'Altaj",
 "Russia_Amur Oblast":"Oblast' dell'Amur",
@@ -896,7 +896,7 @@
 "Saint Martin":"Saint-Martin",
 "Saint Vincent and the Grenadines":"Saint Vincent e Grenadine",
 "Samoa":"Samoa",
-"San Marino":"San Marino",
+"San Marino":"Repubblica di San Marino",
 "Sao Tome and Principe":"São Tomé e Príncipe",
 "Saudi Arabia":"Arabia Saudita",
 "Senegal":"Senegal",
@@ -905,27 +905,27 @@
 "Sierra Leone":"Sierra Leone",
 "Singapore":"Singapore",
 "Slovakia":"Slovacchia",
-"Slovakia_Region of Banska Bystrica":"regione di Banská Bystrica",
-"Slovakia_Region of Bratislava":"regione di Bratislava",
-"Slovakia_Region of Kosice":"regione di Košice",
-"Slovakia_Region of Nitra":"regione di Nitra",
-"Slovakia_Region of Presov":"regione di Prešov",
-"Slovakia_Region of Trencin":"regione di Trenčín",
-"Slovakia_Region of Trnava":"regione di Trnava",
-"Slovakia_Region of Zilina":"regione di Žilina",
+"Slovakia_Region of Banska Bystrica":"Regione di Banská Bystrica",
+"Slovakia_Region of Bratislava":"Regione di Bratislava",
+"Slovakia_Region of Kosice":"Regione di Košice",
+"Slovakia_Region of Nitra":"Regione di Nitra",
+"Slovakia_Region of Presov":"Regione di Prešov",
+"Slovakia_Region of Trencin":"Regione di Trenčín",
+"Slovakia_Region of Trnava":"Regione di Trnava",
+"Slovakia_Region of Zilina":"Regione di Žilina",
 "Slovenia":"Slovenia",
 "Solomon Islands":"Isole Salomone",
 "Somalia":"Somalia",
 "South Africa":"Sudafrica",
-"South Africa_Eastern Cape":"provincia del Capo Orientale",
-"South Africa_Free State":"Stato libero",
+"South Africa_Eastern Cape":"Provincia del Capo Orientale",
+"South Africa_Free State":"Sudafrica - Stato libero",
 "South Africa_Gauteng":"Gauteng",
 "South Africa_KwaZulu-Natal":"KwaZulu-Natal",
-"South Africa_Limpopo":"provincia del Limpopo",
+"South Africa_Limpopo":"Provincia del Limpopo",
 "South Africa_Mpumalanga":"Mpumalanga",
-"South Africa_North West":"provincia del Nordovest",
-"South Africa_Northern Cape":"provincia del Capo Settentrionale",
-"South Africa_Western Cape":"provincia del Capo Occidentale",
+"South Africa_North West":"Sudafrica - Provincia del Nordovest",
+"South Africa_Northern Cape":"Sudafrica - Provincia del Capo Settentrionale",
+"South Africa_Western Cape":"Sudafrica - Provincia del Capo Occidentale",
 "South Carolina":"Carolina del Sud",
 "South Georgia and the South Sandwich Islands":"Georgia del Sud e isole Sandwich meridionali",
 "South Korea":"Corea del Sud",
@@ -936,9 +936,9 @@
 "Spain":"Spagna",
 "Spain_Andalusia":"Andalusia",
 "Spain_Aragon":"Aragona",
-"Spain_Balearic Islands":"isole Baleari",
+"Spain_Balearic Islands":"Isole Baleari",
 "Spain_Basque Country":"Paesi Baschi",
-"Spain_Canary Islands":"isole Canarie",
+"Spain_Canary Islands":"Isole Canarie",
 "Spain_Cantabria":"Cantabria",
 "Spain_Castile and Leon":"Castiglia e León",
 "Spain_Castile-La Mancha":"Castiglia-La Mancia",
@@ -947,15 +947,15 @@
 "Spain_Catalonia_Provincia de Lleida":"Catalogna – Provincia di Lleida",
 "Spain_Catalonia_Provincia de Tarragona":"Catalogna – Provincia di Tarragona",
 "Spain_Ceuta":"Ceuta",
-"Spain_Community of Madrid":"comunità di Madrid",
+"Spain_Community of Madrid":"Comunità di Madrid",
 "Spain_Comunidad Foral de Navarra":"Navarra",
 "Spain_Extremadura":"Estremadura",
 "Spain_Galicia":"Galizia",
 "Spain_La Rioja":"La Rioja",
 "Spain_Melilla":"Melilla",
 "Spain_Principado de Asturias":"Asturie",
-"Spain_Region de Murcia":"regione di Murcia",
-"Spain_Valencian Community":"comunità Valenzana",
+"Spain_Region de Murcia":"Regione di Murcia",
+"Spain_Valencian Community":"Comunità Valenziana",
 "Sri Lanka":"Sri Lanka",
 "Sudan":"Sudan",
 "Suriname":"Suriname",
@@ -964,7 +964,7 @@
 "Sweden_Bergslagen":"Bergslagen",
 "Sweden_Malardalen":"Mälardalen",
 "Sweden_Mellannorrland":"Mellannorrland",
-"Sweden_Norra Sverige":"Norrland",
+"Sweden_Norra Sverige":"Norrland (Svezia del Sud)",
 "Sweden_Ostra Gotaland":"Ostra Götaland",
 "Sweden_Sodra Gotaland":"Södra Götaland",
 "Sweden_Vastra Gotaland":"Västra Götaland",
@@ -972,9 +972,9 @@
 "Switzerland_Central":"Svizzera centrale",
 "Switzerland_Eastern":"Svizzera nordorientale",
 "Switzerland_Espace Mittelland":"Espace Mittelland",
-"Switzerland_Lake Geneva region":"Regione del Lemano",
+"Switzerland_Lake Geneva region":"Regione del Lemano (Lago di Ginevra)",
 "Switzerland_Northwestern":"Basilea e Argovia",
-"Switzerland_Ticino":"canton Ticino",
+"Switzerland_Ticino":"Canton Ticino",
 "Switzerland_Zurich":"Area metropolitana di Zurigo",
 "Syria":"Siria",
 "Taiwan":"Taiwan",
@@ -1000,18 +1000,18 @@
 "Turkey_Mediterranean Region":"Regione del Mar Mediterraneo",
 "Turkey_Southeastern Anatolia Region":"Regione dell'Anatolia Sud Orientale",
 "Turkmenistan":"Turkmenistan",
-"Turks and Caicos Islands":"Turks e Caicos",
+"Turks and Caicos Islands":"Turks e Isole Caicos",
 "Tuvalu":"Tuvalu",
 "UK_England_East Midlands":"Midlands Orientali",
 "UK_England_East of England_Essex":"Est dell'Inghilterra — Essex",
 "UK_England_East of England_Norfolk":"Est dell'Inghilterra — Norfolk",
 "UK_England_Greater London":"Greater London",
-"UK_England_North East England":"Nord Est",
-"UK_England_North West England":"Nord Ovest",
-"UK_England_South East_Brighton":"Sud Est — Brighton",
-"UK_England_South East_Oxford":"Sud Est — Oxford",
-"UK_England_South West England_Bristol":"Sud Ovest — Bristol",
-"UK_England_South West England_Cornwall":"Sud Ovest — Cornovaglia",
+"UK_England_North East England":"Inghilterra - Nord Est",
+"UK_England_North West England":"Inghilterra - Nord Ovest",
+"UK_England_South East_Brighton":"Inghilterra - Sud Est — Brighton",
+"UK_England_South East_Oxford":"Inghilterra - Sud Est — Oxford",
+"UK_England_South West England_Bristol":"Inghilterra - Sud Ovest — Bristol",
+"UK_England_South West England_Cornwall":"Inghilterra - Sud Ovest — Cornovaglia",
 "UK_England_West Midlands":"Midlands Occidentali",
 "UK_England_Yorkshire and the Humber":"Yorkshire e Humber",
 "UK_Northern Ireland":"Irlanda del Nord",
@@ -1072,7 +1072,7 @@
 "US_Louisiana_New Orleans":"New Orleans",
 "US_Maine":"Maine",
 "US_Maryland_Baltimore":"Baltimora",
-"US_Maryland_and_DC":"Ovest, Washington",
+"US_Maryland_and_DC":"Washington Ovest",
 "US_Massachusetts_Boston":"Boston",
 "US_Massachusetts_Central":"Worcester",
 "US_Massachusetts_Plymouth":"Plymouth",
@@ -1135,7 +1135,7 @@
 "US_Texas_Tyler":"Tyler",
 "US_Texas_Wako":"Waco",
 "US_Texas_West":"Odessa",
-"US_United States Minor Outlying Islands":"Isole minori esterne degli Stati Uniti d'America",
+"US_United States Minor Outlying Islands":"Isole minori esterne degli USA",
 "US_Utah":"Utah",
 "US_Vermont":"Vermont",
 "US_Virginia_Chesapeake":"Chesapeake",
@@ -1192,7 +1192,7 @@
 "Yemen":"Yemen",
 "Zambia":"Zambia",
 "Zimbabwe":"Zimbabwe",
-"Argentina_Santa Fe":"provincia di Santa Fe",
+"Argentina_Santa Fe":"Provincia di Santa Fe",
 "Australia_Brisbane":"Brisbane",
 "Australia_Sydney":"Sydney",
 "Austria_Styria_Graz":"Stiria — Graz",
@@ -1232,11 +1232,11 @@
 "Iran_East":"Iran — Est",
 "Iraq_North":"Iraq del Nord",
 "Iraq_South":"Iraq centrale e meridionale",
-"Japan_Chubu Region_Aichi_Nagoya":"prefettura di Aichi — Nagoya",
-"Japan_Chubu Region_Aichi_Toyohashi":"prefettura di Aichi — Toyohashi",
+"Japan_Chubu Region_Aichi_Nagoya":"Prefettura di Aichi — Nagoya",
+"Japan_Chubu Region_Aichi_Toyohashi":"Prefettura di Aichi — Toyohashi",
 "Japan_Hokkaido Region_Sapporo":"Sapporo",
 "Japan_Kinki Region_Osaka_Osaka":"Osaka",
-"Japan_Kinki Region_Osaka_West":"prefettura di Osaka — Ovest",
+"Japan_Kinki Region_Osaka_West":"Prefettura di Osaka — Ovest",
 "Kazakhstan_North":"Kazakistan — Nord",
 "Kazakhstan_South":"Kazakistan — Sud",
 "Lithuania_East":"Lituania — Est",
@@ -1244,8 +1244,8 @@
 "Mexico_Chihuahua":"Chihuahua",
 "Mexico_Sonora":"Sonora",
 "Nepal_Kathmandu":"Katmandu",
-"Nepal_Madhyamanchal":"Regione di Sviluppo Centrale",
-"Nepal_Purwanchal":"Regione di Sviluppo Orientale",
+"Nepal_Madhyamanchal":"Nepal - Regione di Sviluppo Centrale",
+"Nepal_Purwanchal":"Nepal - Regione di Sviluppo Orientale",
 "Nigeria_North":"Nigeria — Nord",
 "Nigeria_South":"Nigeria — Sud",
 "Norway_Hordaland":"Hordaland",
@@ -1337,8 +1337,8 @@
 "Germany_Schleswig-Holstein_Flensburg":"Schleswig-Holstein — Flensburgo",
 "Germany_Schleswig-Holstein_Kiel":"Schleswig-Holstein — Kiel",
 "Portugal_Porto":"Porto",
-"UK_England_North West England_Lancaster":"Nord Ovest — Lancaster",
-"UK_England_North West England_Manchester":"Nord Ovest — Manchester",
+"UK_England_North West England_Lancaster":"Inghilterra - Nord Ovest — Lancaster",
+"UK_England_North West England_Manchester":"Inghilterra - Nord Ovest — Manchester",
 "US_Florida_Gainesville":"Gainesville",
 "US_Texas_Victoria":"Victoria",
 "US_Virginia_Norfolk":"Norfolk",
@@ -1350,7 +1350,7 @@
 "Andorra Description":"Andorra la Vella, La Massana, Ordino",
 "Angola Description":"Luanda, Lobito, Namibe",
 "Anguilla Description":"The Valley, George Hill, Stoney Ground",
-"Antarctica Description":"McMurdo Station, Chilean research station „Villa Las Estrellas”, Rocky Cove",
+"Antarctica Description":"McMurdo Station, Chilean research station, Villa Las Estrellas”, Rocky Cove",
 "Antigua and Barbuda Description":"St. John's, English Harbour, Freetown",
 "Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires, José C. Paz, González Catán",
 "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell",
@@ -1840,14 +1840,14 @@
 "Italy_Lombardy_Bergamo Description":"Bergamo",
 "Italy_Lombardy_Brescia Description":"Brescia",
 "Italy_Lombardy_Como Description":"Como, Cantù",
-"Italy_Lombardy_Cremona Description":"Cremona",
+"Italy_Lombardy_Cremona Description":"Cremona, Trescore Cremasco",
 "Italy_Lombardy_Lecco Description":"Lecco",
 "Italy_Lombardy_Lodi Description":"Lodi",
-"Italy_Lombardy_Mantua Description":"Mantova",
+"Italy_Lombardy_Mantua Description":"Mantova, Suzzara",
 "Italy_Lombardy_Milan Description":"Milano",
 "Italy_Lombardy_Monza and Brianza Description":"Monza",
 "Italy_Lombardy_Pavia Description":"Pavia",
-"Italy_Lombardy_Sondrio Description":"Sondrio",
+"Italy_Lombardy_Sondrio Description":"Sondrio, Morbegno",
 "Italy_Lombardy_Varese Description":"Varese",
 "Italy_Marche Description":"Ancona",
 "Italy_Molise Description":"Campobasso",

data/countries-strings/ru.json/localize.json

@@ -1072,7 +1072,7 @@
 "US_Louisiana_New Orleans":"Новый Орлеан",
 "US_Maine":"Мэн",
 "US_Maryland_Baltimore":"Балтимор",
-"US_Maryland_and_DC":"Запад, Вашингтон",
+"US_Maryland_and_DC":"Запад, штат Вашингтон",
 "US_Massachusetts_Boston":"Бостон",
 "US_Massachusetts_Central":"Вустер",
 "US_Massachusetts_Plymouth":"Плимут",
@@ -1350,7 +1350,7 @@
 "Andorra Description":"Андорра-ла-Велья, Ла-Массана, Ордино",
 "Angola Description":"Луанда, Лобиту, Намибе",
 "Anguilla Description":"Валли",
-"Antarctica Description":"Мак-Мёрдо",
+"Antarctica Description":"Станция Мак-Мёрдо, чилийская исследовательская станция «Вилла-Лас-Эстреллас», Роки-Коув",
 "Antigua and Barbuda Description":"Сент-Джонс",
 "Argentina_Buenos Aires_Buenos Aires Description":"Буэнос-Айрес",
 "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell",
@@ -2476,7 +2476,7 @@
 "Ukraine_Zaporizhia Oblast Description":"Запорожье, Мелитополь, Бердянск",
 "Ukraine_Zhytomyr Oblast Description":"Житомир, Бердичев, Коростень",
 "United Arab Emirates Description":"Абу-Даби, Дубай",
-"United States Virgin Islands Description":"Кристианстед",
+"United States Virgin Islands Description":"Фредерикстед, Кристианстед",
 "Uruguay Description":"Монтевидео, Салту",
 "Uzbekistan Description":"Ташкент, Коканд, Наманган",
 "Vanuatu Description":"Порт-Вила",
@@ -2484,7 +2484,7 @@
 "Venezuela_South Description":"Маракайбо, Сьюдад-Гуаяна, Сан-Кристобаль",
 "Vietnam Description":"Ханой, Хошимин, Вунгтау",
 "Wallis and Futuna Description":"Мата-Уту",
-"Yemen Description":"Сана, Сана, Аден",
+"Yemen Description":"Сана, Аден",
 "Zambia Description":"Лусака, Китве-Нкана, Ндола",
 "Zimbabwe Description":"Хараре, Хванге, Масвинго",
 "United States of America Short":"США",

data/countries-strings/sr.json/localize.json

@@ -32,7 +32,7 @@
 "Armenia":"Јерменија",
 "Australia":"Аустралија",
 "Australia_Melbourne":"Мелбурн",
-"Austria_Upper Austria":"Gornja Austrija",
+"Austria_Upper Austria":"Горња Аустрија",
 "Austria_Vorarlberg":"Ворарлберг",
 "Azerbaijan Region":"Азербејџан",
 "Bahrain":"Бахреин",
@@ -57,5 +57,51 @@
 "Russia_Perm Krai_North Short":"Пермскиј крај",
 "Spain_Castile and Leon":"Кастиља и Леон",
 "People's Republic of China":"Кина",
-"Taiwan":"Тајван"
+"Taiwan":"Тајван",
+"Australia_New South Wales":"Нови Јужни Велс",
+"Australia_Northern Territory":"Северна Територија",
+"Australia_Queensland":"Квинсленд",
+"Australia_South Australia":"Јужна Аустралија",
+"Australia_Tasmania":"Тасманија",
+"Australia_Victoria":"Викторија",
+"Austria":"Аустрија",
+"Austria_Burgenland":"Бургенланд",
+"Austria_Carinthia":"Корушка",
+"Austria_Lower Austria_West":"Доња Аустрија — Запад",
+"Austria_Salzburg":"Салцбург",
+"Austria_Styria":"Штајерска",
+"Austria_Tyrol":"Тирол",
+"Belgium_Antwerp":"Антверпен",
+"Belize":"Белизе",
+"Benin":"Бенин",
+"Bhutan":"Бутан",
+"Bermuda":"Бермуди",
+"Bolivia":"Боливија",
+"Bolivia_North":"Боливија – Сервер",
+"Bolivia_South":"Боливија – Југ",
+"Bosnia and Herzegovina":"Босна и Херцеговина",
+"Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina":"Брчко",
+"Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina":"Федерација Босне и Херцеговине",
+"Bosnia and Herzegovina_Republic of Srpska":"Република Српска",
+"Botswana":"Боцвана",
+"Brazil":"Бразил",
+"Brazil_Bahia":"Баија",
+"Brunei":"Брунеј",
+"Bulgaria":"Бугарска",
+"Burkina Faso":"Буркина Фасо",
+"Burundi":"Бурунди",
+"California":"Калифорнија",
+"Cambodia":"Камбоџа",
+"Cameroon":"Камерун",
+"Cameroon_Central":"Камерун — Центар",
+"Cameroon_West":"Камерун — Запад",
+"Canada":"Канада",
+"Canada_Alberta":"Алберта",
+"Canada_Alberta_Edmonton":"Едмонтон",
+"Canada_Alberta_North":"Алберта — Сервер",
+"Canada_British Columbia":"Британска Колумбија",
+"Australia_Western Australia":"Западна Аустралија",
+"Austria_Lower Austria_Wien":"Беч и Доња Аустрија — Исток",
+"Belgium_East Flanders":"Источна Фландрија",
+"Canada_Alberta_South":"Алберта — Југ"
 }

data/editor.config

@@ -462,6 +462,9 @@
         <include group="poi" />
         <include field="operator" />
       </type>
+      <type id="building-guardhouse">
+        <include group="poi" />
+      </type>
       <!-- Too generic to be added -->
       <type id="craft" can_add="no">
         <include group="poi_internet" />
@@ -702,6 +705,9 @@
       <type id="office-ngo" group="office">
         <include group="poi_internet" />
       </type>
+      <type id="office-security" group="office">
+        <include group="poi_internet" />
+      </type>
       <type id="office-telecommunication" group="office">
         <include group="poi_internet" />
       </type>

data/mapcss-mapping.csv

@@ -304,7 +304,8 @@ waterway|dam;200;
 amenity|charging_station|motorcar;[amenity=charging_station][motorcar?];;name;int_name;201;
 leisure|golf_course;202;
 highway|service|bridge;[highway=service][bridge?];;name;int_name;203;
-deprecated:power|minor_line:01.2017;204;x
+# ~250K usages.
+power|portal;204;
 # Marsh 500K usages, wet_meadow 160K
 natural|wetland|marsh;[natural=wetland][wetland=marsh],[natural=wetland][wetland=wet_meadow],[natural=wetland][wetland=dambo];;;;205;
 leisure|stadium;206;
@@ -873,8 +874,10 @@ barrier|kissing_gate;749;
 barrier|turnstile;750;
 landuse|industrial|mine;[landuse=industrial][industrial=mine];;name;int_name;751;
 landuse|flowerbed;752;
-deprecated|deprecated;753;x
-deprecated|deprecated;754;x
+# Used for barrier|yes in OM
+deprecated|OM;753;x
+# Used for barrier|wicket_gate in OM
+deprecated|OM;754;x
 deprecated|deprecated;755;x
 deprecated|deprecated;756;x
 deprecated|deprecated;757;x
@@ -996,7 +999,7 @@ deprecated|deprecated;871;x
 deprecated|deprecated;872;x
 area:highway|pedestrian;873;
 area:highway|unclassified;874;
-deprecated|deprecated;875;x
+highway|pedestrian|square;[highway=pedestrian][place=square];;;;875;
 deprecated|deprecated;876;x
 area:highway|cycleway;877;
 entrance|exit;878;
@@ -1752,3 +1755,5 @@ post_office|post_partner;1626;
 amenity|ranger_station;1627;
 leisure|escape_game;1628;
 amenity|luggage_locker;1629;
+building|guardhouse;[building=guardhouse],[amenity=security_booth],[amenity=checkpoint];;;;1630;
+office|security;1631;

data/replaced_tags.txt

@@ -162,6 +162,7 @@ recycling:plastic_packaging=yes : recycling:plastic=yes
 recycling:glass=yes             : recycling:glass_bottles=yes
 recycling:organic=yes           : recycling:green_waste=yes
 recycling:garden_waste=yes      : recycling:green_waste=yes
+recycling:food_waste=yes        : recycling:green_waste=yes
 
 recycling:paper_packaging=yes   : recycling:paper=yes
 recycling:newspaper=yes         : recycling:paper=yes

data/sound-strings/fr.json/localize.json

@@ -6,7 +6,7 @@
 "make_a_right_turn_street":"NULL",
 "make_a_sharp_right_turn":"À droite toute.",
 "make_a_sharp_right_turn_street":"NULL",
-"enter_the_roundabout":"Prenez le rond-point.",
+"enter_the_roundabout":"Au rond-point.",
 "enter_the_roundabout_street":"NULL",
 "enter_the_roundabout_street_verb":"NULL",
 "leave_the_roundabout":"Sortez du rond-point.",
@@ -43,9 +43,9 @@
 "in_800_meters":"Dans huit cents mètres",
 "in_900_meters":"Dans neuf cents mètres",
 "in_1_kilometer":"Dans un kilomètre",
-"in_1_5_kilometers":"Dans un virgule cinq kilomètre",
+"in_1_5_kilometers":"Dans un kilomètre et demi",
 "in_2_kilometers":"Dans deux kilomètres",
-"in_2_5_kilometers":"Dans deux virgule cinq kilomètres",
+"in_2_5_kilometers":"Dans deux kilomètres et demi",
 "in_3_kilometers":"Dans trois kilomètres",
 "then":"Puis",
 "dist_direction_onto_street":"%1$s %2$s %3$s %4$s",
@@ -102,7 +102,7 @@
 "in_4500_feet":"Dans quatre mille cinq cents pieds",
 "in_5000_feet":"Dans cinq mille pieds",
 "in_1_mile":"Dans un mile",
-"in_1_5_miles":"Dans un virgule cinq mile",
+"in_1_5_miles":"Dans un mile et demi",
 "in_2_miles":"Dans deux miles",
-"unknown_camera":"Caméra devant"
+"unknown_camera":"Radar droit devant"
 }

data/sound-strings/it.json/localize.json

@@ -12,7 +12,7 @@
 "leave_the_roundabout":"Uscire dalla rotonda.",
 "leave_the_roundabout_street":"NULL",
 "leave_the_roundabout_street_verb":"NULL",
-"make_a_slight_left_turn":"Rimani sulla sinistra.",
+"make_a_slight_left_turn":"Mantieni la sinistra.",
 "make_a_slight_left_turn_street":"NULL",
 "make_a_slight_left_turn_street_verb":"NULL",
 "make_a_left_turn":"Gira a sinistra.",
@@ -33,13 +33,13 @@
 "in_50_meters":"Tra cinquanta metri",
 "in_100_meters":"Tra cento metri",
 "in_200_meters":"Tra duecento metri",
-"in_250_meters":"Tra duecento cinquanta metri",
+"in_250_meters":"Tra duecentocinquanta metri",
 "in_300_meters":"Tra trecento metri",
 "in_400_meters":"Tra quattrocento metri",
 "in_500_meters":"Tra cinquecento metri",
 "in_600_meters":"Tra seicento metri",
 "in_700_meters":"Tra settecento metri",
-"in_750_meters":"Tra settecento cinquanta metri",
+"in_750_meters":"Tra settecentocinquanta metri",
 "in_800_meters":"Tra ottocento metri",
 "in_900_meters":"Tra novecento metri",
 "in_1_kilometer":"Tra un chilometro",