[android] Add intermediate GS cert to fix comaps-cdn.s3-website.cloud.ru maps downloads

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

README.md

@@ -8,6 +8,9 @@
   <a href="https://codeberg.org/comaps#keep-connected">Keep Connected</a>
 </p>
 
+<div align="center" >
+<img src="docs/badges/logo.svg" width="150">
+</div>
 
 
 <div align="center">
@@ -144,8 +147,14 @@ The project's financial information is completely open and transparent at [our O
 
 ## 🔒 Privacy
 
-The Android app has been reviewed by [Exodus Privacy](https://reports.exodus-privacy.eu.org/fr/reports/app.comaps.google/latest/).
+The Android app has been reviewed by [Exodus Privacy](https://reports.exodus-privacy.eu.org/en/reports/app.comaps.google/latest/).
 
+To [verify](https://developer.android.com/studio/command-line/apksigner#usage-verify) the APK, use the following signing certificate fingerprints:
+```
+SHA-256: 4894e8e6963627ef660031d8593fe77297f835acb4e23810003e926135023b4c
+SHA-1: 8b7b5739f917e9f7c681671ced0c9c8562123ade
+MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
+```
 ---
 
 ## ⚖️ License

android/.idea/icon.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64pt" height="64pt" viewBox="0 0 835 835">
+<path d="M698.5 141.1a20 20 0 0 1 30.8-1.3A416 416 0 0 1 835 417.4a416 416 0 0 1-93.3 263 20 20 0 0 1-31.3-.6l-43-56.6a20 20 0 0 1-.2-24 307 307 0 0 0 59.3-181.8c0-74.2-26.2-142.3-69.9-195.6a20 20 0 0 1-.5-24.8zM260.7 456.4a20 20 0 0 1-7.7-36.7l282-177.4a20 20 0 0 1 29.9 22.7l-97 318.9a20 20 0 0 1-37.5 2.2l-49.2-111.5z" style="fill:#ccdfca"/>
+<path d="M626.3 753a20 20 0 0 1-6.2 29.6A416 416 0 0 1 417.5 835 417.7 417.7 0 0 1 0 417.4 417.7 417.7 0 0 1 603.3 43.5a20 20 0 0 1 7 30l-42.4 55.8a20 20 0 0 1-24.2 6.1 307 307 0 0 0-126.2-27 309 309 0 0 0-309 309c0 170.6 138.5 309 309 309a307 307 0 0 0 141.6-34.3 20 20 0 0 1 25.1 5.6z" style="fill:#fefdf6"/>
+</svg>

android/app/build.gradle

@@ -65,6 +65,13 @@ project.ext.appName = 'CoMaps'
 android {
   namespace 'app.organicmaps'
 
+  dependenciesInfo {
+    // Disables dependency metadata when building APKs (for IzzyOnDroid/F-Droid)
+    includeInApk = false
+    // Disables dependency metadata when building Android App Bundles (for Google Play)
+    includeInBundle = false
+  }
+
   buildFeatures {
     dataBinding = true
     buildConfig = true

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

@@ -6,12 +6,12 @@ Můžete se zde také připojit ke komunitě pomáhat s vytvářením nejlepší
 • Poskytujte zpětnou vazbu a nahlašujte problémy
 • Aktualizujte mapová data v aplikaci nebo na webu OpenStreetMap
 
-• <b>Zaměřené na offline použití</b>: Plánujte a navigujte své cesty do zahraničí bez nutnosti mobilních dat, hledejte body na vzdálených túrách apod. Všechny funkce aplikace jsou navrženy tak, aby fungovaly offline.
-• <b>S ohledem na soukromí</b>: Aplikace je navržená s důrazem na soukromí – neidentifikuje lidi, nesleduje vás a nesbírá osobní údaje. Bez reklam.
-• <b>Jednoduché a vyladěné</b>: Základní, snadno použitelné funkce, které prostě fungují.
-• <b>Šetří vaši baterii a místo</b>: Nevybíjí vaší baterii, jako ostatní navigační aplikace. Kompaktní mapy šetří cenné místo ve vašem telefonu.
-• <b>Bezplatné a vytvořené komunitou</b>: S vytvářením aplikace pomáhají lidé, jako jste vy, přidáváním míst do projektu OpenStreetMap, testováním a poskytováním zpětné vazby k funkcím a přispíváním svými vývojářskými schopnostmi a penězi.
-• <b>Otevřené a transparentní rozhodování a nakládání s financemi, neziskovost a plně otevřený zdrojový kód.</b>
+‣ <b>Zaměřené na offline použití</b>: Plánujte a navigujte své cesty do zahraničí bez nutnosti mobilních dat, hledejte body na vzdálených túrách apod. Všechny funkce aplikace jsou navrženy tak, aby fungovaly offline.
+‣ <b>S ohledem na soukromí</b>: Aplikace je navržená s důrazem na soukromí – neidentifikuje lidi, nesleduje vás a nesbírá osobní údaje. Bez reklam.
+‣ <b>Jednoduché a vyladěné</b>: Základní, snadno použitelné funkce, které prostě fungují.
+‣ <b>Šetří vaši baterii a místo</b>: Nevybíjí vaší baterii, jako ostatní navigační aplikace. Kompaktní mapy šetří cenné místo ve vašem telefonu.
+‣ <b>Bezplatné a vytvořené komunitou</b>: S vytvářením aplikace pomáhají lidé, jako jste vy, přidáváním míst do projektu OpenStreetMap, testováním a poskytováním zpětné vazby k funkcím a přispíváním svými vývojářskými schopnostmi a penězi.
+‣ <b>Otevřené a transparentní rozhodování a nakládání s financemi, neziskovost a plně otevřený zdrojový kód.</b>
 
 <b>Hlavní funkce</b>:
 • Stahovatelné podrobné mapy s místy, která nenajdete ani v Mapách Google

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

@@ -0,0 +1 @@
+Nem kortnavigation - Oplev mere af din rejse - Drevet af fællesskabet

android/app/src/fdroid/play/listings/da-DK/title.txt

@@ -0,0 +1 @@
+CoMaps - vandr, cykl og kør offline med privatliv

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

@@ -1,4 +1,4 @@
-Eine von der Community betriebene, kostenlose Open-Source Karten-App, die auf OpenStreetMap Daten basiert. Transparent, datensparsam und nicht gewinnorientiert. CoMaps ist ein Fork/Abspaltung von Organic Maps, die wiederum ein Fork/Abspaltung von Maps.Me ist.
+Eine von der Community betriebene, kostenlose Open-Source Karten-App, die auf OpenStreetMap Daten basiert. Transparent und nicht gewinnorientiert. CoMaps ist ein Fork/Abspaltung von Organic Maps, die wiederum ein Fork/Abspaltung von Maps.Me ist.
 
 Lese mehr über die Gründe und Ziele des Projektes unter <b><i>codeberg.org/comaps</i></b>.
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
@@ -28,5 +28,5 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Dunkler Modus für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor
 
-<b>Freiheit beginnt hier</b>
+<b>Entdecke die Unabhängigkeit</b>
 Entdecke deine Reise – navigiere in der Welt mit Datenschutz!

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

@@ -1,6 +1,9 @@
-• OpenStreetMap-Daten vom 22. Juni
-• Optionale automatische Backups von Lesezeichen & Tracks
-• Neue 100m-Höhenlinien für Regionen die vorher gröbere/keine Isolinien hatten
-• Vegetation & Spielplätze werden früher angezeigt, neue Farben für Campingplätze & andere Einrichtungen
-• Pfade & Tracks werden standardmäßig bei höherem Zoom angezeigt, Outdoor-Stil für Detailübersicht
-• Aktion des linken Button nichtm mehr im Hamburger-Menü, stattdessen werden "Über & Hilfe" dort angezeigt
+Wir stellen vor: Das neue CoMaps-Logo!
+• Verbesserte Höhenlinien in vielen Regionen (Stufen von 20/50 m)
+• Links zu Panoramax-Bildern für ausgewählte POIs
+• OpenStreetMap-Daten vom 13. Juli
+• Neue Farben für viele Objekte und Farben werden früher angezeigt
+• Öffnungszeiten werden beim Antippen eines POI angezeigt
+• Verschiedene Arten von Feuchtgebieten
+• Neue Farben für Vegetation und andere Features; einige neue Icons
+• Wandern: bessere Darstellung der Höhenlinien

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

@@ -1,7 +1,10 @@
-• OpenStreetMap data as of June 22
-• a setting for automatic bookmarks and tracks backup
-• added 100m-step altitude isolines to all regions that had worse or no isolines
-• display vegetation and playground color fills earlier, add fills to camp sites and some amenities
-• paths & tracks appear on the map later by default - still appear earlier in the outdoor style
-• hide active custom button action from the hamburger menu, move there About & Help from the settings
-• update map transport icons
+Introducing CoMaps logo!
+
+• upgrade altitude contour lines for many regions to 20 or 50 meters step
+• add Panoramax Picture links to selected POIs
+• OpenStreetMap data as of July 13
+• add color fills to many features and display fills earlier for existing features
+• display opening hours state when selecting a POI
+• split all wetlands into several distinct types
+• update vegetation and other map colors, update some map icons
+• outdoors: bolder altitude contour lines

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

@@ -1,6 +1,9 @@
-• datos de OpenStreetMap a 22 de junio
-• añadido ajuste para la copia de seguridad automática de marcadores y trazas
-• añadidas isolíneas de 100 m a las regiones que tenían isolíneas peores o no tenían isolíneas
-• se muestra antes la vegetación y zonas de juego, añadidas áreas a campings y otros servicios
-• los senderos y pistas aparecen más tarde - siguen igual en estilo de outdoors
-• se oculta botón personalizado del menú y se mueve allí Acerca de y Ayuda desde los ajustes
+¡Presentamos el logo de CoMaps!
+• mejora de isolíneas con más detalle para muchas regiones
+• añade enlaces de imágenes de Panoramax a POIs seleccionados
+• datos de OpenStreetMap a 13 de julio
+• añadidos rellenos de color a muchas características
+• se muestra el estado de horarios de apertura al seleccionar un POI
+• se dividen los humedales en tipos distintos
+• se actualiza la vegetación y otros colores del mapa, así como otros iconos
+• exteriores: líneas de contorno de altitud más gruesas

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

@@ -1,6 +1,7 @@
-• Données OpenStreetMap du 22 juin
-• Sauvegarde automatique des signets et traces GPS en local
-• Ajout des courbes d'altitude avec un précision de 100 mètres dans toutes les régions qui avaient peu de courbes ou aucune
-• Ajustements des styles notamment sur la végétation, les aires de jeu et les chemins
-• Masque l’action active du bouton personnalisé dans le menu hamburger
-• Correction de certains plantages et bugs
+Présentation du logo CoMaps !
+• Amélioration des courbes d’altitude à une précision de 20 ou 50 mètres pour de nombreuses régions
+• Ajout d'un lien vers les images Panoramax des POI
+• Données OpenStreetMap du 13 juillet
+• Affichage de l’état des heures d’ouverture lors de la sélection d’un POI
+• Mise à jour du style(végétation et zones humides), mise à jour de certaines icônes de la carte
+• Outdoors: Améliorations de la visibilité des courbes d'altitude

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

@@ -1 +1 @@
-Navigation facile - Découvrez plus lors de votre voyage - Fait par la communauté
+Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté

android/app/src/fdroid/play/listings/hu-HU/title.txt

@@ -0,0 +1 @@
+CoMaps - Túra, Bicikli, Vezetés offline diszkréten

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

@@ -0,0 +1,9 @@
+Wprowadzamy logo CoMaps!
+• zwiększenie dokładności izolinii w wielu regionach w krokach 20 do 50 metrów
+• dodanie linków do zdjęć z Panoramax do wybranych POI
+• aktualizacja danych OpenStreetMap z 13 lipca
+• dodanie wypełnienia kolorem dla wielu typów obiektów
+• wyświetlanie stanu godzin otwarcia przy wyborze POI
+• podział mokradeł na kilka typów
+• aktualizacja koloru roślinności i innych kolorów, aktualizacja części ikon na mapie
+• tryb outdoorowy: pogrubione warstwice wysokości

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

@@ -8,7 +8,6 @@ Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.
 
 ‣ <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>Respeito à 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. Livre de 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 esgota a 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.

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

@@ -0,0 +1,9 @@
+Apresentamos o logo do CoMaps!
+• Curvas de nível mais detalhadas em muitas regiões
+• Adicionados links de imagens do Panoramax para pontos de interesse selecionados
+• Dados OSM de 13/07
+• Adicionados preenchimentos de cor a muitos elementos
+• Exibição de horário de funcionamento ao selecionar um ponto de interesse
+• Divididas áreas úmidas em vários tipos distintos
+• Atualizada cores/ícones para vegetação e outros elementos
+• Ar livre: curvas de nível de altitude mais destacadas

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

@@ -0,0 +1 @@
+CoMaps - Drumeții, Ciclism, Condus Offline în confidențialitate

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

@@ -1,6 +1,9 @@
-• карты OpenStreetMap от 22 июня
-• автоматическое резервное копирование меток и треков
-• линии высот с шагом 100м для всех регионов, где линии с этим шагом отсутствовали
-• цветная заливка растительности и игровых площадок отображается раньше, добавлена заливка для кемпингов и других объектов
-• тропы и грунтовки отображаются позже в стиле по умолчанию - используйте стиль «Активный отдых» для обзора троп
-• выбранная функция настраиваемой кнопки больше не дублируется в пунктах меню
+Представляем логотип CoMaps!
+• Линии высот для многих регионов с шагом 20м или 50м
+• Ссылки на изображения Panoramax к выбранным POI
+• Карты OpenStreetMap от 13 июля
+• Заливки цветом ко многим объектам и более ранняя заливка для существующих объектов
+• Показ часов работы при выборе POI
+• Разные водно-болотные угодья отличаются цветом
+• Обновлены цвета растительности и другие цвета на карте, изменены некоторые иконки
+• В стиле "Активный отдых" более четкие линии высот

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

@@ -0,0 +1,9 @@
+Представљамо CoMaps лого!
+• ажуриране изохипсе за многе регионе на кораке од 20 или 50 метара
+• додате везе ка Panoramax сликама за изабране тачке интересовања (POI)
+• подаци са OpenStreetMap-а од 13. јула
+• додате боје за многе елементе и раније приказивање постојећих површина
+• приказ стања радног времена при избору POI-ја
+• мочваре подељене на неколико различитих типова
+• ажуриране боје вегетације и других елемената на мапи, ажуриране поједине иконе
+• на отвореном: наглашеније изохипсе

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

@@ -1 +1 @@
-Једноставна навигација - Сазнајте више о свом путовању - Покреће је заједница
+Једноставна навигација - Сазнајте више о свом путовању - Ради на бази заједнице

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

@@ -0,0 +1 @@
+Định vị bản đồ dễ dàng - Khám phá thế giới quanh bạn - Đồng hành cùng cộng đồng

android/app/src/google/play/listings/da-DK/short-description.txt

@@ -0,0 +1 @@
+Nem kortnavigation - Oplev mere af din rejse - Drevet af fællesskabet

android/app/src/google/play/listings/de-DE/full-description.txt

@@ -1,4 +1,4 @@
-Eine von der Community betriebene, kostenlose Open-Source Karten App, die auf OpenStreetMap-Daten basiert. Transparent, datensparsam und nicht gewinnorientiert.
+Eine von der Community betriebene, kostenlose Open-Source Karten App, die auf OpenStreetMap-Daten basiert. Ein Gemeinschaftsprojekt mit Fokus auf Transparenz und non-profit.
 
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Nutze die App und erzähle anderen davon
@@ -8,8 +8,8 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 <i>Dein Feedback und deine 5-Sterne-Bewertung sind die beste Unterstützung für uns!</i>
 
 ‣ <b>Einfach und ausgereift</b>: Essenzielle, leicht zu bedienende Funktionen, die einfach funktionieren.
-‣ <b>Offline-orientiert</b>: Plane und navigiere im Ausland ohne Mobilfunkverbindung, finde Wegpunkte auf abgelegenen Wanderungen usw. Alle Funktionen sind für den Offline-Einsatz konzipiert.
-‣ <b>Datenschutzfreundlich</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – keine Personenidentifikation, kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
+‣ <b>Offlinekarten</b>: Plane und navigiere im Ausland ohne Mobilfunkverbindung, finde Wegpunkte auf abgelegenen Wanderungen usw. Alle Funktionen sind für den Offline-Einsatz konzipiert.
+‣ <b>Datenschutz ist uns wichtig!</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
 ‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf Deinem Gerät.
 ‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen, die App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Softwareentwicklung oder Spenden.
 ‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open Source</b>
@@ -32,5 +32,5 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 
 Bitte melde Probleme, schlage neue Funktionen vor und werde Teil der Community auf unserer Website: <b><i>comaps.app</i></b>
 
-<b>Freiheit beginnt hier</b>
+<b>Entdecke die Unabhängigkeit</b>
 Entdecke deine Reise – navigiere in der Welt mit Datenschutz!

android/app/src/google/play/listings/fr-FR/short-description.txt

@@ -1 +1 @@
-Navigation facile - Découvrez plus lors de votre voyage - Fait par la communauté
+Navigation cartographique facile - Propulsé par la communauté

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

@@ -0,0 +1 @@
+CoMaps - Navighează liniștit

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

@@ -1,6 +1,6 @@
 Бесплатна апликација за мапе отвореног кода коју води заједница заснована на OpenStreetMap подацима и ојачана посвећеношћу транспарентности, приватности и непрофитности.
 
-Придружите се заједници и помозите да направимо најбољу навигацију
+Придружите се заједници и помозите да направите најбољу навигацију
 • Користите апликацију и ширите информације о њој
 • Оставите повратне информације и пријавите проблеме
 • Ажурирајте мапе из апликације или на сајту OpenStreetMap
@@ -11,26 +11,26 @@
 ‣ <b>Офлајн фокусирана</b>: Планирајте путовање у иностранство без употребе мобилне телефоније, потражите правац тачке током дугог путовања, итд . Све функције апликације су дизајниране за рад у режиму без интернета.
 ‣ <b>Поштовање приватности</b>: Апликација је развијена с обзиром на приватност - не идентификује људе, не прати и не прикупља личне информације. Без реклама.
 ‣ <b>Штеди батерију и простор</b>: Не празни батерију, као остале навигациje. Компактне mape штедe драгоценi prostor на вашем телефону..
-‣ <b>Free and Built by the Community</b>: Такви људи, као што сте помогли да креирате апликацију, додајући места у OpenStreetMap, тестира и остављајући повратне информације о функцијама, као и стављајући своје вештине развоја и новац.
-‣ <b>Отворено и транспарентно доношење одлука и финансија, непрофитни и потпуно отворени кода.</b>
+‣ <b>Бесплатно и изграђено од стране заједнице</b>: Људи попут вас помогли су у изради апликације додавањем места на OpenStreetMap, тестирањем и давањем повратних информација о функцијама и доприносом својим развојним вештинама и новцем.
+‣ <b>Отворено и транспарентно доношење одлука и финансије, непрофитне и потпуно отвореног кода.</b>
 
 <b>Главне карактеристике</b>:
-• Преузимање детаљне мапе са локацијама које нису доступне у Google Maps
-• Истакнуте планинарске стазе, кампови, изворима воде, врхове, контуре линије итд
-• Пешачке и бициклистичке стазе
-• Тачке од интереса као што су ресторани, бензинске станице, хотели, атракције, шопинг и још много тога
-• Претрага по имену или адреси или по категорији интересних места
-• Навигација са гласовним огласима за планинарење, бициклизам или вожње аутомобила
-• Означи своја омиљене места са једним додиром
-• Офлајн Википедиа чланци
-• Транзитни слој метроа и упутства
-• Track recording
-• Export and import bookmarks and tracks in KML, KMZ, GPX formats
-• A dark mode to use during the night
-• Improve map data for everyone using a basic built-in editor
-• Подршка за Андроид Ауто
+<li>Преузимање детаљних мапа са локацијама које нису доступне у Google Maps</li>
+<li>Режим на отвореном са истакнутим планинарским стазама, кампови, извори воде, врхови, контурне линије, итд</li>
+<li>Пешачке и бициклистичке стазе</li>
+<li>Тачке интереса попут ресторана, бензинских станица, хотели, продавнице, разгледање и још много тога</li>
+<li>Претрага по имену, адреси или по ТОИ категоријама</li>
+<li>Навигација са гласовним упутима за планинарење, бициклизам или вожњу аутомобилом</li>
+<li>Обележите своја омиљена места једним додиром</li>
+<li>Википедија чланци без интернета</li>
+<li>Нивои транзита у метроа и смер кретања</li>
+<li>Снимање траса</li>
+<li>Извоз и увоз маркера и траса у форматима KML, KMZ, GPX</li>
+<li>Тамни режим за употребу ноћу</li>
+<li>Побољшавање картографских података за све, користећи основни едитор за уређивање</li>
+<li>Подршка за Андроид Ауто</li>
 
 Молимо Вас да пријавите проблеме са апликацијом, предложите идеје и придружите се нашој заједници на <b><i>comaps.app</i></b> страни.
 
-<b>Сад је слободна</b>
+<b>Сад је слободно</b>
 Откријте своје путовање, путујте светом с приватношћу и заједницом на челу!

android/app/src/google/play/listings/sr/short-description.txt

@@ -1 +1 @@
-Једноставна навигација - Сазнајте више о свом путовању - Покреће је заједница
+Једноставна навигација - Сазнајте више о свом путовању - Ради на бази заједнице

android/app/src/google/play/listings/vi/full-description.txt

@@ -0,0 +1,36 @@
+Một ứng dụng bản đồ miễn phí & mã nguồn mở do cộng đồng phát triển, dựa trên dữ liệu OpenStreetMap và cam kết mạnh mẽ về minh bạch, quyền riêng tư và phi lợi nhuận.
+
+Hãy tham gia cộng đồng và cùng chúng tôi xây dựng ứng dụng bản đồ tốt nhất!
+• Sử dụng ứng dụng và chia sẻ với mọi người
+• Đóng góp ý kiến và báo cáo lỗi
+• Cập nhật dữ liệu bản đồ trong ứng dụng hoặc trên trang web OpenStreetMap
+
+<i>Đánh giá 5 sao và phản hồi của bạn là sự ủng hộ quý giá nhất!</i>
+
+‣ <b>Đơn giản và tinh tế</b>: Những tính năng cần thiết, dễ sử dụng và hoạt động mượt mà.
+‣ <b>Hoạt động offline</b>: Lên kế hoạch và điều hướng chuyến đi ở nước ngoài mà không cần kết nối mạng, tìm kiếm địa điểm khi đi bộ đường dài... Tất cả chức năng đều hoạt động offline.
+‣ <b>Tôn trọng quyền riêng tư</b>: Ứng dụng được thiết kế để bảo vệ sự riêng tư - không định danh người dùng, không theo dõi và không thu thập thông tin cá nhân. Hoàn toàn không có quảng cáo.
+‣ <b>Tiết kiệm pin và dung lượng</b>: Không ngốn pin như các ứng dụng bản đồ khác. Bản đồ nhỏ gọn giúp tiết kiệm dung lượng điện thoại.
+‣ <b>Miễn phí và được xây dựng bởi cộng đồng</b>: Chính những người như bạn đã góp phần phát triển ứng dụng bằng cách thêm địa điểm vào OpenStreetMap, kiểm thử tính năng, đóng góp ý kiến, kỹ năng lập trình và tài chính.
+‣ <b>Minh bạch trong quyết định & tài chính, phi lợi nhuận và mã nguồn mở hoàn toàn.</b>
+
+<b>Tính năng chính</b>:
+• Tải bản đồ chi tiết với nhiều địa điểm không có trên Google Maps
+• Chế độ ngoài trời với các tuyến đi bộ, khu cắm trại, nguồn nước, đỉnh núi, đường đồng mức... được đánh dấu rõ ràng
+• Đường đi bộ và đường dành cho xe đạp
+• Địa điểm quan tâm như nhà hàng, trạm xăng, khách sạn, cửa hàng, điểm tham quan...
+• Tìm kiếm theo tên, địa chỉ hoặc danh mục địa điểm
+• Dẫn đường với thông báo bằng giọng nói cho đi bộ, đạp xe hoặc lái xe
+• Đánh dấu địa điểm yêu thích chỉ với một lần chạm
+• Đọc bài viết Wikipedia offline
+• Lớp bản đồ tàu điện ngầm và chỉ dẫn di chuyển
+• Ghi lại lộ trình
+• Xuất/nhập bookmark và lộ trình dưới dạng KML, KMZ, GPX
+• Chế độ tối để sử dụng ban đêm
+• Chỉnh sửa bản đồ cơ bản ngay trong ứng dụng để cải thiện dữ liệu cho mọi người
+• Hỗ trợ Android Auto
+
+Hãy báo cáo lỗi, đề xuất ý tưởng và tham gia cộng đồng của chúng tôi tại trang web <i><b>comaps.app</b></i>.
+
+<b>Tự do ngay trong tay bạn!</b>
+Khám phá hành trình, điều hướng thế giới với sự riêng tư và tinh thần cộng đồng!

android/app/src/google/play/listings/vi/short-description.txt

@@ -0,0 +1 @@
+Định vị bản đồ dễ dàng - Khám phá thế giới quanh bạn - Đồng hành cùng cộng đồng

android/app/src/google/play/listings/vi/title.txt

@@ -0,0 +1 @@
+CoMaps - Định vị riêng tư

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

@@ -850,7 +850,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       @Override
       public void drawIcon(FloatingActionButton imageView)
       {
-        imageView.setImageResource(R.drawable.ic_question_mark);
+        imageView.setImageResource(R.drawable.ic_logo_monochrome);
       }
 
       @Override
@@ -2615,7 +2615,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       items.add(new MenuBottomSheetItem(R.string.share_my_location, R.drawable.ic_share, this::onShareLocationOptionSelected));
 
       if (!BUTTON_HELP_CODE.equals(activeLeftButton))
-        items.add(new MenuBottomSheetItem(R.string.about_help, R.drawable.ic_question_mark, this::showHelp));
+        items.add(new MenuBottomSheetItem(R.string.about_help, R.drawable.ic_logo_monochrome, this::showHelp));
 
       return items;
     }

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

@@ -69,7 +69,7 @@ public class DownloaderNotifier
         .setAutoCancel(true)
         .setCategory(NotificationCompat.CATEGORY_ERROR)
         .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-        .setSmallIcon(R.drawable.ic_launcher_small)
+        .setSmallIcon(R.drawable.ic_logo_small)
         .setColor(ContextCompat.getColor(mContext, R.color.notification))
         .setContentTitle(title)
         .setContentText(content)
@@ -124,7 +124,7 @@ public class DownloaderNotifier
     return new NotificationCompat.Builder(mContext, CHANNEL_ID)
             .setAutoCancel(true)
             .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-            .setSmallIcon(R.drawable.ic_launcher_small)
+            .setSmallIcon(R.drawable.ic_logo_small)
             .setColor(ContextCompat.getColor(mContext, R.color.notification))
             .setShowWhen(true)
             .setContentTitle(title)

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

@@ -3,6 +3,7 @@ package app.organicmaps.downloader;
 import static android.Manifest.permission.POST_NOTIFICATIONS;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 
+import android.app.ForegroundServiceStartNotAllowedException;
 import android.app.Service;
 import android.content.Intent;
 import android.content.pm.ServiceInfo;
@@ -42,10 +43,24 @@ public class DownloaderService extends Service implements MapManager.StorageCall
 
     var notification = mNotifier.buildProgressNotification();
     Logger.i(TAG, "Starting Downloader Foreground Service");
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-      ServiceCompat.startForeground(this, DownloaderNotifier.NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
-    else
-      ServiceCompat.startForeground(this, DownloaderNotifier.NOTIFICATION_ID, notification, 0);
+    try
+    {
+      int type = 0;
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+        type = ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC;
+      ServiceCompat.startForeground(this, DownloaderNotifier.NOTIFICATION_ID, notification, type);
+    }
+    catch (Exception e)
+    {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+          e instanceof ForegroundServiceStartNotAllowedException)
+      {
+        // App not in a valid state to start foreground service (e.g started from bg)
+        Logger.e(TAG, "Not in a valid state to start foreground service", e);
+      }
+      else
+        Logger.e(TAG, "Failed to promote the service to foreground", e);
+    }
 
     return START_NOT_STICKY;
   }

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

@@ -36,7 +36,7 @@ public class LocationHelper implements BaseLocationProvider.Listener
 {
   private static final long INTERVAL_FOLLOW_MS = 0;
   private static final long INTERVAL_NOT_FOLLOW_MS = 3000;
-  private static final long INTERVAL_NAVIGATION_MS = 0;
+  private static final long INTERVAL_NAVIGATION_MS = 1000;
   private static final long INTERVAL_TRACK_RECORDING = 0;
 
   private static final long AGPS_EXPIRATION_TIME_MS = 16 * 60 * 60 * 1000; // 16 hours

android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java

@@ -1,5 +1,6 @@
 package app.organicmaps.location;
 
+import android.app.ForegroundServiceStartNotAllowedException;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -107,7 +108,7 @@ public class TrackRecordingService extends Service implements LocationListener
         .setOngoing(true)
         .setShowWhen(true)
         .setOnlyAlertOnce(true)
-        .setSmallIcon(R.drawable.ic_launcher_small)
+        .setSmallIcon(R.drawable.ic_logo_small)
         .setContentTitle(context.getString(R.string.track_recording))
         .addAction(0, context.getString(R.string.navigation_stop_button), getExitPendingIntent(context))
         .setContentIntent(getPendingIntent(context))
@@ -160,10 +161,25 @@ public class TrackRecordingService extends Service implements LocationListener
     }
 
     Logger.i(TAG, "Starting Track Recording Foreground service");
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-      ServiceCompat.startForeground(this, TrackRecordingService.TRACK_REC_NOTIFICATION_ID, getNotificationBuilder(this).build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION);
-    else
-      ServiceCompat.startForeground(this, TrackRecordingService.TRACK_REC_NOTIFICATION_ID, getNotificationBuilder(this).build(), 0);
+
+    try
+    {
+      int type = 0;
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+        type = ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION;
+      ServiceCompat.startForeground(this, TrackRecordingService.TRACK_REC_NOTIFICATION_ID, getNotificationBuilder(this).build(), type);
+    }
+    catch (Exception e)
+    {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+          e instanceof ForegroundServiceStartNotAllowedException)
+      {
+        // App not in a valid state to start foreground service (e.g started from bg)
+        Logger.e(TAG, "Not in a valid state to start foreground service", e);
+      }
+      else
+        Logger.e(TAG, "Failed to promote the service to foreground", e);
+    }
 
     final LocationHelper locationHelper = LocationHelper.from(this);
 

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

@@ -7,6 +7,7 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 import static app.organicmaps.util.Constants.Vendor.XIAOMI;
 
 import android.annotation.SuppressLint;
+import android.app.ForegroundServiceStartNotAllowedException;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -154,7 +155,7 @@ public class NavigationService extends Service implements LocationListener
         .setOngoing(true)
         .setShowWhen(false)
         .setOnlyAlertOnce(true)
-        .setSmallIcon(R.drawable.ic_launcher_small)
+        .setSmallIcon(R.drawable.ic_logo_small)
         .setContentIntent(pendingIntent)
         .addAction(0, context.getString(R.string.navigation_stop_button), exitPendingIntent)
         .setColorized(isColorizedSupported())
@@ -226,10 +227,25 @@ public class NavigationService extends Service implements LocationListener
     }
 
     Logger.i(TAG, "Starting Navigation Foreground service");
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-      ServiceCompat.startForeground(this, NavigationService.NOTIFICATION_ID, getNotificationBuilder(this).build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION);
-    else
-      ServiceCompat.startForeground(this, NavigationService.NOTIFICATION_ID, getNotificationBuilder(this).build(), 0);
+
+    try
+    {
+      int type = 0;
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+        type = ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION;
+      ServiceCompat.startForeground(this, NavigationService.NOTIFICATION_ID, getNotificationBuilder(this).build(), type);
+    }
+    catch (Exception e)
+    {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+          e instanceof ForegroundServiceStartNotAllowedException)
+      {
+        // App not in a valid state to start foreground service (e.g started from bg)
+        Logger.e(TAG, "Not in a valid state to start foreground service", e);
+      }
+      else
+        Logger.e(TAG, "Failed to promote the service to foreground", e);
+    }
 
     final LocationHelper locationHelper = LocationHelper.from(this);
 

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M28.2,58.5q-1.6,0 -2.87,-0.74 -1.26,-0.73 -1.98,-2.09t-0.72,-3.21q0,-1.87 0.72,-3.23t1.98,-2.1q1.27,-0.72 2.87,-0.72 1.03,0 1.91,0.3 0.88,0.31 1.56,0.88 0.68,0.56 1.11,1.36 0.44,0.79 0.58,1.77L30.9,50.72q-0.1,-0.52 -0.34,-0.92 -0.23,-0.4 -0.58,-0.68t-0.8,-0.43q-0.43,-0.15 -0.96,-0.15 -1,0 -1.7,0.48t-1.08,1.36 -0.38,2.08 0.37,2.07 1.09,1.35 1.7,0.48q0.53,0 0.97,-0.14t0.78,-0.43 0.59,-0.68 0.35,-0.91h2.44q-0.14,0.97 -0.58,1.76 -0.43,0.8 -1.11,1.36t-1.57,0.88q-0.87,0.3 -1.9,0.3m10.56,0q-1.25,0 -2.2,-0.55 -0.95,-0.54 -1.48,-1.51 -0.53,-0.98 -0.53,-2.28t0.53,-2.27 1.48,-1.52 2.2,-0.55q1.27,0 2.21,0.55 0.95,0.54 1.48,1.52 0.54,0.97 0.54,2.27t-0.54,2.28 -1.48,1.51 -2.2,0.55m0,-1.88q0.57,0 1,-0.3 0.42,-0.3 0.65,-0.84 0.24,-0.55 0.24,-1.32t-0.24,-1.32q-0.23,-0.55 -0.66,-0.84 -0.42,-0.3 -0.99,-0.3 -0.55,0 -0.98,0.3 -0.42,0.29 -0.66,0.84 -0.23,0.55 -0.23,1.32 0,0.78 0.23,1.33 0.24,0.54 0.66,0.84t0.98,0.29m5.82,1.69L44.58,46.6h3.53l1.93,5.45 0.29,0.91 0.33,1.13q0.18,0.58 0.32,1.11l0.24,0.9h-0.6l0.23,-0.9 0.32,-1.11 0.34,-1.13 0.27,-0.9 1.91,-5.46h3.53v11.7h-2.37v-5.56l0.01,-0.93 0.03,-1.16 0.03,-1.25 0.03,-1.2h0.29l-0.38,1.27 -0.37,1.27 -0.34,1.13 -0.28,0.87 -1.98,5.57h-1.96l-2,-5.57 -0.3,-0.87 -0.35,-1.13 -0.38,-1.27 -0.39,-1.27h0.35l0.02,1.2 0.03,1.25 0.03,1.16 0.01,0.93v5.57zM61.72,58.45q-0.82,0 -1.47,-0.28 -0.64,-0.27 -1.01,-0.82 -0.37,-0.56 -0.37,-1.39 0,-0.7 0.26,-1.16 0.26,-0.47 0.7,-0.75 0.46,-0.3 1.04,-0.44 0.6,-0.15 1.24,-0.2 0.76,-0.09 1.2,-0.16 0.46,-0.07 0.65,-0.2 0.2,-0.14 0.2,-0.4v-0.06q0,-0.3 -0.17,-0.53 -0.16,-0.24 -0.47,-0.37 -0.3,-0.14 -0.72,-0.14t-0.75,0.14 -0.52,0.38q-0.18,0.24 -0.22,0.56h-2.17q0.05,-0.85 0.5,-1.48 0.46,-0.63 1.27,-0.97 0.82,-0.35 1.96,-0.35 0.85,0 1.52,0.2 0.67,0.19 1.12,0.56 0.47,0.37 0.7,0.9 0.24,0.52 0.24,1.19v5.63h-2.27v-1.17h-0.03q-0.22,0.4 -0.54,0.7t-0.79,0.45 -1.1,0.16m0.65,-1.61q0.56,0 0.96,-0.2t0.63,-0.57 0.22,-0.8v-0.83l-0.27,0.11 -0.39,0.1 -0.48,0.08 -0.53,0.09q-0.4,0.06 -0.72,0.2 -0.33,0.12 -0.52,0.34 -0.18,0.21 -0.18,0.54 0,0.3 0.15,0.5 0.16,0.22 0.45,0.33t0.68,0.1m5.98,4.75L68.35,50.01h2.29v1.12h0.02q0.26,-0.43 0.62,-0.72 0.37,-0.29 0.83,-0.43 0.48,-0.15 1.01,-0.15 1.06,0 1.86,0.55 0.81,0.55 1.26,1.52 0.46,0.97 0.46,2.25 0,1.3 -0.45,2.27 -0.45,0.98 -1.25,1.52t-1.9,0.54q-0.54,0 -1,-0.16 -0.46,-0.15 -0.82,-0.47t-0.59,-0.79h-0.02v4.53zM72.51,56.58q0.56,0 0.97,-0.28 0.42,-0.29 0.65,-0.83 0.23,-0.55 0.23,-1.33t-0.23,-1.32 -0.65,-0.83q-0.4,-0.3 -0.97,-0.3 -0.59,0 -1.03,0.31 -0.44,0.3 -0.69,0.85 -0.23,0.54 -0.23,1.29 0,0.74 0.23,1.29 0.25,0.55 0.69,0.85 0.45,0.3 1.03,0.3m9.18,1.92q-1.08,0 -1.92,-0.33 -0.84,-0.34 -1.35,-0.97 -0.5,-0.62 -0.58,-1.51h2.28q0.07,0.54 0.46,0.85 0.4,0.3 1.07,0.3 0.64,0 1,-0.24 0.37,-0.24 0.37,-0.63 0,-0.33 -0.28,-0.53 -0.27,-0.2 -0.79,-0.3l-1.45,-0.29q-1.21,-0.23 -1.84,-0.84 -0.63,-0.62 -0.63,-1.58 0,-0.78 0.43,-1.37t1.21,-0.91q0.8,-0.33 1.88,-0.33t1.88,0.35 1.25,0.97q0.46,0.63 0.48,1.49h-2.14q-0.01,-0.5 -0.4,-0.83 -0.38,-0.33 -1,-0.33 -0.6,0 -0.94,0.26 -0.34,0.25 -0.34,0.62 0,0.32 0.27,0.52t0.74,0.31l1.57,0.3q1.26,0.25 1.85,0.8 0.6,0.56 0.6,1.48 0,0.82 -0.48,1.44 -0.46,0.62 -1.3,0.96 -0.82,0.34 -1.9,0.34"
-      android:fillColor="#fff"/>
-</vector>

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

