[fdroid] Release version 2025.11.19-2

Signed-off-by: map-per <map-per@gmx.de>
Release notes for 2nd November release
2025-12-19 13:03:36 +00:00 · 2025-11-19 09:40:04 +01:00 · 2025-11-19 08:17:11 +01:00 · 2025-11-18 21:29:15 +01:00 · 2025-11-18 19:19:10 +01:00 · 2025-11-18 17:17:14 +01:00
401 changed files with 5858 additions and 2987 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,6 +222,11 @@ if (PLATFORM_DESKTOP AND NOT WITH_SYSTEM_PROVIDED_3PARTY)
  include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include")
 endif()

+# Android fails to find boost in many cases, this fixes it.
+if (PLATFORM_ANDROID)
+  include_directories("${OMIM_ROOT}/3party/boost")
+endif()
+
 # Used in qt/ and shaders/
 find_package(Python3 REQUIRED COMPONENTS Interpreter)

--- a/android/app/src/fdroid/play/listings/da-DK/full-description.txt
+++ b/android/app/src/fdroid/play/listings/da-DK/full-description.txt
@@ -0,0 +1,33 @@
+En fællesskabdrevet og åben source kortapp, baseret på kortdata fra OpenStreetMap og styrket i forpligtelsen til værdierne gennemsigtighed, privatlivets fred, og non-profit. CoMaps udspringer af Organic Maps, som selv udsprang af Maps.ME.
+
+Læs mere om grundlaget for projektet og dets udviklingsretnign på <b><i>codeberg.org/comaps</i></b>.
+Slut dig til fælleskabet og hjælp til med at bygge den bedste kortapp i verden.
+• Brug appen og fortæl andre om den
+• Giv feedback anmeld fejl
+• Opdater kortdata i appen eller på OpenStreetMap-hjemmesiden.
+
+‣ <b>Offlinefokuseret</b>: Planlæg din rute og find vej i udlandet uden brug af mobildata, søg og find afsidesliggende mål på en afsidesliggende vandretur, mm. Alle funktioner er designet til at fungere uden internetforbindelse.
+‣ <b>Respekt for privatlivets fred</b>: Appen er designet med henblik på at respektere dit privatliv – den identificerer dig ikke, indeholder ingen sporingsmekanismer, og insamler ingen personlig information. Appen er reklamefri.
+‣ <b>Enkel og elegant</b>: de essentielle funktioner er nemme at bruge, og de virker bare.
+‣ <b>Sparer på batteriet og på lagerpladsen</b>: Dræner ikke dit batteri hurtigt, som andre kortapps. De kompakte kortfiler minimerer varigt lagerpladsforbrug.
+‣ <b>Gratis og bygget i fællesskab</b>: Folk som dig har hjulpet med denne app ved at tilføje steder til OpenStreetMap, ved at teste appens funktioner og give feedback på dem og ved at bidrage til udviklingen af appen med deres tid og penge.
+‣ <b>Åben og gennemsigtig beslutningstagningsproces og finanser, non-profit, og fuldt ud åben source.</b>
+
+<b>Hovedfunktioner</b>
+• Hent detaljerede kort, der indeholder steder som ikke findes i mange kommericelle kort.
+• En frilufts-tilstand med markede vandrestier, teltpladser, kilder, bjerg- og bakketoppe, højdekonturlinjer, mm.
+• Gangstier og cykelstier
+• Steder, der kan besøges, som f.eks. restauranter, tankstationer, hoteller, butikker, seværdigheder og mange andre.
+• Søg efter stednavn, adresse, eller type af sted.
+• Gem dine yndlingssteder som bogmærker med et enkelt tryk. 
+• iCloud synkronisering af bogmærker og optagede spor.
+• Offline artikler fra Wikipedia.
+• Metro-lag med navigation.
+• Optagelse af spor.
+• Eksport og import af bogmærker og spor i formaterne KML, KMZ og GPX.
+• Mørk tilstand til brug om natten.
+• Mulighed for at forbedre kortet vha. en indbygget editor.
+• CarPlay understøttes.
+
+<b>Friheden er ankommet</b>
+Opdag din rejse, find vej i verden med privatliv og fællesskab i førersædet!
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,8 +1,11 @@
-• OpenStreetMap-Daten vom 4. November
-• Aktualisierte Karten-Icons, inkl. Farben für Unterhaltungs-, Sport- & andere Unternehmen
-• Informationen zu Steckdosen an EV-Ladestationen
-• Symbole für Sportzentren, Veranstaltungsorte, Massagesalons, Gästehäuser und einige stillgelegte Unternehmen
-• Verbesserungen bei der Suche
-• Behebung eines Absturzes bei der Suche
-• Verbesserte Sprachführung während der Navigation
-Weitere Änderungen finden in unseren Codeberg-Versionshinweisen!
+• OpenStreetMap-Daten vom 16. November
+• Bäume hinzugefügt
+• Kleine Bushaltestellen-Icons die früher angezeigt werden
+• Sichtbarkeit von Eingängen reduziert
+• Neue POI-Typen hinzugefügt
+• Sandflächen werden auf Karte angezeigt
+• Option „Geschäft ist leerstehend” zum OSM-Editor hinzugefügt
+• Straßenbeschilderung in Europa verbessert
+• Option „Asphaltierte Straßen vermeiden” hinzugefügt
+• Icons in den Einstellungen hinzugefügt
+Weitere Änderungen in unseren Codeberg-Versionshinweisen!
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,8 +1,11 @@
-• OpenStreetMap data as of November 4
-• Recategorized map icons including some new colors for entertainment, sports and other businesses
-• Display info about available sockets on charging stations
-• Added bandstands, backless benches and loungers
-• New icons for different sport centres, event venues, massage salons, guest houses and some disused businesses
-• Multiple search improvements and crash fix
-• Improved voice guidance during navigation
+• OpenStreetMap data as of November 16
+• Added trees
+• Made bus stop icons smaller and show up earlier
+• Reduce visibility of entrances
+• Added several other POI types
+• Show sand areas on the map
+• Add business is vacant option to the OSM editor
+• Improved road shields in Europe
+• Avoid paved roads routing option
+• Added icons to the settings page
 Check our Codeberg release notes for more changes!
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,7 +1,11 @@
-• Datos OSM del 04/11
-• Iconos del mapa recategorizados, incluyendo nuevos colores
-• Visualización de información sobre enchufes disponibles en estaciones de recarga
-• Adición de iconos para diferentes centros deportivos, lugares de eventos, salones de masajes, posadas y algunos establecimientos comerciales desactivados
-• Varias mejoras y correcciones de errores en la búsqueda
-• Mejora en la orientación por voz durante la navegación
+• Nuevos datos OSM a 16.11.25
+• Se añaden árboles
+• Se reducen los iconos de paradas de autobús y aparecen antes
+• Se reduce visibilidad de entradas
+• Se añaden muchos tipos de puntos de interés
+• Se muestran las zonas de arena en el mapa
+• Se añade la opción «negocio vacío» al editor
+• Se mejoran las señales de tráfico en Europa
+• Nueva opción «evitar caminos asfaltadas»
+• Nuevos iconos en la página de configuración
 Más detalles en Codeberg
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/5.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/5.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/6.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/6.png
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -1,8 +1,11 @@
-• Données OpenStreetMap au 4 novembre
-• Recatégorisation des icônes sur la carte avec ajout de nouvelles couleurs pour certains types de lieux
-• Affichage des prises sur les bornes électriques
-• Ajout d'icônes pour les centres sportifs, salles d'événements, salon de massage et autres lieux
-• Multiple améliorations dans la recherche
-• Correction d'un plantage dans la recherche
-• Amélioration de la synthèse vocale durant la navigation
+• Données OpenStreetMap du 16 novembre
+• Ajout des arbres
+• Les icônes des arrêts de bus sont plus petites et apparaissent plus tôt
+• Réduction de la visibilité des entrées
+• Ajout de nouveaux types de POI
+• Affichage des zones de sable
+• Nouveau bouton pour signaler un commerce vacant
+• Amélioration des badges routiers en Europe
+• Ajout d'une option pour éviter les routes pavées
+• Ajout d'icônes dans les paramètres
 Plus d'informations sur notre Codeberg
--- a/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
@@ -0,0 +1,11 @@
+• Mappe OSM al 16 Novembre
+• Aggiunti alberi
+• Fermate bus più piccole e visibili prima
+• Entrate rese meno ingombranti
+• Aggiunti diversi POI
+• Le zone sabbiose sono ora visibili
+• Aggiunta l'opzione di POI vacante nell'editor OSM
+• Migliorate le insegne stradali in Europa
+• Aggiunta opzione per evitare strade pavimentate
+• Aggiunte icone nelle impostazioni
+Visita Codeberg per ulteriori dettagli
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,7 +1,11 @@
-• Dados OSM de 04/11
-• Ícones do mapa recategorizados, incluindo novas cores
-• Exibição de informações sobre tomadas disponíveis em eletropostos
-• Adição de ícones para diferentes centros esportivos, locais de eventos, salões de massagem, pousadas e alguns estabelecimentos comerciais desativados
-• Diversas melhorias e correção de erro na busca
-• Melhoria na orientação por voz durante a navegação
-Confira nossas notas de lançamento no Codeberg para mais detalhes!
+• Dados OSM de 16/11
+• Adição de árvores ao mapa
+• Ícones de pontos de ônibus menores e exibidos mais cedo
+• Visibilidade reduzida das entradas
+• Adição de diversos outros tipos de Pontos de Interesse
+• Exibição de áreas de areia no mapa
+• Adição de opção de "Estabelecimento vazio" ao editor do OSM
+• Melhorias nas placas de rodovias na Europa
+• Opção para evitar rotas por estradas pavimentadas
+• Adição de ícones nas configurações
+Confira as notas de lançamento do Codeberg para mais detalhes!
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,8 +1,10 @@
-• Карты OpenStreetMap от 4 ноября
-• Обновлены цвета иконок на карте, добавлены новые цвета для развлечений, спорта, некоторых бизнесов
-• На зарядных станциях показываются имеющиеся типы разъёмов
-• Добавлены эстрады, скамейки без спинок и лежаки
-• Новые иконки для разных спорт центров, массажных салонов, гостевых домов, некоторых закрытых бизнесов
-• Несколько улучшений и исправлений в поиске
-• Улучшены голосовые подсказки при навигации
+• Карты OpenStreetMap от 16 ноября
+• Добавлены деревья и песчаные области
+• Автобусные остановки показываются раньше, но маленькими иконами
+• Входы разделены по типам
+• В OSM редакторе можно отметить место как неиспользуемое
+• Улучшения в иконках номеров дорог в Европе
+• Возможность избегать дорог с покрытием при построении маршрута
+• Иконки в экране настроек
+• На карту добавлены несколько новых типов объектов 
 Подробнее смотрите на codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/sr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/sr/release-notes.txt
@@ -0,0 +1,11 @@
+• Подaци са OpenStreetMap-а закључно са 16. новембром
+• Додате ознаке за дрвеће
+• Смањене иконе аутобуских стајалишта и ранији приказ
+• Смањена видљивост улаза
+• Додато неколико нових типова ознака на мапу
+• Приказ пешчаних површина на мапи
+• Додата опција „пословни простор је празан“ у OSM едитору
+• Побољшани путокази у Европи
+• Опција рутирања „избегавај асфалтиране путеве“
+• Додате иконе на страници подешавања
+Погледајте детаље на Codeberg-у за списак свих промена!
--- a/android/app/src/fdroid/play/listings/ta-IN/short-description.txt
+++ b/android/app/src/fdroid/play/listings/ta-IN/short-description.txt
@@ -1 +1 @@
-எளிதான வரைபட வழிசெல் - உங்கள் பயணத்தை மேலும் கண்டறி - சமூகத்தால் இயக்கப்படுகிறது
+எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது
--- a/android/app/src/fdroid/play/version.yaml
+++ b/android/app/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.11.19-2-FDroid+25111902
--- a/android/app/src/google/play/listings/ta-IN/short-description.txt
+++ b/android/app/src/google/play/listings/ta-IN/short-description.txt
@@ -1 +1 @@
-எளிதான வரைபட வழிசெல் - உங்கள் பயணத்தை மேலும் கண்டறி - சமூகத்தால் இயக்கப்படுகிறது
+எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
@@ -18,9 +18,7 @@ import androidx.fragment.app.FragmentManager;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.SplashActivity;
-import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.log.Logger;
-import app.organicmaps.util.RtlUtils;
 import com.google.android.material.appbar.MaterialToolbar;
 import java.util.Objects;