@@ -0,0 +1,4 @@
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/ic_logo"
+    android:inset="24%" />

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

@@ -0,0 +1,4 @@
+<inset
+xmlns:android="http://schemas.android.com/apk/res/android"
+android:drawable="@drawable/ic_logo_monochrome"
+android:inset="24%" />

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

@@ -1,10 +0,0 @@
-<!-- Used for notification icon etc -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="144dp"
-    android:height="144dp"
-    android:viewportWidth="144"
-    android:viewportHeight="144">
-  <path
-      android:pathData="M40.34 29.42a41.6 41.6 0 0 0-19.66 5.03q-8.77 4.85-13.8 14.42-5.05 9.57-5.05 23.18 0 13.4 5.04 22.88a36 36 0 0 0 13.71 14.51q8.67 5.04 19.76 5.04 7.95 0 14.2-2.42A33.6 33.6 0 0 0 72.8 96.24a33 33 0 0 0 3.43-11.09l-17.64-0.1q-0.6 3.33-2.22 5.95a12 12 0 0 1-3.83 4.33 19 19 0 0 1-5.44 2.73q-2.93 0.9-6.45 0.9-6.15 0-10.99-3.02-4.82-3.03-7.46-9.07-2.61-6.05-2.62-14.82 0-8.56 2.62-14.61 2.63-6.06 7.46-9.28 4.64-3.22 11.09-3.22 3.53 0 6.55 1 3.13 1.01 5.44 3.03a14.5 14.5 0 0 1 3.83 4.63q1.51 2.63 2.02 6.05h17.64a37 37 0 0 0-3.83-12.8 30 30 0 0 0-7.76-9.47 34 34 0 0 0-10.99-5.95 43 43 0 0 0-13.3-2.01m71.29 21.16q-9.37 0-16.23 4.03a26.6 26.6 0 0 0-10.59 11.2q-3.62 7.14-3.62 16.82 0 9.48 3.62 16.73a28 28 0 0 0 10.69 11.2q6.84 4.01 16.28 4.02 9.24 0 16.07-4.03a27.4 27.4 0 0 0 10.59-11.19q3.72-7.25 3.73-16.73 0-9.87-3.73-16.93a27.6 27.6 0 0 0-10.59-11.09q-6.86-4.03-16.22-4.03m0.2 13.1a9.8 9.8 0 0 1 7.05 2.42 16 16 0 0 1 4.34 6.76q1.5 4.23 1.5 9.57a33 33 0 0 1-1.5 9.68 14 14 0 0 1-4.44 6.65q-2.72 2.52-7.05 2.52-4.24 0-7.26-2.52a15 15 0 0 1-4.44-6.65 31 31 0 0 1-1.4-9.68q0-5.34 1.4-9.57 1.52-4.24 4.44-6.76 2.92-2.41 7.36-2.42"
-      android:fillColor="#fff"/>
-</vector>

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

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="835"
+    android:viewportHeight="835">
+  <path
+      android:pathData="M698.5,141.1a20,20 0,0 1,30.8 -1.3A416,416 0,0 1,835 417.4a416,416 0,0 1,-93.3 263,20 20,0 0,1 -31.3,-0.6l-43,-56.6a20,20 0,0 1,-0.2 -24,307 307,0 0,0 59.3,-181.8c0,-74.2 -26.2,-142.3 -69.9,-195.6a20,20 0,0 1,-0.5 -24.8zM260.7,456.4a20,20 0,0 1,-7.7 -36.7l282,-177.4a20,20 0,0 1,29.9 22.7l-97,318.9a20,20 0,0 1,-37.5 2.2l-49.2,-111.5z"
+      android:fillColor="#ccdfca"/>
+  <path
+      android:pathData="M626.3,753a20,20 0,0 1,-6.2 29.6A416,416 0,0 1,417.5 835,417.7 417.7,0 0,1 0,417.4 417.7,417.7 0,0 1,603.3 43.5a20,20 0,0 1,7 30l-42.4,55.8a20,20 0,0 1,-24.2 6.1,307 307,0 0,0 -126.2,-27 309,309 0,0 0,-309 309c0,170.6 138.5,309 309,309a307,307 0,0 0,141.6 -34.3,20 20,0 0,1 25.1,5.6z"
+      android:fillColor="#fefdf6"/>
+</vector>

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

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="835"
+    android:viewportHeight="835">
+  <path
+      android:pathData="M698.5,141.1a20,20 0,0 1,30.8 -1.3A416,416 0,0 1,835 417.4a416,416 0,0 1,-93.3 263,20 20,0 0,1 -31.3,-0.6l-43,-56.6a20,20 0,0 1,-0.2 -24,307 307,0 0,0 59.3,-181.8c0,-74.2 -26.2,-142.3 -69.9,-195.6a20,20 0,0 1,-0.5 -24.8zM260.7,456.4a20,20 0,0 1,-7.7 -36.7l282,-177.4a20,20 0,0 1,29.9 22.7l-97,318.9a20,20 0,0 1,-37.5 2.2l-49.2,-111.5z"
+      android:fillColor="#BFFFFFFF"/>
+  <path
+      android:pathData="M626.3,753a20,20 0,0 1,-6.2 29.6A416,416 0,0 1,417.5 835,417.7 417.7,0 0,1 0,417.4 417.7,417.7 0,0 1,603.3 43.5a20,20 0,0 1,7 30l-42.4,55.8a20,20 0,0 1,-24.2 6.1,307 307,0 0,0 -126.2,-27 309,309 0,0 0,-309 309c0,170.6 138.5,309 309,309a307,307 0,0 0,141.6 -34.3,20 20,0 0,1 25.1,5.6z"
+      android:fillColor="#FFFFFFFF"/>
+</vector>

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

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="835dp"
+    android:height="835dp"
+    android:viewportWidth="835"
+    android:viewportHeight="835">
+  <path
+      android:pathData="M698.5,141.1a20,20 0,0 1,30.8 -1.3A416,416 0,0 1,835 417.4a416,416 0,0 1,-93.3 263,20 20,0 0,1 -31.3,-0.6l-43,-56.6a20,20 0,0 1,-0.2 -24,307 307,0 0,0 59.3,-181.8c0,-74.2 -26.2,-142.3 -69.9,-195.6a20,20 0,0 1,-0.5 -24.8zM260.7,456.4a20,20 0,0 1,-7.7 -36.7l282,-177.4a20,20 0,0 1,29.9 22.7l-97,318.9a20,20 0,0 1,-37.5 2.2l-49.2,-111.5z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M626.3,753a20,20 0,0 1,-6.2 29.6A416,416 0,0 1,417.5 835,417.7 417.7,0 0,1 0,417.4 417.7,417.7 0,0 1,603.3 43.5a20,20 0,0 1,7 30l-42.4,55.8a20,20 0,0 1,-24.2 6.1,307 307,0 0,0 -126.2,-27 309,309 0,0 0,-309 309c0,170.6 138.5,309 309,309a307,307 0,0 0,141.6 -34.3,20 20,0 0,1 25.1,5.6z"
+      android:fillColor="#fff"/>
+</vector>

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

@@ -17,15 +17,14 @@
       android:orientation="vertical"
       android:padding="@dimen/margin_base">
 
-    <!--ImageView
+    <ImageView
         android:layout_width="@dimen/about_logo"
         android:layout_height="@dimen/about_logo"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="@dimen/margin_base"
-        android:layout_marginBottom="@dimen/margin_half"
+        android:layout_marginBottom="@dimen/margin_base"
         android:contentDescription="@string/app_name"
-        app:srcCompat="@drawable/ic_launcher"
-        app:tint="?attr/colorLogo" /-->
+        app:srcCompat="@drawable/ic_logo_monochrome"
+        app:tint="?attr/colorLogo"/>
 
     <TextView
         android:id="@+id/version"

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

@@ -14,7 +14,7 @@
       android:layout_width="300dp"
       android:layout_height="0dp"
       android:contentDescription="@null"
-      app:srcCompat="@drawable/ic_launcher"
+      app:srcCompat="@drawable/ic_launcher_foreground"
       android:layout_weight="1000"
       android:layout_margin="@dimen/margin_double"/>
 
@@ -22,8 +22,18 @@
       android:id="@+id/tv__app_name"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="@dimen/margin_double"
+      android:text="@string/app_name"
+      android:gravity="center_horizontal"
+      android:textAppearance="@style/MwmTextAppearance.Title.Splash" />
+
+  <TextView
+      android:id="@+id/tv__splash_subtitle"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
       android:text="@string/splash_subtitle"