@@ -42,7 +40,6 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
  {
    super.onCreate(savedInstanceState);
    EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
-    RtlUtils.manageRtl(this);
    if (!MwmApplication.from(this).getOrganicMaps().arePlatformAndCoreInitialized())
    {
      final Intent intent = Objects.requireNonNull(getIntent());
--- a/android/app/src/main/java/app/organicmaps/util/RtlUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/RtlUtils.java
@@ -1,25 +0,0 @@
-package app.organicmaps.util;
-
-import android.app.Activity;
-import android.view.View;
-import androidx.annotation.NonNull;
-import androidx.core.text.TextUtilsCompat;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-public class RtlUtils
-{
-  private final static List<String> rtlLocalesWithTranslation = Arrays.asList("ar", "fa");
-
-  public static void manageRtl(@NonNull final Activity activity)
-  {
-    final String currentLanguage = Locale.getDefault().getLanguage();
-    final boolean isRTL =
-        TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_RTL;
-    if (isRTL && rtlLocalesWithTranslation.contains(currentLanguage))
-      activity.getWindow().getDecorView().setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
-    else
-      activity.getWindow().getDecorView().setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
-  }
-}
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -31,6 +31,8 @@ import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
+
+import app.organicmaps.BuildConfig;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
@@ -108,7 +110,6 @@ public class PlacePageView extends Fragment
  private static final String TRACK_SHARE_MENU_ID = "TRACK_SHARE_MENU_ID";

  private static final int SHORT_HORIZON_CLOSE_MIN = 60;
-
  private static final int SHORT_HORIZON_OPEN_MIN = 15;

  private static final List<CoordinatesFormat> visibleCoordsFormat =
@@ -831,12 +832,44 @@ public class PlacePageView extends Fragment
    final SpannableStringBuilder openStateString = new SpannableStringBuilder();
    final boolean isOpen = (poiState.state == OhState.State.Open); // False == Closed due to early exit for Unknown
    final long nextStateTime = isOpen ? poiState.nextTimeClosed : poiState.nextTimeOpen; // Unix time (seconds)
+
+    ZonedDateTime nextChangeLocal = null;
+    boolean hasFiniteNextChange = false;
+
    final long nowSec = System.currentTimeMillis() / 1000;
    final int minsToNextState = (int) ((nextStateTime - nowSec) / 60);

-    // NOTE: Timezone is currently device timezone. TODO: use feature-specific timezone.
-    final ZonedDateTime nextChangeLocal =
-      ZonedDateTime.ofInstant(Instant.ofEpochSecond(nextStateTime), ZoneId.systemDefault());
+    // Try to resolve a finite next-change time; handle 24/7 case
+    final boolean looksLike247 = "24/7".equals(ohStr.trim());
+    final int ONE_WEEK_MIN = 7 * 24 * 60;
+    final boolean noRealNextChange = looksLike247 || minsToNextState >= ONE_WEEK_MIN;
+
+    if (!noRealNextChange)
+    {
+      try
+      {
+        if (nextStateTime > 0 && nextStateTime < Long.MAX_VALUE / 2)
+        {
+          // NOTE: Timezone is currently device timezone. TODO: use feature-specific timezone.
+          nextChangeLocal = ZonedDateTime.ofInstant(
+              Instant.ofEpochSecond(nextStateTime), ZoneId.systemDefault()
+          );
+          hasFiniteNextChange = true;
+        }
+      }
+      catch (Throwable ignored) {}
+    }
+
+    if (!hasFiniteNextChange) // No valid next change
+    {
+      if (isOpen)
+        openStateString.append(getString(R.string.open_now), colorGreen, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+      else
+        openStateString.append(getString(R.string.closed_now), colorRed, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+      UiUtils.setTextAndHideIfEmpty(mTvOpenState, openStateString);
+      return;
+    }

    String localizedTimeString = OpenStateTextFormatter.formatHoursMinutes(
      nextChangeLocal.getHour(), nextChangeLocal.getMinute(), DateUtils.is24HourFormat(context));
--- a/android/app/src/main/res/drawable-night/ic_category_atm.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_atm.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_bank.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_bank.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_children.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_children.xml
@@ -4,7 +4,7 @@
      <size
          android:width="40dp"
          android:height="40dp" />
-      <solid android:color="#7F5933" />
+      <solid android:color="#802D19" />
    </shape>
  </item>
  <item>
--- a/android/app/src/main/res/drawable-night/ic_category_eat.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_eat.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#BB9342" />
+            <solid android:color="#8C491C" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_entertainment.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_entertainment.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#7F5933" />
+            <solid android:color="#802D19" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_food.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_food.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#8C5F93" />
+            <solid android:color="#6B425C" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_fuel.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_fuel.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#574469" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_hospital.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_hospital.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#C15746" />
+            <solid android:color="#983E44" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_hotel.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_hotel.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#664E42" />
+            <solid android:color="#614A43" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_nightlife.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_nightlife.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#BB9342" />
+            <solid android:color="#8C491C" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_parking.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_parking.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#2E89B0" />
+            <solid android:color="#20607C" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#C15746" />
+            <solid android:color="#983E44" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_police.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_police.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_post.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_post.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_recycling.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_recycling.xml
@@ -5,7 +5,7 @@
      <size
        android:width="40dp"
        android:height="40dp" />
-      <solid android:color="#717065" />
+      <solid android:color="#51585E" />
    </shape>
  </item>
  <item>
--- a/android/app/src/main/res/drawable-night/ic_category_rv.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_rv.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_secondhand.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_secondhand.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#8C5F93" />
+            <solid android:color="#6B425C" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_shopping.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_shopping.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#8C5F93" />
+            <solid android:color="#6B425C" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_toilet.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_toilet.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#7F5933" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_tourism.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_tourism.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#7F5933" />
+            <solid android:color="#6E4426" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_wifi.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_wifi.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable/ic_avoid_motorways_enabled.xml
+++ b/android/app/src/main/res/drawable/ic_avoid_motorways_enabled.xml
--- a/android/app/src/main/res/drawable/ic_category_children.xml
+++ b/android/app/src/main/res/drawable/ic_category_children.xml
@@ -4,7 +4,7 @@
      <size
          android:width="40dp"
          android:height="40dp" />
-      <solid android:color="#9C6136" />
+      <solid android:color="#EB785D" />
    </shape>
  </item>
  <item>
--- a/android/app/src/main/res/drawable/ic_category_entertainment.xml
+++ b/android/app/src/main/res/drawable/ic_category_entertainment.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#9C6136" />
+            <solid android:color="#EB785D" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable/ic_category_fuel.xml
+++ b/android/app/src/main/res/drawable/ic_category_fuel.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="#AA96BC" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable/ic_category_toilet.xml
+++ b/android/app/src/main/res/drawable/ic_category_toilet.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#9C6136" />
+            <solid android:color="#747E86" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.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:background="?attr/cardBackground"
  android:orientation="vertical"
  android:layout_width="match_parent"
@@ -20,8 +21,15 @@
    android:minHeight="@dimen/height_block_base"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
    android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_tolls_disabled"
+      app:tint="?iconTint" />
    <com.google.android.material.textview.MaterialTextView
      android:text="@string/avoid_tolls"
      android:textAppearance="?android:attr/textAppearanceMedium"
@@ -41,8 +49,15 @@
    android:minHeight="@dimen/height_block_base"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
    android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_unpaved_disabled"
+      app:tint="?iconTint" />
    <com.google.android.material.textview.MaterialTextView
      android:text="@string/avoid_unpaved"
      android:textAppearance="?android:attr/textAppearanceMedium"
@@ -62,8 +77,15 @@
    android:minHeight="@dimen/height_block_base"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
    android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_paved_disabled"
+      app:tint="?iconTint" />
    <com.google.android.material.textview.MaterialTextView
      android:text="@string/avoid_paved"
      android:textAppearance="?android:attr/textAppearanceMedium"
@@ -83,8 +105,15 @@
    android:minHeight="@dimen/height_block_base"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
    android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_ferry_disabled"
+      app:tint="?iconTint" />
    <com.google.android.material.textview.MaterialTextView
      android:text="@string/avoid_ferry"
      android:textAppearance="?android:attr/textAppearanceMedium"
@@ -104,8 +133,15 @@
    android:minHeight="@dimen/height_block_base"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
    android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_motorways_disabled"
+      app:tint="?iconTint" />
    <com.google.android.material.textview.MaterialTextView
      android:text="@string/avoid_motorways"
      android:textAppearance="?android:attr/textAppearanceMedium"
@@ -125,8 +161,15 @@
    android:minHeight="@dimen/height_block_base"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
    android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_steps_disabled"
+      app:tint="?iconTint" />
    <com.google.android.material.textview.MaterialTextView
      android:text="@string/avoid_steps"
      android:textAppearance="?android:attr/textAppearanceMedium"
--- a/android/app/src/main/res/layout/item_phone.xml
+++ b/android/app/src/main/res/layout/item_phone.xml
@@ -28,12 +28,12 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toStartOf="@+id/delete_icon"
        app:layout_constraintStart_toEndOf="@+id/phone_icon"
+        app:hintEnabled="false"
        app:layout_constraintTop_toTopOf="parent">
        <com.google.android.material.textfield.TextInputEditText
            android:id="@+id/input"
            style="@style/MwmWidget.Editor.FieldLayout.EditText"
-            tools:hint="Hint"
-            tools:text="Input"
+            android:hint="@string/phone_format"
            android:inputType="phone"/>
    </com.google.android.material.textfield.TextInputLayout>

--- a/android/app/src/main/res/layout/item_search_result.xml
+++ b/android/app/src/main/res/layout/item_search_result.xml
@@ -6,7 +6,7 @@
  android:layout_height="wrap_content"
  android:background="?selectableItemBackground"
  android:minHeight="@dimen/search_item_height"
-  android:padding="@dimen/margin_base"
+  android:padding="@dimen/margin_half_double_plus"
  tools:background="#20FF0000">

  <com.google.android.material.textview.MaterialTextView
--- a/android/app/src/main/res/layout/map_buttons_layers.xml
+++ b/android/app/src/main/res/layout/map_buttons_layers.xml
@@ -7,4 +7,4 @@
  android:tint="?iconTint"
  android:contentDescription="@string/layers_title"
  app:tint="?accentColorSelector"
-  app:srcCompat="@drawable/ic_layers" />
+  app:srcCompat="@drawable/ic_layers" />
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -3,4 +3,4 @@
  <background android:drawable="@color/bg_app_icon_release"/>
  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
  <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome"/>
-</adaptive-icon>
+</adaptive-icon>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -505,8 +505,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Chcete změnu odeslat všem uživatelům?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Ujistěte se, že jste nezadali žádná soukromá nebo osobní data</string>
-    <string name="editor_share_to_all_dialog_message_2">Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy</string>
+    <string name="editor_share_to_all_dialog_message_1">Ujistěte se, že jste nezadali žádná soukromá nebo osobní data.</string>
+    <string name="editor_share_to_all_dialog_message_2">Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy.</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Záznam trasy</string>
    <!-- For the first routing -->
@@ -890,4 +890,18 @@
    <string name="offline_explanation_title">Offline mapy</string>
    <string name="list_description_empty">Upravit seznam pro přidání popisu</string>
    <string name="avoid_paved">Vyhnout se zpevněným cestám</string>
+    <string name="opens_at">Otevírá v %s</string>
+    <string name="closes_at">Zavírá v %s</string>
+    <string name="opens_day_at">Otevírá %1$s v %2$s</string>
+    <string name="closes_day_at">Zavírá %1$s v %2$s</string>
+    <string name="editor_business_vacant_button">Podnik je volný</string>
+    <string name="editor_mark_business_vacant_title">Označit podnik jako volný</string>
+    <string name="editor_mark_business_vacant_description">Použijte, pokud se podnik přestěhoval a místo je volné a připravené pro nového zájemce.</string>
+    <string name="editor_submit">Odeslat</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="few">%d min</item>
+        <item quantity="many">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
 </resources>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -109,11 +109,11 @@
    <!-- 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">Parkplätze|Parkplatz|Stellplatz</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! -->
-    <string name="category_secondhand">Second-hand|Gebrauchte Artikel|Gebrauchte Ware</string>
+    <string name="category_secondhand">Second-hand</string>
    <!-- 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! -->
@@ -894,4 +894,15 @@
    <string name="error_invalid_number">ungültige Zahl</string>
    <string name="list_description_empty">Liste bearbeiten, um eine Beschreibung hinzuzufügen</string>
    <string name="avoid_paved">Befst. Straßen vermeiden</string>
+    <string name="opens_at">Öffnet um %s</string>
+    <string name="closes_at">Schließt um %s</string>
+    <string name="opens_day_at">Öffnet am %1$s um %2$s</string>
+    <string name="closes_day_at">Schließt am %1$s um %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
+    <string name="editor_business_vacant_button">Geschäft ist leerstehend</string>
+    <string name="editor_mark_business_vacant_title">Geschäft als leerstehend markieren</string>
+    <string name="editor_submit">Absenden</string>
 </resources>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -909,4 +909,8 @@
        <item quantity="other">%d min</item>
    </plurals>
    <string name="list_description_empty">Modificar la lista para añadir una descripción</string>
+    <string name="editor_business_vacant_button">Negocio vacante</string>
+    <string name="editor_mark_business_vacant_title">Marcar negocio como vacante</string>
+    <string name="editor_mark_business_vacant_description">Usa esto si el negocio ya no existe y el local ha quedado vacío para un nuevo inquilino.</string>
+    <string name="editor_submit">Enviar</string>
 </resources>
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -516,8 +516,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Kas soovid saata selle kõigile kasutajatele?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Palun kontrolli, et sa ei sisestanud isiklikke andmeid</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMapi haldajad kontrollivad muudatused üle ja võtavad küsimuste korral sinuga ühendust</string>
+    <string name="editor_share_to_all_dialog_message_1">Palun kontrolli, et sa ei sisestanud isiklikke andmeid.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMapi haldajad kontrollivad muudatused üle ja võtavad küsimuste korral sinuga ühendust.</string>
    <string name="navigation_stop_button">Lõpeta</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Rada on salvestamisel</string>
@@ -898,4 +898,8 @@
        <item quantity="one">%d min</item>
        <item quantity="other">%d min</item>
    </plurals>
+    <string name="editor_business_vacant_button">Äripind on vaba</string>
+    <string name="editor_mark_business_vacant_title">Märgi äripind vabaks</string>
+    <string name="editor_mark_business_vacant_description">Kasuta seda valikut, kui senine rentnik/omanik on kolinud välja ja äripind on tühi ja uue ootel.</string>
+    <string name="editor_submit">Saada</string>
 </resources>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -899,4 +899,17 @@
    <string name="offline_explanation_text">Une carte doit être téléchargée pour visualiser et vous déplacer dans une zone.\nTéléchargez les cartes des zones que vous souhaitez visiter.</string>
    <string name="list_description_empty">Modifier la liste pour ajouter une description</string>
    <string name="avoid_paved">Éviter les routes goudronnées</string>
+    <string name="opens_at">Ouvre à %s</string>
+    <string name="closes_at">Ferme à %s</string>
+    <string name="opens_day_at">Ouverture le %1$s à %2$s</string>
+    <string name="closes_day_at">Fermeture le %1$s à %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="many">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
+    <string name="editor_business_vacant_button">Local commercial vacant</string>
+    <string name="editor_mark_business_vacant_title">Marquer l\'établissement comme vacant</string>
+    <string name="editor_mark_business_vacant_description">Utilisez cette option si l\'entreprise a déménagé et que l\'espace est vide et prêt à accueillir un nouveau locataire.</string>
+    <string name="editor_submit">Soumettre</string>
 </resources>
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -627,4 +627,17 @@
    <string name="offline_explanation_title">Mapas sen conexión</string>
    <string name="offline_explanation_text">Hai que descargar un mapa para ver e navegar polo área.\nDescarga os mapas para as zonas polas que vas viaxar.</string>
    <string name="list_description_empty">Editar a lista para engadir unha descrición</string>
+    <string name="opens_at">Abre ás %s</string>
+    <string name="closes_at">Fecha ás %s</string>
+    <string name="opens_day_at">Abre o %1$s ás %2$s</string>
+    <string name="closes_day_at">Fecha o %1$s ás %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
+    <string name="editor_mark_business_vacant_description">Usa isto se a empresa marchou e o espazo está baleiro e preparado para un novo proxecto.</string>
+    <string name="editor_submit">Enviar</string>
+    <string name="avoid_paved">Evitar estradas asfaltadas</string>
+    <string name="editor_business_vacant_button">Dispoñible para empresas</string>
+    <string name="editor_mark_business_vacant_title">Marcar como dispoñible para negocios</string>
 </resources>
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -891,4 +891,8 @@
    <string name="unknown_count">sconosciuto</string>
    <string name="error_value_must_be_positive">Il valore deve essere positivo</string>
    <string name="error_invalid_number">Numero non valido</string>
+    <string name="editor_business_vacant_button">L\'attività è vacante</string>
+    <string name="editor_mark_business_vacant_title">Contrassegna l\'attività come vacante</string>
+    <string name="editor_mark_business_vacant_description">Utilizza questa opzione se l\'azienda ha traslocato e lo spazio è vuoto e pronto per un nuovo inquilino.</string>
+    <string name="editor_submit">Conferma</string>
 </resources>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -506,9 +506,9 @@
    <!-- Error message for "Place doesn't exist" dialog when comment is empty -->
    <string name="delete_place_empty_comment_error">Norādiet šīs vietas dzēšanas iemeslu</string>
    <!-- Phone number error message -->
-    <string name="error_enter_correct_phone">Ierakstiet derīgu tālruņa numuru</string>
-    <string name="error_enter_correct_web">Ierakstiet derīgu tīmekļa vietnes adresi</string>
-    <string name="error_enter_correct_email">Ierakstiet e-pasta adresi</string>
+    <string name="error_enter_correct_phone">Jāievada derīgs tālruņa numurs</string>
+    <string name="error_enter_correct_web">Jāievada derīga tīmekļa adrese</string>
+    <string name="error_enter_correct_email">Jāievada derīga e-pasta adrese</string>
    <string name="error_enter_correct_facebook_page">Ierakstiet „Facebook“ lapas adresi, kontu vai mājaslapas nosaukumu</string>
    <string name="error_enter_correct_instagram_page">Ierakstiet „Instagram“ vietnes adresi vai konta nosaukumu</string>
    <string name="error_enter_correct_twitter_page">Ierakstiet „Twitter“ vietnes adresi vai lietotājvārdu</string>
@@ -518,8 +518,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Vai vēlaties to nosūtīt visiem lietotājiem?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi</string>
+    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.</string>
    <string name="navigation_stop_button">Apturēt</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Maršruta reģistrēšana</string>
@@ -845,4 +845,5 @@
    <string name="clear">Notīrīt</string>
    <string name="closed_now">Šobrīd slēgts</string>
    <string name="avoid_paved">Izvairīties no ceļiem ar cietu mākslīgo segumu</string>
+    <string name="editor_submit">Iesniegt</string>
 </resources>
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -522,8 +522,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Vil du sende det til alle brukere?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Sørg for at du ikke har angitt noen private eller personlige data</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-redaktører vil sjekke endringene og kontakte deg hvis de har spørsmål</string>
+    <string name="editor_share_to_all_dialog_message_1">Sørg for at du ikke har angitt noen private eller personlige data.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-redaktører vil sjekke endringene og kontakte deg hvis de har spørsmål.</string>
    <string name="navigation_stop_button">Stopp</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Tar opp sporet</string>
@@ -894,4 +894,5 @@
    <string name="opens_day_at">Åpner %1$s %2$s</string>
    <string name="closes_at">Stenger %s</string>
    <string name="opens_at">Åpner %s</string>
+    <string name="editor_submit">Send</string>
 </resources>
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -3,7 +3,7 @@
  <color name="base_accent">#FF7CBC7B</color>
  <color name="base_accent_pressed">#FF588157</color>

-  <color name="icon_tint">#FFC4C6C7</color>
+  <color name="icon_tint">#FFF</color>

  <color name="icon_tint_light">#FF76797C</color>

--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -520,8 +520,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Wil je het naar alle gebruikers sturen?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Controleer dat je geen persoonlijke gegevens hebt ingevoerd</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben</string>
+    <string name="editor_share_to_all_dialog_message_1">Controleer dat je geen persoonlijke gegevens hebt ingevoerd.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben.</string>
    <string name="navigation_stop_button">Stop</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Spoor opnemen</string>
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -462,8 +462,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Deseja enviar para todos os usuários?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Certifique-se de não ter incluído nenhum dado privado ou pessoal</string>
-    <string name="editor_share_to_all_dialog_message_2">Os mapeadores do OpenStreetMap verificarão as mudanças e entrarão em contato com você se tiverem alguma dúvida</string>
+    <string name="editor_share_to_all_dialog_message_1">Certifique-se de não ter incluído nenhum dado privado ou pessoal.</string>
+    <string name="editor_share_to_all_dialog_message_2">Os mapeadores do OpenStreetMap verificarão as alterações e entrarão em contato caso tenham alguma dúvida.</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Registro da pista</string>
    <!-- For the first routing -->
@@ -880,4 +880,8 @@
        <item quantity="many">%d min</item>
        <item quantity="other">%d min</item>
    </plurals>
+    <string name="editor_business_vacant_button">Local está desocupado</string>
+    <string name="editor_mark_business_vacant_title">Marcar local como desocupado</string>
+    <string name="editor_mark_business_vacant_description">Use isto se o estabelecimento mudou de endereço ou o local está vago e disponível para outra empresa.</string>
+    <string name="editor_submit">Enviar</string>
 </resources>
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -387,10 +387,10 @@
    <string name="editor_time_open">Deschis</string>
    <string name="editor_time_close">Închis</string>
    <string name="editor_time_add_closed">Adaugă ore de închidere</string>
-    <string name="editor_time_title">Ore de deschidere</string>
+    <string name="editor_time_title">Program</string>
    <string name="editor_time_advanced">Mod Avansat</string>
    <string name="editor_time_simple">Mod simplu</string>
-    <string name="editor_hours_closed">Ore de închidere</string>
+    <string name="editor_hours_closed">Pauză</string>
    <string name="editor_example_values">Exemple</string>
    <string name="editor_correct_mistake">Corectare greșeală</string>
    <string name="editor_add_select_location">Selectați locația</string>
@@ -867,4 +867,16 @@
    <string name="pref_tts_no_system_tts_short">Nu s-a găsit un motor de text-to-speech, verifică setările aplicației</string>
    <string name="osm_note_hint">Sau, alternativ, lăsați un mesaj comunității OpenStreetMap, astfel încât altcineva să poată adăuga sau corecta un loc aici.</string>
    <string name="osm_note_toast">Nota va fi trimisă către OpenStreetMap</string>
+    <string name="opens_at">Deschide la %s</string>
+    <string name="closes_at">Închide la %s</string>
+    <string name="opens_day_at">Deschide %1$s la %2$s</string>
+    <string name="closes_day_at">Închide %1$s la %2$s</string>
+    <string name="editor_business_vacant_button">Magazinul este vacant</string>
+    <string name="editor_mark_business_vacant_title">Machează magazinul ca vacant</string>
+    <string name="editor_place_doesnt_exist_description">Descrie cum arată locul acum ca să trimiți o notiță comunității OpenStreetMap</string>
+    <string name="editor_mark_business_vacant_description">Folosește acest buton dacă magazinul a plecat din spațiu și spațiul este gol, aștepând alt magazin.</string>
+    <string name="editor_submit">Trimite</string>
+    <string name="avoid_paved">Evită drumurile pavate</string>
+    <string name="avoid_steps">Evită treptele</string>
+    <string name="offline_explanation_text">O hartă trebuie descărcată ca să vezi și si să nevighezi prin zonă.\nDescarcă hărți pentru zonele în care vrei să mergi.</string>
 </resources>
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -513,8 +513,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Да ли желите да поделите са свим другим корисницима?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Проверите да нисте унели приватне или личне податке</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap мапери ће проверити промене и контактирати Вас уколико буду имали питања</string>
+    <string name="editor_share_to_all_dialog_message_1">Проверите да нисте унели приватне или личне податке.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap мапери ће проверити промене и контактирати Вас уколико буду имали питања.</string>
    <string name="navigation_stop_button">Стоп</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Снимање путање</string>
--- a/android/app/src/main/res/values-ta/strings.xml
+++ b/android/app/src/main/res/values-ta/strings.xml
@@ -449,8 +449,8 @@
    <string name="opens_day_at">%1$s அன்று %2$sக்கு திறக்கப்படும்</string>
    <string name="closes_day_at">%1$s அன்று %2$s இல் மூடப்படும்</string>
    <plurals name="minutes_short">
-        <item quantity="one">%dmin</item>
-        <item quantity="other">%dmin</item>
+        <item quantity="one">%d நிமையம்</item>
+        <item quantity="other">%d நிமையங்கள்</item>
    </plurals>
    <string name="hours_confirmed_time_ago">%s உறுதிப்படுத்தப்பட்டது</string>
    <string name="existence_confirmed_time_ago">இருப்பு உறுதிப்படுத்தப்பட்டது %s</string>
@@ -626,4 +626,18 @@
    <string name="charge_socket_chademo">சேட்மோ</string>
    <string name="unknown_socket_type">தெரியாத சாக்கெட்</string>
    <string name="unknow_socket_type">தெரியாத சாக்கெட்</string>
+    <string name="edit_socket_info_tooltip">புதிய சாக்கெட்டுகளை உருவாக்கவும் அல்லது ஏற்கனவே உள்ளவற்றைத் திருத்தவும்.</string>
+    <string name="charging_station_available_sockets">கிடைக்கும் சாக்கெட்டுகள்</string>
+    <string name="charge_socket_unknown_other">மற்றவை அல்லது தெரியாதவை</string>
+    <string name="charge_socket_count">எண்ணுங்கள்</string>
+    <string name="charge_socket_power">ஆற்றல் (kW)</string>
+    <string name="editor_socket">சாக்கெட்டை திருத்து</string>
+    <string name="unknown_count">தெரியவில்லை</string>
+    <string name="error_value_must_be_positive">மதிப்பு நேர்மறையாக இருக்க வேண்டும்</string>
+    <string name="error_invalid_number">தவறான எண்</string>
+    <string name="list_description_empty">விளக்கத்தைச் சேர்க்க பட்டியலைத் திருத்தவும்</string>
+    <string name="editor_business_vacant_button">வணிகம் காலியாக உள்ளது</string>
+    <string name="editor_mark_business_vacant_title">வணிகம் காலியாக இருப்பதாகக் குறி</string>
+    <string name="editor_mark_business_vacant_description">வணிகம் வெளியேறி, இடம் காலியாக இருந்தால் மற்றும் புதிய குத்தகைதாரருக்கு தயாராக இருந்தால் இதைப் பயன்படுத்தவும்.</string>
+    <string name="editor_submit">சமர்ப்பி</string>
 </resources>
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -530,8 +530,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">您想要发送给所有用户吗？</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">请确保您没有输入任何私人或个人数据</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap 编辑人员将检查更改，如有任何疑问，将与您联系</string>
+    <string name="editor_share_to_all_dialog_message_1">请确保您没有输入任何私人或个人数据。</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap 编辑人员将检查更改，如有任何疑问，将与您联系。</string>
    <string name="navigation_stop_button">停止</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">记录轨迹</string>
@@ -634,7 +634,7 @@
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
    <string name="avoid_tolls">避开收费公路</string>
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
-    <string name="avoid_unpaved">避开非铺装道路‌</string>
+    <string name="avoid_unpaved">避开非铺装道路</string>
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
    <string name="avoid_ferry">避开轮渡</string>
    <string name="avoid_motorways">避开高速公路</string>
@@ -643,7 +643,7 @@
    <string name="define_to_avoid_btn">选择要避开的道路</string>
    <string name="change_driving_options_btn">绕行设置已开启</string>
    <string name="toll_road">收费公路</string>
-    <string name="unpaved_road">非铺装道路‌</string>
+    <string name="unpaved_road">非铺装道路</string>
    <string name="ferry_crossing">轮渡</string>
    <!-- A generic "Yes" button in dialogs -->
    <string name="yes">是</string>
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -74,8 +74,8 @@
  <color name="bg_statusbar_translucent">#66000000</color>

  <!-- App icons background and foreground colors -->
-  <color name="bg_app_icon_release">@color/bg_primary</color>
-  <color name="bg_app_icon_test">@color/bg_primary</color>
+  <color name="bg_app_icon_release">#588157</color>
+  <color name="bg_app_icon_test">#588157</color>
  <color name="bg_app_icon_debug">#f8b42e</color>

  <color name="fg_app_icon_white">#fefdf6</color>
--- a/android/app/src/main/res/values/donottranslate.xml
+++ b/android/app/src/main/res/values/donottranslate.xml
@@ -100,4 +100,5 @@
  <string name="pixelfed" translatable="false">Pixelfed</string>
  <string name="count_label" translatable="false">× %d</string>
  <string name="kw_label" translatable="false">%s kW</string>
+  <string name="phone_format" translatable="false">+ XX X XX XX XX</string>
 </resources>
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -578,8 +578,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Do you want to send it to all users?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Make sure you did not enter any private or personal data</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editors will check the changes and contact you if they have any questions</string>
+    <string name="editor_share_to_all_dialog_message_1">Make sure you did not enter any private or personal data.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editors will check the changes and contact you if they have any questions.</string>
    <string name="navigation_stop_button">Stop</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Recording the track</string>
--- a/android/sdk/src/main/res/values-cs/types_strings.xml
+++ b/android/sdk/src/main/res/values-cs/types_strings.xml
@@ -306,7 +306,7 @@
    <string name="type.entrance">Vchod</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">Hlavní vchod</string>
-    <string name="type.entrance.exit">Východ</string>
+    <string name="type.entrance.exit">Východ (Pouze)</string>
    <string name="type.fee.no">Zdarma</string>
    <string name="type.healthcare.laboratory">Lékařská laboratoř</string>
    <string name="type.healthcare.physiotherapist">Fyzioterapeut</string>
@@ -1001,7 +1001,7 @@
    <string name="type.shop.jewelry">Klenotnictví</string>
    <string name="type.shop.kitchen">Prodejna kuchyní</string>
    <string name="type.shop.laundry">Prádelna</string>
-    <string name="type.shop.mall">Obchoďák</string>
+    <string name="type.shop.mall">Obchodní centrum</string>
    <string name="type.shop.massage">Masážní salon</string>
    <string name="type.shop.mobile_phone">Obchod s mobilními telefony</string>
    <string name="type.shop.money_lender">Půjčovatel peněz</string>
@@ -1439,4 +1439,61 @@
    <string name="type.leisure.indoor_play">Vnitřní herní centrum</string>
    <string name="type.shop.telecommunication">Telekomunikační obchod</string>
    <string name="type.amenity.car_pooling">Spolujízda</string>
+    <string name="type.man_made.telescope">Teleskop</string>
+    <string name="type.amenity.sailing_school">Jachtařská škola</string>
+    <string name="type.amenity.flight_school">Letecká škola</string>
+    <string name="type.amenity.prep_school">Přípravná škola</string>
+    <string name="type.emergency.access_point">Nouzový bod záchrany</string>
+    <string name="type.emergency.life_ring">Záchranný kruh</string>
+    <string name="type.shop.beauty.day_spa">Denní lázně</string>
+    <string name="type.social_facility.food_bank">Potravinová banka</string>
+    <string name="type.man_made.telescope.optical">Teleskop (optický)</string>
+    <string name="type.man_made.telescope.radio">Teleskop (rádio)</string>
+    <string name="type.man_made.telescope.gamma">Teleskop (gamma)</string>
+    <string name="type.man_made.observatory">Observatoř</string>
+    <string name="type.social_facility.soup_kitchen">Vývařovna</string>
+    <string name="type.amenity.food_sharing">Food sharing</string>
+    <string name="type.amenity.give_box">Give Box</string>
+    <string name="type.beacon.cardinal.east">Kardinální baken</string>
+    <string name="type.beacon.cardinal.north">Kardinální baken</string>
+    <string name="type.beacon.cardinal.south">Kardinální baken</string>
+    <string name="type.beacon.cardinal.west">Kardinální baken</string>
+    <string name="type.beacon.isolated_danger">Izolovaný výstražný baken</string>
+    <string name="type.beacon.lateral.port">Laterální baken</string>
+    <string name="type.beacon.lateral.starboard">Laterální baken</string>
+    <string name="type.beacon.safe_water">Baken pro bezpečnou vodu</string>
+    <string name="type.beacon.special_purpose">Baken pro speciální účely</string>
+    <string name="type.buoy.cardinal.east">Kardinální bóje</string>
+    <string name="type.buoy.cardinal.north">Kardinální bóje</string>
+    <string name="type.buoy.cardinal.south">Kardinální bóje</string>
+    <string name="type.buoy.cardinal.west">Kardinální bóje</string>
+    <string name="type.buoy.isolated_danger">Izolovaná výstražná bóje</string>
+    <string name="type.buoy.lateral.port">Laterální bóje</string>
+    <string name="type.buoy.lateral.starboard">Laterální bóje</string>
+    <string name="type.buoy.safe_water">Bóje pro bezpečnou vodu</string>
+    <string name="type.buoy.special_purpose">Bóje pro speciální účely</string>
+    <string name="type.spherical_buoy.cardinal.east">Sférická kardinální bóje</string>
+    <string name="type.spherical_buoy.cardinal.north">Sférická kardinální bóje</string>
+    <string name="type.spherical_buoy.cardinal.south">Sférická kardinální bóje</string>
+    <string name="type.spherical_buoy.cardinal.west">Sférická kardinální bóje</string>
+    <string name="type.spherical_buoy.isolated_danger">Sférická izolovaná výstražná bóje</string>
+    <string name="type.spherical_buoy.lateral.port">Sférická laterální bóje</string>
+    <string name="type.spherical_buoy.lateral.starboard">Sférická laterální bóje</string>
+    <string name="type.spherical_buoy.safe_water">Sférická bóje pro bezpečnou vodu</string>
+    <string name="type.spherical_buoy.special_purpose">Sférická bóje pro speciální účely</string>
+    <string name="type.lateral.port">Levobok</string>
+    <string name="type.lateral.starboard">Pravobok</string>
+    <string name="type.cardinal.east">Východ</string>
+    <string name="type.cardinal.north">Sever</string>
+    <string name="type.cardinal.south">Jih</string>
+    <string name="type.cardinal.west">Západ</string>
+    <string name="type.entrance.house">Vchod do domu</string>
+    <string name="type.entrance.garage">Vchod do garáže</string>
+    <string name="type.entrance.service">Služební vchod</string>
+    <string name="type.entrance.entry">Vstup (Pouze)</string>
+    <string name="type.entrance.emergency">Nouzový východ</string>
+    <string name="type.natural.sand">Písek</string>
+    <string name="type.natural.tree">Strom</string>
+    <string name="type.shop.beauty.nails">Nehtový salón</string>
+    <string name="type.xmas.tree">Vánoční strom</string>
 </resources>
--- a/android/sdk/src/main/res/values-da/types_strings.xml
+++ b/android/sdk/src/main/res/values-da/types_strings.xml
@@ -1416,5 +1416,8 @@
    <string name="type.social_facility.food_bank">Fødevarebank</string>
    <string name="type.social_facility.soup_kitchen">Suppekøkken</string>
    <string name="type.amenity.food_sharing">Fødevarerdeling</string>
-    <string name="type.amenity.give_box">Donationsbøsse</string>
+    <string name="type.amenity.give_box">Bytteboks</string>
+    <string name="type.amenity.sailing_school">Sejlerskole</string>
+    <string name="type.amenity.flight_school">Flyveskole</string>
+    <string name="type.power.portal">Kraftværksportal</string>
 </resources>
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -345,13 +345,51 @@
    <string name="type.emergency.phone">Notruftelefon</string>
    <!-- A place where a lifeguard is on duty. -->
    <string name="type.emergency.lifeguard">Rettungsschwimmer</string>
+    <string name="type.beacon.cardinal.east">Kardinalbake</string>
+    <string name="type.beacon.cardinal.north">Kardinalbake</string>
+    <string name="type.beacon.cardinal.south">Kardinalbake</string>
+    <string name="type.beacon.cardinal.west">Kardinalbake</string>
+    <string name="type.beacon.isolated_danger">Einzelgefahrenbake</string>
+    <string name="type.beacon.lateral.port">Lateralbake</string>
+    <string name="type.beacon.lateral.starboard">Lateralbake</string>
+    <string name="type.beacon.safe_water">Mittefahrwasserbarke</string>
+    <string name="type.beacon.special_purpose">Spezialbake</string>
+    <string name="type.buoy.cardinal.east">Kardinalboje</string>
+    <string name="type.buoy.cardinal.north">Kardinalboje</string>
+    <string name="type.buoy.cardinal.south">Kardinalboje</string>
+    <string name="type.buoy.cardinal.west">Kardinalboje</string>
+    <string name="type.buoy.isolated_danger">Einzelgefahrenboje</string>
+    <string name="type.buoy.lateral.port">Lateralboje</string>
+    <string name="type.buoy.lateral.starboard">Lateralboje</string>
+    <string name="type.buoy.safe_water">Mittefahrwasserboje</string>
+    <string name="type.buoy.special_purpose">Spezialboje</string>
+    <string name="type.spherical_buoy.cardinal.east">Kugelförmige Kardinalboje</string>
+    <string name="type.spherical_buoy.cardinal.north">Kugelförmige Kardinalboje</string>
+    <string name="type.spherical_buoy.cardinal.south">Kugelförmige Kardinalboje</string>
+    <string name="type.spherical_buoy.cardinal.west">Kugelförmige Kardinalboje</string>
+    <string name="type.spherical_buoy.isolated_danger">Kugelförmige Einzelgefahrenboje</string>
+    <string name="type.spherical_buoy.lateral.port">Kugelförmige Lateralboje</string>
+    <string name="type.spherical_buoy.lateral.starboard">Kugelförmige Lateralboje</string>
+    <string name="type.spherical_buoy.safe_water">Kugelförmige Mittefahrwasserboje</string>
+    <string name="type.spherical_buoy.special_purpose">Kugelförmige Spezialboje</string>
+    <string name="type.lateral.port">Backbord</string>
+    <string name="type.lateral.starboard">Steuerbord</string>
+    <string name="type.cardinal.east">Ost</string>
+    <string name="type.cardinal.north">Nord</string>
+    <string name="type.cardinal.south">Süd</string>
+    <string name="type.cardinal.west">West</string>
    <!-- A mountain rescue base for search and rescue activities. -->
    <string name="type.emergency.mountain_rescue">Bergrettungsstation</string>
    <!-- This is for secondary entrances, for main entrances see type.entrance.main -->
    <string name="type.entrance">Eingang</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">Haupteingang</string>
-    <string name="type.entrance.exit">Ausgang</string>
+    <string name="type.entrance.house">Hauseingang</string>
+    <string name="type.entrance.garage">Garageneingang</string>
+    <string name="type.entrance.service">Serviceeingang</string>
+    <string name="type.entrance.entry">(Nur) Eingang</string>
+    <string name="type.entrance.exit">(Nur) Ausgang</string>
+    <string name="type.entrance.emergency">Notausgang</string>
    <string name="type.fee.no">Kostenlos</string>
    <string name="type.healthcare.laboratory">Medizinisches Labor</string>
    <string name="type.healthcare.physiotherapist">Physiotherapie</string>
@@ -750,6 +788,7 @@
    <string name="type.natural.spring">Quelle</string>
    <string name="type.natural.spring.drinking_water_no">Quelle</string>
    <string name="type.natural.strait">Meerenge</string>
+    <string name="type.natural.tree">Baum</string>
    <string name="type.natural.tree_row">Baumreihe</string>
    <string name="type.natural.vineyard">Weinberg</string>
    <string name="type.natural.volcano">Vulkan</string>
@@ -1122,6 +1161,7 @@
    <string name="type.shop.bakery">Bäckerei</string>
    <string name="type.shop.bathroom_furnishing">Badezimmerausstattung</string>
    <string name="type.shop.beauty">Schönheitssalon</string>
+    <string name="type.shop.beauty.nails">Nagelstudio</string>
    <string name="type.shop.beverages">Getränkemarkt</string>
    <string name="type.shop.bicycle">Fahrradladen</string>
    <string name="type.shop.bookmaker">Wettbüro</string>
@@ -1445,10 +1485,19 @@
    <string name="type.shop.telecommunication">Telekommunikationsgeschäft</string>
    <string name="type.man_made.telescope">Teleskop</string>
    <string name="type.man_made.telescope.optical">Teleskop (Optisch)</string>
-    <string name="type.man_made.telescope.radio">Radioteleskop</string>
+    <string name="type.man_made.telescope.radio">Teleskop (Radio)</string>
    <string name="type.man_made.telescope.gamma">Teleskop (Gamma)</string>
    <string name="type.man_made.observatory">Observatorium</string>
    <string name="type.amenity.payment_centre">Zahlungszentrum</string>
    <string name="type.social_facility.soup_kitchen">Suppenküche</string>
    <string name="type.social_facility.food_bank">Tafel</string>
+    <string name="type.amenity.flight_school">Flugschule</string>
+    <string name="type.amenity.sailing_school">Segelschule</string>
+    <string name="type.amenity.prep_school">Nachhilfeschule</string>
+    <string name="type.shop.beauty.day_spa">Tages-Spa</string>
+    <string name="type.amenity.give_box">Spendenbox</string>
+    <string name="type.xmas.tree">Weihnachtsbaum</string>
+    <string name="type.amenity.mobile_money_agent">Mobile Money Vertretung</string>
+    <string name="type.amenity.food_sharing">Food Sharing</string>
+    <string name="type.natural.sand">Sand</string>
 </resources>
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -1454,4 +1454,49 @@
    <string name="type.social_facility.soup_kitchen">Comedor social</string>
    <string name="type.amenity.food_sharing">Alimentos compartidos</string>
    <string name="type.amenity.give_box">Give Box</string>
+    <string name="type.amenity.sailing_school">Escuela de vela</string>
+    <string name="type.amenity.flight_school">Escuela de aviación</string>
+    <string name="type.amenity.prep_school">Escuela de tutoría</string>
+    <string name="type.beacon.cardinal.east">Marca cardinal</string>
+    <string name="type.beacon.cardinal.north">Marca cardinal</string>
+    <string name="type.beacon.cardinal.south">Marca cardinal</string>
+    <string name="type.beacon.cardinal.west">Marca cardinal</string>
+    <string name="type.beacon.isolated_danger">Marca de peligro aislado</string>
+    <string name="type.beacon.lateral.port">Marca lateral</string>
+    <string name="type.beacon.lateral.starboard">Marca lateral</string>
+    <string name="type.beacon.safe_water">Marca de aguas navegables</string>
+    <string name="type.beacon.special_purpose">Marca especial</string>
+    <string name="type.buoy.cardinal.east">Boya cardinal</string>
+    <string name="type.buoy.cardinal.north">Boya cardinal</string>
+    <string name="type.buoy.cardinal.south">Boya cardinal</string>
+    <string name="type.buoy.cardinal.west">Boya cardinal</string>
+    <string name="type.buoy.isolated_danger">Boya de peligro aislado</string>
+    <string name="type.buoy.lateral.port">Boya lateral</string>
+    <string name="type.buoy.lateral.starboard">Boya lateral</string>
+    <string name="type.buoy.safe_water">Boya de aguas navegables</string>
+    <string name="type.buoy.special_purpose">Boya de uso especial</string>
+    <string name="type.spherical_buoy.cardinal.east">Boya cardinal especial</string>
+    <string name="type.spherical_buoy.cardinal.north">Boya esférica cardinal</string>
+    <string name="type.spherical_buoy.cardinal.south">Boya esférica cardinal</string>
+    <string name="type.spherical_buoy.cardinal.west">Boya esférica cardinal</string>
+    <string name="type.spherical_buoy.isolated_danger">Boya esférica de peligro aislado</string>
+    <string name="type.spherical_buoy.lateral.port">Boya esférica lateral</string>
+    <string name="type.spherical_buoy.lateral.starboard">Boya esférica lateral</string>
+    <string name="type.spherical_buoy.safe_water">Boya esférica de aguas navegables</string>
+    <string name="type.spherical_buoy.special_purpose">Boya esférica de uso especial</string>
+    <string name="type.lateral.port">Babor</string>
+    <string name="type.lateral.starboard">Estribor</string>
+    <string name="type.cardinal.east">Este</string>
+    <string name="type.cardinal.north">Norte</string>
+    <string name="type.cardinal.south">Sur</string>
+    <string name="type.cardinal.west">Oeste</string>
+    <string name="type.entrance.house">Entrada de casa</string>
+    <string name="type.entrance.garage">Entrada de garaje</string>
+    <string name="type.entrance.service">Entrada de servicio</string>
+    <string name="type.entrance.entry">Entrada (únicamente)</string>
+    <string name="type.entrance.emergency">Salida de emergencia</string>
+    <string name="type.natural.sand">Arena</string>
+    <string name="type.natural.tree">Árbol</string>
+    <string name="type.shop.beauty.day_spa">Spa</string>
+    <string name="type.xmas.tree">Árbol de Navidad</string>
 </resources>
--- a/android/sdk/src/main/res/values-et/types_strings.xml
+++ b/android/sdk/src/main/res/values-et/types_strings.xml
@@ -358,7 +358,7 @@
    <string name="type.entrance">Sissepääs</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">Peasissepääs</string>
-    <string name="type.entrance.exit">Väljapääs</string>
+    <string name="type.entrance.exit">Vaid väljapääs</string>
    <string name="type.fee.no">Tasuta</string>
    <string name="type.healthcare.laboratory">Meditsiinilabor</string>
    <string name="type.healthcare.physiotherapist">Füsioterapeut</string>
@@ -1454,4 +1454,42 @@
    <string name="type.emergency.access_point">Asukohatuvastuspunkt hädaolukorras</string>
    <string name="type.emergency.life_ring">Päästerõngas</string>
    <string name="type.shop.beauty.day_spa">Päevaspaa</string>
+    <string name="type.amenity.flight_school">Lennukool</string>
+    <string name="type.amenity.prep_school">Tugiõpe</string>
+    <string name="type.amenity.sailing_school">Purjetamiskool</string>
+    <string name="type.entrance.house">Maja sissepääs</string>
+    <string name="type.entrance.garage">Garaaži sissepääs</string>
+    <string name="type.entrance.service">Teenistuskäik</string>
+    <string name="type.entrance.entry">Vaid sissepääs</string>
+    <string name="type.entrance.emergency">Avariiväljapääs</string>
+    <string name="type.natural.sand">Liiv</string>
+    <string name="type.natural.tree">Üksik puu</string>
+    <string name="type.xmas.tree">Jõulupuu</string>
+    <string name="type.beacon.cardinal.east">Idatooder</string>
+    <string name="type.beacon.cardinal.north">Põhjatooder</string>
+    <string name="type.beacon.cardinal.south">Lõunatooder</string>
+    <string name="type.beacon.cardinal.west">Läänetooder</string>
+    <string name="type.buoy.cardinal.east">Idapoi</string>
+    <string name="type.buoy.cardinal.north">Põhjapoi</string>
+    <string name="type.buoy.cardinal.south">Lõunapoi</string>
+    <string name="type.buoy.cardinal.west">Läänepoi</string>
+    <string name="type.buoy.lateral.port">Lateraalpoi pakpoordis</string>
+    <string name="type.buoy.lateral.starboard">Lateraalpoi tüürpoordis</string>
+    <string name="type.buoy.special_purpose">Eriotstarbeline poi</string>
+    <string name="type.spherical_buoy.cardinal.east">Kerapoi idas</string>
+    <string name="type.spherical_buoy.cardinal.north">Kerapoi põhjas</string>
+    <string name="type.spherical_buoy.cardinal.south">Kerapoi lõunas</string>
+    <string name="type.spherical_buoy.cardinal.west">Kerapoi läänes</string>
+    <string name="type.spherical_buoy.lateral.port">Kerapoi pakpoordis</string>
+    <string name="type.spherical_buoy.lateral.starboard">Kerapoi tüürpoordis</string>
+    <string name="type.spherical_buoy.special_purpose">Eritistarbeline kerapoi</string>
+    <string name="type.spherical_buoy.isolated_danger">Kerapoi eraldiasetseva ohu märkimiseks</string>
+    <string name="type.buoy.isolated_danger">Poi eraldiasetseva ohu märkimiseks</string>
+    <string name="type.beacon.isolated_danger">Tooder eraldiasetseva ohu märkimiseks</string>
+    <string name="type.beacon.lateral.port">Lateraalne tooder tüürpoordis</string>
+    <string name="type.beacon.lateral.starboard">Lateraalne tooder pakpoordis</string>
+    <string name="type.beacon.special_purpose">Eriotstarbeline tooder</string>
+    <string name="type.beacon.safe_water">Faarvaatri tooder</string>
+    <string name="type.buoy.safe_water">Faarvaatri poi</string>
+    <string name="type.spherical_buoy.safe_water">Faarvaatri kerapoi</string>
 </resources>
--- a/android/sdk/src/main/res/values-fr/types_strings.xml
+++ b/android/sdk/src/main/res/values-fr/types_strings.xml
@@ -1451,4 +1451,51 @@
    <string name="type.social_facility.soup_kitchen">Soupe populaire</string>
    <string name="type.amenity.give_box">Boîte à don</string>
    <string name="type.man_made.telescope">Télescope</string>
+    <string name="type.amenity.sailing_school">École de voile</string>
+    <string name="type.amenity.flight_school">École de pilotage</string>
+    <string name="type.amenity.prep_school">École de soutien scolaire</string>
+    <string name="type.emergency.access_point">Point de secours d\'urgence</string>
+    <string name="type.emergency.life_ring">Bouée de sauvetage</string>
+    <string name="type.shop.beauty.day_spa">Spa de jour</string>
+    <string name="type.beacon.cardinal.east">Phare cardinal</string>
+    <string name="type.beacon.cardinal.north">Phare cardinal</string>
+    <string name="type.beacon.cardinal.south">Phare cardinal</string>
+    <string name="type.beacon.cardinal.west">Phare cardinal</string>
+    <string name="type.beacon.isolated_danger">Balise de danger isolée</string>
+    <string name="type.beacon.lateral.port">Balise latérale</string>
+    <string name="type.beacon.lateral.starboard">Balise latérale</string>
+    <string name="type.beacon.safe_water">Balise d\'eau potable</string>
+    <string name="type.beacon.special_purpose">Balise à usage spécial</string>
+    <string name="type.buoy.cardinal.east">Bouée cardinale</string>
+    <string name="type.buoy.cardinal.north">Bouée cardinale</string>
+    <string name="type.buoy.cardinal.south">Bouée cardinale</string>
+    <string name="type.buoy.cardinal.west">Bouée cardinale</string>
+    <string name="type.buoy.isolated_danger">Bouée de danger isolée</string>
+    <string name="type.buoy.lateral.port">Bouée latérale</string>
+    <string name="type.buoy.lateral.starboard">Bouée latérale</string>
+    <string name="type.buoy.safe_water">Bouée en eau sûre</string>
+    <string name="type.buoy.special_purpose">Bouée à usage spécial</string>
+    <string name="type.spherical_buoy.cardinal.east">Bouée cardinale sphérique</string>
+    <string name="type.spherical_buoy.cardinal.north">Bouée cardinale sphérique</string>
+    <string name="type.spherical_buoy.cardinal.south">Bouée cardinale sphérique</string>
+    <string name="type.spherical_buoy.cardinal.west">Bouée cardinale sphérique</string>
+    <string name="type.spherical_buoy.isolated_danger">Bouée de danger sphérique isolée</string>
+    <string name="type.spherical_buoy.lateral.port">Bouée latérale sphérique</string>
+    <string name="type.spherical_buoy.lateral.starboard">Bouée latérale sphérique</string>
+    <string name="type.spherical_buoy.safe_water">Bouée sphérique de sécurité en eau</string>
+    <string name="type.spherical_buoy.special_purpose">Bouée sphérique à usage spécial</string>
+    <string name="type.lateral.port">Port</string>
+    <string name="type.lateral.starboard">Tribord</string>
+    <string name="type.cardinal.east">Est</string>
+    <string name="type.cardinal.north">Nord</string>
+    <string name="type.cardinal.south">Sud</string>
+    <string name="type.cardinal.west">Ouest</string>
+    <string name="type.entrance.house">Entrée de la maison</string>
+    <string name="type.entrance.garage">Entrée du garage</string>
+    <string name="type.entrance.service">Entrée de service</string>
+    <string name="type.entrance.entry">Entrée (uniquement)</string>
+    <string name="type.entrance.emergency">Issue de secours</string>
+    <string name="type.xmas.tree">Arbre de Noël</string>
+    <string name="type.natural.tree">Arbre</string>
+    <string name="type.natural.sand">Sable</string>
 </resources>
--- a/android/sdk/src/main/res/values-hu/types_strings.xml
+++ b/android/sdk/src/main/res/values-hu/types_strings.xml
@@ -1431,4 +1431,10 @@
    <string name="type.leisure.sports_centre.sport.yoga">Sportközpont</string>
    <string name="type.leisure.fitness_centre.sport.yoga">Jógastúdió</string>
    <string name="type.amenity.charging_station.motorcar.small">Elektromos töltőpont</string>
+    <string name="type.amenity.boat_rental">Hajóbérlés</string>
+    <string name="type.man_made.telescope">Távcső</string>
+    <string name="type.man_made.telescope.optical">Távcső (Optikai)</string>
+    <string name="type.man_made.telescope.radio">Távcső (Rádió)</string>
+    <string name="type.man_made.telescope.gamma">Távcső (Gamma)</string>
+    <string name="type.man_made.observatory">Csillagvizsgáló</string>
 </resources>
--- a/android/sdk/src/main/res/values-lv/types_strings.xml
+++ b/android/sdk/src/main/res/values-lv/types_strings.xml
@@ -163,4 +163,23 @@
    <string name="type.emergency.assembly_point">Ārkārtas tikšanās punkts</string>
    <string name="type.shop.beauty.day_spa">Dienas spa</string>
    <string name="type.shop.massage">Masāžas salons</string>
+    <string name="type.natural.sand">Smiltis</string>
+    <string name="type.natural.geyser">Geizers</string>
+    <string name="type.natural.glacier">Ledājs</string>
+    <string name="type.natural.grassland">Pļava</string>
+    <string name="type.natural.heath">Tīrelis</string>
+    <string name="type.natural.hot_spring">Karstais avots</string>
+    <string name="type.natural.water.lake">Ezers</string>
+    <string name="type.natural.tree">Koks</string>
+    <string name="type.natural.tree_row">Koku rinda</string>
+    <string name="type.natural.vineyard">Vīnogu dārzs</string>
+    <string name="type.natural.volcano">Vulkāns</string>
+    <string name="type.natural.water">Ūdens</string>
+    <string name="type.natural.wetland">Mitrājs</string>
+    <string name="type.natural.wetland.bog">Muklājs</string>
+    <string name="type.natural.wetland.marsh">Dumbrājs</string>
+    <string name="type.natural.wetland.saltmarsh">Sāļūdens dumbrājs</string>
+    <string name="type.xmas.tree">Ziemassvētku egle</string>
+    <string name="type.entrance.emergency">Ārkārtas izeja</string>
+    <string name="type.lateral.port">Osta</string>
 </resources>
--- a/android/sdk/src/main/res/values-nb/types_strings.xml
+++ b/android/sdk/src/main/res/values-nb/types_strings.xml
@@ -314,7 +314,7 @@
    <string name="type.entrance">Inngang</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">Hovedinngang</string>
-    <string name="type.entrance.exit">Utgang</string>
+    <string name="type.entrance.exit">Utgang (bare)</string>
    <string name="type.fee.no">Gratis</string>
    <string name="type.healthcare.laboratory">Medisinsk laboratorium</string>
    <string name="type.healthcare.physiotherapist">Fysioterapeut</string>
@@ -1373,4 +1373,13 @@
    <string name="type.amenity.boat_rental">Båtutleie</string>
    <string name="type.man_made.observatory">Observatorium</string>
    <string name="type.emergency.life_ring">Livbøye</string>
+    <string name="type.natural.sand">Sand</string>
+    <string name="type.natural.tree">Tre</string>
+    <string name="type.cardinal.south">Sør</string>
+    <string name="type.cardinal.north">Nord</string>
+    <string name="type.cardinal.east">Øst</string>
+    <string name="type.cardinal.west">Vest</string>
+    <string name="type.xmas.tree">Juletre</string>
+    <string name="type.entrance.emergency">Nødutgang</string>
+    <string name="type.entrance.entry">Inngang (bare)</string>
 </resources>
--- a/android/sdk/src/main/res/values-nl/types_strings.xml
+++ b/android/sdk/src/main/res/values-nl/types_strings.xml
@@ -355,7 +355,7 @@
    <string name="type.entrance">Ingang</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">Hoofdingang</string>
-    <string name="type.entrance.exit">Ga naar</string>
+    <string name="type.entrance.exit">Uitgang (enig)</string>
    <string name="type.fee.no">Gratis</string>
    <string name="type.healthcare.laboratory">Medisch laboratorium</string>
    <string name="type.healthcare.physiotherapist">Fysiotherapeut</string>
@@ -419,8 +419,8 @@
    <string name="type.highway.path.difficult">Moeilijk of slecht zichtbaar pad</string>
    <!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
    <string name="type.highway.path.expert">Zeer moeilijk of niet te onderscheiden spoor</string>
-    <string name="type.highway.path.bicycle">Fietspad</string>
-    <string name="type.highway.footway.bicycle">Fietspad</string>
+    <string name="type.highway.path.bicycle">Fiets- &amp; voetpad</string>
+    <string name="type.highway.footway.bicycle">Fiets- &amp; voetpad</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.path.bridge">Brug</string>
    <string name="type.highway.path.horse">Ruiterpad</string>
@@ -1450,4 +1450,46 @@
    <string name="type.amenity.lounger">Lounge</string>
    <string name="type.amenity.payment_centre">Betaalkantoor</string>
    <string name="type.leisure.indoor_play">Speelhal</string>
+    <string name="type.amenity.sailing_school">Zeilschool</string>
+    <string name="type.amenity.flight_school">Vliegschool</string>
+    <string name="type.amenity.prep_school">Bijscholing</string>
+    <string name="type.cardinal.east">Oost</string>
+    <string name="type.cardinal.north">Noorden</string>
+    <string name="type.cardinal.south">Zuiden</string>
+    <string name="type.natural.sand">Zand</string>
+    <string name="type.natural.tree">Boom</string>
+    <string name="type.beacon.cardinal.east">Kardinaal baken</string>
+    <string name="type.beacon.cardinal.north">Kardinaal baken</string>
+    <string name="type.beacon.cardinal.south">Kardinaal baken</string>
+    <string name="type.beacon.cardinal.west">Kardinaal baken</string>
+    <string name="type.beacon.lateral.port">Lateraal baken</string>
+    <string name="type.beacon.lateral.starboard">Lateraal baken</string>
+    <string name="type.beacon.safe_water">Scheidingsbaken</string>
+    <string name="type.beacon.special_purpose">Speciaal baken</string>
+    <string name="type.buoy.cardinal.east">Kardinale boei</string>
+    <string name="type.buoy.cardinal.north">Kardinale boei</string>
+    <string name="type.buoy.cardinal.south">Kardinale boei</string>
+    <string name="type.buoy.cardinal.west">Kardinale boei</string>
+    <string name="type.buoy.lateral.port">Laterale boei</string>
+    <string name="type.buoy.lateral.starboard">Laterale boei</string>
+    <string name="type.buoy.safe_water">Scheidingsboei</string>
+    <string name="type.buoy.special_purpose">Speciale boei</string>
+    <string name="type.spherical_buoy.cardinal.east">Sferische kardinale boei</string>
+    <string name="type.spherical_buoy.cardinal.north">Sferische kardinale boei</string>
+    <string name="type.spherical_buoy.cardinal.south">Sferische kardinale boei</string>
+    <string name="type.spherical_buoy.cardinal.west">Sferische kardinale boei</string>
+    <string name="type.spherical_buoy.lateral.port">Sferische laterale boei</string>
+    <string name="type.spherical_buoy.lateral.starboard">Sferische laterale boei</string>
+    <string name="type.spherical_buoy.safe_water">Sferische scheidingsboei</string>
+    <string name="type.spherical_buoy.special_purpose">Sferische speciale boei</string>
+    <string name="type.lateral.port">Haven</string>
+    <string name="type.lateral.starboard">Stuurboord</string>
+    <string name="type.cardinal.west">West</string>
+    <string name="type.entrance.house">Huis entree</string>
+    <string name="type.entrance.garage">Garage entree</string>
+    <string name="type.entrance.service">Dienstingang</string>
+    <string name="type.entrance.entry">Ingang (enig)</string>
+    <string name="type.entrance.emergency">Nooduitgang</string>
+    <string name="type.xmas.tree">Kerstboom</string>
+    <string name="type.shop.beauty.day_spa">Schoonheidssalon</string>
 </resources>
--- a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
@@ -1131,7 +1131,7 @@
    <string name="type.sport.curling">Curling</string>
    <string name="type.emergency.assembly_point">Ponto de Reunião de Emergência</string>
    <string name="type.emergency.mountain_rescue">Estação de resgate na montanha</string>
-    <string name="type.entrance.exit">Saída</string>
+    <string name="type.entrance.exit">Saída (apenas)</string>
    <string name="type.amenity.arts_centre">Centro de artes</string>
    <string name="type.amenity.bbq">Churrasqueira</string>
    <string name="type.amenity.compressed_air">Ar comprimido</string>
@@ -1442,4 +1442,49 @@
    <string name="type.amenity.give_box">Caixa de doação</string>
    <string name="type.emergency.access_point">Ponto de Resgate de Emergência</string>
    <string name="type.emergency.life_ring">Boia salva-vidas</string>
+    <string name="type.amenity.sailing_school">Escola de vela</string>
+    <string name="type.amenity.flight_school">Escola de aviação</string>
+    <string name="type.amenity.prep_school">Cursinho</string>
+    <string name="type.beacon.cardinal.east">Marca cardinal</string>
+    <string name="type.beacon.cardinal.north">Marca cardinal</string>
+    <string name="type.beacon.cardinal.south">Marca cardinal</string>
+    <string name="type.beacon.cardinal.west">Marco cardinal</string>
+    <string name="type.beacon.isolated_danger">Marco de período isolado</string>
+    <string name="type.beacon.lateral.port">Marca lateral</string>
+    <string name="type.buoy.lateral.starboard">Boia lateral</string>
+    <string name="type.buoy.safe_water">Boia de águas seguras</string>
+    <string name="type.buoy.special_purpose">Boia para fins especiais</string>
+    <string name="type.spherical_buoy.cardinal.east">Boia cardinal esférica</string>
+    <string name="type.spherical_buoy.cardinal.north">Boia cardinal esférica</string>
+    <string name="type.spherical_buoy.cardinal.south">Boia cardinal esférica</string>
+    <string name="type.spherical_buoy.cardinal.west">Boia cardinal esférica</string>
+    <string name="type.spherical_buoy.isolated_danger">Boia esférica de perigo isolado</string>
+    <string name="type.spherical_buoy.lateral.port">Boia esférica lateral</string>
+    <string name="type.spherical_buoy.lateral.starboard">Boia esférica lateral</string>
+    <string name="type.spherical_buoy.safe_water">Boia esférica de águas seguras</string>
+    <string name="type.spherical_buoy.special_purpose">Boia esférica para fins especiais</string>
+    <string name="type.lateral.port">Bombordo</string>
+    <string name="type.lateral.starboard">Estibordo</string>
+    <string name="type.cardinal.east">Leste</string>
+    <string name="type.cardinal.north">Norte</string>
+    <string name="type.cardinal.south">Sul</string>
+    <string name="type.cardinal.west">Oeste</string>
+    <string name="type.entrance.house">Entrada de casa</string>
+    <string name="type.entrance.garage">Entrada de garagem</string>
+    <string name="type.entrance.service">Entrada de serviço</string>
+    <string name="type.entrance.entry">Entrada (apenas)</string>
+    <string name="type.entrance.emergency">Saída de emergência</string>
+    <string name="type.natural.sand">Areia</string>
+    <string name="type.natural.tree">Árvore</string>
+    <string name="type.shop.beauty.day_spa">Spa sem alojamento</string>
+    <string name="type.xmas.tree">Árvore de natal</string>
+    <string name="type.beacon.lateral.starboard">Marco lateral</string>
+    <string name="type.beacon.safe_water">Marco de águas seguras</string>
+    <string name="type.beacon.special_purpose">Marco de fins especiais</string>
+    <string name="type.buoy.cardinal.east">Boia cardeal</string>
+    <string name="type.buoy.cardinal.north">Boia cardeal</string>
+    <string name="type.buoy.cardinal.south">Boia cardeal</string>
+    <string name="type.buoy.cardinal.west">Boia cardeal</string>
+    <string name="type.buoy.isolated_danger">Boia de perigo isolado</string>
+    <string name="type.buoy.lateral.port">Boia lateral</string>
 </resources>
--- a/android/sdk/src/main/res/values-pt/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt/types_strings.xml
@@ -1455,4 +1455,7 @@
    <string name="type.amenity.food_sharing">Partilha de Comida</string>
    <string name="type.amenity.give_box">Caixa de Doações</string>
    <string name="type.shop.beauty.day_spa">Spa Diurno</string>
+    <string name="type.amenity.sailing_school">Escola Náutica</string>
+    <string name="type.amenity.flight_school">Escola de Aviação</string>
+    <string name="type.amenity.prep_school">Centro de Explicações</string>
 </resources>
--- a/android/sdk/src/main/res/values-ro/types_strings.xml
+++ b/android/sdk/src/main/res/values-ro/types_strings.xml
@@ -1437,4 +1437,5 @@
    <string name="type.leisure.sports_centre.sport.volleyball">Centru Sportiv</string>
    <string name="type.leisure.fitness_centre.sport.yoga">Centru de Yoga</string>
    <string name="type.leisure.sports_centre.sport.tennis">Centru Sportiv</string>
+    <string name="type.leisure.bandstand">Foișor</string>
 </resources>
--- a/android/sdk/src/main/res/values-sl/types_strings.xml
+++ b/android/sdk/src/main/res/values-sl/types_strings.xml
@@ -236,4 +236,13 @@
    <string name="type.amenity.vending_machine.newspapers">Avtomat za časopis</string>
    <string name="type.amenity.vending_machine.parking_tickets">Avtomat za parkirne listke</string>
    <string name="type.amenity.vending_machine.sweets">Avtomat za sladkarije</string>
+    <string name="type.entrance.emergency">Izhod v sili</string>
+    <string name="type.fee.yes">€</string>
+    <string name="type.fee.no">Plačilo</string>
+    <string name="type.healthcare.physiotherapist">Fizioterapevt</string>
+    <string name="type.healthcare.alternative">Alternativno zdravljenje</string>
+    <string name="type.healthcare.audiologist">Strokovnjak za sluh</string>
+    <string name="type.healthcare.blood_donation">Središče za darovanje krvi</string>
+    <string name="type.healthcare.optometrist">Optometrist</string>
+    <string name="type.healthcare.podiatrist">Podiater</string>
 </resources>
--- a/android/sdk/src/main/res/values-sr/types_strings.xml
+++ b/android/sdk/src/main/res/values-sr/types_strings.xml
@@ -359,7 +359,7 @@
    <string name="type.entrance">Улаз</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">Главни улаз</string>
-    <string name="type.entrance.exit">Излаз</string>
+    <string name="type.entrance.exit">Излаз (искључиво)</string>
    <string name="type.fee.no">Бесплатно</string>
    <string name="type.healthcare.laboratory">Медицинска лабораторија</string>
    <string name="type.healthcare.physiotherapist">Физиотерапеут</string>
@@ -1454,4 +1454,49 @@
    <string name="type.shop.beauty.day_spa">Дневни спа</string>
    <string name="type.emergency.life_ring">Појас за спасавање</string>
    <string name="type.emergency.access_point">Спасилачка тачка</string>
+    <string name="type.amenity.sailing_school">Школа једрења</string>
+    <string name="type.amenity.flight_school">Школа летења</string>
+    <string name="type.amenity.prep_school">Припремна школа</string>
+    <string name="type.beacon.cardinal.east">Кардинални светионик</string>
+    <string name="type.beacon.cardinal.north">Кардинални светионик</string>
+    <string name="type.beacon.cardinal.south">Кардинални светионик</string>
+    <string name="type.beacon.cardinal.west">Кардинални светионик</string>
+    <string name="type.beacon.isolated_danger">Светионик изоловане опасности</string>
+    <string name="type.beacon.lateral.port">Бочни светионик</string>
+    <string name="type.beacon.lateral.starboard">Бочни светионик</string>
+    <string name="type.beacon.safe_water">Светионик безбедне воде</string>
+    <string name="type.beacon.special_purpose">Светионик посебне намене</string>
+    <string name="type.buoy.cardinal.east">Кардинална бова</string>
+    <string name="type.buoy.cardinal.north">Кардинална бова</string>
+    <string name="type.buoy.cardinal.south">Кардинална бова</string>
+    <string name="type.buoy.cardinal.west">Кардинална бова</string>
+    <string name="type.buoy.isolated_danger">Бова изоловане опасности</string>
+    <string name="type.buoy.lateral.port">Бочна бова</string>
+    <string name="type.buoy.lateral.starboard">Бочна бова</string>
+    <string name="type.buoy.safe_water">Бова безбедне воде</string>
+    <string name="type.buoy.special_purpose">Бова посебне намене</string>
+    <string name="type.spherical_buoy.cardinal.east">Сферна кардинална бова</string>
+    <string name="type.spherical_buoy.cardinal.north">Сферна кардинална бова</string>
+    <string name="type.spherical_buoy.cardinal.south">Сферна кардинална бова</string>
+    <string name="type.spherical_buoy.cardinal.west">Сферна кардинална бова</string>
+    <string name="type.spherical_buoy.isolated_danger">Сферна бова изоловане опасности</string>
+    <string name="type.spherical_buoy.lateral.port">Сферна бочна бова</string>
+    <string name="type.spherical_buoy.lateral.starboard">Сферна бочна бова</string>
+    <string name="type.spherical_buoy.safe_water">Сферна бова безбедне воде</string>
+    <string name="type.spherical_buoy.special_purpose">Сферна бова посебне намене</string>
+    <string name="type.lateral.port">Лево (порт)</string>
+    <string name="type.lateral.starboard">Десно (старборд)</string>
+    <string name="type.cardinal.east">Исток</string>
+    <string name="type.cardinal.north">Север</string>
+    <string name="type.cardinal.south">Југ</string>
+    <string name="type.cardinal.west">Запад</string>
+    <string name="type.entrance.house">Улаз у кућу</string>
+    <string name="type.entrance.garage">Улаз у гаражу</string>
+    <string name="type.entrance.service">Сервисни улаз</string>
+    <string name="type.entrance.entry">Улаз (искључиво)</string>
+    <string name="type.entrance.emergency">Улаз за хитне случајеве</string>
+    <string name="type.natural.sand">Песак</string>
+    <string name="type.natural.tree">Дрво</string>
+    <string name="type.xmas.tree">Божићна јелка</string>
+    <string name="type.shop.beauty.nails">Салон за нокте</string>
 </resources>
--- a/android/sdk/src/main/res/values-ta/strings.xml
+++ b/android/sdk/src/main/res/values-ta/strings.xml
@@ -8,16 +8,27 @@
    <string name="ft">அடி</string>
    <string name="today">இன்று</string>
    <string name="yesterday">நேற்று</string>
-    <string name="days_ago">%s நாட்களுக்கு முன்</string>
-    <string name="weeks_ago">%s வாரங்களுக்கு முன்</string>
-    <string name="months_ago">%s மாதங்களுக்கு முன்</string>
-    <string name="years_ago">%s வருடங்களுக்கு முன்</string>
+    <string name="days_ago">%s நாட்களுக்கு முன்பு</string>
+    <string name="weeks_ago">%s வாரங்களுக்கு முன்பு</string>
+    <string name="months_ago">%s மாதங்களுக்கு முன்பு</string>
+    <string name="years_ago">%s ஆண்டுகளுக்கு முன்பு</string>
    <string name="km">கி.மீ</string>
    <string name="postal_code">குறியீடு</string>
    <string name="core_placepage_unknown_place">வரைபட புள்ளி</string>
    <string name="core_exit">வெளியேறு</string>
    <string name="core_entrance">நுழைவாயில்</string>
    <string name="subway_data_unavailable">சுரங்கப்பாதை வரைபடம் கிடைக்கவில்லை</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
+    <string name="mb">எம்பி</string>
+    <string name="gb">சிபி</string>
+    <string name="maps_storage_internal">உள் தனிப்பட்ட சேமிப்பு</string>
+    <string name="maps_storage_shared">உள் பகிரப்பட்ட சேமிப்பு</string>
+    <string name="maps_storage_removable">SD அட்டை</string>
+    <string name="maps_storage_external">வெளிப்புற பகிர்ந்த சேமிப்பு</string>
+    <string name="public_access">பொது அணுகல்</string>
+    <string name="limited_access">வரையறுக்கப்பட்ட அணுகல்</string>
+    <string name="not_shared">தனிப்பட்ட</string>
+    <string name="access_rules_author_only">நிகழ்நிலை திருத்துதல்</string>
+    <string name="week_ago">%s வாரத்திற்கு முன்பு</string>
+    <string name="month_ago">%s மாதம் முன்பு</string>
+    <string name="year_ago">%s வருடத்திற்கு முன்பு</string>
 </resources>
--- a/android/sdk/src/main/res/values-ta/types_strings.xml
+++ b/android/sdk/src/main/res/values-ta/types_strings.xml
@@ -9,4 +9,8 @@
    <string name="type.addr_interpolation">முகவரி/சாலைத் தொகுதி</string>
    <string name="type.addr_interpolation.even">முகவரி/சாலைத் தொகுதி</string>
    <string name="type.amenity.music_school">இசை பள்ளிக்கூடம்</string>
+    <string name="type.aerialway.cable_car">கேபிள் கார்</string>
+    <string name="type.aeroway.aerodrome.international">சர்வதேச விமான நிலையம்</string>
+    <string name="type.aeroway.helipad">ஹெலிபேட்</string>
+    <string name="type.aeroway.runway">ஓடுதளம்</string>
 </resources>
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -74,6 +74,9 @@
    <string name="type.amenity.exhibition_centre">Exhibition Center</string>
    <string name="type.amenity.money_transfer">Money Transfer</string>
    <string name="type.amenity.music_school">Music School</string>
+    <string name="type.amenity.sailing_school">Sailing School</string>
+    <string name="type.amenity.flight_school">Flight School</string>
+    <string name="type.amenity.prep_school">Tutorial School</string>
    <string name="type.amenity.language_school">Language School</string>
    <string name="type.office.diplomatic">Embassy</string>
    <string name="type.office.security">Security Guards Office</string>
@@ -379,13 +382,51 @@
    <string name="type.emergency.phone">Emergency Phone</string>
    <!-- A place where a lifeguard is on duty. -->
    <string name="type.emergency.lifeguard">Lifeguard</string>
+    <string name="type.beacon.cardinal.east">Cardinal Beacon</string>
+    <string name="type.beacon.cardinal.north">Cardinal Beacon</string>
+    <string name="type.beacon.cardinal.south">Cardinal Beacon</string>
+    <string name="type.beacon.cardinal.west">Cardinal Beacon</string>
+    <string name="type.beacon.isolated_danger">Isolated Danger Beacon</string>
+    <string name="type.beacon.lateral.port">Lateral Beacon</string>
+    <string name="type.beacon.lateral.starboard">Lateral Beacon</string>
+    <string name="type.beacon.safe_water">Safe Water Beacon</string>
+    <string name="type.beacon.special_purpose">Special Purpose Beacon</string>
+    <string name="type.buoy.cardinal.east">Cardinal Buoy</string>
+    <string name="type.buoy.cardinal.north">Cardinal Buoy</string>
+    <string name="type.buoy.cardinal.south">Cardinal Buoy</string>
+    <string name="type.buoy.cardinal.west">Cardinal Buoy</string>
+    <string name="type.buoy.isolated_danger">Isolated Danger Buoy</string>
+    <string name="type.buoy.lateral.port">Lateral Buoy</string>
+    <string name="type.buoy.lateral.starboard">Lateral Buoy</string>
+    <string name="type.buoy.safe_water">Safe Water Buoy</string>
+    <string name="type.buoy.special_purpose">Special Purpose Buoy</string>
+    <string name="type.spherical_buoy.cardinal.east">Spherical Cardinal Buoy</string>
+    <string name="type.spherical_buoy.cardinal.north">Spherical Cardinal Buoy</string>
+    <string name="type.spherical_buoy.cardinal.south">Spherical Cardinal Buoy</string>
+    <string name="type.spherical_buoy.cardinal.west">Spherical Cardinal Buoy</string>
+    <string name="type.spherical_buoy.isolated_danger">Spherical Isolated Danger Buoy</string>
+    <string name="type.spherical_buoy.lateral.port">Spherical Lateral Buoy</string>
+    <string name="type.spherical_buoy.lateral.starboard">Spherical Lateral Buoy</string>
+    <string name="type.spherical_buoy.safe_water">Spherical Safe Water Buoy</string>
+    <string name="type.spherical_buoy.special_purpose">Spherical Special Purpose Buoy</string>
+    <string name="type.lateral.port">Port</string>
+    <string name="type.lateral.starboard">Starboard</string>
+    <string name="type.cardinal.east">East</string>
+    <string name="type.cardinal.north">North</string>
+    <string name="type.cardinal.south">South</string>
+    <string name="type.cardinal.west">West</string>
    <!-- A mountain rescue base for search and rescue activities. -->
    <string name="type.emergency.mountain_rescue">Mountain Rescue Station</string>
    <!-- This is for secondary entrances, for main entrances see type.entrance.main -->
    <string name="type.entrance">Entrance</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">Main Entrance</string>
-    <string name="type.entrance.exit">Exit</string>
+    <string name="type.entrance.house">House Entrance</string>
+    <string name="type.entrance.garage">Garage Entrance</string>
+    <string name="type.entrance.service">Service Entrance</string>
+    <string name="type.entrance.entry">Entry (Only)</string>
+    <string name="type.entrance.exit">Exit (Only)</string>
+    <string name="type.entrance.emergency">Emergency Exit</string>
    <string name="type.fee.yes">$</string>
    <string name="type.fee.no">Free</string>
    <string name="type.healthcare.laboratory">Medical Laboratory</string>
@@ -778,6 +819,7 @@
    <string name="type.man_made.embankment">Embankment</string>
    <string name="type.natural.coastline">Coastline</string>
    <string name="type.natural.desert">Desert</string>
+    <string name="type.natural.sand">Sand</string>
    <string name="type.natural.geyser">Geyser</string>
    <string name="type.natural.glacier">Glacier</string>
    <string name="type.natural.grassland">Grassland</string>
@@ -799,6 +841,7 @@
    <string name="type.natural.spring">Natural Spring</string>
    <string name="type.natural.spring.drinking_water_no">Natural Spring</string>
    <string name="type.natural.strait">Strait</string>
+    <string name="type.natural.tree">Tree</string>
    <string name="type.natural.tree_row">Tree Row</string>
    <string name="type.natural.vineyard">Vineyard</string>
    <string name="type.natural.volcano">Volcano</string>
@@ -1185,6 +1228,7 @@
    <string name="type.shop.bakery">Bakery</string>
    <string name="type.shop.bathroom_furnishing">Bathroom Furnishings</string>
    <string name="type.shop.beauty">Beauty Shop</string>
+    <string name="type.shop.beauty.nails">Nail Salon</string>
    <string name="type.shop.beverages">Beverages</string>
    <string name="type.shop.bicycle">Bicycle Shop</string>
    <string name="type.shop.bookmaker">Bookmaker</string>
@@ -1459,4 +1503,5 @@
    <string name="type.amenity.dojo">Dojo</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
    <string name="type.leisure.sports_hall">Sports hall</string>
+    <string name="type.xmas.tree">Christmas Tree</string>
 </resources>
--- a/data/categories-strings/de.json/localize.json
+++ b/data/categories-strings/de.json/localize.json
@@ -47,7 +47,8 @@
 "shop-jewelry|@category_shopping|@shop": "4Juwelier|Juweliergeschäft|Schmuck",
 "shop-optician|@shop": "4Optiker|5Brillengeschäft|5Augenoptiker",
 "shop-gift|@category_shopping|@shop": "5Geschenkeladen|Geschenke|Geschenkartikelladen|5Andenkenladen|Andenken|Präsente|4Mitbringsel|4Souvenirladen",
-"shop-beauty": "5Schönheitssalon|Schönheitsshop|Kosmetiker|Friseur|Frisör|Haarschnitt|Kosmetikstudio|Friseursalon|Kosmetiksalon|Nagelstudio|Färbung",
+"shop-beauty": "5Schönheitssalon|Schönheitsshop|Kosmetiker|Kosmetikstudio|Kosmetiksalon",
+"shop-beauty-nails": "5Nagelstudio|Nagelsalon|Fingernägel|Fußnägel|Nägel",
 "shop-greengrocer|@category_food|@shop": "5Gemüseladen|Gemüsehändler",
 "shop-sports|@category_shopping|@shop": "4Sportgeschäft|Sportartikel|Fitnessgeschäft",
 "shop-supermarket|@category_food|@shop": "3Supermarkt",
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -50,7 +50,8 @@
 "shop-jewelry|@category_shopping|@shop": "4Jewelry|U+1F48D",
 "shop-optician|@shop": "4Optician|glasses|sunglasses|U+1F453",
 "shop-gift|@category_shopping|@shop": "Gift|U+1F381|souvenir|souvenirs|3gifts|presents|4Souvenir shop|gift shop|giftshop",
-"shop-beauty": "4Beauty Shop|beautician|U+1F484|beauty salon|beauty parlor|nail salon|coloring",
+"shop-beauty": "4Beauty Shop|beautician|U+1F484|beauty salon|beauty parlor|coloring",
+"shop-beauty-nails": "4Nail salon|nail technician|nail tech|finger nails|toe nails|nails",
 "shop-greengrocer|@category_food|@shop": "4Greengrocer|U+1F345|U+1F346|U+1F33D|U+1F360|U+1F348|U+1F347|U+1F349|U+1F34A|U+1F34C|U+1F34D|U+1F34E|U+1F34F|U+1F350|U+1F351|U+1F353",
 "shop-sports|@category_shopping|@shop": "4Sports Goods|U+1F3BF|U+1F3A3|U+1F3C2|U+1F6B4|U+26BD|U+1F3C0|U+1F3C8|U+26BE|U+1F3BE|U+1F3C9|U+26F3",
 "shop-supermarket|@category_food|@shop": "3Supermarket",
@@ -415,6 +416,9 @@
 "leisure-resort|@category_hotel": "Resort",
 "amenity-biergarten|@category_eat|@category_nightlife": "5Biergarten",
 "amenity-driving_school": "4Driving school",
+"amenity-sailing_school": "4Sailing school|4Boating school",
+"amenity-flight_school": "5Flight school|Flying school",
+"amenity-prep_school": "3Tutorial school|Prep school|Test prep center|Cram school",
 "amenity-music_school": "4Music school",
 "amenity-language_school": "4Language school",
 "amenity-ice_cream": "3Ice cream|Gelato",
--- a/data/copyright.html
+++ b/data/copyright.html
@@ -200,6 +200,9 @@
    <li><a href="https://pugixml.org/">Pugixml</a><br>
      &copy; 2006-2015 Arseny Kapoulkine; <a href="#mit-license" class="license">MIT License</a></li>

+    <li><a href="https://github.com/mnalis/StreetComplete-taginfo-categorize">StreetComplete Taginfo Categorize</a><br>
+      &copy; 2025; <a href="#cc0-1" class="license">CC0 1.0 Universal</a></li>
+
    <li><a href="https://github.com/ot/succinct">succinct library</a><br>
      &copy; 2011 Giuseppe Ottaviano; <a href="#apache2-license" class="license">Apache License</a></li>

@@ -223,10 +226,10 @@

    <li><a href="https://github.com/skarupke/flat_hash_map">Skarupke Hash Tables</a><br>
      &copy; Malte Skarupke 2017; <a href="#boost-license" class="license">Boost License</a></li>
-
-</ul>
+  </ul>

  <p lang="en">Beyond OpenStreetMap, we also use a few other open data sources to improve our map data:</p>
+  <p lang="de">Neben OpenStreetMap verwenden wir auch einige andere freie Datenquellen, um die Kartendaten zu verbessern:</p>

  <ul>
    <li><a href="https://simplemaps.com/data/us-zips">US Zip Codes Database</a><br>
@@ -349,13 +352,13 @@
    &copy; 2023 Sergey Vartanov <a href="#cc-by-4" class="license">CC BY 4.0 License</a></li>

  <li><a href="https://upload.wikimedia.org/wikipedia/commons/a/a9/Panoramax.svg">Panoramax</a><br>
-      &copy; 2023 Adrien Pavie; <a href="#cc-by-4" class="license">CC BY 4.0 License</a></li>
+    &copy; 2023 Adrien Pavie; <a href="#cc-by-4" class="license">CC BY 4.0 License</a></li>
  
  <li><a href="https://github.com/gravitystorm/openstreetmap-carto">OpenStreetMap Carto</a><br>
-      &copy; 2025 OpenStreetMap Carto; <a href="#cc0-1" class="license">CC0 1.0 Universal</li>
-      
-      <li><a href="https://github.com/rapideditor/temaki">Temaki</a><br>
-          &copy; 2025 Rapid Editor; <a href="#cc0-1" class="license">CC0 1.0 Universal</li>
+    &copy; 2025 OpenStreetMap Carto; <a href="#cc0-1" class="license">CC0 1.0 Universal</a></li>
+
+  <li><a href="https://github.com/rapideditor/temaki">Temaki</a><br>
+    &copy; 2025 Rapid Editor; <a href="#cc0-1" class="license">CC0 1.0 Universal</a></li>
 </ul>
 </div>

--- a/data/countries-strings/sr.json/localize.json
+++ b/data/countries-strings/sr.json/localize.json
@@ -130,5 +130,67 @@
 "Brazil_Southeast Region_Sao Paulo_City":"Сао Пауло - Сантос",
 "Brazil_Southeast Region_Sao Paulo_West":"Сао Пауло - Рибеирао Прето",
 "British Indian Ocean Territory":"Британска територија у Индијском океану",
-"British Virgin Islands":"Британска Девичанска Острва"
+"British Virgin Islands":"Британска Девичанска Острва",
+"Campo de Hielo Sur":"Јужно патагонско ледено поље",
+"Canada_British Columbia_Central":"Британска Колумбија — центар",
+"Canada_British Columbia_Far_North":"Британска Колумбија — исток",
+"Canada_British Columbia_Islands":"Острво Ванкувер",
+"Canada_British Columbia_North":"Британска Колумбија — запад",
+"Canada_British Columbia_Northeast":"Британска Колумбија — север",
+"Canada_British Columbia_Southeast":"Келоуна",
+"Canada_British Columbia_Vancouver":"Ванкувер",
+"Canada_Labrador":"Лабрадор",
+"Canada_Labrador_North":"Лабрадор — север",
+"Canada_Labrador_South":"Лабрадор — југ",
+"Canada_Labrador_West":"Лабрадор — запад",
+"Canada_Manitoba":"Манитоба",
+"Canada_Manitoba_Northeast":"Манитоба — север",
+"Canada_Manitoba_Northwest":"Манитоба — запад",
+"Canada_Manitoba_South":"Брендон",
+"Canada_Manitoba_Winnipeg":"Винипег",
+"Canada_New Brunswick":"Њу Бранзвик",
+"Canada_Newfoundland":"Њуфаундленд",
+"Canada_Newfoundland_East":"Њуфаундленд — исток",
+"Canada_Newfoundland_North":"Њуфаундленд — север",
+"Canada_Newfoundland_South":"Њуфаундленд — југ",
+"Canada_Newfoundland_West":"Њуфаундленд — запад",
+"Canada_Northwest Territories":"Северозападне Територије",
+"Canada_Northwest Territories_East":"Северозападне Територије — исток",
+"Canada_Northwest Territories_North":"Северозападне Територије — север",
+"Canada_Northwest Territories_Yellowknife":"Јелоунајф",
+"Canada_Nova Scotia":"Нова Шкотска",
+"Canada_Nova Scotia_Halifax":"Халифакс",
+"Canada_Nova Scotia_Sydney":"Сидни",
+"Canada_Nunavut":"Нунавут",
+"Canada_Nunavut_North":"Нунавут — север",
+"Canada_Nunavut_South":"Нунавут — југ",
+"Canada_Ontario":"Онтарио",
+"Canada_Ontario_Bame":"Бери",
+"Canada_Ontario_Kingston":"Кингстон",
+"Canada_Ontario_London":"Лондон",
+"Canada_Ontario_Northeastern_Central":"Тиминс",
+"Canada_Ontario_Northeastern_North":"Мус Фектори",
+"Canada_Ontario_Northeastern_S":"Велики Садбери",
+"Canada_Ontario_Northeastern_SE":"Норт Беј",
+"Canada_Ontario_Northeastern_SW":"Су Сент Мари",
+"Canada_Ontario_Northeastern_Wawa":"Вава",
+"Canada_Ontario_Northern":"Тандербеј",
+"Canada_Ontario_Northwestern":"Онтарио — север",
+"Canada_Ontario_Toronto":"Торонто",
+"Canada_Prince Edward Island":"Острво Принца Едварда",
+"Canada_Quebec":"Квебек",
+"Canada_Quebec_Quebec":"Град Квебек",
+"Canada_Quebek_Far North":"Квебек — север",
+"Canada_Quebek_Montreal":"Монтреал",
+"Canada_Quebek_North":"Септ-Ил",
+"Canada_Quebek_Southeast_Rimouski":"Римуски",
+"Canada_Quebek_Southeast_Saguenay":"Сагне",
+"Canada_Quebek_West_Chibougamau":"Шибугамо",
+"Canada_Quebek_West_Rouyn-Noranda":"Руен-Норанда",
+"Canada_Saskatchewan":"Саскачеван",
+"Canada_Saskatchewan_North":"Саскачеван — север",
+"Canada_Saskatchewan_South":"Саскачеван — југ",
+"Canada_Yukon":"Јукон",
+"Canada_Yukon_North":"Јукон — север",
+"Canada_Yukon_Whitehorse":"Вајтхорс"
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
map-per	762797684e	[fdroid] Release version 2025.11.19-2 Signed-off-by: map-per <map-per@gmx.de>	2025-11-19 09:40:04 +01:00
map-per	07cd1ec4f5	Release notes for 2nd November release Signed-off-by: map-per <map-per@gmx.de>	2025-11-19 08:17:11 +01:00
Yannik Bloscheck	9b42b08673	[translations] Fixed wrong German search category labels in the interface Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-18 21:29:15 +01:00
Jean-Baptiste	47efaa77d3	[android] Update colors of categories Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-18 19:19:10 +01:00
Codeberg Translate	ec14b3bb85	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Linus_W_Frische <linus_w_frische@noreply.codeberg.org> Co-authored-by: Weicat <weicat@noreply.codeberg.org> Co-authored-by: prashere <prashere@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Apple AppStore description Translation: CoMaps/F-Droid app description Translation: CoMaps/Google Play and Huawei AppGallery descriptions Translation: CoMaps/iOS - Map Feature Types	2025-11-18 17:17:14 +01:00
map-per	1612e6045f	[planet] Update map data to 251116 Signed-off-by: map-per <map-per@gmx.de>	2025-11-18 17:13:42 +01:00
Yannik Bloscheck	d20144d4f6	[styles] Fix recycling centres not appearing right Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-18 16:50:56 +01:00
Yannik Bloscheck	06ecf4e54a	[styles] Fix background for service bridges at zoom level 15 Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-18 15:35:29 +01:00
Codeberg Translate	0bf9dad343	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Linus_W_Frische <linus_w_frische@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: demode <demode@noreply.codeberg.org> Co-authored-by: dobridabar <dobridabar@noreply.codeberg.org> Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Countries and regions names Translation: CoMaps/iOS - Map Feature Types	2025-11-18 14:17:05 +00:00
Yannik Bloscheck	12bd86d26d	[ios] Match search category colors to map Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-18 15:16:54 +01:00
map-per	5564c449b3	[styles] Adjust sand colors Signed-off-by: map-per <map-per@gmx.de>	2025-11-18 14:04:23 +01:00
NoelClick	96782ad5b1	[android] Fix crash for 24/7 places in Place Page opening-hours display Signed-off-by: NoelClick <dev@noel.click> Co-authored-by: NoelClick <dev@noel.click> Co-committed-by: NoelClick <dev@noel.click>	2025-11-18 12:40:57 +01:00
map-per	67938cdf31	[styles] Fix vehicle style after icon renaming Signed-off-by: map-per <map-per@gmx.de>	2025-11-18 12:28:00 +01:00
x7z4w	0e5fa5c501	nit Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-18 12:04:02 +01:00
Codeberg Translate	101faeb2aa	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Edgarsons <edgarsons@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: patepelo <patepelo@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS UI Strings	2025-11-17 21:05:24 +00:00
Yannik Bloscheck	6f9ea8a758	[styles] Use smaller taxi icon Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-17 22:05:04 +01:00
Yannik Bloscheck	176b11003f	[types] Adding nail salon Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-17 22:04:58 +01:00
Yannik Bloscheck	ed0728a332	[styles] Improve tree icon Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-17 22:04:53 +01:00
Yannik Bloscheck	f3b105ee33	[drape] Render trees under buildings Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-17 19:10:36 +01:00
Bastian Greshake Tzovaras	dd106df592	[taginfo] Regenerate Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com> Co-authored-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com> Co-committed-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>	2025-11-17 19:09:06 +01:00
x7z4w	c25552ce03	[styles] Show toll booth later Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-17 17:00:34 +01:00
Codeberg Translate	40b0023046	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: JanezPavelZebovec <janezpavelzebovec@noreply.codeberg.org> Co-authored-by: Juno Takano <jutty@noreply.codeberg.org> Co-authored-by: Mickael81 <mickael81@noreply.codeberg.org> Co-authored-by: Outbreak2096 <outbreak2096@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org> Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: clacsonduro <clacsonduro@noreply.codeberg.org> Co-authored-by: dobridabar <dobridabar@noreply.codeberg.org> Co-authored-by: matheusgomesms <matheusgomesms@noreply.codeberg.org> Co-authored-by: ovl-005 <ovl-005@noreply.codeberg.org> Co-authored-by: tace16 <tace16@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Android UI Strings (SDK) Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS UI Strings	2025-11-17 14:09:31 +00:00
Yannik Bloscheck	efe4570adf	[styles] Fix boat rental icon name Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-17 08:54:48 +01:00
Jean-Baptiste	b72d747a5e	[android] Add avoid icons in settings Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-17 08:28:40 +01:00
Codeberg Translate	1a95097fbb	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: yannikbloscheck <yannikbloscheck@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/iOS - Map Feature Types	2025-11-16 20:20:56 +00:00
map-per	0243b1e86b	[copyright] Add StreetComplete-taginfo-categorize to copyright Signed-off-by: map-per <map-per@gmx.de>	2025-11-16 21:20:43 +01:00
Codeberg Translate	8f3978e391	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: yannikbloscheck <yannikbloscheck@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/iOS - Map Feature Types	2025-11-16 20:08:15 +01:00
map-per	680d97bc4f	[styles] Add natural=sand (#2451 ) Signed-off-by: map-per <map-per@gmx.de> Reviewed-on: https://codeberg.org/comaps/comaps/pulls/2451 Reviewed-by: Yannik Bloscheck <yannikbloscheck@noreply.codeberg.org> Reviewed-by: Konstantin Pastbin <pastk@noreply.codeberg.org> Co-authored-by: map-per <map-per@gmx.de> Co-committed-by: map-per <map-per@gmx.de>	2025-11-16 19:19:58 +01:00
zyphlar	5683606c31	[android] Punctuate complete sentences Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org> Co-authored-by: zyphlar <zyphlar@noreply.codeberg.org> Co-committed-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-11-16 19:15:08 +01:00
Yannik Bloscheck	3c7eb92b17	[styles] Adding trees Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 18:30:49 +01:00
x7z4w	226b0f03c8	[cmake] Fix Android boost errors Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-16 18:27:04 +01:00
x7z4w	0a3a4ebd9a	[core] Regex refactoring Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-16 18:27:04 +01:00
map-per	a62f6c0ef6	[translations] Fix translation merge conflict Signed-off-by: map-per <map-per@gmx.de>	2025-11-16 17:35:29 +01:00
Yannik Bloscheck	ef280c7f89	[styles] Differentiate between different entrances Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 15:22:47 +01:00
Yannik Bloscheck	c49c414ec4	[styles] Added smaller bus stop icons Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 15:16:20 +01:00
Jean-Baptiste	e62196798f	[android] Add place holder in phone field Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-16 14:52:21 +01:00
Jean-Baptiste	c687c850b8	[android] Reduce padding foreach items in the search view Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-16 14:51:59 +01:00
Codeberg Translate	f549358f28	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Edgarsons <edgarsons@noreply.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: Mickael81 <mickael81@noreply.codeberg.org> Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org> Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: ghose <ghose@noreply.codeberg.org> Co-authored-by: tace16 <tace16@noreply.codeberg.org> Co-authored-by: teletext <teletext@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS UI Strings	2025-11-16 14:51:41 +01:00
Yannik Bloscheck	e3c8e422d5	[styles] Apply pill shape road sign also to tertiary roads in Austria Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 14:38:18 +01:00
Yannik Bloscheck	f664138a42	[types] Adding buoys Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 14:38:02 +01:00
x7z4w	6ae28a0ccf	[android] Fix layers button tint Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-16 14:34:46 +01:00
Jean-Baptiste	6cef8e3594	[android] Add new fresh screenshots Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-16 14:21:41 +01:00
Yannik Bloscheck	ec76982895	[styles] Reduce visbility of service roads Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 14:12:38 +01:00
Yannik Bloscheck	17fb4dd855	[styles] Reduce visbility of tram tunnels Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 14:12:38 +01:00
Yannik Bloscheck	8c880f00b2	[styles] Decrease visbility of railway tunnels further Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 14:12:38 +01:00
Yannik Bloscheck	6c02e1d53a	[types] Christmas trees Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-16 14:02:08 +01:00
zyphlar	a1944435ae	Add French national library archiving info/instructions Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>	2025-11-16 12:39:44 +01:00
Jean-Baptiste	5beed2672f	[android] Remove custom right to left implementation Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-16 08:45:51 +01:00
x7z4w	64eb8af3c1	[android] Fix dark mode launcher icon Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-15 21:23:48 +01:00
Yannik Bloscheck	316e259ebb	[types] Preperations for new education tag Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 18:40:57 +01:00
Yannik Bloscheck	dce50b2ca6	[types] Adding prep, sailing and flight school Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 18:40:57 +01:00
Yannik Bloscheck	8db1dd55b5	[generator] Name method parameter more clearly Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 18:32:43 +01:00
Yannik Bloscheck	14c4d08e32	[generator] Shorten code to avoid unnecessary `if` condition Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 18:32:43 +01:00
Yannik Bloscheck	2ae482de76	[generator] Ignore edited status for nearby places during map generation Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 18:32:43 +01:00