+      android:layout_marginStart="@dimen/margin_double"
+      android:layout_marginEnd="@dimen/margin_double"
+      android:layout_marginBottom="@dimen/margin_double"
       android:gravity="center_horizontal"
       android:textAppearance="@style/MwmTextAppearance.Toolbar" />
 

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

@@ -13,6 +13,7 @@
     android:layout_marginStart="@dimen/margin_base"
     android:text="@string/download_country_ask"
     android:textAppearance="?fontBody2"
+    app:buttonTint="?colorAccent"
     android:visibility="gone"
     tools:visibility="visible"/>
   <com.google.android.material.progressindicator.LinearProgressIndicator

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   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="@dimen/height_item_oneline"
   android:background="?clickableBackground"
@@ -12,7 +13,8 @@
     android:id="@+id/selected"
     android:layout_width="48dp"
     android:layout_height="48dp"
-    android:layout_marginEnd="@dimen/margin_double"/>
+    android:layout_marginEnd="@dimen/margin_double"
+    app:buttonTint="?colorAccent"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/cuisine"

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

@@ -52,7 +52,8 @@
         <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@id/chb__day"
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content"/>
+          android:layout_height="wrap_content"
+          style="@style/MwmWidget.Editor.DayCheckBox"/>
 
       </LinearLayout>
 
@@ -69,7 +70,8 @@
         <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@id/chb__day"
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content"/>
+          android:layout_height="wrap_content"
+          style="@style/MwmWidget.Editor.DayCheckBox"/>
 
       </LinearLayout>
 
@@ -86,7 +88,8 @@
         <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@id/chb__day"
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content"/>
+          android:layout_height="wrap_content"
+          style="@style/MwmWidget.Editor.DayCheckBox"/>
 
       </LinearLayout>
 
@@ -103,7 +106,8 @@
         <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@id/chb__day"
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content"/>
+          android:layout_height="wrap_content"
+          style="@style/MwmWidget.Editor.DayCheckBox"/>
 
       </LinearLayout>
 
@@ -120,7 +124,8 @@
         <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@id/chb__day"
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content"/>
+          android:layout_height="wrap_content"
+          style="@style/MwmWidget.Editor.DayCheckBox"/>
 
       </LinearLayout>
 
@@ -141,7 +146,8 @@
         <com.google.android.material.checkbox.MaterialCheckBox
           android:id="@id/chb__day"
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content"/>
+          android:layout_height="wrap_content"
+          style="@style/MwmWidget.Editor.DayCheckBox"/>
 
       </LinearLayout>
 

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

@@ -4,6 +4,5 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/help_button"
   style="@style/MwmWidget.MapButton.Square"
-  android:tint="@null"
   app:shapeAppearanceOverlay="@style/MwmWidget.MapButton.Square"
   app:srcCompat="@drawable/ic_question_mark" />

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

@@ -80,7 +80,7 @@
           android:ellipsize="end"
           android:textAppearance="@style/MwmTextAppearance.Body3"
           tools:background="#300000F0"
-          tools:text="Open • Closing in 45 min" />
+          tools:text="Closes in 45 min • at 23:00" />
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__address"
         android:textAlignment="viewStart"

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher"/>
-    <monochrome android:drawable="@drawable/ic_launcher"/>
+    <background android:drawable="@color/bg_primary"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome"/>
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher"/>
-</adaptive-icon>

android/app/src/main/res/raw/globalsignovssl2018

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIETjCCAzagAwIBAgINAe5fIh38YjvUMzqFVzANBgkqhkiG9w0BAQsFADBMMSAw
+HgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFs
+U2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjAeFw0xODExMjEwMDAwMDBaFw0yODEx
+MjEwMDAwMDBaMFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52
+LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIFJTQSBPViBTU0wgQ0EgMjAxODCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdaydUMGCEAI9WXD+uu3Vxoa2uP
+UGATeoHLl+6OimGUSyZ59gSnKvuk2la77qCk8HuKf1UfR5NhDW5xUTolJAgvjOH3
+idaSz6+zpz8w7bXfIa7+9UQX/dhj2S/TgVprX9NHsKzyqzskeU8fxy7quRU6fBhM
+abO1IFkJXinDY+YuRluqlJBJDrnw9UqhCS98NE3QvADFBlV5Bs6i0BDxSEPouVq1
+lVW9MdIbPYa+oewNEtssmSStR8JvA+Z6cLVwzM0nLKWMjsIYPJLJLnNvBhBWk0Cq
+o8VS++XFBdZpaFwGue5RieGKDkFNm5KQConpFmvv73W+eka440eKHRwup08CAwEA
+AaOCASkwggElMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgEAMB0G
+A1UdDgQWBBT473/yzXhnqN5vjySNiPGHAwKz6zAfBgNVHSMEGDAWgBSP8Et/qC5F
+JK5NUPpjmove4t0bvDA+BggrBgEFBQcBAQQyMDAwLgYIKwYBBQUHMAGGImh0dHA6
+Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9yb290cjMwNgYDVR0fBC8wLTAroCmgJ4Yl
+aHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9yb290LXIzLmNybDBHBgNVHSAEQDA+
+MDwGBFUdIAAwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5j
+b20vcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAJmQyC1fQorUC2bbmANz
+EdSIhlIoU4r7rd/9c446ZwTbw1MUcBQJfMPg+NccmBqixD7b6QDjynCy8SIwIVbb
+0615XoFYC20UgDX1b10d65pHBf9ZjQCxQNqQmJYaumxtf4z1s4DfjGRzNpZ5eWl0
+6r/4ngGPoJVpjemEuunl1Ig423g7mNA2eymw0lIYkN5SQwCuaifIFJ6GlazhgDEw
+fpolu4usBCOmmQDo8dIm7A9+O4orkjgTHY+GzYZSR+Y0fFukAj6KYXwidlNalFMz
+hriSqHKvoflShx8xpfywgVcvzfTO3PYkz6fiNJBonf6q8amaEsybwMbDqKWwIX7e
+SPY=
+-----END CERTIFICATE-----

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

@@ -41,13 +41,11 @@
     <string name="try_again">Probeer weer</string>
     <string name="about_menu_title">Oor CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Gratis vir almal, gemaak met liefde</string>
-    <!-- Text in About screen -->
     <string name="about_proposition_1">• Geen advertensies, geen nasporing, geen dataversameling</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Geen battery dreineer, werk vanlyn</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• Vinnig, minimalisties, ontwikkel deur die gemeenskap</string>
+    <string name="about_proposition_3">• Vanlyn, vinnig en kompak</string>
     <!-- Text in About screen -->
     <string name="about_developed_by_enthusiasts">Oopbrontoepassing geskep deur entoesiaste en vrywilligers.</string>
     <string name="close">Sluit</string>
@@ -803,4 +801,5 @@
     <string name="panoramax">Panoramax-prent</string>
     <string name="editor_line_social_network">LINE</string>
     <string name="app_site_url">https://comaps.app/</string>
+    <string name="saved">Gestoor</string>
 </resources>

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

@@ -41,13 +41,11 @@
     <string name="try_again">محاولة مرة أخرى</string>
     <string name="about_menu_title">حول CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">مجاني للجميع ، مصنوع من الحب</string>
-    <!-- Text in About screen -->
     <string name="about_proposition_1">• لا إعلانات ، لا تتبع ، لا جمع البيانات</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• لا يوجد استنزاف للبطارية، يعمل دون اتصال بالإنترنت</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• سريع وبسيط، تم تطويره بواسطة المجتمع</string>
+    <string name="about_proposition_3">• غير متصل بالإنترنت، سريع وصغير الحجم</string>
     <!-- Text in About screen -->
     <string name="about_developed_by_enthusiasts">تطبيق مفتوح المصدر الذي أنشأه المتحمسون والمتطوعون.</string>
     <!-- The button that opens system location settings -->
@@ -891,4 +889,5 @@
     <string name="editor_line_social_network">LINE</string>
     <string name="panoramax">صورة Panoramax</string>
     <string name="app_site_url">https://comaps.app/ar</string>
+    <string name="saved">تم الحفظ</string>
 </resources>

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

@@ -185,4 +185,6 @@
     <string name="panoramax">Panoramax Foto</string>
     <string name="app_site_url">https://comaps.app/</string>
     <string name="bluesky">Bluesky</string>
+    <string name="saved">Archivos</string>
+    <string name="about_proposition_3">• Offline, rápidu y compactu</string>
 </resources>

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

@@ -46,7 +46,7 @@
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Batareyanın boşalması yoxdur, oflayn işləyir</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• Sürətli, minimalist, icma tərəfindən hazırlanmışdır</string>
+    <string name="about_proposition_3">• Oflayn, sürətli və yığcam</string>
     <!-- Text in About screen -->
     <string name="about_developed_by_enthusiasts">Həvəskarlar və könüllülər tərəfindən yaradılan açıq mənbə proqramı.</string>
     <!-- The button that opens system location settings -->
@@ -844,4 +844,5 @@
     <string name="panoramax">Panoramax Şəkil</string>
     <string name="editor_line_social_network">LINE</string>
     <string name="app_site_url">https://comaps.app/tr/</string>
+    <string name="saved">Saxlandı</string>
 </resources>

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

@@ -41,13 +41,11 @@
     <string name="try_again">Паспрабаваць зноў</string>
     <string name="about_menu_title">Аб праграме CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Бясплатная для ўсіх, зробленая з любоўю</string>
-    <!-- Text in About screen -->
     <string name="about_proposition_1">• Без рэкламы, без трэкінгу, без збірання вашых даных</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Без празмернай разрадкі батарэі, працуе ў аўтаномным рэжыме</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• Хуткая, мінімалістычная, распрацаваная супольнасцю</string>
+    <string name="about_proposition_3">• Афлайн, хуткі і кампактны</string>
     <!-- Text in About screen -->
     <string name="about_developed_by_enthusiasts">Праграма з адкрытым зыходным кодам, створаная энтузіястамі і валанцёрамі.</string>
     <!-- The button that opens system location settings -->
@@ -883,4 +881,5 @@
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="panoramax">Фота Panoramax</string>
     <string name="app_site_url">https://comaps.app/ru/</string>
+    <string name="saved">Захавана</string>
 </resources>

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

@@ -41,13 +41,11 @@
     <string name="try_again">Опитайте отново</string>
     <string name="about_menu_title">Относно приложението</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Безплатно за всички, направени с любов</string>
-    <!-- Text in About screen -->
     <string name="about_proposition_1">• Без реклами, без проследяване, без събиране на данни</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Без източване на батерията, работи офлайн</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• Бърз, прост, разработен от общността</string>
+    <string name="about_proposition_3">• Офлайн, бърз и компактен</string>
     <!-- Text in About screen -->
     <string name="about_developed_by_enthusiasts">Приложение с отворен код, създадено от ентусиасти и доброволци.</string>
     <!-- The button that opens system location settings -->
@@ -839,4 +837,5 @@
     <string name="panoramax">Panoramax Снимка</string>
     <string name="editor_line_social_network">LINE</string>
     <string name="app_site_url">https://comaps.app/</string>
+    <string name="saved">Запазено</string>
 </resources>

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

@@ -775,4 +775,238 @@
     <string name="type.highway.tertiary">Третостепенен път</string>
     <string name="type.landuse.cemetery">Гробище</string>
     <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.amenity.studio">Студио</string>
+    <string name="type.amenity.college">Колеж</string>
+    <string name="type.barrier.guard_rail">Мантинела</string>
+    <string name="type.amenity.love_hotel">Любовен хотел</string>
+    <string name="type.highway.ladder">Стълба</string>
+    <string name="type.amenity.vending_machine.excrement_bags">Диспенсър за торбички</string>
+    <string name="type.natural.wetland.fen">Мочурище</string>
+    <string name="type.natural.wetland.reedbed">Тръстиково легло</string>
+    <string name="type.natural.wetland.swamp">Блато</string>
+    <string name="type.natural.wetland.mangrove">Мангрова гора</string>
+    <string name="type.cuisine.burger">Бургер</string>
+    <string name="type.aerialway.gondola">Гондола</string>
+    <string name="type.sport.diving">Високо гмуркане</string>
+    <string name="type.amenity.place_of_worship.hindu">Хиндуистки храм</string>
+    <string name="type.amenity.place_of_worship.taoist">Даоистки храм</string>
+    <string name="type.recycling.small_appliances">Електронни отпадъци</string>
+    <string name="type.amenity.sanitary_dump_station">Станция за изхвърляне на резервоара за задържане</string>
+    <string name="type.amenity.vending_machine">Вендинг машина</string>
+    <string name="type.amenity.vending_machine.cigarettes">Диспенсър за цигари</string>
+    <string name="type.amenity.vending_machine.coffee">Диспенсър за кафе</string>
+    <string name="type.amenity.vending_machine.condoms">Диспенсър за презервативи</string>
+    <string name="type.amenity.vending_machine.drinks">Диспенсър за напитки</string>
+    <string name="type.amenity.vending_machine.newspapers">Диспенсър за вестници</string>
+    <string name="type.amenity.vending_machine.parking_tickets">Паркинг метър</string>
+    <string name="type.barrier.retaining_wall">Подпорна стена</string>
+    <string name="type.barrier.stile">Стъпалата</string>
+    <string name="type.barrier.swing_gate">Бариера на жп линия</string>
+    <string name="type.cuisine.argentinian">Аржентински</string>
+    <string name="type.cuisine.asian">Азиатски</string>
+    <string name="type.cuisine.bagel">Геврек</string>
+    <string name="type.cuisine.barbecue">Барбекю</string>
+    <string name="type.cuisine.beef_bowl">Купа с говеждо месо</string>
+    <string name="type.cuisine.bubble_tea">Бабъл чай</string>
+    <string name="type.cuisine.buschenschank">Бушеншанк</string>
+    <string name="type.cuisine.cake">Торта</string>
+    <string name="type.cuisine.chicken">Пиле</string>
+    <string name="type.cuisine.coffee_shop">Кафе</string>
+    <string name="type.cuisine.crepe">Креп</string>
+    <string name="type.cuisine.croatian">Хърватски</string>
+    <string name="type.cuisine.diner">Вагон-ресторант</string>
+    <string name="type.cuisine.donut">Донът</string>
+    <string name="type.cuisine.fine_dining">Изящна кухня</string>
+    <string name="type.cuisine.fish">Риба</string>
+    <string name="type.railway.station.subway.qingdao">Метростанция</string>
+    <string name="type.natural.wetland.tidalflat">Приливната равнина</string>
+    <string name="type.cuisine.curry">Къри</string>
+    <string name="type.amenity.place_of_worship.shinto">Шинтоистко светилище</string>
+    <string name="type.amenity.vending_machine.food">Диспенсър за храна</string>
+    <string name="type.amenity.nightclub">Нощен клуб</string>
+    <string name="type.cuisine.breakfast">Закуска</string>
+    <string name="type.cuisine.fish_and_chips">Риба и чипс</string>
+    <string name="type.cuisine.friture">Фритюр</string>
+    <string name="type.cuisine.grill">Грил</string>
+    <string name="type.cuisine.hotdog">Хотдог</string>
+    <string name="type.cuisine.ice_cream">Сладолед</string>
+    <string name="type.cuisine.italian_pizza">Италиански, пица</string>
+    <string name="type.cuisine.kebab">Кебап</string>
+    <string name="type.cuisine.mediterranean">Средиземноморски</string>
+    <string name="type.cuisine.oriental">Източноазиатска</string>
+    <string name="type.cuisine.pancake">Палачинки</string>
+    <string name="type.cuisine.pizza">Пица</string>
+    <string name="type.cuisine.mexican">Мексиканска</string>
+    <string name="type.cuisine.moroccan">Мароканска</string>
+    <string name="type.cuisine.japanese">Японска</string>
+    <string name="type.cuisine.hungarian">Унгарска</string>
+    <string name="type.cuisine.french">Френска</string>
+    <string name="type.cuisine.chinese">Китайска</string>
+    <string name="type.cuisine.ethiopian">Етиопска</string>
+    <string name="type.cuisine.filipino">Филипинска</string>
+    <string name="type.cuisine.georgian">Грузинска</string>
+    <string name="type.cuisine.german">Немска</string>
+    <string name="type.cuisine.greek">Гръцка</string>
+    <string name="type.cuisine.indian">Индийска</string>
+    <string name="type.cuisine.indonesian">Индонезийска</string>
+    <string name="type.cuisine.international">Международна</string>
+    <string name="type.cuisine.irish">Ирландска</string>
+    <string name="type.cuisine.italian">Италианска</string>
+    <string name="type.cuisine.korean">Корейска</string>
+    <string name="type.cuisine.lao">Лао</string>
+    <string name="type.cuisine.lebanese">Ливанска</string>
+    <string name="type.cuisine.local">Местна</string>
+    <string name="type.cuisine.ramen">Рамен</string>
+    <string name="type.cuisine.regional">Регионална</string>
+    <string name="type.cuisine.sausage">Колбаси</string>
+    <string name="type.cuisine.savory_pancakes">Пикантни палачинки</string>
+    <string name="type.cuisine.seafood">Морски дарове</string>
+    <string name="type.cuisine.soba">Соба</string>
+    <string name="type.cuisine.steak_house">Стекхаус</string>
+    <string name="type.cuisine.sushi">Суши</string>
+    <string name="type.cuisine.tapas">Тапас</string>
+    <string name="type.cuisine.tea">Чай</string>
+    <string name="type.cuisine.vegan">Веганска</string>
+    <string name="type.cuisine.thai">Тайландска</string>
+    <string name="type.cuisine.turkish">Турска</string>
+    <string name="type.cuisine.russian">Руска</string>
+    <string name="type.leisure.dog_park">Парк за кучета</string>
+    <string name="type.leisure.fitness_centre">Фитнес център</string>
+    <string name="type.leisure.garden">Градина</string>
+    <string name="type.leisure.golf_course">Голф игрище</string>
+    <string name="type.leisure.hackerspace">Хакерспейс</string>
+    <string name="type.leisure.ice_rink">Ледена пързалка</string>
+    <string name="type.leisure.marina">Яхт-клуб</string>
+    <string name="type.leisure.pitch">Спортен терен</string>
+    <string name="type.leisure.playground">Детска площадка</string>
+    <string name="type.leisure.recreation_ground">Парк за отдих</string>
+    <string name="type.leisure.firepit">Огнище</string>
+    <string name="type.leisure.park">Парк</string>
+    <string name="type.leisure.park.no.access">Частен парк</string>
+    <string name="type.leisure.park.permissive">Парк</string>
+    <string name="type.leisure.park.private">Частен парк</string>
+    <string name="type.leisure.sauna">Сауна</string>
+    <string name="type.leisure.track.area">Пътека</string>
+    <string name="type.leisure.water_park">Аквапарк</string>
+    <string name="type.leisure.beach_resort">Плажен курорт</string>
+    <string name="type.man_made">Изкуствена структура</string>
+    <string name="type.man_made.cairn">Керн</string>
+    <string name="type.man_made.chimney">Комин</string>
+    <string name="type.leisure">Място за отдих</string>
+    <string name="type.cuisine.malaysian">Мадагаскарска</string>
+    <string name="type.cuisine.malagasy">Мадагаскар</string>
+    <string name="type.cuisine.polish">Полска</string>
+    <string name="type.cuisine.portuguese">Португалска</string>
+    <string name="type.leisure.slipway">Стапел</string>
+    <string name="type.leisure.sports_centre">Спортен център</string>
+    <string name="type.leisure.stadium">Стадион</string>
+    <string name="type.shop.cosmetics">Магазин за козметика</string>
+    <string name="type.leisure.nature_reserve">Природен резерват</string>
+    <string name="type.shop.florist">Цветарски магазин</string>
+    <string name="type.man_made.breakwater">Вълнолом</string>
+    <string name="type.leisure.fitness_station">Фитнес станция</string>
+    <string name="type.leisure.track">Пътека</string>
+    <string name="type.landuse.forest.coniferous">Иглолистни гори</string>
+    <string name="type.landuse.forest.deciduous">Широколистна гора</string>
+    <string name="type.landuse.garages">Гаражи</string>
+    <string name="type.landuse.greenfield">Земля за застройки</string>
+    <string name="type.landuse.greenhouse_horticulture">Оранжерия</string>
+    <string name="type.landuse.industrial">Индустриална зона</string>
+    <string name="type.landuse.landfill">Депо за отпадъци</string>
+    <string name="type.landuse.military">Военна зона</string>
+    <string name="type.landuse.orchard">Овощна градина</string>
+    <string name="type.landuse.railway">Железопътни съоръжения</string>
+    <string name="type.landuse.recreation_ground">Място за отдих</string>
+    <string name="type.landuse.reservoir">Резервоар</string>
+    <string name="type.landuse.residential">Жилищна зона</string>
+    <string name="type.landuse.retail">Търговска площ</string>
+    <string name="type.landuse.salt_pond">Солено езеро</string>
+    <string name="type.man_made.cutline">Просека</string>
+    <string name="type.man_made.survey_point">Геодезическа точка</string>
+    <string name="type.man_made.flagpole">Мачта за знаме</string>
+    <string name="type.man_made.crane">Кран</string>
+    <string name="type.man_made.water_tap">Кранче за вода</string>
+    <string name="type.man_made.water_tap.drinking_water_no">Кранче за вода</string>
+    <string name="type.man_made.water_tower">Водна кула</string>
+    <string name="type.man_made.water_well">Кладенец</string>
+    <string name="type.man_made.water_well.drinking_water_no">Кладенец</string>
+    <string name="type.man_made.windmill">Вятърна мелница</string>
+    <string name="type.man_made.works">Промишлени предприятия</string>
+    <string name="type.military">Военни</string>
+    <string name="type.military.bunker">Бункер</string>
+    <string name="type.power.generator">Генератор на електроенергия</string>
+    <string name="type.power.line">Електропровод</string>
+    <string name="type.power.line.underground">Подземен електропровод</string>
+    <string name="type.power.minor_line">Електропровод за ниско напрежение</string>
+    <string name="type.power.substation">Подстанция</string>
+    <string name="type.railway">Железопътна линия</string>
+    <string name="type.railway.funicular.tunnel">Фуникулярен тунел</string>
+    <string name="type.power">Електричество</string>
+    <string name="type.landuse.farmyard">Стопански двор</string>
+    <string name="type.man_made.lighthouse">Фар</string>
+    <string name="type.man_made.mast">Мачта</string>
+    <string name="type.man_made.pier">Пирс</string>
+    <string name="type.man_made.pipeline">Тръбопровод</string>
+    <string name="type.man_made.pipeline.overground">Надземен тръбопровод</string>
+    <string name="type.man_made.storage_tank">Резервоар за съхранение</string>
+    <string name="type.man_made.surveillance">Камера за наблюдение</string>
+    <string name="type.cuisine.vegetarian">Вегетарианска</string>
+    <string name="type.emergency">Спешна помощ</string>
+    <string name="type.emergency.defibrillator">Дефибрилатор</string>
+    <string name="type.emergency.phone">Телефон за спешни случаи</string>
+    <string name="type.cuisine.vietnamese">Виетнамска</string>
+    <string name="type.highway.bridleway">Пътека за юздечки</string>
+    <string name="type.highway.bridleway.permissive">Пътека за юздечки</string>
+    <string name="type.highway.construction">Път в процес на изграждане</string>
+    <string name="type.highway.living_street">Жилищна улица</string>
+    <string name="type.highway.track">Пътека</string>
+    <string name="type.highway.track.area">Пътека</string>
+    <string name="type.highway.track.grade1">Пътека</string>
+    <string name="type.highway.track.no.access">Пътека</string>
+    <string name="type.area_highway.living_street">Жилищна улица</string>
+    <string name="type.area_highway.track">Пътека</string>
+    <string name="type.landuse">Земеползване</string>
+    <string name="type.landuse.allotments">Овощни градини</string>
+    <string name="type.landuse.brownfield">Земля за застройки</string>
+    <string name="type.landuse.commercial">Търговска зона</string>
+    <string name="type.landuse.construction">Строителна зона</string>
+    <string name="type.landuse.education">Учебно заведение</string>
+    <string name="type.man_made.utility_pole">Стълб за комунални услуги</string>
+    <string name="type.landuse.religious">Религиозна земя</string>
+    <string name="type.power.tower">Електрическа кула</string>
+    <string name="type.power.pole">Електрически стълб</string>
+    <string name="type.railway.abandoned">Изоставена железопътна линия</string>
+    <string name="type.railway.abandoned.bridge">Изоставен железопътен мост</string>
+    <string name="type.railway.abandoned.tunnel">Изоставен железопътен тунел</string>
+    <string name="type.railway.construction">Строителство на железопътни линии</string>
+    <string name="type.railway.crossing">Железопътен прелез</string>
+    <string name="type.railway.disused">Неизползвана железопътна линия</string>
+    <string name="type.railway.funicular.bridge">Фуникулярен мост</string>
+    <string name="type.railway.halt">Железопътна спирка</string>
+    <string name="type.railway.level_crossing">Железопътен прелез</string>
+    <string name="type.railway.light_rail">Скоростен трамвай</string>
+    <string name="type.railway.light_rail.bridge">Мост на скоростен трамвай</string>
+    <string name="type.railway.light_rail.tunnel">Тунел на скоростен трамвай</string>
+    <string name="type.railway.monorail">Монорелс</string>
+    <string name="type.natural.wetland.saltmarsh">Солено блато</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Приливни солени блато</string>
+    <string name="type.noexit">Задънена улица</string>
+    <string name="type.office.estate_agent">Агент по недвижими имоти</string>
+    <string name="type.office.government">Правителствен офис</string>
+    <string name="type.office.lawyer">Адвокат</string>
+    <string name="type.office.ngo">Неправителствена организация</string>
+    <string name="type.organic.only">Органичен</string>
+    <string name="type.organic.yes">Органичен</string>
+    <string name="type.railway.monorail.bridge">Мост на монорелсите</string>
+    <string name="type.junction">Съединение</string>
+    <string name="type.landuse.forest.mixed">Смесена гора</string>
+    <string name="type.landuse.plant_nursery">Посадъчен материал</string>
+    <string name="type.landuse.farmland">Земеделска земя</string>
+    <string name="type.area_highway.steps">Стълбища</string>
+    <string name="type.office.company">Офис на компанията</string>
+    <string name="type.man_made.wastewater_plant">Пречиствателна станция за отпадъчни води</string>
+    <string name="type.landuse.quarry">Кариера</string>
+    <string name="type.office.insurance">Застрахователна служба</string>
+    <string name="type.railway.monorail.tunnel">Тунел на монорелсите</string>
+    <string name="type.boundary.national_park">National Park</string>
 </resources>

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

@@ -39,6 +39,7 @@
     <string name="self_service">স্ব-সেবা</string>
     <string name="panoramax">Panoramax ছবি</string>
     <string name="editor_line_social_network">LINE</string>
-    <string name="mastodon">Mastodon</string>
+    <string name="mastodon">মাস্টোডন</string>
     <string name="bluesky">Bluesky</string>
+    <string name="saved">সংরক্ষণ</string>
 </resources>

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

@@ -36,17 +36,15 @@
     <string name="country_status_download_failed">La baixada ha fallat</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Torna-ho a intentar</string>
-    <string name="about_menu_title">Quant a l’CoMaps</string>
+    <string name="about_menu_title">Quant al CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Gratuït per a tothom, fet amb amor</string>
+    <string name="about_proposition_1">• Fàcil d\'usar i elegant</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• Sense publicitat, rastreig ni recopilació de dades</string>
+    <string name="about_proposition_2">• Centrat en la privacitat i sense anuncis</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_2">• Consum de bateria mínim, funciona fora de línia</string>
+    <string name="about_proposition_3">• Fora de línia, ràpid i compacte</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• Ràpid, minimalista, desenvolupat per la comunitat</string>
-    <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Aplicació de codi obert creada per entusiastes i voluntaris.</string>
+    <string name="about_developed_by_enthusiasts">Codi totalment obert, sense ànim de lucre i transparència en la presa de decisions i finances.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">Paràmetres d’ubicació</string>
     <string name="close">Tanca</string>
@@ -299,9 +297,9 @@
     <!-- Item in context menu. -->
     <string name="downloader_update_map">Actualitza el mapa</string>
     <!-- Preference title -->
-    <string name="google_play_services">Serveis d\'ubicació de Google Play</string>
+    <string name="google_play_services">Servei d\'ubicació de Google Fused</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Determineu ràpidament la vostra ubicació aproximada mitjançant Bluetooth, WiFi o xarxa mòbil</string>
+    <string name="pref_use_google_play">Un servei de propietat que combina GPS, Wi-Fi, xarxes mòbils, etc. per a determinar la teva ubicació amb més precisió. Pot ser que es connecti als serveis de Google.</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -885,4 +883,45 @@
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="panoramax">Imatge Panoramax</string>
     <string name="app_site_url">https://comaps.app/ca/</string>
+    <string name="saved">S\'ha desat</string>
+    <string name="about_headline">Projecte obert, desenvolupat per la comunitat</string>
+    <string name="codeberg">Codeberg</string>
+    <string name="bluesky">Bluesky</string>
+    <string name="error_enter_correct_level">Introdueix un valor de pis vàlid</string>
+    <string name="error_enter_correct_fediverse_page">Introdueix un nom d\'usuari o una adreça web de Mastodon vàlids</string>
+    <string name="pref_backup_now_summary">Crear una còpia de seguretat immediatament</string>
+    <string name="pref_backup_now_title">Crear una còpia de seguretat ara</string>
+    <string name="pref_backup_now_summary_progress">Còpia de seguretat en progrés…</string>
+    <string name="editor_building_levels">Pisos (incl. baixos, excl. teulada)</string>
+    <string name="pref_left_button_disable">Desactivar</string>
+    <string name="editor_level">Pis (0 és la planta baixa)</string>
+    <string name="error_enter_correct_bluesky_page">Introdueix un nom d\'usuari o una adreça web de Bluesky vàlids</string>
+    <string name="pref_backup_title">Còpia de seguretat de marcadors i recorreguts</string>
+    <string name="pref_left_button_title">Configuració del botó esquerre</string>
+    <string name="pref_backup_summary">Còpia de seguretat automàtica a un directori del teu dispositiu</string>
+    <string name="pref_backup_now_summary_ok">Còpia de seguretat completada amb èxit</string>
+    <string name="pref_backup_now_summary_empty_lists">No hi ha marcadors o recorreguts per a fer una còpia de seguretat</string>
+    <string name="pref_backup_now_summary_failed">Còpia de seguretat fallida</string>
+    <string name="pref_backup_now_summary_folder_unavailable">El directori de la còpia de seguretat no està disponible</string>
+    <string name="pref_backup_status_summary_success">Última còpia de seguretat amb èxit</string>
+    <string name="pref_backup_location_title">Ubicació de la còpia de seguretat</string>
+    <string name="pref_backup_location_summary_initial">Si us plau, selecciona primer un directori i proporciona accés</string>
+    <string name="pref_backup_history_title">Nombre de còpies de seguretat a mantenir</string>
+    <string name="pref_backup_interval_title">Còpia de seguretat automàtica</string>
+    <string name="backup_interval_every_day">Diari</string>
+    <string name="backup_interval_every_week">Setmanal</string>
+    <string name="backup_interval_manual_only">Desactivat (només manual)</string>
+    <string name="clear">Netejar</string>
+    <string name="route_type">Tipus de ruta</string>
+    <string name="vehicle">Vehicle</string>
+    <string name="pedestrian">A peu</string>
+    <string name="bicycle">Bicicleta</string>
+    <string name="ruler">Regle</string>
+    <string name="bookmark_color">Color del marcador</string>
+    <string name="about_help">Quant a i Ajuda</string>
+    <string name="open_now">Obert ara</string>
+    <string name="closed_now">Tancat ara</string>
+    <string name="at">a les %s</string>
+    <string name="dialog_report_error_missing_folder">La ubicació seleccionada per a la còpia de seguretat no està disponible o no s\'hi pot escriure. Si us plau, selecciona una ubicació diferent.</string>
+    <string name="dialog_report_error_with_logs">Si us plau, envia\'ns un informe d\'error:\n - \"Activa el registre\" a la configuració\n - reprodueix el problema\n - a la pantalla \"Quant a i Ajuda\" prem el botó \"Informa d’un error\" i envia-ho via email o xat\n - desactiva el registre</string>
 </resources>

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

@@ -909,4 +909,7 @@
     <string name="dialog_report_error_with_logs">Pošlete nám prosím hlášení o chybě:\n - „Povolit protokolování“ v nastavení\n - zopakujte problém\n - na stránce „O aplikaci a nápověda“ klepněte na tlačítko „Nahlásit chybu“ a odešlete hlášení skrze e-mail nebo chat\n - zakažte protokolování</string>
     <string name="backup_interval_every_day">Denně</string>
     <string name="backup_interval_every_week">Týdně</string>
+    <string name="open_now">Otevřeno</string>
+    <string name="closed_now">Zavřeno</string>
+    <string name="at">v %s</string>
 </resources>

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

@@ -624,7 +624,7 @@
     <string name="type.natural.water">Vodní plocha</string>
     <string name="type.natural.wetland">Mokřadní oblast</string>
     <string name="type.natural.wetland.bog">Rašeliniště</string>
-    <string name="type.natural.wetland.marsh">Bažina</string>
+    <string name="type.natural.wetland.marsh">Močál</string>
     <string name="type.office">Kancelář</string>
     <string name="type.office.company">Kancelář společnosti</string>
     <string name="type.office.estate_agent">Realitní makléř</string>
@@ -774,7 +774,7 @@
     <string name="type.railway.station.subway.lille">Stanice metra</string>
     <string name="type.railway.station.subway.lima">Stanice metra</string>
     <string name="type.railway.station.subway.lisboa">Stanice metra</string>
-    <string name="type.railway.station.subway.london">Stanice metra</string>
+    <string name="type.railway.station.subway.london">Stanice londýnského metra</string>
     <string name="type.railway.station.subway.lyon">Stanice metra</string>
     <string name="type.railway.station.subway.madrid">Stanice metra</string>
     <string name="type.railway.station.subway.malaga">Stanice metra</string>
@@ -1144,14 +1144,14 @@
     <string name="type.waterway.lock_gate">Stavidlo</string>
     <string name="type.waterway.river">Řeka</string>
     <string name="type.waterway.river.tunnel">Řeka</string>
-    <string name="type.waterway.stream">Řeka</string>
-    <string name="type.waterway.stream.ephemeral">Řeka</string>
-    <string name="type.waterway.stream.intermittent">Řeka</string>
-    <string name="type.waterway.stream.tunnel">Řeka</string>
+    <string name="type.waterway.stream">Vodní tok</string>
+    <string name="type.waterway.stream.ephemeral">Dočasný tok</string>
+    <string name="type.waterway.stream.intermittent">Občasný tok</string>
+    <string name="type.waterway.stream.tunnel">Vodní tok</string>
     <string name="type.waterway.waterfall">Vodopád</string>
-    <string name="type.wheelchair.limited">Omezený vstup pro vozíčkáře</string>
+    <string name="type.wheelchair.limited">Omezený přístup pro vozíčkáře</string>
     <string name="type.wheelchair.no">Bez přístupu pro vozíčkáře</string>
-    <string name="type.wheelchair.yes">Plný vstup pro vozíčkáře</string>
+    <string name="type.wheelchair.yes">Plný přístup pro vozíčkáře</string>
     <string name="type.piste_type.snow_park">Snowpark</string>
     <string name="type.piste_type.hike">Zimní stezka</string>
     <string name="type.piste_type.connection">Připojení sjezdovky</string>
@@ -1397,4 +1397,12 @@
     <string name="type.leisure.firepit">Ohniště</string>
     <string name="type.man_made.crane">Jeřáb</string>
     <string name="type.railway.station.subway.qingdao">Stanice metra</string>
+    <string name="type.landuse.religious">Náboženské území</string>
+    <string name="type.natural.wetland.saltmarsh">Slanisko</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Přílivové slanisko</string>
+    <string name="type.natural.wetland.fen">Slatiniště</string>
+    <string name="type.natural.wetland.reedbed">Rákosina</string>
+    <string name="type.natural.wetland.swamp">Bažina</string>
+    <string name="type.natural.wetland.mangrove">Mangrovy</string>
+    <string name="type.natural.wetland.tidalflat">Wattové pobřeží</string>
 </resources>

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

@@ -900,4 +900,7 @@
     <string name="pref_backup_location_title">Placering af sikkerhedskopi</string>
     <string name="pref_left_button_disable">Deaktiver</string>
     <string name="app_site_url">https://comaps.app/</string>
+    <string name="closed_now">Lukket nu</string>
+    <string name="open_now">Åben nu</string>
+    <string name="at">kl. %s</string>
 </resources>

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

@@ -111,7 +111,7 @@
     <string name="type.amenity.post_office">Posthus</string>
     <string name="type.amenity.prison">Fængsel</string>
     <string name="type.amenity.pub">Værtshus</string>
-    <string name="type.amenity.public_bookcase">Bogudveksling</string>
+    <string name="type.amenity.public_bookcase">Bogbytteskab</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Genbrugsplads</string>
     <string name="type.amenity.recycling">Genbrugscontainer</string>
@@ -1368,4 +1368,5 @@
     <string name="type.power.minor_line">Mindre strømledning</string>
     <string name="type.power.line">Strømledning</string>
     <string name="type.highway.ladder">Stige</string>
+    <string name="type.amenity.love_hotel">Kærlighedshotel</string>
 </resources>

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

@@ -66,7 +66,7 @@
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
     <string name="continue_button">Fortfahren</string>
     <!-- Show popup notification on top of the map when country download has failed. -->
-    <string name="download_country_failed">%s Herunterladen fehlgeschlagen</string>
+    <string name="download_country_failed">Herunterladen von %s ist fehlgeschlagen</string>
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Neue Liste hinzufügen</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
@@ -106,11 +106,11 @@
     <!-- Error moving map files from one storage to another -->
     <string name="move_maps_error">Fehler beim Verschieben der Karten</string>
     <!-- Ask user to wait several minutes (some long process in modal dialog). -->
-    <string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen. \nBitte warten…</string>
+    <string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen. \nBitte warten …</string>
     <!-- Measurement units title in settings activity -->
     <string name="measurement_units">Maßeinheiten</string>
     <!-- Detailed description of Measurement Units settings button -->
-    <string name="measurement_units_summary">Wählen Sie zwischen Kilometern und Meilen</string>
+    <string name="measurement_units_summary">Zwischen Kilometern und Meilen wählen</string>
     <!-- SECTION: Search categories -->
     <!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! -->
     <string name="category_eat">Essmöglichkeiten</string>
@@ -121,7 +121,7 @@
     <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
     <string name="category_fuel">Tankstelle</string>
     <!-- Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! -->
-    <string name="category_parking">Parkplatz</string>
+    <string name="category_parking">Parkplätze</string>
     <!-- Search category for malls/clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @category_shopping! -->
     <string name="category_shopping">Shopping</string>
     <!-- Search category for second_hand/charity/antique/auction shops; any changes should be duplicated in categories.txt @category_secondhand! -->
@@ -129,7 +129,7 @@
     <!-- Search category for places to stay; any changes should be duplicated in categories.txt @category_hotel! -->
     <string name="category_hotel">Hotel</string>
     <!-- Search category sight seeings and touristic attractions; any changes should be duplicated in categories.txt @category_tourism! -->
-    <string name="category_tourism">Sehenswürdigkeit</string>
+    <string name="category_tourism">Sehenswürdigkeiten</string>
     <!-- Search category for entertainment; any changes should be duplicated in categories.txt @category_entertainment! -->
     <string name="category_entertainment">Unterhaltung</string>
     <!-- Search category for ATMs; any changes should be duplicated in categories.txt @category_atm! -->
@@ -918,4 +918,7 @@
     <string name="pref_backup_location_title">Sicherungsort</string>
     <string name="backup_interval_every_week">Wöchentlich</string>
     <string name="pref_backup_now_summary_progress">Sicherung wird durchgeführt…</string>
+    <string name="open_now">Jetzt geöffnet</string>
+    <string name="at">um %s</string>
+    <string name="closed_now">Jetzt geschlossen</string>
 </resources>

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

@@ -12,8 +12,8 @@
     <string name="type.aerialway.mixed_lift">Kombibahn</string>
     <string name="type.aerialway.station">Liftstation</string>
     <string name="type.aeroway">Luftverkehr</string>
-    <string name="type.aeroway.aerodrome">Flugplatz</string>
-    <string name="type.aeroway.aerodrome.international">Flughafen</string>
+    <string name="type.aeroway.aerodrome">Flughafen</string>
+    <string name="type.aeroway.aerodrome.international">Internationaler Flughafen</string>
     <string name="type.aeroway.apron">Vorfeld</string>
     <string name="type.aeroway.helipad">Hubschrauberlandeplatz</string>
     <string name="type.aeroway.runway">Start-/Landebahn</string>
@@ -41,7 +41,7 @@
     <string name="type.leisure.adult_gaming_centre">Gaming-Zentrum für Erwachsene</string>
     <string name="type.leisure.amusement_arcade">Arkade</string>
     <string name="type.amenity.charging_station">Ladestation</string>
-    <string name="type.amenity.charging_station.bicycle">Fahrrad Ladestation</string>
+    <string name="type.amenity.charging_station.bicycle">Fahrrad-Ladestation</string>
     <string name="type.amenity.charging_station.motorcar">Kfz-Ladestation</string>
     <string name="type.amenity.childcare">Kindertagesstätte</string>
     <string name="type.amenity.cinema">Kino</string>
@@ -715,7 +715,7 @@
     <string name="type.natural.water">Wasserfläche</string>
     <string name="type.natural.wetland">Feuchtgebiet</string>
     <string name="type.natural.wetland.bog">Moor</string>
-    <string name="type.natural.wetland.marsh">Sumpf</string>
+    <string name="type.natural.wetland.marsh">Marsch</string>
     <string name="type.office">Büro</string>
     <string name="type.office.company">Firmenbüro</string>
     <string name="type.office.estate_agent">Immobilienmakler</string>
@@ -1381,7 +1381,7 @@
     <string name="type.fee.yes">$</string>
     <string name="type.man_made.utility_pole">Versorgungsmast</string>
     <string name="type.cuisine.bubble_tea">Bubble Tea</string>
-    <string name="type.aeroway.gate">Tor</string>
+    <string name="type.aeroway.gate">Gate</string>
     <string name="type.amenity.biergarten">Biergarten</string>
     <string name="type.amenity.kindergarten">Kindergarten</string>
     <string name="type.public_transport.platform">Plattform</string>
@@ -1398,4 +1398,12 @@
     <string name="type.amenity.studio">Studio</string>
     <string name="type.man_made.crane">Kran</string>
     <string name="type.railway.station.subway.qingdao">U-Bahn-Station</string>
+    <string name="type.landuse.religious">Religiöses Land</string>
+    <string name="type.natural.wetland.saltmarsh">Salzmarsch</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Gezeitenabhängige Salzmarsch</string>
+    <string name="type.natural.wetland.fen">Fenn</string>
+    <string name="type.natural.wetland.reedbed">Schilfgürtel</string>
+    <string name="type.natural.wetland.swamp">Sumpf</string>
+    <string name="type.natural.wetland.mangrove">Mangrove</string>
+    <string name="type.natural.wetland.tidalflat">Watt</string>
 </resources>

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

@@ -39,13 +39,11 @@
     <string name="try_again">Δοκιμάστε ξανά</string>
     <string name="about_menu_title">Σχετικά με το CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Δωρεάν για όλους, φτιαγμένα με αγάπη</string>
-    <!-- Text in About screen -->
     <string name="about_proposition_1">• Χωρίς διαφημίσεις, χωρίς tracking, χωρίς συλλογή δεδομένων</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Δεν εξαντλεί τη μπαταρία, λειτουργεί εκτός σύνδεσης</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">- Γρήγορο, μινιμαλιστικό, αναπτυγμένο από την κοινότητα</string>
+    <string name="about_proposition_3">• Εκτός σύνδεσης, γρήγορο και συμπαγές</string>
     <!-- Text in About screen -->
     <string name="about_developed_by_enthusiasts">Εφαρμογή ανοιχτού κώδικα που δημιουργήθηκε από θιασώτες και εθελοντές.</string>
     <!-- The button that opens system location settings -->
@@ -880,4 +878,5 @@
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="panoramax">εικόνα Panoramax</string>
     <string name="app_site_url">https://comaps.app/</string>
+    <string name="saved">Αποθηκεύτηκε</string>
 </resources>

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

@@ -57,4 +57,5 @@
     <string name="panoramax">Panoramax Picture</string>
     <string name="editor_line_social_network">LINE</string>
     <string name="app_site_url">https://comaps.app/</string>
+    <string name="about_proposition_3">• Offline, fast and compact</string>
 </resources>

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

@@ -221,4 +221,7 @@
     <string name="editor_line_social_network">LINE</string>
     <string name="panoramax">Imagen Panoramax</string>
     <string name="app_site_url">https://comaps.app/es/</string>
+    <string name="about_headline">Proyecto abierto impulsado por la comunidad</string>
+    <string name="saved">Guardado</string>
+    <string name="about_proposition_3">• No necesita conexión a internet, rápido y compacto</string>
 </resources>

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

@@ -913,4 +913,7 @@
     <string name="dialog_report_error_missing_folder">Valitud varukoopiate kaust pole kas saadaval või kirjutatav. Palun vali muu kaust.</string>
     <string name="pref_backup_location_title">Varukoopia asukoht</string>
     <string name="pref_backup_interval_title">Automaatne varundus</string>
+    <string name="open_now">Hetkel avatud</string>
+    <string name="at">kell %s</string>
+    <string name="closed_now">Praegu suletud</string>
 </resources>

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

@@ -862,29 +862,29 @@
     <string name="type.railway.station.light_rail.porto">Kergraudtee jaam</string>
     <string name="type.railway.station.monorail">Monorelstee jaam</string>
     <string name="type.railway.station.subway">Metroojaam</string>
-    <string name="type.railway.station.subway.adana">Adana metroojaam</string>
-    <string name="type.railway.station.subway.algiers">Alžiiri metroojaam</string>
-    <string name="type.railway.station.subway.almaty">Almatõ metroojaam</string>
-    <string name="type.railway.station.subway.amsterdam">Amsterdami metroojaam</string>
-    <string name="type.railway.station.subway.ankara">Ankara metroojaam</string>
-    <string name="type.railway.station.subway.athens">Ateena metroojaam</string>
-    <string name="type.railway.station.subway.baku">Bakuu metroojaam</string>
-    <string name="type.railway.station.subway.bangkok">Bangkoki metroojaam</string>
-    <string name="type.railway.station.subway.barcelona">Barcelona metroojaam</string>
-    <string name="type.railway.station.subway.beijing">Pekingi metroojaam</string>
-    <string name="type.railway.station.subway.bengalore">Bengaluru metroojaam</string>
-    <string name="type.railway.station.subway.berlin">Berliini metroojaam</string>
-    <string name="type.railway.station.subway.bilbao">Bilbao metroojaam</string>
+    <string name="type.railway.station.subway.adana">Metroojaam</string>
+    <string name="type.railway.station.subway.algiers">Metroojaam</string>
+    <string name="type.railway.station.subway.almaty">Metroojaam</string>
+    <string name="type.railway.station.subway.amsterdam">Metroojaam</string>
+    <string name="type.railway.station.subway.ankara">Metroojaam</string>
+    <string name="type.railway.station.subway.athens">Metroojaam</string>
+    <string name="type.railway.station.subway.baku">Metroojaam</string>
+    <string name="type.railway.station.subway.bangkok">Metroojaam</string>
+    <string name="type.railway.station.subway.barcelona">Metroojaam</string>
+    <string name="type.railway.station.subway.beijing">Metroojaam</string>
+    <string name="type.railway.station.subway.bengalore">Metroojaam</string>
+    <string name="type.railway.station.subway.berlin">Metroojaam</string>
+    <string name="type.railway.station.subway.bilbao">Metroojaam</string>
     <string name="type.railway.station.subway.brasilia">Brasília Metroojaam</string>
     <string name="type.railway.station.subway.brescia">Brescia metroojaam</string>
-    <string name="type.railway.station.subway.brussels">Brüsseli metroojaam</string>
-    <string name="type.railway.station.subway.bucharest">Bukaresti metroojaam</string>
-    <string name="type.railway.station.subway.budapest">Budapesti metroojaam</string>
-    <string name="type.railway.station.subway.buenos_aires">Buenos Airese metroojaam</string>
-    <string name="type.railway.station.subway.bursa">Bursa metroojaam</string>
-    <string name="type.railway.station.subway.cairo">Kairo metroojaam</string>
-    <string name="type.railway.station.subway.caracas">Caracase metroojaam</string>
-    <string name="type.railway.station.subway.catania">Catania metroojaam</string>
+    <string name="type.railway.station.subway.brussels">Metroojaam</string>
+    <string name="type.railway.station.subway.bucharest">Metroojaam</string>
+    <string name="type.railway.station.subway.budapest">Metroojaam</string>
+    <string name="type.railway.station.subway.buenos_aires">Metroojaam</string>
+    <string name="type.railway.station.subway.bursa">Metroojaam</string>
+    <string name="type.railway.station.subway.cairo">Metroojaam</string>
+    <string name="type.railway.station.subway.caracas">Metroojaam</string>
+    <string name="type.railway.station.subway.catania">Metroojaam</string>
     <string name="type.railway.station.subway.changchun">Changchuni metroojaam</string>
     <string name="type.railway.station.subway.chengdu">Chengdu metroojaam</string>
     <string name="type.railway.station.subway.chicago">Chicago metroojaam</string>
@@ -1400,4 +1400,12 @@
     <string name="type.amenity.studio">Stuudio</string>
     <string name="type.man_made.crane">Kraana</string>
     <string name="type.railway.station.subway.qingdao">Qingdao metroojaam</string>
+    <string name="type.landuse.religious">Usuorganisatsiooni maa</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Loodete mõjutatud sooldunud padur</string>
+    <string name="type.natural.wetland.fen">Madalsoo</string>
+    <string name="type.natural.wetland.reedbed">Roostik</string>
+    <string name="type.natural.wetland.swamp">Lodu</string>
+    <string name="type.natural.wetland.mangrove">Mangroov</string>
+    <string name="type.natural.wetland.tidalflat">Loodeline tasandik</string>
+    <string name="type.natural.wetland.saltmarsh">Sooldunud padur</string>
 </resources>

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

@@ -38,7 +38,7 @@
     <string name="try_again">Saiatu berriro</string>
     <string name="about_menu_title">CoMaps-i buruz</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Proiektu irekia, auzolanean egina.</string>
+    <string name="about_headline">Proiektu irekia, auzolanean egina</string>
     <!-- Text in About screen -->
     <string name="about_proposition_1">• Ez iragarkirik, ez jarraipenik, ez datu-bilketarik</string>
     <!-- Text in About screen -->
@@ -203,7 +203,7 @@
     <!-- Confirmation for OpenStreetMap log out. -->
     <string name="osm_log_out_confirmation">Ziur zure OpenStreetMap kontutik saioa amaitu nahi duzula?</string>
     <!-- Title for tracks category in bookmarks manager -->
-    <string name="tracks_title">Arrastoak</string>
+    <string name="tracks_title">Arrasto</string>
     <!-- Length of track in cell that describes route -->
     <string name="length">Luzera</string>
     <string name="share_my_location">Partekatu nire kokapena</string>
@@ -307,7 +307,7 @@
     <!-- Text for routing error dialog -->
     <string name="routing_download_maps_along">Deskargatu zure arrastoaren mapa guztiak</string>
     <!-- Text for routing error dialog -->
-    <string name="routing_requires_all_map">Arrasto bat sortzeko beharrezkoa da helmugako kokapenaren mapa guztiak deskargatzea eta eguneratzea.</string>
+    <string name="routing_requires_all_map">Arrasto bat sortzeko beharrezkoa da kokapenetik helmugarainoko mapa guztiak deskargatzea eta eguneratzea.</string>
     <!-- Text for routing error dialog -->
     <string name="routing_not_enough_space">Leku nahikorik ez</string>
     <!-- location service disabled -->
@@ -349,7 +349,7 @@
     <!-- SECTION: Routing dialogs strings -->
     <string name="dialog_routing_disclaimer_title">Arrastoa jarraitzean, kontuan izan:</string>
     <string name="dialog_routing_disclaimer_priority">— Bidearen egoera, zirkulazio arauek eta bide seinaleek lehentasuna dute beti nabigazio-iradokizunen gainetik;</string>
-    <string name="dialog_routing_disclaimer_precision">— Mapa zehazgabea izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;</string>
+    <string name="dialog_routing_disclaimer_precision">— Zehaztasunik gabeko mapa izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;</string>
     <string name="dialog_routing_disclaimer_recommendations">— Iradokitako ibilbideak gomendio gisa soilik hartu behar dira;</string>
     <string name="dialog_routing_disclaimer_borders">— Kontuz ibili muga-eremuak dituzten ibilbideetan: gure aplikazioak sortutako ibilbideek batzuetan herrialdeen mugak zeharkatu ditzakete baimendu gabeko tokietan.</string>
     <string name="dialog_routing_disclaimer_beware">Egon adi eta seguru errepideetan!</string>
@@ -360,7 +360,7 @@
     <string name="dialog_routing_location_unknown_turn_on">Ezin dira GPS koordenatuak aurkitu. Aktibatu kokapen zerbitzuak arrastoa kalkulatzeko.</string>
     <string name="dialog_routing_unable_locate_route">Ezin da ibilbiderik aurkitu</string>
     <string name="dialog_routing_cant_build_route">Ezin da ibilbidea sortu.</string>
-    <string name="dialog_routing_change_start_or_end">Ezarri zure abiapuntua edo helmuga.</string>
+    <string name="dialog_routing_change_start_or_end">Ezarri zure abiapuntua edota helmuga.</string>
     <string name="dialog_routing_change_start">Ezarri abiapuntua</string>
     <string name="dialog_routing_start_not_determined">Ibilbidea ez da sortu. Abiapuntua ezin izan da aurkitu.</string>
     <string name="dialog_routing_select_closer_start">Hautatu errepide batetik gertuko abiapuntua.</string>
@@ -392,8 +392,8 @@
     <string name="clear_search">Garbitu bilaketa historia</string>
     <string name="p2p_your_location">Zure kokapena</string>
     <string name="p2p_start">Hasi</string>
-    <string name="p2p_from_here">Hemendik</string>
-    <string name="p2p_to_here">Bidea hona</string>
+    <string name="p2p_from_here">Abiapuntua</string>
+    <string name="p2p_to_here">Helmuga</string>
     <string name="p2p_only_from_current">Nabigazioa zure uneko kokapenetik soilik dago erabilgarri.</string>
     <string name="p2p_reroute_from_current">Zure uneko kokapenetik ibilbide bat antolatzea nahi duzu?</string>
     <!-- Edit open hours/set time and minutes dialog -->
@@ -591,7 +591,7 @@
     <!-- 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". -->
     <string name="routing_add_start_point">Erabili bilaketa edo sakatu mapan ibilbidearen abiapuntua gehitzeko</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
-    <string name="routing_add_finish_point">Erabili bilaketa edo sakatu mapan helmuga puntu bat gehitzeko</string>
+    <string name="routing_add_finish_point">Erabili bilaketa edo sakatu mapan helmuga puntua gehitzeko</string>
     <string name="planning_route_manage_route">Kudeatu ibilbidea</string>
     <string name="button_plan">Planifikatu</string>
     <string name="placepage_remove_stop">Kendu geltokia</string>

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

@@ -41,13 +41,11 @@
     <string name="try_again">تلاش مجدد</string>
     <string name="about_menu_title">CoMaps درباره‌ی</string>
     <!-- Text in About screen -->
-    <string name="about_headline">رایگان برای همه ، ساخته شده با عشق</string>
-    <!-- Text in About screen -->
     <string name="about_proposition_1">• بدون تبلیغات ، ردیابی ، جمع آوری داده ها</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• بدون تخلیه باتری، آفلاین کار می کند</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• سریع، مینیمالیستی، توسعه یافته توسط انجمن</string>
+    <string name="about_proposition_3">• آفلاین، سریع و جمع و جور</string>
     <!-- Text in About screen -->
     <string name="about_developed_by_enthusiasts">برنامه منبع باز ایجاد شده توسط علاقه مندان و داوطلبان.</string>
     <!-- The button that opens system location settings -->
@@ -818,4 +816,5 @@
     <string name="panoramax">تصویر Panoramax</string>
     <string name="editor_line_social_network">LINE</string>
     <string name="app_site_url">https://comaps.app</string>
+    <string name="saved">ذخیره شد</string>
 </resources>

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

@@ -41,7 +41,7 @@
     <string name="try_again">Yritä uudelleen</string>
     <string name="about_menu_title">Tietoa CoMaps:stä</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Avoin projekti yhteisön toteuttamana</string>
+    <string name="about_headline">Avoin projekti yhteisön voimin</string>
     <!-- Text in About screen -->
     <string name="about_proposition_1">• Helppokäyttöinen ja viimeistelty</string>
     <!-- Text in About screen -->
@@ -917,4 +917,8 @@
     <string name="pref_backup_title">Kirjanmerkkien ja reittien varmuuskopiointi</string>
     <string name="pref_backup_status_summary_success">Viimeisin onnistunut varmuuskopio</string>
     <string name="backup_interval_manual_only">Pois (Varmuuskopioi manuaalisesti)</string>
+    <string name="dialog_report_error_with_logs">Lähetä meille virheraportti:\n - kytke \"Ota loki käyttöön\" asetuksista\n - yritä toistaa ongelma\n - paina \"Tietoja ja ohje\" valikosta \"Ilmoita virhe\" painiketta ja lähetä virheraportti sähköpostin tai chatin kautta\n - kytke lokitallennus pois käytöstä</string>
+    <string name="open_now">Auki nyt</string>
+    <string name="closed_now">Suljettu nyt</string>
+    <string name="at">kello %s</string>
 </resources>

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

@@ -1399,4 +1399,12 @@
     <string name="type.mountain_pass">Vuoristosola</string>
     <string name="type.attraction.big_wheel">Maailmanpyörä</string>
     <string name="type.railway.station.subway.qingdao">Metro</string>
+    <string name="type.landuse.religious">Uskonnollinen maa</string>
+    <string name="type.natural.wetland.saltmarsh">Marskimaa</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Marskimaa</string>
+    <string name="type.natural.wetland.fen">Avosuo</string>
+    <string name="type.natural.wetland.swamp">Suo</string>
+    <string name="type.natural.wetland.mangrove">Mangrove</string>
+    <string name="type.natural.wetland.tidalflat">Vuorovesitasanko</string>
+    <string name="type.natural.wetland.reedbed">Ruovikko</string>
 </resources>

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

@@ -10,4 +10,5 @@
     <string name="editor_line_social_network">LINE</string>
     <string name="panoramax">Image Panoramax</string>
     <string name="app_site_url">https://www.comaps.app/fr/</string>
+    <string name="about_proposition_3">• Hors ligne, rapide et compact</string>
 </resources>

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

@@ -904,4 +904,27 @@
     <string name="ruler">Règle</string>
     <string name="bookmark_color">Couleur du marque-page</string>
     <string name="panoramax">Image Panoramax</string>
+    <string name="pref_backup_now_title">Sauvegarder maintenant</string>
+    <string name="backup_interval_every_day">Chaque jour</string>
+    <string name="open_now">Actuellement ouvert</string>
+    <string name="closed_now">Actuellement fermé</string>
+    <string name="pref_backup_now_summary_progress">Sauvegarde en cours…</string>
+    <string name="pref_backup_now_summary_failed">La sauvegarde a échoué</string>
+    <string name="backup_interval_every_week">Chaque semaine</string>
+    <string name="pref_backup_location_title">Emplacement de sauvegarde</string>
+    <string name="pref_backup_location_summary_initial">Veuillez d\'abord sélectionner répertoire et accorder l\'autorisation</string>
+    <string name="pref_backup_now_summary_empty_lists">Aucun signet ni de trace à sauvegarder</string>
+    <string name="pref_backup_interval_title">Sauvegarde automatique</string>
+    <string name="pref_backup_status_summary_success">Dernière sauvegarde réussie</string>
+    <string name="pref_backup_now_summary_ok">La sauvegarde s\'est déroulée avec succès</string>
+    <string name="pref_backup_history_title">Nombre de sauvegardes à conserver</string>
+    <string name="pref_backup_now_summary_folder_unavailable">L\'emplacement de sauvegarde n\'est pas disponible</string>
+    <string name="pref_backup_title">Sauvegarde des signets et des traces</string>
+    <string name="backup_interval_manual_only">Désactivé (manuel uniquement)</string>
+    <string name="pref_backup_summary">Sauvegarde automatique dans un dossier de votre appareil</string>
+    <string name="about_help">À propos &amp; aide</string>
+    <string name="dialog_report_error_missing_folder">L\'emplacement de sauvegarde choisi n\'est pas disponible ou accessible en écriture. Veuillez sélectionner un autre emplacement.</string>
+    <string name="dialog_report_error_with_logs">Veuillez nous envoyer un rapport d\'erreur :\n - \"Activer la journalisation\" dans les paramètres\n - reproduire le problème\n - dans l\'écran \"À propos &amp; Help\", appuyez sur le bouton \"SIGNAER UN BUG\" et envoyez-le par e-mail ou par chat\n - désactiver la journalisation</string>
+    <string name="pref_backup_now_summary">Créer une sauvegarde immédiatement</string>
+    <string name="at">à %s</string>
 </resources>

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

@@ -1400,4 +1400,12 @@
     <string name="type.hwtag">hwtag</string>
     <string name="type.man_made.crane">Grue</string>
     <string name="type.railway.station.subway.qingdao">Station de métro</string>
+    <string name="type.landuse.religious">Terre religieuse</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Marais salant à marée</string>
+    <string name="type.natural.wetland.fen">Marais</string>
+    <string name="type.natural.wetland.swamp">Marais</string>
+    <string name="type.natural.wetland.mangrove">Mangrove</string>
+    <string name="type.natural.wetland.tidalflat">Estran</string>
+    <string name="type.natural.wetland.reedbed">Roselière</string>
+    <string name="type.natural.wetland.saltmarsh">Marais salant</string>
 </resources>