Merge commit '4f2b479b' into traffic

# Conflicts:
#	android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java

.gitignore

@@ -21,6 +21,7 @@ data/symbols/**/symbols.sdf
 
 data/bookmarks
 data/edits.xml
+data/traffic.xml
 data/World.mwm
 data/WorldCoasts.mwm
 data/world_mwm/*

CONTRIBUTORS

@@ -10,6 +10,7 @@ CoMaps contributors:
 Bastian Greshake Tzovaras
 clover sage
 Harry Bond <me@hbond.xyz>
+NoelClick
 thesupertechie
 vikiawv
 Yannik Bloscheck

android/app/proguard-rules.pro

@@ -28,3 +28,8 @@
 # R8 crypts the source line numbers in all log messages.
 # https://github.com/organicmaps/organicmaps/issues/6559#issuecomment-1812039926
 -dontoptimize
+
+# Keep classes for Android TraFF support
+-keep class app.organicmaps.sdk.traffxml.SourceImplV0_7 { *; }
+-keep class app.organicmaps.sdk.traffxml.SourceImplV0_8 { *; }
+

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

@@ -1,10 +1,8 @@
-• OpenStreetMap-Daten vom 9. Dezember
-• Material 3 Design
-• Im OSM-Editor können nun Ladestationen hinzugefügt werden
-• Schuko und Typ E Ladestationen hinzugefügt
-• Verbesserte Suchvorschläge
-• Litauische und lettische Sprachankündigungen
-• Die Fahranweisungen wurden vergrößert
-• Der Zoomlevel passt sich an die Distanz zur nächsten Abbiegung an
-• Neue Anordnung der Einstellungen
-Weitere Einzelheiten auf codeberg.org/comaps/comaps/releases
+• OpenStreetMap Daten vom 17. Dezember
+• Map download server nun wählbar
+• Warnung über veraltete Karten hinzugefügt + Knopf zum updaten
+• Vermeidung von Parkplatzwegen im Routing
+• Neuer Zoombutton
+• Verbesserte Französchische Suchsynonme
+• OSM editor: Maximale Länge für OSM-Tags werden nun geprüft
+Mehr auf codeberg.org/comaps/comaps/releases

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

@@ -1,10 +1,8 @@
-• OpenStreetMap data as of December 9
-• Use Material 3 themes
-• Support charging sockets in OSM Editor
-• Added schuko/type-E charge sockets
-• Improved search results ranking
-• Enabled Lithuanian and Latvian in voice announcements
-• Improved size of driving indications
-• Base zoom level on distance to next turn
-• Reordered settings
+• OpenStreetMap data as of December 17
+• Make map download server configurable
+• Added info about outdated maps and an update button to the selected place info card
+• Avoid using parking aisles for routing
+• Changed shape of zoom buttons
+• Improved French search synonyms
+• OSM editor: check length limit for OSM tags in value validation
 More details on codeberg.org/comaps/comaps/releases

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

@@ -1,11 +0,0 @@
-• Datos de OpenStreetMap a fecha 9/12.
-• Uso de temas Material 3.
-• Compatibilidad con enchufes de recarga en Editor.
-• Se añaden enchufes de recarga schuko/tipo E.
-• Se mejora la búsqueda.
-• Se habilitan el lituano y el letón en las indicaciones de voz.
-• Se aumenta el tamaño de las indicaciones de conducción.
-• Nivel de zoom base según la distancia al siguiente giro.
-• Se han reordenado los ajustes.
-
-Más detalles en codeberg.org/comaps/comaps/releases

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

@@ -1,10 +1,8 @@
-• Données OpenStreetMap du 9 Décembre
-• Utilisation de Material 3
-• Support de l'édition des bornes de recharge dans l'éditeur OSM
-• Ajout du type de prise schuko/type-E
-• Amélioration de l'ordre des résultats de recherche
-• Ajout du lituanien et du letton dans le guidage vocal
-• Amélioration de la taille des instructions dans la navigation
-• Niveau de zoom basé sur la distance jusqu’au prochain virage
-• Réorganisation des paramètres
-Plus de détails sur codeberg.org/comaps/comaps/releases
+• Données OpenStreetMap du 17 décembre
+• Serveur de téléchargement de cartes configurable
+• Ajout d'un message d'avertissement pour les cartes trop anciennes
+• Évitement des allées de parking dans les itinéraires
+• Mise à jour de l'apparence des boutons de zooms
+• Amélioration des synonymes de recherche en français
+• Editeur OSM: vérification de la taille limite des tags OSM
+Plus d'informations sur codeberg.org/comaps/comaps/releases

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

@@ -1,10 +0,0 @@
-• Podaci OpenStreetMap karte od 9. prosinca
-• Korištenje Material 3 tema
-• Podrška za utičnice za punjenje u OSM Editoru
-• Dodane šuko/tip-E utičnice
-• Poboljšano rangiranje rezultata pretraživanja
-• Omogućeni litvanski i latvijski jezici u glasovnim najavama
-• Povećana veličina indikatora vožnje
-• Razina zumiranja se mijenja ovisno o udaljenosti do sljedećeg skretanja
-• Promijenjen redoslijed postavki
-Više detalja na codeberg.org/comaps/comaps/releases

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

@@ -1 +1 @@
-Paprasta ir patogi navigacija – Turiningos kelionės – Vystoma bendruomenės
+Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės

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

@@ -1,10 +0,0 @@
-• Dane OpenStreetMap z 9 grudnia
-• Użycie motywów Material 3
-• Obsługa gniazd ładowania w Edytorze OSM
-• Dodane gniazda ładowania schuko/type-E
-• Poprawiony ranking wyników wyszukiwania
-• Dodane litewskie i łotewskie komunikaty głosowe
-• Poprawiony rozmiar znaków drogowych
-• Poziom powiększenia oparty na odległości do następnego manewru
-• Zmieniona kolejność ustawień
-Więcej szczegółów na codeberg.org/comaps/comaps/releases

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

@@ -1,10 +1,8 @@
-• Dados OpenStreetMap atualizados em 9 de dezembro
-• Uso do estilo Material 3
-• Suporte para tomadas de carregamento no Editor OSM
-• Adição de tomadas de carregamento Schuko/Tipo E
-• Melhoria na classificação dos resultados de busca
-• Adição dos idiomas letão e lituano nas orientações por voz
-• Melhoria no tamanho das indicações de direção
-• Nível de zoom baseado em distância até a próxima curva
-• Configurações reordenadas
+• Dados OSM de 17/12
+• Servidor de download de mapas configurável
+• Adição de informações sobre mapas desatualizados e um botão de atualização ao cartão de informações do local selecionado
+• Evita o uso de corredores de estacionamento para roteamento
+• Formato dos botões de zoom alterado
+• Sinônimos de busca em francês aprimorados
+• Editor OSM: verificação do limite de comprimento das tags do OSM na validação de valores
 Mais detalhes em codeberg.org/comaps/comaps/releases

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

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

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

@@ -1,20 +1,20 @@
-Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nedobičkonosnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.
+Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nepridobitnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.
 
-Preverite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
+Preberite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
 Pridružite se skupnosti in pomagajte narediti najboljše zemljevidno orodje
 • Uporabljajte orodje in širite glas o njem
 • Dajajte povratne informacije in poročajte o napakah
 • Posodabljajte podatke zemljevida v tem orodju ali na spletni strani OpenStreetMap
 
-‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potocanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
+‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potovanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
 ‣ <b>Spoštovanje zasebnosti</b>: orodje je zasnovano z mislijo na zasebnost – ne prepoznava oseb, ne sledi in ne zbira osebnih podatkov. Brez oglasov.
 ‣ <b>Preprosto in dodelano</b>: nujne zmogljivosti, enostavne za uporabo, ki preprosto delujejo.
 ‣ <b>Prihrani vašo baterijo in prostor.</b>: ne izčrpava vaše baterije kakor druga usmerjevalna orodja. Strnjeni zemljevidi prihranijo dragocen prostor na vašem telefonu.
 ‣ <b>Brezplačno in ustvarjeno v skupnosti</b>: ljudje kot ste vi pomagajo ustvarjati to orodje, tako da dodajajo kraje na OpenStreetMap, preizkušajo in dajejo povratne informacije o zmogljivostih in prispevajo svoje razvijalske sposobnosti in sredstva.
-‣ <b>Odprto in transparentno odločanje in finance, nedobičkonosno in popolnoma odprtokodno.</b>
+‣ <b>Odprto in transparentno odločanje in finance, nepridobitno in popolnoma odprtokodno.</b>
 
 <b>Glavne zmogljivosti</b>:
-• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovoh zemljevidih niso na voljo.
+• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovih zemljevidih niso na voljo.
 • Prikaz za dejavnosti na prostem s poudarjenimi pohodniškimi potmi, tabornimi prostori, vodnimi viri, vrhovi, plastnicami itd.
 • Pešpoti in kolesarke poti
 • Kraji zanimanja, npr. restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in mnogo več

android/app/src/fdroid/play/version.yaml

@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.07.23-4-FDroid+25072304

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

@@ -1 +1 @@
-Paprasta ir patogi navigacija – Turiningos kelionės – Vystoma bendruomenės
+Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės

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

@@ -1 +1 @@
-CoMaps - Usmerjajte zasebno
+CoMaps - Usmerjajte se zasebno

android/app/src/main/AndroidManifest.xml

@@ -62,6 +62,21 @@
       <category android:name="android.intent.category.BROWSABLE" />
       <data android:scheme="https" />
     </intent>
+    <intent>
+      <action android:name="org.traffxml.traff.GET_CAPABILITIES"/>
+    </intent>
+    <intent>
+      <action android:name="org.traffxml.traff.POLL"/>
+    </intent>
+    <intent>
+      <action android:name="org.traffxml.traff.SUBSCRIBE"/>
+    </intent>
+    <intent>
+      <action android:name="org.traffxml.traff.SUBSCRIPTION_CHANGE"/>
+    </intent>
+    <intent>
+      <action android:name="org.traffxml.traff.UNSUBSCRIBE"/>
+    </intent>
   </queries>
 
   <supports-screens

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

@@ -18,6 +18,7 @@ import android.location.Location;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
+
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
@@ -25,7 +26,15 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.view.ViewCompat;
+
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.checkbox.MaterialCheckBox;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.progressindicator.LinearProgressIndicator;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.base.BaseMwmFragmentActivity;
+import app.organicmaps.dialog.CustomMapServerDialog;
 import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.intent.Factory;
 import app.organicmaps.sdk.Framework;
@@ -38,11 +47,7 @@ import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.checkbox.MaterialCheckBox;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.progressindicator.LinearProgressIndicator;
-import com.google.android.material.textview.MaterialTextView;
+
 import java.util.List;
 import java.util.Objects;
 
@@ -54,6 +59,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
   private MaterialTextView mTvMessage;
   private LinearProgressIndicator mProgress;
   private MaterialButton mBtnDownload;
+  private MaterialButton mBtnAdvanced;
   private MaterialCheckBox mChbDownloadCountry;
 
   private String mCurrentCountry;
@@ -267,6 +273,14 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
     mProgress = findViewById(R.id.progressbar);
     mBtnDownload = findViewById(R.id.btn_download_resources);
     mChbDownloadCountry = findViewById(R.id.chb_download_country);
+    mBtnAdvanced = findViewById(R.id.btn_advanced);
+
+    mBtnAdvanced.setOnClickListener(v -> {
+      CustomMapServerDialog.show(this, url -> {
+        prepareFilesDownload(false);
+      });
+    });
+    mBtnAdvanced.setEnabled(true);
 
     mBtnListeners = new View.OnClickListener[BTN_COUNT];
     mBtnNames = new String[BTN_COUNT];
@@ -291,6 +305,11 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
   {
     mBtnDownload.setOnClickListener(mBtnListeners[action]);
     mBtnDownload.setText(mBtnNames[action]);
+
+    // Allow changing server only when idle or after an error.
+    boolean advancedEnabled = (action == DOWNLOAD || action == TRY_AGAIN || action == RESUME);
+    mBtnAdvanced.setEnabled(advancedEnabled);
+    mBtnAdvanced.setAlpha(advancedEnabled ? 1f : 0.5f);
   }
 
   private void doDownload()
@@ -359,6 +378,9 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
 
   private void finishFilesDownload(int result)
   {
+    mBtnAdvanced.setEnabled(true);
+    mBtnAdvanced.setAlpha(1f);
+
     if (result == ERR_NO_MORE_FILES)
     {
       // World and WorldCoasts has been downloaded, we should register maps again to correctly add them to the model.
@@ -428,12 +450,16 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
                            .setTitle(titleId)
                            .setMessage(messageId)
                            .setCancelable(true)
-                           .setOnCancelListener((dialog) -> setAction(PAUSE))
+                           .setOnCancelListener((dialog) -> setAction(RESUME))
                            .setPositiveButton(R.string.try_again,
                                               (dialog, which) -> {
                                                 setAction(TRY_AGAIN);
                                                 onTryAgainClicked();
                                               })
+                           .setNegativeButton(R.string.cancel,
+                                              (dialog, which) -> {
+                                                setAction(RESUME);
+                                              })
                            .setOnDismissListener(dialog -> mAlertDialog = null)
                            .show();
   }

android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java

@@ -0,0 +1,86 @@
+package app.organicmaps.dialog;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.PreferenceManager;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+
+import app.organicmaps.R;
+import app.organicmaps.sdk.Framework;
+
+public final class CustomMapServerDialog
+{
+  public interface OnUrlAppliedListener
+  {
+    void onUrlApplied(@NonNull String url);
+  }
+
+  private CustomMapServerDialog() {}
+
+  public static void show(@NonNull Context context,
+                          @Nullable OnUrlAppliedListener listener)
+  {
+    View dialogView = LayoutInflater.from(context)
+        .inflate(R.layout.dialog_custom_map_server, null);
+    TextInputLayout til = dialogView.findViewById(R.id.til_custom_map_server);
+    TextInputEditText edit = dialogView.findViewById(R.id.edit_custom_map_server);
+
+    SharedPreferences prefs =
+        PreferenceManager.getDefaultSharedPreferences(context);
+    String current = prefs.getString(context.getString(R.string.pref_custom_map_download_url), "");
+    edit.setText(current);
+
+    MaterialAlertDialogBuilder builder =
+        new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+            .setTitle(R.string.download_resources_custom_url_title)
+            .setMessage(R.string.download_resources_custom_url_message)
+            .setView(dialogView)
+            .setNegativeButton(R.string.cancel, null)
+            .setPositiveButton(R.string.save, null);
+
+    AlertDialog dialog = builder.create();
+    dialog.setOnShowListener(dlg -> {
+      Button ok = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+      ok.setOnClickListener(v -> {
+        String url = edit.getText() != null ? edit.getText().toString().trim() : "";
+
+        if (!url.isEmpty()
+            && !url.startsWith("http://")
+            && !url.startsWith("https://"))
+        {
+          til.setError(context.getString(R.string.download_resources_custom_url_error_scheme));
+          return;
+        }
+
+        til.setError(null);
+
+        String normalizedUrl = Framework.normalizeServerUrl(url);
+
+        prefs.edit()
+            .putString(context.getString(R.string.pref_custom_map_download_url), normalizedUrl)
+            .apply();
+
+        // Apply to native
+        Framework.applyCustomMapDownloadUrl(context, normalizedUrl);
+
+        if (listener != null)
+          listener.onUrlApplied(normalizedUrl);
+
+        dialog.dismiss();
+      });
+    });
+
+    dialog.show();
+  }
+}

android/app/src/main/java/app/organicmaps/maplayer/LayersUtils.java

@@ -12,6 +12,7 @@ public class LayersUtils
     availableLayers.add(Mode.OUTDOORS);
     availableLayers.add(Mode.ISOLINES);
     availableLayers.add(Mode.SUBWAY);
+    availableLayers.add(Mode.TRAFFIC);
     return availableLayers;
   }
 }

android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java

@@ -3,17 +3,31 @@ package app.organicmaps.settings;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.DISABLE_BUTTON_CODE;
 
 import android.annotation.SuppressLint;
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.View;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.preference.EditTextPreference;
 import androidx.preference.ListPreference;
+import androidx.preference.MultiSelectListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
 import androidx.preference.TwoStatePreference;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
+import app.organicmaps.dialog.CustomMapServerDialog;
 import app.organicmaps.downloader.OnmapDownloader;
 import app.organicmaps.editor.LanguagesFragment;
 import app.organicmaps.editor.ProfileActivity;
@@ -28,6 +42,7 @@ import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.sdk.search.SearchRecents;
 import app.organicmaps.sdk.settings.MapLanguageCode;
 import app.organicmaps.sdk.settings.UnitLocale;
+import app.organicmaps.sdk.traffxml.AndroidTransport;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.NetworkPolicy;
 import app.organicmaps.sdk.util.PowerManagment;
@@ -35,11 +50,12 @@ import app.organicmaps.sdk.util.SharedPropertiesUtils;
 import app.organicmaps.sdk.util.log.LogsManager;
 import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.Utils;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements LanguagesFragment.Listener
 {
@@ -61,6 +77,10 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     initAutoDownloadPrefsCallbacks();
     initLargeFontSizePrefsCallbacks();
     initTransliterationPrefsCallbacks();
+    initTrafficHttpEnabledPrefsCallbacks();
+    initTrafficHttpUrlPrefsCallbacks();
+    initTrafficAppsPrefs();
+    initTrafficLegacyEnabledPrefsCallbacks();
     init3dModePrefsCallbacks();
     initPerspectivePrefsCallbacks();
     initAutoZoomPrefsCallbacks();
@@ -73,6 +93,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     initScreenSleepEnabledPrefsCallbacks();
     initShowOnLockScreenPrefsCallbacks();
     initLeftButtonPrefs();
+    initCustomMapDownloadUrlPrefsCallbacks();
   }
 
   private void initLeftButtonPrefs()
@@ -136,6 +157,46 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     pref.setSummary(locale.getDisplayLanguage());
   }
 
+  private void updateTrafficHttpUrlSummary()
+  {
+    final Preference pref = getPreference(getString(R.string.pref_traffic_http_url));
+    String summary = Config.getTrafficHttpUrl();
+    if (summary.length() == 0)
+      pref.setSummary(R.string.traffic_http_url_not_set);
+    else
+      pref.setSummary(summary);
+  }
+
+  private void updateTrafficAppsSummary()
+  {
+    final MultiSelectListPreference pref = getPreference(getString(R.string.pref_traffic_apps));
+    /*
+     * If the preference is disabled, it has not been initialized. This is the case if no TraFF
+     * apps were found. The code below would crash when trying to access the entries, and there
+     * is no need to update the summary if the setting cannot be changed.
+     */
+    if (!pref.isEnabled())
+      return;
+    String[] apps = Config.getTrafficApps();
+    if (apps.length == 0)
+      pref.setSummary(R.string.traffic_apps_none_selected);
+    else
+    {
+      String summary = "";
+      for (int i = 0; i < apps.length; i++)
+      {
+        if (i > 0)
+          summary = summary + ", ";
+        int index = pref.findIndexOfValue(apps[i]);
+        if (i >= 0)
+          summary = summary + pref.getEntries()[index];
+        else
+          summary = summary + apps[i];
+      }
+      pref.setSummary(summary);
+    }
+  }
+
   private void updateRoutingSettingsPrefsSummary()
   {
     final Preference pref = getPreference(getString(R.string.prefs_routing));
@@ -163,6 +224,8 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     updateVoiceInstructionsPrefsSummary();
     updateRoutingSettingsPrefsSummary();
     updateMapLanguageCodeSummary();
+    updateTrafficHttpUrlSummary();
+    updateTrafficAppsSummary();
   }
 
   @Override
@@ -224,6 +287,91 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     });
   }
 
+  private void initTrafficHttpEnabledPrefsCallbacks()
+  {
+    final Preference pref = getPreference(getString(R.string.pref_traffic_http_enabled));
+
+    ((TwoStatePreference)pref).setChecked(Config.getTrafficHttpEnabled());
+    pref.setOnPreferenceChangeListener((preference, newValue) -> {
+      final boolean oldVal = Config.getTrafficHttpEnabled();
+      final boolean newVal = (Boolean) newValue;
+      if (oldVal != newVal)
+        Config.setTrafficHttpEnabled(newVal);
+
+      return true;
+    });
+  }
+
+  private void initTrafficHttpUrlPrefsCallbacks()
+  {
+    final Preference pref = getPreference(getString(R.string.pref_traffic_http_url));
+
+    ((EditTextPreference)pref).setText(Config.getTrafficHttpUrl());
+    pref.setOnPreferenceChangeListener((preference, newValue) -> {
+      final String oldVal = Config.getTrafficHttpUrl();
+      final String newVal = (String) newValue;
+      if (!oldVal.equals(newVal))
+        Config.setTrafficHttpUrl(newVal);
+
+      return true;
+    });
+  }
+
+  private void initTrafficAppsPrefs()
+  {
+    final MultiSelectListPreference pref = getPreference(getString(R.string.pref_traffic_apps));
+    
+    PackageManager pm = getContext().getPackageManager();
+    List<ResolveInfo> receivers = pm.queryBroadcastReceivers(new Intent(AndroidTransport.ACTION_TRAFF_GET_CAPABILITIES), 0);
+    
+    if (receivers == null || receivers.isEmpty())
+    {
+      pref.setSummary(R.string.traffic_apps_not_available);
+      pref.setEnabled(false);
+      return;
+    }
+    
+    pref.setEnabled(true);
+
+    List<String> entryList = new ArrayList<>(receivers.size());
+    List<String> valueList = new ArrayList<>(receivers.size());
+
+    for (ResolveInfo receiver : receivers)
+    {
+      // friendly name
+      entryList.add(receiver.loadLabel(pm).toString());
+      // actual value (we just need the package name, broadcasts are sent to any receiver in the package)
+      valueList.add(receiver.activityInfo.applicationInfo.packageName);
+    }
+    
+    pref.setEntries(entryList.toArray(new CharSequence[0]));
+    pref.setEntryValues(valueList.toArray(new CharSequence[0]));
+    
+    pref.setOnPreferenceChangeListener((preference, newValue) -> {
+      // newValue is a Set<String>, each item is a package ID
+      String[] apps = ((Set<String>)newValue).toArray(new String[0]);
+      Config.setTrafficApps(apps);
+      updateTrafficAppsSummary();
+
+      return true;
+    });
+  }
+
+  private void initTrafficLegacyEnabledPrefsCallbacks()
+  {
+    final Preference pref = getPreference(getString(R.string.pref_traffic_legacy_enabled));
+
+    ((TwoStatePreference)pref).setChecked(Config.getTrafficLegacyEnabled());
+    pref.setOnPreferenceChangeListener((preference, newValue) -> {
+      final boolean oldVal = Config.getTrafficLegacyEnabled();
+      final boolean newVal = (Boolean) newValue;
+      if (oldVal != newVal)
+        Config.setTrafficLegacyEnabled(newVal);
+
+      return true;
+    });
+  }
+
   private void initUseMobileDataPrefsCallbacks()
   {
     final ListPreference mobilePref = getPreference(getString(R.string.pref_use_mobile_data));
@@ -535,6 +683,34 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     });
   }
 
+  private void initCustomMapDownloadUrlPrefsCallbacks()
+  {
+    Preference customUrlPref = getPreference(getString(R.string.pref_custom_map_download_url));
+
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
+
+    String current = prefs.getString(getString(R.string.pref_custom_map_download_url), "");
+    String normalizedUrl = Framework.normalizeServerUrl(current);
+
+    // Initial summary
+    customUrlPref.setSummary(normalizedUrl.isEmpty()
+        ? getString(R.string.download_resources_custom_url_summary_none)
+        : normalizedUrl);
+
+    // Sync native
+    Framework.applyCustomMapDownloadUrl(requireContext(), normalizedUrl);
+
+    // Show dialog
+    customUrlPref.setOnPreferenceClickListener(preference -> {
+      CustomMapServerDialog.show(requireContext(), url -> {
+        preference.setSummary(url.isEmpty()
+            ? getString(R.string.download_resources_custom_url_summary_none)
+            : url);
+      });
+      return true;
+    });
+  }
+
   private void removePreference(@NonNull String categoryKey, @NonNull Preference preference)
   {
     final PreferenceCategory category = getPreference(categoryKey);

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

@@ -700,22 +700,27 @@ public class PlacePageView extends Fragment
 
       if (shouldEnableEditPlace)
       {
+        mTvEditPlace.setEnabled(true);
+        mTvAddPlace.setEnabled(true);
         mTvEditPlace.setOnClickListener(this);
         mTvAddPlace.setOnClickListener(this);
       }
       else
       {
-        mTvEditPlace.setOnClickListener((v) -> {
-          Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
-        });
-        mTvAddPlace.setOnClickListener((v) -> {
-          Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
-        });
-
         String countryId = MapManager.nativeGetSelectedCountry();
 
-        if (countryId != null)
+        if (countryId != null && MapManager.nativeIsMapTooOldToEdit(countryId))
         {
+          // map editing is disabled because the map is too old
+          mTvEditPlace.setEnabled(true);
+          mTvAddPlace.setEnabled(true);
+          mTvEditPlace.setOnClickListener((v) -> {
+            Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
+          });
+          mTvAddPlace.setOnClickListener((v) -> {
+            Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
+          });
+
           CountryItem map = CountryItem.fill(countryId);
 
           if (map.status == CountryItem.STATUS_UPDATABLE || map.status == CountryItem.STATUS_DONE
@@ -740,6 +745,12 @@ public class PlacePageView extends Fragment
               mapTooOldDescription.setText(R.string.place_page_app_too_old_description);
           }
         }
+        else
+        {
+          // map editing is disabled for other reasons
+          mTvEditPlace.setEnabled(false);
+          mTvAddPlace.setEnabled(false);
+        }
       }
 
       final int editButtonColor =

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

@@ -2,6 +2,6 @@
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
-  <solid android:color="@color/bg_panel"/>
+  <solid android:color="@color/bg_window"/>
   <corners android:radius="100dp"/>
 </shape>

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

@@ -2,5 +2,5 @@
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="oval">
-  <solid android:color="@color/bg_panel"/>
+  <solid android:color="@color/bg_window"/>
 </shape>

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

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="?colorControlNormal"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="960"
+    android:viewportWidth="960">
+      
+    <path android:fillColor="@android:color/white"
+        android:pathData="M260,800Q169,800 104.5,737Q40,674 40,583Q40,505 87,444Q134,383 210,366Q227,294 295,229Q363,164 440,164Q473,164 496.5,187.5Q520,211 520,244L520,486L584,424L640,480L480,640L320,480L376,424L440,486L440,244Q364,258 322,317.5Q280,377 280,440L260,440Q202,440 161,481Q120,522 120,580Q120,638 161,679Q202,720 260,720L740,720Q782,720 811,691Q840,662 840,620Q840,578 811,549Q782,520 740,520L680,520L680,440Q680,392 658,350.5Q636,309 600,280L600,187Q674,222 717,290.5Q760,359 760,440L760,440L760,440Q829,448 874.5,499.5Q920,551 920,620Q920,695 867.5,747.5Q815,800 740,800L260,800ZM480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442L480,442L480,442Q480,442 480,442Q480,442 480,442Z"/>
+    
+</vector>

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

@@ -11,6 +11,18 @@
     android:layout_height="match_parent"
     android:layout_above="@+id/button_container"
     android:layout_gravity="center">
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_advanced"
+        style="@style/Widget.Material3.Button.IconButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_settings"
+        app:iconTint="?iconTint"
+        android:contentDescription="@string/download_resources_custom_url_title"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_margin="@dimen/margin_half" />
+
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="match_parent"

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textfield.TextInputLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/til_custom_map_server"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_base"
+    android:paddingTop="@dimen/margin_base"
+    android:paddingBottom="@dimen/margin_half"
+    android:hint="@string/download_resources_custom_url_title"
+    app:placeholderText="@string/download_resources_custom_url_hint"
+    app:endIconMode="clear_text">
+
+  <com.google.android.material.textfield.TextInputEditText
+      android:id="@+id/edit_custom_map_server"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:inputType="textUri"
+      android:singleLine="true" />
+</com.google.android.material.textfield.TextInputLayout>

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

@@ -24,7 +24,7 @@
     android:id="@+id/items_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?panel">
+    android:background="?windowBackgroundForced">
     <include
       layout="@layout/item_missed_map"
       android:layout_width="match_parent"

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

@@ -26,7 +26,7 @@
     android:id="@+id/items_frame"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?panel"
+    android:background="?windowBackgroundForced"
     android:listSelector="?clickableBackground"
     android:drawSelectorOnTop="true"/>
 

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

@@ -60,7 +60,7 @@
       android:layout_below="@id/tv__bookmark_set_title"
       android:layout_centerVertical="true"
       android:layout_marginEnd="@dimen/margin_quadruple"
-      android:background="?attr/selectableItemBackground"
+      android:background="?selectableItemBackground"
       android:clickable="true"
       android:paddingTop="@dimen/margin_quarter_plus"
       android:paddingBottom="@dimen/margin_half_plus"

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

@@ -2,7 +2,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?attr/cardBackground"
+  android:background="?cardBackground"
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
@@ -11,7 +11,6 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?colorPrimary"
     android:gravity="end|center_vertical"
     android:theme="@style/MwmWidget.ToolbarTheme">
   </com.google.android.material.appbar.MaterialToolbar>

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

@@ -18,7 +18,7 @@
         app:srcCompat="@drawable/ic_done"
         android:layout_width="?actionBarSize"
         android:layout_height="?actionBarSize"
-        android:background="?attr/selectableItemBackgroundBorderless"
+        android:background="?selectableItemBackgroundBorderless"
         android:layout_gravity="end|center_vertical"
         android:scaleType="centerInside"
         android:contentDescription="@string/save" />

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

@@ -402,11 +402,13 @@
         <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_half"
             android:fontFamily="@string/robotoMedium"
             android:text="@string/editor_other_info"
             android:textAppearance="@style/MwmTextAppearance.Body3"/>
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/custom_input"
+            android:layout_marginBottom="@dimen/margin_quarter"
             style="@style/MwmWidget.Editor.CustomTextInput"
             android:gravity="center_vertical"
             android:minHeight="74dp"
@@ -416,6 +418,7 @@
               android:id="@+id/input"
               style="@style/MwmWidget.Editor.FieldLayout.EditText"
               android:inputType="textMultiLine"
+              android:gravity="top"
               android:hint="@string/editor_note_hint"/>
         </com.google.android.material.textfield.TextInputLayout>
       </LinearLayout>

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

@@ -48,7 +48,6 @@
   <FrameLayout
     android:id="@+id/fragment_container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?panel"/>
+    android:layout_height="match_parent" />
 
 </LinearLayout>

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

@@ -12,7 +12,6 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?colorPrimary"
     android:gravity="end|center_vertical"
     android:theme="@style/MwmWidget.ToolbarTheme">
     <com.google.android.material.imageview.ShapeableImageView

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

@@ -22,8 +22,7 @@
   <ScrollView
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?panel">
+    android:layout_height="match_parent">
 
     <LinearLayout
       android:layout_width="match_parent"

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

@@ -15,7 +15,7 @@
       android:id="@+id/app_bar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="?attr/colorPrimary"
+      android:background="?colorPrimary"
       android:elevation="@dimen/dp_0"
       app:elevation="@dimen/dp_0">
         <include

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

@@ -45,7 +45,7 @@
     android:paddingStart="0dp"
     android:paddingEnd="@dimen/altitude_chart_container_padding_left">
 
-    <View
+    <com.google.android.material.divider.MaterialDivider
       android:layout_width="match_parent"
       android:layout_height="@dimen/divider_height"
       android:background="?dividerHorizontal"/>

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

@@ -4,7 +4,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?panel"
+  android:background="?windowBackgroundForced"
   android:orientation="vertical">
 
 

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

@@ -155,7 +155,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_half_plus"
         android:layout_marginBottom="@dimen/margin_quarter"
-        android:background="?attr/selectableItemBackground"
+        android:background="?selectableItemBackground"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingStart="@dimen/margin_quarter"

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

@@ -29,7 +29,7 @@
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?panel"
+    android:background="?cardBackground"
     android:padding="@dimen/margin_base"
     android:text="@string/editor_focus_map_on_location"
     app:layout_constraintTop_toBottomOf="@+id/toolbar_point_chooser" />

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

@@ -4,7 +4,7 @@
   android:id="@+id/pp_buttons_layout"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?ppButtonsBackground"
+  android:background="?windowBackgroundForced"
   android:orientation="horizontal"
   android:layout_gravity="bottom">
   <include layout="@layout/item_divider" />

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

@@ -28,7 +28,7 @@
             android:layout_width="?attr/actionBarSize"
             android:layout_height="?attr/actionBarSize"
             android:layout_alignParentStart="true"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="?selectableItemBackgroundBorderless"
             app:srcCompat="?homeAsUpIndicator"
             android:scaleType="center"
             tools:src="@drawable/ic_expand_more" />
@@ -143,7 +143,7 @@
     android:id="@+id/driving_options_btn_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/drivingOptionsViewBg"
+    android:background="?drivingOptionsViewBg"
     android:foreground="@drawable/shadow_top"
     android:visibility="gone"
     tools:visibility="visible">
@@ -151,7 +151,7 @@
       android:id="@+id/driving_options_btn"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="?attr/selectableItemBackgroundBorderless"
+      android:background="?selectableItemBackgroundBorderless"
       android:gravity="center"
       android:minHeight="@dimen/height_block_base">
       <LinearLayout

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

@@ -14,7 +14,7 @@
     android:id="@+id/back"
     android:layout_width="?attr/actionBarSize"
     android:layout_height="?attr/actionBarSize"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
     app:srcCompat="?homeAsUpIndicator"
     android:scaleType="center"
     tools:src="@drawable/ic_expand_more"
@@ -52,7 +52,7 @@
     android:layout_height="?actionBarSize"
     android:layout_gravity="center_vertical"
     android:layout_weight="0"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
     android:contentDescription="@string/clear_the_search"
     android:scaleType="center"
     app:srcCompat="@drawable/ic_close"/>
@@ -63,7 +63,7 @@
     android:layout_height="?actionBarSize"
     android:layout_gravity="center_vertical"
     android:layout_weight="0"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
     android:contentDescription="@null"
     android:scaleType="center"
     app:srcCompat="@drawable/ic_mic_white"

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

@@ -912,4 +912,12 @@
     <string name="charge_socket_type1">Tipus 1</string>
     <string name="charge_socket_nacs">NACS</string>
     <string name="charge_socket_chademo">CHAdeMO</string>
+    <string name="place_page_too_old_to_edit">L\'edició de dades d\'OpenStreetMap està deshabilitada perquè les dades del mapa són massa antigues.</string>
+    <string name="place_page_map_too_old_title">Dades del mapa desactualitzades</string>
+    <string name="place_page_map_too_old_description">Les teves dades de mapa son molt antigues, per favor actualitza el mapa.</string>
+    <string name="place_page_app_too_old_description">Les teues dades del mapa son molt antigues, per favor actualitza l\'app de CoMaps.</string>
+    <string name="place_page_update_too_old_map">Actualitzar regió del mapa</string>
+    <string name="prefs_speed_cameras_information">Les advertències de càmeres radar estan deshabilitades als països on estan prohibides per llei.</string>
+    <string name="navigation_start_tts_message">"Iniciant Navegació, idioma d\'instruccions de veu: "</string>
+    <string name="navigation_start_tts_disabled_message">Instruccions de veu desactivades: motor TTS no disponible</string>
 </resources>

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

@@ -907,4 +907,10 @@
     <string name="charge_socket_schuko">Domovní EU</string>
     <string name="prefs_speed_cameras_information">Upozornění na radary jsou vypnuty v zemích, kde je tato funkcionalita zakázána místními zákony.</string>
     <string name="navigation_start_tts_message">"Spouštím navigaci, jazyk hlasových instrukcí: "</string>
+    <string name="place_page_map_too_old_title">Mapová data jsou zastaralá</string>
+    <string name="place_page_map_too_old_description">Vaše mapová data jsou velmi stará, doporučujeme je aktualizovat.</string>
+    <string name="place_page_app_too_old_description">Vaše aktuální mapová data jsou velmi stará, aktualizujte prosím aplikaci CoMaps.</string>
+    <string name="place_page_update_too_old_map">Aktualizovat oblast mapy</string>
+    <string name="place_page_too_old_to_edit">Úprava OpenStreetMap je zakázaná, protože mapová data jsou příliš stará.</string>
+    <string name="navigation_start_tts_disabled_message">Hlasové pokyny vypnuty: služba TTS není dostupná</string>
 </resources>

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

@@ -489,7 +489,7 @@
     <string name="placepage_edit_bookmark_button">Rediger bogmærke</string>
     <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
     <string name="editor_reset_edits_message">Kassér alle lokale ændringer?</string>
-    <string name="editor_reset_edits_button">Kassér</string>
+    <string name="editor_reset_edits_button">Kassér ændringer</string>
     <string name="editor_remove_place_message">Slet tilføjet sted?</string>
     <string name="editor_remove_place_button">Slet</string>
     <string name="editor_place_doesnt_exist">Stedet eksisterer ikke</string>
@@ -896,4 +896,10 @@
     <string name="charge_socket_schuko">Europæisk</string>
     <string name="prefs_speed_cameras_information">Advarsler om hastighedskameraer er deaktiveret i lande, hvor advarsler er forbudt i henhold til lokal lovgivning.</string>
     <string name="navigation_start_tts_message">"Starter navigation, sprog for stemmeinstruktioner: "</string>
+    <string name="place_page_map_too_old_title">Kortdata forældet</string>
+    <string name="place_page_map_too_old_description">Dine nuværende kortdata er meget gamle. Opdater kortet.</string>
+    <string name="place_page_app_too_old_description">Dine nuværende kortdata er meget gamle. Opdater CoMaps-appen.</string>
+    <string name="place_page_update_too_old_map">Opdater kortregion</string>
+    <string name="place_page_too_old_to_edit">Redigering af OpenStreetMap er deaktiveret, fordi kortdataene er for gamle.</string>
+    <string name="navigation_start_tts_disabled_message">Stemmeinstruktioner deaktiveret: TTS-motor ikke tilgængelig</string>
 </resources>

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

@@ -502,7 +502,7 @@
     <string name="placepage_edit_bookmark_button">Lesezeichen bearbeiten</string>
     <string name="placepage_personal_notes_hint">Persönliche Notizen (Text oder html)</string>
     <string name="editor_reset_edits_message">Alle lokalen Änderungen verwerfen?</string>
-    <string name="editor_reset_edits_button">Verwerfen</string>
+    <string name="editor_reset_edits_button">Änderungen verwerfen</string>
     <string name="editor_remove_place_message">Hinzugefügtes Objekt löschen?</string>
     <string name="editor_remove_place_button">Löschen</string>
     <string name="editor_place_doesnt_exist">Dieser Ort existiert nicht</string>
@@ -902,9 +902,17 @@
         <item quantity="other">%d min</item>
     </plurals>
     <string name="editor_business_vacant_button">Geschäft steht leer</string>
-    <string name="editor_mark_business_vacant_title">Geschäft als leerstehend markieren</string>
+    <string name="editor_mark_business_vacant_title">Geschäft auf leerstehend setzen</string>
     <string name="editor_submit">Absenden</string>
-    <string name="editor_mark_business_vacant_description">Wenn das Unternehmen ausgezogen ist und die Fläche leer und bereit für die nächste Miete ist.</string>
+    <string name="editor_mark_business_vacant_description">Verwenden Sie diese Option, wenn das Geschäft ausgezogen ist und ein neues Geschäft die leerstehenden Räume übernehmen könnte.</string>
     <string name="charge_socket_schuko">Schuko</string>
     <string name="power_management">Energiemanagement</string>
+    <string name="place_page_map_too_old_title">Kartendaten veraltet</string>
+    <string name="place_page_map_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die Karte.</string>
+    <string name="place_page_app_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die CoMaps-App.</string>
+    <string name="place_page_update_too_old_map">Kartenregion aktualisieren</string>
+    <string name="place_page_too_old_to_edit">OpenStreetMap-Bearbeitung ist deaktiviert, da die Kartendaten zu alt sind.</string>
+    <string name="prefs_speed_cameras_information">Blitzerwarnungen sind in Ländern deaktiviert, in denen Warnungen durch lokale Gesetze verboten sind.</string>
+    <string name="navigation_start_tts_message">"Navigation wird gestartet, Sprache der Sprachansagen: "</string>
+    <string name="navigation_start_tts_disabled_message">Sprachansagen deaktiviert: TTS-Engine nicht verfügbar</string>
 </resources>

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

@@ -68,7 +68,7 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Agregar una lista nueva</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nombre del grupo de marcadores</string>
+    <string name="bookmark_set_name">Nombre de la lista de marcadores</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Marcadores</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
@@ -246,7 +246,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Donar</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Apoya el proyecto</string>
+    <string name="how_to_support_us">Apoya y mejora el proyecto CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Derechos de autor</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -914,4 +914,12 @@
     <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>
     <string name="power_management">Gestión de energía</string>
+    <string name="place_page_map_too_old_title">Datos del mapa anticuados</string>
+    <string name="place_page_map_too_old_description">Tus datos del mapa están muy anticuados, por favor actualiza el mapa.</string>
+    <string name="place_page_app_too_old_description">Tus datos del mapa están muy anticuados, por favor actualiza la aplicación CoMaps.</string>
+    <string name="place_page_update_too_old_map">Actualizar mapa de la región</string>
+    <string name="place_page_too_old_to_edit">La edición de OpenStreetMap está deshabilitada porque los datos del mapa están muy anticuados.</string>
+    <string name="prefs_speed_cameras_information">Las advertencias de radares de velocidad están deshabilitadas en países donde las alertas están prohibidas por ley.</string>
+    <string name="navigation_start_tts_message">"Iniciando Navegación, idioma de las instrucciones por voz: "</string>
+    <string name="navigation_start_tts_disabled_message">Instrucciones por voz deshabilitadas: Motor de TTS no disponible</string>
 </resources>

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

@@ -497,7 +497,7 @@
     <string name="placepage_edit_bookmark_button">Muuda järjehoidjat</string>
     <string name="placepage_personal_notes_hint">Isiklikud märkmed (tekst või html)</string>
     <string name="editor_reset_edits_message">Kas loobud kõigist kohalikest muudatustest?</string>
-    <string name="editor_reset_edits_button">Loobu</string>
+    <string name="editor_reset_edits_button">Loobu muudatustest</string>
     <string name="editor_remove_place_message">Kas kustutad lisatud koha?</string>
     <string name="editor_remove_place_button">Kustuta</string>
     <string name="editor_place_doesnt_exist">Kohta pole olemas</string>
@@ -905,4 +905,16 @@
     <string name="charge_socket_schuko">EU-sisene</string>
     <string name="prefs_speed_cameras_information">Kiiruskaamerate teavitused on nendes riikides lülitatud välja, kus seda keelab kohalik seadusandlus.</string>
     <string name="navigation_start_tts_message">"Alustan tee juhatamist, hääljuhiste keel: "</string>
+    <string name="place_page_map_too_old_title">Kaardiandmed on aegunud</string>
+    <string name="place_page_map_too_old_description">Sinu kasutatavad kaardiandmed on väga vanad. Palun uuenda andmeid.</string>
+    <string name="place_page_app_too_old_description">Sinu kasutatavad kaardiandmed on väga vanad. Palun uuenda CoMapsi rakendust.</string>
+    <string name="place_page_update_too_old_map">Uuenda piirkonna kaardiandmeid</string>
+    <string name="place_page_too_old_to_edit">Kuna kaardiandmed on liiga vanad, siis OpenStreetMapi muutmise võimalus on lülitatud välja.</string>
+    <string name="navigation_start_tts_disabled_message">Hääljuhiste kasutamine on lülitatud välja: kõnesünteesimootorit pole saadaval</string>
+    <string name="download_resources_custom_url_summary_none">Pole määratud</string>
+    <string name="advanced">Täiendavad seadistused</string>
+    <string name="download_resources_custom_url_title">Sinu oma kaardiserver</string>
+    <string name="download_resources_custom_url_message">Kui tahad kasutada oma kaardiserverit, siis lisa ta siia. CoMapsi vaikimisi serveri kasutamiseks jäta tühjaks.</string>
+    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
+    <string name="download_resources_custom_url_error_scheme">Palun sisesta täismahuline võrguaadress, mille alguses on https:// ja lõpus /</string>
 </resources>

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

@@ -25,46 +25,46 @@
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">هم‌اینک، شما همه‌ی سامانه‌های گیاگ‌یابی را برای این دستگاه یا این برنامه ناکارا کرده‌اید. خواهشمند است آن را در پیکربندی‌ها کارا کنید.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="limited_accuracy">دقت محدود</string>
+    <string name="limited_accuracy">نزومان ویمندیگ</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">برای اطمینان از دقیق ناوبری ، موقعیت مکانی دقیق را در تنظیمات فعال کنید</string>
+    <string name="precise_location_is_disabled_long_text">برای آسوده‌دل بودن از نزومانی ناوبری، گیاگ‌یابی نزومان را در پیکربندی کارا کنید</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">نمایش بر روی نقشه</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
-    <string name="country_status_download_failed">دانلود با شکست مواجه شد</string>
+    <string name="country_status_download_failed">بارگیری ناکام بود</string>
     <!-- Button text for the button under the country_status_download_failed message -->
-    <string name="try_again">تلاش مجدد</string>
-    <string name="about_menu_title">CoMaps درباره‌ی</string>
+    <string name="try_again">تلاش دوباره</string>
+    <string name="about_menu_title">درباره CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• آسان برای استفاده و جلا</string>
+    <string name="about_proposition_1">• بکارگیری آسان اود پیراسته</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_2">• حریم خصوصی متمرکز و بدون تبلیغات</string>
+    <string name="about_proposition_2">• حریم خصوصی متمرکز اود بی‌آگهی</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• آفلاین، سریع و جمع و جور</string>
+    <string name="about_proposition_3">• آفلاین، چابک و جمع و جور</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">منبع کاملا باز، نه برای سود، تصمیم گیری شفاف و امور مالی شفاف.</string>
+    <string name="about_developed_by_enthusiasts">ویدابُن بُوَندگ، نه ازبرای سود، وزیریدن اود تیس‌های مالی رو راست.</string>
     <!-- The button that opens system location settings -->
-    <string name="location_settings">تنظیمات مکان</string>
+    <string name="location_settings">پیکربندی‌های گیاگ</string>
     <string name="close">بستن</string>
-    <string name="unsupported_phone">متأسفانه دستگاه شما از آن پشتیبانی نمی‌کندبرنامه برای اجرا به OpenGL نیازمند است.</string>
-    <string name="download">دانلود</string>
+    <string name="unsupported_phone">برنامه به OpenGL نیازمند است.شوربختانه، از دستگاه شما پشتیبانی نمی‌شود.</string>
+    <string name="download">بارگیری</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">لطفا مقداری از فضای ذخیره‌سازی را آزاد نمایید</string>
-    <string name="download_resources">قبل از استفاده از اپلیکیشن, اجازه دهید تا ما نقشه جهانی را بر روی موبایل شما دانلود کنیم. \nمقدار %s از حافظه شما اشغال می شود.</string>
+    <string name="not_enough_free_space_on_sdcard">لطفا پیش از بکارگیری برنامه، نخست کمی جا در کارت SD/ویر USB آزاد کنید</string>
+    <string name="download_resources">پیش از بکارگیری برنامه, لطفا نقشه پیش‌نمایش جهانی را بر روی دستگاه خویش بارگیری کنید.\nاندازه %s از ویر شما را می‌گیرد.</string>
     <string name="download_resources_continue">برو به نقشه</string>
-    <string name="downloading_country_can_proceed">درحال دانلود %1$s (%2$s). شما اکنون می توانید \nبه نقشه بروید.</string>
-    <string name="download_country_ask">دانلود %1$s؟ (%2$s)</string>
+    <string name="downloading_country_can_proceed">بارگیری می‌شود %1$s (%2$s). شما اکنون می‌توانید\nبه نقشه بروید.</string>
+    <string name="download_country_ask">بارگیری %1$s؟ (%2$s)</string>
     <string name="update_country_ask">بروزرسانی %1$s؟ (%2$s)</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
     <string name="pause">درنگ</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
     <string name="continue_button">ادامه</string>
     <!-- Show popup notification on top of the map when country download has failed. -->
-    <string name="download_country_failed">%s دانلود با شکست مواجه شد</string>
+    <string name="download_country_failed">%s بارگیری ناکام بود</string>
     <!-- "Add new bookmark list" dialog title -->
-    <string name="add_new_set">اضافه کردن مجموعه جدید</string>
+    <string name="add_new_set">افزودن پهرستی نو</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">نشانه‌ها</string>
+    <string name="bookmarks">نشانگ‌ها</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">نشانه‌ها و مسیر ها</string>
     <!-- Add bookmark dialog - bookmark name -->
@@ -138,7 +138,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">یادداشت‌ها</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">در حال بارگیری نشانه‌ها</string>
+    <string name="load_kmz_title">بارگذاری نشانگ‌ها</string>
     <!-- Kmz file successful loading -->
     <string name="load_kmz_successful">نشانه‌ها با موفقیت بارگذاری شد!شما می توانید آنها را در نقشه یا بخش مدیریت نشانه‌ها بیابید.</string>
     <!-- Kml file loading failed -->
@@ -778,10 +778,12 @@
     <string name="panoramax">تصویر Panoramax</string>
     <string name="app_site_url">https://comaps.app</string>
     <string name="saved">ذخیره شد</string>
-    <string name="about_headline">رایگان برای همه، ساخته شده با عشق</string>
+    <string name="about_headline">پروژه‌ای باز نیرو گرفته از انجمن</string>
     <string name="pedestrian">پیاده</string>
     <string name="bicycle">دوچرخه</string>
     <string name="backup_interval_every_week">هفتگی</string>
     <string name="backup_interval_manual_only">خاموش (تنها به شیوه دستی)</string>
     <string name="backup_interval_every_day">روزانه</string>
+    <string name="disconnect_usb_cable">برای بکارگیری CoMaps، لطفا USB را بگسلانید یا کارت‌ویر را اندرون گذارید.</string>
+    <string name="bookmark_set_name">نام پهرست نشانگ‌ها</string>
 </resources>

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

@@ -524,7 +524,7 @@
     <string name="editor_share_to_all_dialog_title">Haluatko lähettää sen kaikille käyttäjille?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
     <string name="editor_share_to_all_dialog_message_1">Varmista, ettet syöttänyt henkilökohtaisia tietojasi.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-muokkaimet tarkistavat muutokset ja ottavat sinuun yhteyttä, jos niillä on kysyttävää</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-muokkaajat tarkistavat muutokset ja ottavat sinuun yhteyttä, jos heillä on kysyttävää.</string>
     <string name="navigation_stop_button">Lopeta</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Reitin kirjaaminen</string>
@@ -903,4 +903,12 @@
     <string name="editor_submit">Lähetä</string>
     <string name="list_description_empty">Muokkaa listaa lisätäksesi kuvauksen</string>
     <string name="editor_business_vacant_button">Liike on tyhjillään</string>
+    <string name="place_page_map_too_old_title">Karttatiedot vanhentuneet</string>
+    <string name="place_page_map_too_old_description">Nykyinen karttadata on hyvin vanhaa, päivitä kartta.</string>
+    <string name="place_page_app_too_old_description">Nykyinen karttadata on hyvin vanhaa, päivitä CoMaps-sovellus.</string>
+    <string name="place_page_update_too_old_map">Päivitä kartta-alue</string>
+    <string name="place_page_too_old_to_edit">OpenStreetMap-muokkaus on poistettu käytöstä, koska karttadata on liian vanhaa.</string>
+    <string name="prefs_speed_cameras_information">Nopeuskameravaroitukset on poistettu käytöstä niissä maissa, missä varoitukset on kielletty lain nojalla.</string>
+    <string name="power_management">Virranhallinta</string>
+    <string name="navigation_start_tts_message">"Käynnistetään navigointi, ääniohjeistuksen kieli: "</string>
 </resources>

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

@@ -897,7 +897,7 @@
     <string name="editor_place_doesnt_exist_description">Décrivez le lieu afin de signaler l\'erreur à la communauté OpenStreetMap</string>
     <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="avoid_paved">Éviter les routes pavé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>
@@ -913,4 +913,12 @@
     <string name="editor_submit">Soumettre</string>
     <string name="power_management">Gestion de l\'énergie</string>
     <string name="charge_socket_schuko">Europe</string>
+    <string name="place_page_map_too_old_title">Carte obsolète</string>
+    <string name="place_page_map_too_old_description">Les données de la carte actuelle sont anciennes, pensez à les mettre à jour.</string>
+    <string name="place_page_update_too_old_map">Mettre à jour la carte</string>
+    <string name="place_page_too_old_to_edit">Les modifications OpenStreetMap sont désactivées car les données de la carte sont trop anciennes.</string>
+    <string name="place_page_app_too_old_description">Vos données cartographiques actuelles sont très anciennes, veuillez mettre à jour l\'application CoMaps.</string>
+    <string name="prefs_speed_cameras_information">Les avertissements relatifs aux radars de vitesse sont désactivés dans les pays où les alertes sont interdites par la législation locale.</string>
+    <string name="navigation_start_tts_message">"Navigation de démarrage, langue des instructions vocales : "</string>
+    <string name="navigation_start_tts_disabled_message">Instructions vocales désactivées : moteur de synthèse vocale non disponible</string>
 </resources>

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

@@ -261,4 +261,13 @@
     <string name="dialog_routing_system_error">Sistemska greška</string>
     <string name="dialog_routing_application_error">Nije moguće napraviti rutu zbog greške u aplikaciji</string>
     <string name="dialog_routing_try_again">Pokušajte ponovno</string>
+    <string name="search_not_found_query">Preuzmite regiju u kojoj pretražujete ili pokušajte dodati naziv obližnjeg grada/sela.</string>
+    <string name="search_history_text">Pogledajte svoja nedavna pretraživanja</string>
+    <string name="read_in_wikipedia">Wikipedija</string>
+    <string name="p2p_your_location">Vaša lokacija</string>
+    <string name="p2p_only_from_current">Navigacija je dostupna samo od vaše trenutne lokacije</string>
+    <string name="p2p_reroute_from_current">Želite li isplanirati rutu od vaše trenutne lokacije?</string>
+    <string name="editor_time_add">Dodaj Raspored</string>
+    <string name="editor_time_delete">Izbriši Raspored</string>
+    <string name="editor_time_allday">Cijeli dan (24 sata)</string>
 </resources>

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

@@ -898,4 +898,12 @@
     <string name="avoid_paved">Evita le strade asfaltate</string>
     <string name="charge_socket_schuko">Domestico EU</string>
     <string name="power_management">Risparmio energetico</string>
+    <string name="place_page_too_old_to_edit">La modifica di OpenStreetMap è disabilitata perché le mappe sono troppo vecchie.</string>
+    <string name="place_page_update_too_old_map">Aggiorna questa mappa</string>
+    <string name="place_page_app_too_old_description">Le mappe correnti sono molto vecchie, si suggerisce di aggiornare CoMaps.</string>
+    <string name="place_page_map_too_old_description">La mappa corrente è molto vecchia, si suggerisce di aggiornarla.</string>
+    <string name="place_page_map_too_old_title">Mappa obsoleta</string>
+    <string name="navigation_start_tts_disabled_message">Istruzioni vocali disabilitate: TTS non disponibile</string>
+    <string name="prefs_speed_cameras_information">Gli avvisi di Autovelox sono disabilitati dove proibito dalla legge locale.</string>
+    <string name="navigation_start_tts_message">"Inizio Navigazione, lingua per istruzioni vocali: "</string>
 </resources>

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

@@ -371,4 +371,8 @@
     <string name="error_value_must_be_positive">Res an niver positiv</string>
     <string name="error_invalid_number">Niver anewn</string>
     <string name="offline_explanation_title">Mappys Dhywarlinen</string>
+    <string name="category_shopping">Gwerthjiow</string>
+    <string name="edit">Golegi</string>
+    <string name="downloader_no_space_title">Nyns eus lowr dalghuster</string>
+    <string name="translated_om_site_url">https://comaps.app/</string>
 </resources>

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

@@ -845,4 +845,12 @@
     <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>
+    <string name="place_page_map_too_old_title">Novecojuši kartes dati</string>
+    <string name="place_page_map_too_old_description">Pašreizējie kartes dati ir ļoti veci, lūgums atjaunināt karti.</string>
+    <string name="place_page_app_too_old_description">Pašreizējie kartes dati ir ļoti veci, lūgums atjaunināt CoMaps lietotni.</string>
+    <string name="place_page_update_too_old_map">Atjaunināt karšu apgabalu</string>
+    <string name="place_page_too_old_to_edit">OpenStreetMap labošana ir atspējota, jo kartes dati ir pārāk veci.</string>
+    <string name="navigation_start_tts_disabled_message">Balss norādes atspējotas: nav pieejams teksta pārveidošanas runā dzinējs</string>
+    <string name="prefs_speed_cameras_information">Brīdinājumi par ātruma noteikšanas kamerā ir atspējoti valstīs, kurās šādus brīdinājumus aizliedz vietējais likums.</string>
+    <string name="navigation_start_tts_message">"Uzsāk navigāciju, balss norāžu valoda: "</string>
 </resources>

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

@@ -503,7 +503,7 @@
     <string name="placepage_edit_bookmark_button">Rediger bokmerke</string>
     <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
     <string name="editor_reset_edits_message">Forkaste alle lokale endringer?</string>
-    <string name="editor_reset_edits_button">Forkast</string>
+    <string name="editor_reset_edits_button">Forkast endringer</string>
     <string name="editor_remove_place_message">Slette tillagt sted?</string>
     <string name="editor_remove_place_button">Slett</string>
     <string name="editor_place_doesnt_exist">Sted finnes ikke</string>
@@ -899,4 +899,17 @@
     <string name="navigation_start_tts_disabled_message">Taleveiledninger deaktivert: TTS-motor ikke tilgjengelig</string>
     <string name="navigation_start_tts_message">"Starter navigering, taleveiledningsspråk: "</string>
     <string name="prefs_speed_cameras_information">Fotoboksvarsler er deaktivert i land hvor varsler er forbudt i henhold til lokal lovgivning.</string>
+    <string name="place_page_map_too_old_title">Kartdata utdatert</string>
+    <string name="place_page_map_too_old_description">Gjeldende kartdata er gamle, oppdater kartet.</string>
+    <string name="place_page_app_too_old_description">Gjeldende kartdata er gamle, oppdater CoMaps-appen.</string>
+    <string name="place_page_update_too_old_map">Oppdater kartregion</string>
+    <string name="place_page_too_old_to_edit">OpenStreetMap-redigering er deaktivert fordi kartdataene er for gamle.</string>
+    <string name="osm_note_hint">Alternativt, så kan du legge til et notat i OpenStreetMap, slik at noen andre kan redigere eller legge til stedet.</string>
+    <string name="osm_note_toast">Notatet vil bli sendt til OpenStreetMap</string>
+    <string name="advanced">Avansert</string>
+    <string name="download_resources_custom_url_summary_none">Ikke angitt</string>
+    <string name="download_resources_custom_url_error_scheme">Angi en fullstendig nettadresse som starter med https:// og slutter med /</string>
+    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
+    <string name="download_resources_custom_url_message">Overstyr standardserveren som brukes til nedlasting av kart. La det stå tomt for å bruke CoMaps standardserver.</string>
+    <string name="download_resources_custom_url_title">Tilpasset kartserver</string>
 </resources>

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

@@ -88,19 +88,6 @@
     <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
     <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
     <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
-    <item name="fontHeadline1">@style/TextAppearance.Headline1</item>
-    <item name="fontHeadline2">@style/TextAppearance.Headline2</item>
-    <item name="fontHeadline3">@style/TextAppearance.Headline3</item>
-    <item name="fontHeadline4">@style/TextAppearance.Headline4</item>
-    <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-    <item name="fontHeadline6">@style/TextAppearance.Headline6</item>
-    <item name="fontSubtitle1">@style/TextAppearance.Subtitle1</item>
-    <item name="fontSubtitle2">@style/TextAppearance.Subtitle2</item>
-    <item name="fontBody1">@style/TextAppearance.Body1</item>
-    <item name="fontBody2">@style/TextAppearance.Body2</item>
-    <item name="fontButton">@style/TextAppearance.Button</item>
-    <item name="fontCaption">@style/TextAppearance.Caption</item>
-    <item name="fontOverline">@style/TextAppearance.Overline</item>
     <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
     <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
     <item name="elevationProfilePropIconTint">@color/white_secondary</item>

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

@@ -910,4 +910,9 @@
     <string name="navigation_start_tts_message">"Navigatie starten, taal voor steminstructie: "</string>
     <string name="prefs_speed_cameras_information">Waarschuwingen voor flitsers zijn uitgeschakeld in landen waar deze wettelijk zijn verboden.</string>
     <string name="navigation_start_tts_disabled_message">Spraakinstructies uitgeschakeld: TTS-engine niet beschikbaar</string>
+    <string name="place_page_map_too_old_title">Kaartgegevens verouderd</string>
+    <string name="place_page_map_too_old_description">Uw huidige kaartgegevens zijn erg oud. Werk de kaart bij.</string>
+    <string name="place_page_app_too_old_description">Uw huidige kaartgegevens zijn erg oud. Update de CoMaps-app.</string>
+    <string name="place_page_update_too_old_map">Kaart regio bijwerken</string>
+    <string name="place_page_too_old_to_edit">Het bewerken van OpenStreetMap is uitgeschakeld omdat de kaartgegevens te oud zijn.</string>
 </resources>

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

@@ -885,4 +885,12 @@
     <string name="editor_submit">Enviar</string>
     <string name="power_management">Gerenciamento de energia</string>
     <string name="charge_socket_schuko">Doméstica UE</string>
+    <string name="place_page_map_too_old_title">Dados do mapa desatualizados</string>
+    <string name="place_page_map_too_old_description">Os seus dados do mapa atuais são muito antigos, por favor atualize o mapa.</string>
+    <string name="place_page_app_too_old_description">Seus dados do mapa atuais são muito antigos, por favor atualize o aplicativo CoMaps.</string>
+    <string name="place_page_update_too_old_map">Atualizar região do mapa</string>
+    <string name="place_page_too_old_to_edit">A edição do OpenStreetMap está desativada porque os dados do mapa são antigos demais.</string>
+    <string name="prefs_speed_cameras_information">Alertas de radar fotográfico de velocidade estão desativados em países onde os alertas são proibidos pelas leis locais.</string>
+    <string name="navigation_start_tts_message">"Iniciando navegação, idioma da instrução por voz: "</string>
+    <string name="navigation_start_tts_disabled_message">Instrução por voz desativada: nenhum motor de texto para voz disponível</string>
 </resources>

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

@@ -901,4 +901,18 @@
     <string name="list_description_empty">Edite a lista para adicionar uma descrição</string>
     <string name="power_management">Gestão de Energia</string>
     <string name="charge_socket_schuko">Doméstica UE</string>
+    <string name="place_page_map_too_old_title">Dados do mapa desatualizados</string>
+    <string name="place_page_map_too_old_description">O seu mapa atual tem dados demasiado antigos, por favor atualize-o.</string>
+    <string name="place_page_app_too_old_description">O seu mapa atual tem dados demasiado antigos, por favor atualize a aplicação do CoMaps.</string>
+    <string name="place_page_update_too_old_map">Atualizar região do mapa</string>
+    <string name="place_page_too_old_to_edit">Edição OpenStreetMap está desativada, pois os dados do mapa são demasiado antigos.</string>
+    <string name="prefs_speed_cameras_information">Avisos de câmaras de velocidade estão desativados em países onde alertas estão proibidos por lei.</string>
+    <string name="navigation_start_tts_message">"Iniciando Navegação, idioma das instruções por voz: "</string>
+    <string name="navigation_start_tts_disabled_message">Instruções por voz desativadas: nenhum motor de TTS disponível</string>
+    <string name="advanced">Avançadas</string>
+    <string name="download_resources_custom_url_title">Servidor de Mapa Personalizado</string>
+    <string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string>
+    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
+    <string name="download_resources_custom_url_summary_none">Indefinido</string>
+    <string name="download_resources_custom_url_error_scheme">Por favor insira um URL inteiro começando com https:// e acabando com /</string>
 </resources>

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

@@ -277,7 +277,7 @@
     <!-- Preference title -->
     <string name="google_play_services">Serviciul de Localizare Fuzionat Google</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Un serviciu proprietar care combină GPS, Wi-Fi, rețelele celulare etc. pentru a-ți determina locația mai precisă. Se poate conecta la serverele Google.</string>
+    <string name="pref_use_google_play">Un serviciu proprietar care combină GPS, Wi-Fi, rețelele celulare etc. pentru a-ți determina locația mai precis. Se poate conecta la serverele Google.</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -460,7 +460,7 @@
     <string name="osm_presentation">Date OpenStreetMap create de comunitate la data de %s. Aflați mai multe despre cum să editați și să actualizați harta la OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) este un proiect comunitar pentru construirea unei hărți libere și deschise. Este principala sursă de date cartografice în CoMaps și funcționează similar cu Wikipedia. Puteți adăuga sau edita locuri, iar acestea devin disponibile pentru milioane de utilizatori din întreaga lume. \nAlăturați-vă comunității și ajutați la crearea unei hărți mai bune pentru toată lumea!</string>
-    <string name="login_to_make_edits_visible">Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica edițiile de hartă în întreaga lume</string>
+    <string name="login_to_make_edits_visible">Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica editările hărții pentru întreaga lume</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d din %2$d</string>
     <string name="download_over_mobile_header">Vrei să descarci prin rețeaua de telefonie mobilă?</string>
@@ -475,7 +475,7 @@
     <!-- Hint of the input field in the OSM note section of the editor -->
     <string name="editor_note_hint">Descrieți erorile de pe hartă sau lucrurile care nu pot fi editate cu CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
-    <string name="editor_about_osm">Edițiile dvs. sunt încărcate în baza de date publică <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Vă rugăm să nu adăugați informații personale sau protejate prin drepturi de autor.</string>
+    <string name="editor_about_osm">Editările dvs. sunt încărcate în baza de date publică <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Vă rugăm să nu adăugați informații personale sau protejate prin drepturi de autor.</string>
     <string name="editor_more_about_osm">Mai multe despre OpenStreetMap</string>
     <string name="editor_osm_history">Istoricul dvs. de editare</string>
     <string name="editor_osm_notes">Note privind datele hărții dvs</string>
@@ -889,4 +889,13 @@
     <string name="list_description_empty">Editează lista ca să adaugi o descriere</string>
     <string name="charging_station_available_sockets">Conectori</string>
     <string name="charge_socket_unknown_other">Alte tipuri necunoscute</string>
+    <string name="place_page_map_too_old_title">Harta este prea veche</string>
+    <string name="place_page_map_too_old_description">Harta dvs. este foarte veche, vă rugăm actualizați-o.</string>
+    <string name="place_page_app_too_old_description">Harta dvs. este foarte veche, vă rugăm actualizați CoMaps.</string>
+    <string name="place_page_update_too_old_map">Actualizează harta</string>
+    <string name="place_page_too_old_to_edit">Editarea OpenStreetMap este dezactivată pentru că harta descărcată este prea veche.</string>
+    <string name="prefs_speed_cameras_information">Avertizările pentru radare sunt dezactivate unde avertizarea este interzisă de legea locală.</string>
+    <string name="navigation_start_tts_disabled_message">Instrucțiuni vocale dezactivate: Nu este disponibil niciun sistem TTS</string>
+    <string name="charge_socket_count">Număr</string>
+    <string name="unknown_count">Necunoscut</string>
 </resources>

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

@@ -17,7 +17,7 @@
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Мили</string>
     <!-- Update maps later button text -->
-    <string name="later">Не сейчас</string>
+    <string name="later">Позже</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
     <string name="search">Поиск</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
@@ -27,7 +27,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Точность местоположения ограничена</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Для обеспечения точной навигации включите определение точного местоположения в настройках</string>
+    <string name="precise_location_is_disabled_long_text">Включите в настройках определение точного местоположения</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Показать на карте</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -297,7 +297,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Пожалуйста, включите геолокацию</string>
     <string name="save">Сохранить</string>
-    <string name="create">создать</string>
+    <string name="create">Создать</string>
     <!-- red color -->
     <string name="red">Красный</string>
     <!-- yellow color -->
@@ -526,8 +526,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">Cтоп</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Запись трека</string>
@@ -918,4 +918,9 @@
     <string name="list_description_empty">Отредактируйте список, чтобы добавить описание</string>
     <string name="pref_tts_no_system_tts_short">Не найден движок синтезатора речи, проверьте настройки приложения</string>
     <string name="unknown_power_output">неизвестно</string>
+    <string name="opens_day_at">Откроется %1$s на %2$s</string>
+    <string name="closes_day_at">Закроется %1$s на %2$s</string>
+    <string name="place_page_map_too_old_title">Данные карты устарели</string>
+    <string name="place_page_update_too_old_map">Обновить регион карты</string>
+    <string name="place_page_too_old_to_edit">Редактирование OpenStreetMap отключено, так как данные карты слишком старые.</string>
 </resources>

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

@@ -349,8 +349,8 @@
     <string name="osm_note_hint">Ali pa pusti sporočilo skupnosti OpenStreetMap, da bo nekdo drug dodal ali popravil ta kraj.</string>
     <string name="osm_note_toast">Sporočilo bo poslano na OpenStreetMap</string>
     <string name="editor_share_to_all_dialog_title">Ali to želite poslati vsem uporabnikom?</string>
-    <string name="editor_share_to_all_dialog_message_1">Poskrbite, da niste vnesli nobenih zasebnih podatkov</string>
-    <string name="editor_share_to_all_dialog_message_2">Uredniki na OpenStreetMap bodo preverili spremembe in stopili v stik z vami, če kaj ne bo jasno</string>
+    <string name="editor_share_to_all_dialog_message_1">Poskrbite, da niste vnesli nobenih zasebnih ali osebnih podatkov</string>
+    <string name="editor_share_to_all_dialog_message_2">Uredniki na OpenStreetMap bodo preverili spremembe in stopili v stik z vami, če kaj ne bo jasno.</string>
     <string name="navigation_stop_button">Ustavi</string>
     <string name="track_recording">Snemam pot</string>
     <string name="accept">Potrdi</string>
@@ -639,4 +639,22 @@
         <item quantity="few">%d min</item>
         <item quantity="other">%d min</item>
     </plurals>
+    <string name="opens_day_at">Odpre se %1$s, ob %2$s</string>
+    <string name="closes_day_at">Zapre se %1$s, ob %2$s</string>
+    <string name="editor_business_vacant_button">Podjetje ni zakupljeno</string>
+    <string name="editor_mark_business_vacant_title">Označi, da je podjetje nezakupljeno</string>
+    <string name="editor_mark_business_vacant_description">To uporabite, če se je podjetje izselilo in so prostori prazni in pripravljeni za novega zakupnika.</string>
+    <string name="editor_submit">Potrdi</string>
+    <string name="place_page_map_too_old_title">Podatki zemljevida so zastareli</string>
+    <string name="place_page_map_too_old_description">Vaši trenutni podatki zemljevida so zelo stari; prosimo, posodobite zemljevid.</string>
+    <string name="place_page_app_too_old_description">Vaši trenutni podatki zemljevida so zelo stari; prosimo, posodobite orodje CoMaps.</string>
+    <string name="place_page_update_too_old_map">Posodobi področje zemljevida</string>
+    <string name="place_page_too_old_to_edit">Urejanje OpenStreetMap je onemogočeno, ker so podatki zemljevida prestari.</string>
+    <string name="prefs_speed_cameras_information">Opozorila o merilnikih hitrosti so onemogočena v državah, kjer so prepovedana s tamkajšnjimi zakoni.</string>
+    <string name="power_management">Energetsko upravljanje</string>
+    <string name="avoid_paved">Izogni se neasfaltiranim cestam</string>
+    <string name="navigation_start_tts_message">"Začenjanje potnega usmerjanja, jezik glasovnih napotkov: "</string>
+    <string name="navigation_start_tts_disabled_message">Glasovni napotki so onemogočeni: ustvarjalec glasu (TTS) ni na voljo</string>
+    <string name="charge_socket_schuko">standardna evropska vtičnica (Schuko)</string>
+    <string name="list_description_empty">Uredite seznam, da dodate opis</string>
 </resources>

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

@@ -893,4 +893,5 @@
     <string name="unknown_count">bilinmiyor</string>
     <string name="error_value_must_be_positive">Değer pozitif olmalıdır</string>
     <string name="error_invalid_number">Geçersiz sayı</string>
+    <string name="avoid_paved">Asfalt yollardan kaçın</string>
 </resources>

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

@@ -511,7 +511,7 @@
     <string name="placepage_edit_bookmark_button">编辑书签</string>
     <string name="placepage_personal_notes_hint">个人注记（文字或 html）</string>
     <string name="editor_reset_edits_message">舍弃所有本地更改？</string>
-    <string name="editor_reset_edits_button">舍弃</string>
+    <string name="editor_reset_edits_button">舍弃更改</string>
     <string name="editor_remove_place_message">删除已添加的地点？</string>
     <string name="editor_remove_place_button">删除</string>
     <string name="editor_place_doesnt_exist">该地点不存在</string>
@@ -912,4 +912,15 @@
     <string name="navigation_start_tts_message">"启动导航，语音指令语言： "</string>
     <string name="prefs_speed_cameras_information">在当地法律禁止发出警报的国家/地区，测速摄像头警告功能将被禁用。</string>
     <string name="navigation_start_tts_disabled_message">语音指令已禁用：TTS 引擎不可用</string>
+    <string name="place_page_map_too_old_title">地图数据已过时</string>
+    <string name="place_page_map_too_old_description">您当前的地图数据非常旧，请更新地图。</string>
+    <string name="place_page_app_too_old_description">您当前的地图数据非常旧，请更新 CoMaps 应用。</string>
+    <string name="place_page_update_too_old_map">更新地图区域</string>
+    <string name="place_page_too_old_to_edit">由于地图数据太旧，OpenStreetMap 编辑被禁用。</string>
+    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
+    <string name="download_resources_custom_url_summary_none">未设置</string>
+    <string name="download_resources_custom_url_error_scheme">请输入以 https:// 开头、以 / 结尾的完整 URL</string>
+    <string name="advanced">高级</string>
+    <string name="download_resources_custom_url_title">自定义地图服务器</string>
+    <string name="download_resources_custom_url_message">覆盖用于地图下载的默认地图下载服务器。留空则使用 CoMaps 默认服务器。</string>
 </resources>

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

@@ -35,6 +35,11 @@
   <string name="pref_settings_general" translatable="false">GeneralSettings</string>
   <string name="pref_navigation" translatable="false">Navigation</string>
   <string name="pref_information" translatable="false">Information</string>
+  <string name="pref_traffic" translatable="false">Traffic</string>
+  <string name="pref_traffic_http_enabled" translatable="false">TrafficHttpEnabled</string>
+  <string name="pref_traffic_http_url" translatable="false">TrafficHttpUrl</string>
+  <string name="pref_traffic_apps" translatable="false">TrafficApps</string>
+  <string name="pref_traffic_legacy_enabled" translatable="false">TrafficLegacyEnabled</string>
   <string name="pref_transliteration" translatable="false">Transliteration</string>
   <string name="pref_power_management" translatable="false">PowerManagment</string>
   <string name="pref_keep_screen_on" translatable="false">KeepScreenOn</string>
@@ -43,6 +48,8 @@
   <string name="pref_backup" translatable="false">Backup</string>
   <string name="pref_left_button" translatable="false">LeftButton</string>
   <string name="pref_power" translatable="false">pref_power</string>
+  <string name="pref_custom_map_download_url" translatable="false">CustomMapDownloadUrl</string>
+  <string name="pref_advanced" translatable="false">pref_advanced</string>
 
   <string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
   <string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>

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

@@ -215,6 +215,7 @@
     <!-- Settings information group in settings screen -->
     <string name="prefs_group_information">Information</string>
     <string name="prefs_group_route">Navigation</string>
+    <string name="prefs_group_traffic">Traffic information</string>
     <string name="pref_zoom_title">Zoom buttons</string>
     <string name="pref_zoom_summary">Display on the map</string>
     <!-- Settings «Map» category: «Night style» title -->
@@ -544,7 +545,7 @@
     <string name="placepage_edit_bookmark_button">Edit Bookmark</string>
     <string name="placepage_personal_notes_hint">Personal notes (text or html)</string>
     <string name="editor_reset_edits_message">Discard all local changes?</string>
-    <string name="editor_reset_edits_button">Discard</string>
+    <string name="editor_reset_edits_button">Discard changes</string>
     <string name="editor_remove_place_message">Delete added place?</string>
     <string name="editor_remove_place_button">Delete</string>
     <string name="editor_place_doesnt_exist">Place does not exist</string>
@@ -799,6 +800,24 @@
     <string name="enable_show_on_lock_screen_description">When enabled, the app will work on the lockscreen even when the device is locked.</string>
     <!-- Current language of the map! -->
     <string name="change_map_locale">Map language</string>
+    <!-- Enable live traffic data via HTTP (title) -->
+    <string name="traffic_http_enabled">Enable live traffic data</string>
+    <!-- Enable live traffic data via HTTP (description) -->
+    <string name="traffic_http_enabled_description">When enabled, the app will periodically retrieve traffic information from the configured URL.</string>
+    <!-- URL for live traffic data -->
+    <string name="traffic_http_url">Traffic service URL</string>
+    <!-- Status message indicating that user did not set a traffic URL yet. -->
+    <string name="traffic_http_url_not_set">Not set</string>
+    <!-- TraFF 0.8 apps from which to receive data (title) -->
+    <string name="traffic_apps">Use data from TraFF applications</string>
+    <!-- Status message indicating that no TraFF 0.8 apps are installed -->
+    <string name="traffic_apps_not_available">No apps installed</string>
+    <!-- Status message indicating that no TraFF 0.8 apps are currently selected -->
+    <string name="traffic_apps_none_selected">No apps salected</string>
+    <!-- Enable traffic data from TraFF 0.7 apps (title) -->
+    <string name="traffic_legacy_enabled">Use data from legacy TraFF applications</string>
+    <!-- Enable traffic data from TraFF 0.7 apps (description) -->
+    <string name="traffic_legacy_enabled_description">When enabled, the app will receive and process traffic data from legacy TraFF applications.</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Map data from OpenStreetMap</string>
     <!-- Telegram group url for the "?" About page -->
@@ -966,4 +985,12 @@
     <string name="offline_explanation_title">Offline Maps</string>
     <string name="offline_explanation_text">A map needs to be downloaded to view and navigate the area.\nDownload maps for areas you want to travel.</string>
     <string name="list_description_empty">Edit the list to add a description</string>
+    <!-- Settings: Advanced group -->
+    <string name="advanced">Advanced</string>
+    <!-- Custom Download URL -->
+    <string name="download_resources_custom_url_title">Custom Map Server</string>
+    <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
+    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
+    <string name="download_resources_custom_url_summary_none">Not set</string>
+    <string name="download_resources_custom_url_error_scheme">Please enter a full URL starting with https:// and ending with /</string>
 </resources>

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

@@ -69,19 +69,4 @@
     <attr name="elevationProfileSelectedPointTriangle" format="reference" />
     <attr name="elevationProfileFloatingTriangle" format="reference" />
   </declare-styleable>
-  <declare-styleable name="ThemeAttrs.Fonts">
-    <attr name="fontHeadline1" format="reference" />
-    <attr name="fontHeadline2" format="reference" />
-    <attr name="fontHeadline3" format="reference" />
-    <attr name="fontHeadline4" format="reference" />
-    <attr name="fontHeadline5" format="reference" />
-    <attr name="fontHeadline6" format="reference" />
-    <attr name="fontSubtitle1" format="reference" />
-    <attr name="fontSubtitle2" format="reference" />
-    <attr name="fontBody1" format="reference" />
-    <attr name="fontBody2" format="reference" />
-    <attr name="fontButton" format="reference" />
-    <attr name="fontCaption" format="reference" />
-    <attr name="fontOverline" format="reference" />
-  </declare-styleable>
 </resources>

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

@@ -93,19 +93,6 @@
     <item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
     <item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
     <item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
-    <item name="fontHeadline1">@style/TextAppearance.Headline1</item>
-    <item name="fontHeadline2">@style/TextAppearance.Headline2</item>
-    <item name="fontHeadline3">@style/TextAppearance.Headline3</item>
-    <item name="fontHeadline4">@style/TextAppearance.Headline4</item>
-    <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-    <item name="fontHeadline6">@style/TextAppearance.Headline6</item>
-    <item name="fontSubtitle1">@style/TextAppearance.Subtitle1</item>
-    <item name="fontSubtitle2">@style/TextAppearance.Subtitle2</item>
-    <item name="fontBody1">@style/TextAppearance.Body1</item>
-    <item name="fontBody2">@style/TextAppearance.Body2</item>
-    <item name="fontButton">@style/TextAppearance.Button</item>
-    <item name="fontCaption">@style/TextAppearance.Caption</item>
-    <item name="fontOverline">@style/TextAppearance.Overline</item>
     <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
     <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
     <item name="elevationProfilePropIconTint">@color/black_secondary</item>

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

@@ -144,7 +144,8 @@
       </intent>
     </PreferenceScreen>
   </androidx.preference.PreferenceCategory>
-<PreferenceCategory
+
+  <PreferenceCategory
     android:key="@string/pref_power"
     android:title="@string/power_management"
     android:order="4">
@@ -190,7 +191,38 @@
         android:defaultValue="true"
         android:widgetLayout="@layout/preference_switch"
         android:order="5"/>
-</PreferenceCategory>
+  </PreferenceCategory>
+
+  <androidx.preference.PreferenceCategory
+    android:key="@string/pref_traffic"
+    android:title="@string/prefs_group_traffic"
+    android:order="4">
+    <SwitchPreferenceCompat
+      android:key="@string/pref_traffic_http_enabled"
+      android:title="@string/traffic_http_enabled"
+      app:singleLineTitle="false"
+      android:summary="@string/traffic_http_enabled_description"
+      android:defaultValue="true"
+      android:order="1"/>
+    <EditTextPreference
+      android:key="@string/pref_traffic_http_url"
+      android:title="@string/traffic_http_url"
+      app:singleLineTitle="false"
+      android:order="2"/>
+    <MultiSelectListPreference
+      android:key="@string/pref_traffic_apps"
+      android:title="@string/traffic_apps"
+      app:singleLineTitle="false"
+      android:order="3"/>
+    <SwitchPreferenceCompat
+      android:key="@string/pref_traffic_legacy_enabled"
+      android:title="@string/traffic_legacy_enabled"
+      app:singleLineTitle="false"
+      android:summary="@string/traffic_legacy_enabled_description"
+      android:defaultValue="true"
+      android:order="4"/>
+  </androidx.preference.PreferenceCategory>
+
   <androidx.preference.PreferenceCategory
     android:key="@string/pref_privacy"
     android:title="@string/privacy"
@@ -212,5 +244,18 @@
       android:defaultValue="true"
       android:widgetLayout="@layout/preference_switch"
       android:order="2"/>
+
   </androidx.preference.PreferenceCategory>
+
+  <androidx.preference.PreferenceCategory
+    android:key="@string/pref_advanced"
+    android:title="@string/advanced"
+    android:order="6">
+    <Preference
+      android:key="@string/pref_custom_map_download_url"
+      android:title="@string/download_resources_custom_url_title"
+      app:icon="@drawable/ic_cloud_download"
+      android:order="1" />
+  </androidx.preference.PreferenceCategory>
+
 </androidx.preference.PreferenceScreen>

android/sdk/build.gradle

@@ -124,6 +124,7 @@ dependencies {
   implementation libs.androidx.lifecycle.process
   implementation libs.androidx.media
   implementation libs.androidx.recyclerview
+  implementation libs.androidx.preference
   implementation libs.android.material
 
   testImplementation libs.junit

android/sdk/src/main/cpp/CMakeLists.txt

@@ -17,6 +17,7 @@ set(SRC
   app/organicmaps/sdk/opengl/gl3stub.h
   app/organicmaps/sdk/platform/GuiThread.hpp
   app/organicmaps/sdk/platform/AndroidPlatform.hpp
+  app/organicmaps/sdk/traffxml/AndroidTraffSource.hpp
   app/organicmaps/sdk/util/Distance.hpp
   app/organicmaps/sdk/util/FeatureIdBuilder.hpp
   app/organicmaps/sdk/vulkan/android_vulkan_context_factory.hpp
@@ -76,6 +77,8 @@ set(SRC
   app/organicmaps/sdk/platform/PThreadImpl.cpp
   app/organicmaps/sdk/platform/SecureStorage.cpp
   app/organicmaps/sdk/platform/SocketImpl.cpp
+  app/organicmaps/sdk/traffxml/AndroidTraffSource.cpp
+  app/organicmaps/sdk/traffxml/SourceImpl.cpp
   app/organicmaps/sdk/util/Config.cpp
   app/organicmaps/sdk/util/GeoUtils.cpp
   app/organicmaps/sdk/util/HttpClient.cpp
@@ -127,6 +130,7 @@ target_link_libraries(${PROJECT_NAME}
   # icu
   # agg
   # vulkan_wrapper
+  traffxml
 
   # Android libs
   log

android/sdk/src/main/cpp/app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp

@@ -42,12 +42,16 @@ using namespace std::placeholders;
 
 namespace
 {
+std::unique_ptr<MapFilesDownloader> & LegacyDownloader()
+{
+  static auto downloader = storage::GetDownloader();
+  return downloader;
+}
 
 static std::vector<platform::CountryFile> g_filesToDownload;
 static int g_totalDownloadedBytes;
 static int g_totalBytesToDownload;
 static std::shared_ptr<HttpRequest> g_currentRequest;
-
 }  // namespace
 
 extern "C"
@@ -152,11 +156,11 @@ JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_
     return ERR_NO_MORE_FILES;
 
   /// @todo One downloader instance with cached servers. All this routine will be refactored some time.
-  static auto downloader = storage::GetDownloader();
+  auto & downloader = LegacyDownloader();
   storage::Storage const & storage = g_framework->GetStorage();
   downloader->SetDataVersion(storage.GetCurrentDataVersion());
 
-  downloader->EnsureMetaConfigReady([&storage, ptr = jni::make_global_ref(listener)]()
+  downloader->EnsureMetaConfigReady([&storage, ptr = jni::make_global_ref(listener), &downloader]()
   {
     auto const & curFile = g_filesToDownload.back();
     auto const fileName = curFile.GetFileName(MapFileType::Map);
@@ -177,4 +181,12 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_
   LOG(LDEBUG, ("cancelCurrentFile, currentRequest=", g_currentRequest));
   g_currentRequest.reset();
 }
+
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeResetMetaConfig(JNIEnv *,
+                                                                                                      jclass)
+{
+  auto & downloader = LegacyDownloader();
+  if (downloader)
+    downloader->ResetMetaConfig();
+}
 }

android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp

@@ -1505,6 +1505,22 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeGet3dMode(JNIEnv
   env->SetBooleanField(result, buildingsField, buildings);
 }
 
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetCustomMapDownloadUrl(JNIEnv * env, jclass, 
+                                                                                        jstring url)
+{
+  std::string nativeUrl = jni::ToNativeString(env, url);
+  GetPlatform().SetCustomMapServerUrl(nativeUrl);
+
+  if (g_framework)
+  {
+    frm()->GetStorage().ResetMapDownloadMetaConfig();
+  }
+  else
+  {
+    LOG(LINFO, ("nativeSetCustomMapDownloadUrl: framework not created yet, skipping ResetMapDownloadMetaConfig"));
+  }
+}
+
 JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetAutoZoomEnabled(JNIEnv * env, jclass,
                                                                                    jboolean enabled)
 {

android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp

@@ -182,6 +182,8 @@ public:
   void Set3dMode(bool allow3d, bool allow3dBuildings);
   void Get3dMode(bool & allow3d, bool & allow3dBuildings);
 
+  TrafficManager & GetTrafficManager() { return m_work.GetTrafficManager(); }
+
   void SetMapLanguageCode(std::string const & languageCode);
   std::string GetMapLanguageCode();
 

android/sdk/src/main/cpp/app/organicmaps/sdk/MapManager.cpp

@@ -587,4 +587,11 @@ JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeG
   storage::CountryId const & res = g_framework->GetPlacePageInfo().GetCountryId();
   return (res == storage::kInvalidCountryId ? nullptr : jni::ToJavaString(env, res));
 }
+
+// static native boolean nativeIsMapTooOldToEdit(String countryId);
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeIsMapTooOldToEdit(JNIEnv *env, jclass clazz,
+                                                                                            jstring country_id)
+{
+  return GetStorage().IsMapTooOldToEdit(jni::ToNativeString(env, country_id));
+}
 }  // extern "C"

android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp

@@ -1,6 +1,7 @@
 #include "app/organicmaps/sdk/Framework.hpp"
 
 #include "app/organicmaps/sdk/platform/AndroidPlatform.hpp"
+#include "app/organicmaps/sdk/traffxml/AndroidTraffSource.hpp"
 
 #include "app/organicmaps/sdk/core/jni_helper.hpp"
 
@@ -34,6 +35,26 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_OrganicMaps_nativeInitFramework(
       JNIEnv * env = jni::GetEnv();
       jmethodID const methodId = jni::GetMethodID(env, *onComplete, "run", "()V");
       env->CallVoidMethod(*onComplete, methodId);
+
+      ASSERT(g_framework, ("g_framework must be non-null"));
+
+      /*
+       * Add traffic sources for Android.
+       */
+      jclass configClass = env->FindClass("app/organicmaps/sdk/util/Config");
+      jmethodID const getTrafficLegacyEnabledId = jni::GetStaticMethodID(env, configClass,
+                                                                         "getTrafficLegacyEnabled", "()Z");
+      jmethodID const applyTrafficLegacyEnabledId = jni::GetStaticMethodID(env, configClass,
+                                                                           "applyTrafficLegacyEnabled", "(Z)V");
+      jmethodID const getTrafficAppsId = jni::GetStaticMethodID(env, configClass,
+                                                                "getTrafficApps", "()[Ljava/lang/String;");
+      jmethodID const applyTrafficAppsId = jni::GetStaticMethodID(env, configClass,
+                                                                  "applyTrafficApps", "([Ljava/lang/String;)V");
+
+      env->CallStaticVoidMethod(configClass, applyTrafficLegacyEnabledId,
+                                env->CallStaticBooleanMethod(configClass, getTrafficLegacyEnabledId));
+      env->CallStaticVoidMethod(configClass, applyTrafficAppsId,
+                                (jobjectArray)env->CallStaticObjectMethod(configClass, getTrafficAppsId));
     });
   }
 }

android/sdk/src/main/cpp/app/organicmaps/sdk/traffxml/AndroidTraffSource.cpp

@@ -0,0 +1,115 @@
+#include "AndroidTraffSource.hpp"
+
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
+
+namespace traffxml {
+void AndroidTraffSourceV0_7::Create(TraffSourceManager & manager)
+{
+  std::unique_ptr<AndroidTraffSourceV0_7> source = std::unique_ptr<AndroidTraffSourceV0_7>(new AndroidTraffSourceV0_7(manager));
+  manager.RegisterSource(std::move(source));
+}
+
+AndroidTraffSourceV0_7::AndroidTraffSourceV0_7(TraffSourceManager & manager)
+  : TraffSource(manager)
+{
+  JNIEnv * env = jni::GetEnv();
+
+  static jclass const implClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/traffxml/SourceImplV0_7");
+
+  static jmethodID const implConstructor = jni::GetConstructorID(env, implClass, "(Landroid/content/Context;J)V");
+
+  jlong nativeManager = reinterpret_cast<jlong>(&manager);
+
+  jobject implObject = env->NewObject(
+      implClass, implConstructor, android::Platform::Instance().GetContext(), nativeManager);
+
+  m_implObject = env->NewGlobalRef(implObject);
+
+  m_subscribeImpl = jni::GetMethodID(env, m_implObject, "subscribe", "(Ljava/lang/String;)V");
+  m_unsubscribeImpl = jni::GetMethodID(env, m_implObject, "unsubscribe", "()V");
+}
+
+AndroidTraffSourceV0_7::~AndroidTraffSourceV0_7()
+{
+  jni::GetEnv()->DeleteGlobalRef(m_implObject);
+}
+
+void AndroidTraffSourceV0_7::Close()
+{
+  Unsubscribe();
+}
+
+void AndroidTraffSourceV0_7::Subscribe(std::set<MwmSet::MwmId> & mwms)
+{
+  jni::GetEnv()->CallVoidMethod(m_implObject, m_subscribeImpl, nullptr);
+}
+
+void AndroidTraffSourceV0_7::Unsubscribe()
+{
+  jni::GetEnv()->CallVoidMethod(m_implObject, m_unsubscribeImpl);
+}
+
+void AndroidTraffSourceV0_8::Create(TraffSourceManager & manager, std::string const & packageId)
+{
+  std::unique_ptr<AndroidTraffSourceV0_8> source = std::unique_ptr<AndroidTraffSourceV0_8>(new AndroidTraffSourceV0_8(manager, packageId));
+  manager.RegisterSource(std::move(source));
+}
+
+AndroidTraffSourceV0_8::AndroidTraffSourceV0_8(TraffSourceManager & manager, std::string const & packageId)
+  : TraffSource(manager)
+{
+  JNIEnv * env = jni::GetEnv();
+
+  static jclass const implClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/traffxml/SourceImplV0_8");
+
+  static jmethodID const implConstructor = jni::GetConstructorID(env, implClass, "(Landroid/content/Context;JLjava/lang/String;)V");
+
+  jlong nativeManager = reinterpret_cast<jlong>(&manager);
+
+  jobject implObject = env->NewObject(
+      implClass, implConstructor, android::Platform::Instance().GetContext(), nativeManager, jni::ToJavaString(env, packageId));
+
+  m_implObject = env->NewGlobalRef(implObject);
+
+  m_subscribeImpl = jni::GetMethodID(env, m_implObject, "subscribe", "(Ljava/lang/String;)V");
+  m_changeSubscriptionImpl = jni::GetMethodID(env, m_implObject, "changeSubscription", "(Ljava/lang/String;)V");
+  m_unsubscribeImpl = jni::GetMethodID(env, m_implObject, "unsubscribe", "()V");
+
+  // TODO packageId (if we need that at all here)
+}
+
+AndroidTraffSourceV0_8::~AndroidTraffSourceV0_8()
+{
+  jni::GetEnv()->DeleteGlobalRef(m_implObject);
+}
+
+void AndroidTraffSourceV0_8::Close()
+{
+  Unsubscribe();
+}
+
+void AndroidTraffSourceV0_8::Subscribe(std::set<MwmSet::MwmId> & mwms)
+{
+  JNIEnv * env = jni::GetEnv();
+  std::string data = "<filter_list>\n"
+      + GetMwmFilters(mwms)
+      + "</filter_list>";
+
+  env->CallVoidMethod(m_implObject, m_subscribeImpl, jni::ToJavaString(env, data));
+}
+
+void AndroidTraffSourceV0_8::ChangeSubscription(std::set<MwmSet::MwmId> & mwms)
+{
+  JNIEnv * env = jni::GetEnv();
+  std::string data = "<filter_list>\n"
+      + GetMwmFilters(mwms)
+      + "</filter_list>";
+
+  env->CallVoidMethod(m_implObject, m_changeSubscriptionImpl, jni::ToJavaString(env, data));
+}
+
+void AndroidTraffSourceV0_8::Unsubscribe()
+{
+  jni::GetEnv()->CallVoidMethod(m_implObject, m_unsubscribeImpl);
+}
+}  // namespace traffxml

android/sdk/src/main/cpp/app/organicmaps/sdk/traffxml/AndroidTraffSource.hpp

@@ -0,0 +1,199 @@
+#pragma once
+
+#include "traffxml/traff_source.hpp"
+
+namespace traffxml
+{
+/**
+ * @brief A TraFF source which relies on Android Binder for message delivery, using version 0.7 of the TraFF protocol.
+ *
+ * TraFF 0.7 does not support subscriptions. Messages are broadcast as the payload to a `FEED` intent.
+ */
+class AndroidTraffSourceV0_7 : public TraffSource
+{
+public:
+  /**
+   * @brief Creates a new `AndroidTraffSourceV0_7` instance and registers it with the traffic manager.
+   *
+   * @param manager The traffic manager to register the new instance with
+   */
+  static void Create(TraffSourceManager & manager);
+
+  virtual ~AndroidTraffSourceV0_7() override;
+
+  /**
+   * @brief Prepares the traffic source for unloading.
+   */
+  // TODO do we need a close operation here?
+  // TODO move this to the parent class and override it here?
+  void Close();
+
+  /**
+   * @brief Subscribes to a traffic service.
+   *
+   * TraFF 0.7 does not support subscriptions. This implementation registers a broadcast receiver.
+   *
+   * @param mwms The MWMs for which data is needed (not used by this implementation).
+   */
+  virtual void Subscribe(std::set<MwmSet::MwmId> & mwms) override;
+
+  /**
+   * @brief Changes an existing traffic subscription.
+   *
+   * This implementation does nothing, as TraFF 0.7 does not support subscriptions.
+   *
+   * @param mwms The new set of MWMs for which data is needed.
+   */
+  virtual void ChangeSubscription(std::set<MwmSet::MwmId> & mwms) override {};
+
+  /**
+   * @brief Unsubscribes from a traffic service we are subscribed to.
+   *
+   * TraFF 0.7 does not support subscriptions. This implementation unregisters the broadcast
+   * receiver which was registered by `Subscribe()`.
+   */
+  virtual void Unsubscribe() override;
+
+  /**
+   * @brief Whether this source should be polled.
+   *
+   * Prior to calling `Poll()` on a source, the caller should always first call `IsPollNeeded()` and
+   * poll the source only if the result is true.
+   *
+   * This implementation always returns false, as message delivery on Android uses `FEED` (push).
+   *
+   * @return true if the source should be polled, false if not.
+   */
+  virtual bool IsPollNeeded() override { return false; };
+
+  /**
+   * @brief Polls the traffic service for updates.
+   *
+   * This implementation does nothing, as message delivery on Android uses `FEED` (push).
+   */
+  virtual void Poll() override {};
+
+protected:
+  /**
+   * @brief Constructs a new `AndroidTraffSourceV0_7`.
+   * @param manager The `TrafficSourceManager` instance to register the source with.
+   */
+  AndroidTraffSourceV0_7(TraffSourceManager & manager);
+
+private:
+  // TODO “subscription” (i.e. broadcast receiver) state
+
+  /**
+   * @brief The Java implementation class instance.
+   */
+  jobject m_implObject;
+
+  /**
+   * @brief The Java subscribe method.
+   */
+  jmethodID m_subscribeImpl;
+
+  /**
+   * @brief The Java unsubscribe method.
+   */
+  jmethodID m_unsubscribeImpl;
+};
+
+/**
+ * @brief A TraFF source which relies on Android Binder for message delivery, using version 0.8 of the TraFF protocol.
+ *
+ * TraFF 0.8 supports subscriptions. Messages are announced through a `FEED` intent, whereupon the
+ * consumer can retrieve them from a content provider.
+ */
+class AndroidTraffSourceV0_8 : public TraffSource
+{
+public:
+  /**
+   * @brief Creates a new `AndroidTraffSourceV0_8` instance and registers it with the traffic manager.
+   *
+   * @param manager The traffic manager to register the new instance with
+   * @param packageId The package ID of the app providing the TraFF source.
+   */
+  static void Create(TraffSourceManager & manager, std::string const & packageId);
+
+  virtual ~AndroidTraffSourceV0_8() override;
+
+  /**
+   * @brief Prepares the traffic source for unloading.
+   *
+   * If there is still an active subscription, it unsubscribes, but without processing the result
+   * received from the service. Otherwise, teardown is a no-op.
+   */
+  // TODO move this to the parent class and override it here?
+  void Close();
+
+  /**
+   * @brief Subscribes to a traffic service.
+   *
+   * @param mwms The MWMs for which data is needed.
+   */
+  virtual void Subscribe(std::set<MwmSet::MwmId> & mwms) override;
+
+  /**
+   * @brief Changes an existing traffic subscription.
+   *
+   * @param mwms The new set of MWMs for which data is needed.
+   */
+  virtual void ChangeSubscription(std::set<MwmSet::MwmId> & mwms) override;
+
+  /**
+   * @brief Unsubscribes from a traffic service we are subscribed to.
+   */
+  virtual void Unsubscribe() override;
+
+  /**
+   * @brief Whether this source should be polled.
+   *
+   * Prior to calling `Poll()` on a source, the caller should always first call `IsPollNeeded()` and
+   * poll the source only if the result is true.
+   *
+   * This implementation always returns false, as message delivery on Android uses `FEED` (push).
+   *
+   * @return true if the source should be polled, false if not.
+   */
+  virtual bool IsPollNeeded() override { return false; };
+
+  /**
+   * @brief Polls the traffic service for updates.
+   *
+   * This implementation does nothing, as message delivery on Android uses `FEED` (push).
+   */
+  virtual void Poll() override {};
+
+protected:
+  /**
+   * @brief Constructs a new `AndroidTraffSourceV0_8`.
+   * @param manager The `TrafficSourceManager` instance to register the source with.
+   * @param packageId The package ID of the app providing the TraFF source.
+   */
+  AndroidTraffSourceV0_8(TraffSourceManager & manager, std::string const & packageId);
+
+private:
+  // TODO subscription state
+
+  /**
+   * @brief The Java implementation class instance.
+   */
+  jobject m_implObject;
+
+  /**
+   * @brief The Java subscribe method.
+   */
+  jmethodID m_subscribeImpl;
+
+  /**
+   * @brief The Java changeSubscription method.
+   */
+  jmethodID m_changeSubscriptionImpl;
+
+  /**
+   * @brief The Java unsubscribe method.
+   */
+  jmethodID m_unsubscribeImpl;
+};
+}  // namespace traffxml

android/sdk/src/main/cpp/app/organicmaps/sdk/traffxml/SourceImpl.cpp

@@ -0,0 +1,34 @@
+// TODO which of the two do we need? (jni_helper includes jni)
+//#include <jni>
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
+
+#include "traffxml/traff_source.hpp"
+#include "traffxml/traff_model_xml.hpp"
+
+#include <optional>
+
+extern "C"
+{
+  JNIEXPORT void JNICALL
+  Java_app_organicmaps_sdk_traffxml_SourceImpl_onFeedReceivedImpl(JNIEnv * env, jclass thiz, jlong nativeManager, jstring feed)
+  {
+    std::string feedStd = jni::ToNativeString(env, feed);
+    pugi::xml_document document;
+    traffxml::TraffFeed parsedFeed;
+
+    if (!document.load_string(feedStd.c_str()))
+    {
+      LOG(LWARNING, ("Feed is not a well-formed XML document"));
+      return;
+    }
+
+    if (!traffxml::ParseTraff(document, std::nullopt, parsedFeed))
+    {
+      LOG(LWARNING, ("Feed is not a valid TraFF feed"));
+      return;
+    }
+
+    traffxml::TraffSourceManager & manager = *reinterpret_cast<traffxml::TraffSourceManager*>(nativeManager);
+    manager.ReceiveFeed(parsedFeed);
+  }
+}

android/sdk/src/main/cpp/app/organicmaps/sdk/util/Config.cpp

@@ -119,4 +119,74 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetTranslitera
   frm()->SaveTransliteration(value);
   frm()->AllowTransliteration(value);
 }
+
+JNIEXPORT jboolean JNICALL
+Java_app_organicmaps_sdk_util_Config_nativeGetTrafficHttpEnabled(JNIEnv * env, jclass thiz)
+{
+  return frm()->LoadTrafficHttpEnabled();
+}
+
+JNIEXPORT void JNICALL
+Java_app_organicmaps_sdk_util_Config_nativeSetTrafficHttpEnabled(JNIEnv * env, jclass thiz,
+                                                                 jboolean value)
+{
+  frm()->SaveTrafficHttpEnabled(value);
+  frm()->SetTrafficHttpEnabled(value);
+}
+
+JNIEXPORT jstring JNICALL
+Java_app_organicmaps_sdk_util_Config_nativeGetTrafficHttpUrl(JNIEnv * env, jclass thiz)
+{
+  std::string value = frm()->LoadTrafficHttpUrl();
+  return jni::ToJavaString(env, value);
+}
+
+JNIEXPORT void JNICALL
+Java_app_organicmaps_sdk_util_Config_nativeSetTrafficHttpUrl(JNIEnv * env, jclass thiz,
+                                                             jstring value)
+{
+  frm()->SaveTrafficHttpUrl(jni::ToNativeString(env, value));
+  frm()->SetTrafficHttpUrl(jni::ToNativeString(env, value));
+}
+
+JNIEXPORT void JNICALL
+Java_app_organicmaps_sdk_util_Config_applyTrafficLegacyEnabled(JNIEnv * env, jclass thiz,
+                                                               jboolean value)
+{
+  TrafficManager & tm = g_framework->GetTrafficManager();
+  tm.RemoveTraffSourceIf([](traffxml::TraffSource* source) {
+    if (traffxml::AndroidTraffSourceV0_7* traffSource = dynamic_cast<traffxml::AndroidTraffSourceV0_7*>(source))
+    {
+      traffSource->Close();
+      return true;
+    }
+    else
+      return false;
+  });
+  if (value)
+    traffxml::AndroidTraffSourceV0_7::Create(tm);
+}
+
+JNIEXPORT void JNICALL
+Java_app_organicmaps_sdk_util_Config_applyTrafficApps(JNIEnv * env, jclass thiz, jobjectArray value)
+{
+  jsize valueLen = env->GetArrayLength(value);
+  TrafficManager & tm = g_framework->GetTrafficManager();
+  tm.RemoveTraffSourceIf([](traffxml::TraffSource* source) {
+    if (traffxml::AndroidTraffSourceV0_8* traffSource = dynamic_cast<traffxml::AndroidTraffSourceV0_8*>(source))
+    {
+      traffSource->Close();
+      return true;
+    }
+    else
+      return false;
+  });
+  for (jsize i = 0; i < valueLen; i++)
+  {
+    jstring jAppId = (jstring)env->GetObjectArrayElement(value, i);
+    std::string appId = jni::ToNativeString(env, jAppId);
+    traffxml::AndroidTraffSourceV0_8::Create(tm, appId);
+    env->DeleteLocalRef(jAppId);
+  }
+}
 }  // extern "C"

android/sdk/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java

@@ -27,4 +27,5 @@ public class DownloadResourcesLegacyActivity
   public static native int nativeGetBytesToDownload();
   public static native int nativeStartNextFileDownload(Listener listener);
   public static native void nativeCancelCurrentFile();
+  public static native void nativeResetMetaConfig();
 }

android/sdk/src/main/java/app/organicmaps/sdk/Framework.java

@@ -1,10 +1,13 @@
 package app.organicmaps.sdk;
 
+import android.content.Context;
 import android.graphics.Bitmap;
+
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Size;
+
 import app.organicmaps.sdk.api.ParsedRoutingData;
 import app.organicmaps.sdk.api.ParsedSearchRequest;
 import app.organicmaps.sdk.api.RequestType;
@@ -23,6 +26,7 @@ import app.organicmaps.sdk.routing.RoutingRecommendationListener;
 import app.organicmaps.sdk.routing.TransitRouteInfo;
 import app.organicmaps.sdk.settings.SpeedCameraMode;
 import app.organicmaps.sdk.util.Constants;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -348,4 +352,20 @@ public class Framework
 
   public static native void nativeMemoryWarning();
   public static native void nativeSaveRoute();
+  public static native void nativeSetCustomMapDownloadUrl(String url);
+
+  public static void applyCustomMapDownloadUrl(@NonNull Context context, @Nullable String url)
+  {
+    nativeSetCustomMapDownloadUrl(normalizeServerUrl(url));
+    // Reset the legacy downloader too (world/coasts).
+    app.organicmaps.sdk.DownloadResourcesLegacyActivity.nativeResetMetaConfig();
+  }
+
+  public static String normalizeServerUrl(@Nullable String url)
+  {
+    String out = url != null ? url.trim() : "";
+    if (!out.isEmpty() && !out.endsWith("/"))
+      out = out + "/";
+    return out;
+  }
 }

android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java

@@ -2,10 +2,13 @@ package app.organicmaps.sdk;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+
 import androidx.annotation.NonNull;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;
+import androidx.preference.PreferenceManager;
+
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround;
@@ -25,6 +28,7 @@ import app.organicmaps.sdk.util.SharedPropertiesUtils;
 import app.organicmaps.sdk.util.StorageUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.sdk.util.log.LogsManager;
+
 import java.io.IOException;
 
 public final class OrganicMaps implements DefaultLifecycleObserver
@@ -167,6 +171,11 @@ public final class OrganicMaps implements DefaultLifecycleObserver
                        /* isTablet */ false);
     Config.setStoragePath(writablePath);
 
+    // Use the same prefs as SettingsPrefsFragment
+    final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
+    final String savedUrl = prefs.getString(mContext.getString(R.string.pref_custom_map_download_url), "");
+    Framework.nativeSetCustomMapDownloadUrl(savedUrl.trim());
+
     mPlatformInitialized = true;
     Logger.i(TAG, "Platform initialized");
   }

android/sdk/src/main/java/app/organicmaps/sdk/downloader/MapManager.java

@@ -261,4 +261,9 @@ public final class MapManager
    * Returns country ID which the current PP object points to, or {@code null}.
    */
   public static native @Nullable String nativeGetSelectedCountry();
+
+  /**
+   * Returns true when the map exists and is too old for map editing.
+   */
+  public static native boolean nativeIsMapTooOldToEdit(String countryId);
 }

android/sdk/src/main/java/app/organicmaps/sdk/traffxml/AndroidConsumer.java

@@ -0,0 +1,111 @@
+/*
+ * Copyright © 2017–2020 traffxml.org.
+ * 
+ * Relicensed to CoMaps by the original author.
+ */
+
+package app.organicmaps.sdk.traffxml;
+
+import java.util.List;
+
+import app.organicmaps.sdk.traffxml.Version;
+import app.organicmaps.sdk.traffxml.AndroidTransport;
+
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.IntentFilter.MalformedMimeTypeException;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.Bundle;
+
+public class AndroidConsumer {
+	/**
+	 * Creates an Intent filter which matches the Intents a TraFF consumer needs to receive.
+	 * 
+	 * <p>Different filters are available for consumers implementing different versions of the TraFF
+	 * specification.
+	 * 
+	 * @param version The version of the TraFF specification (one of the constants in {@link org.traffxml.traff.Version})
+	 * 
+	 * @return An intent filter matching the necessary Intents
+	 */
+	public static IntentFilter createIntentFilter(int version) {
+		IntentFilter res = new IntentFilter();
+		switch (version) {
+		case Version.V0_7:
+			res.addAction(AndroidTransport.ACTION_TRAFF_PUSH);
+			break;
+		case Version.V0_8:
+			res.addAction(AndroidTransport.ACTION_TRAFF_PUSH);
+			res.addDataScheme(AndroidTransport.CONTENT_SCHEMA);
+	        try {
+	        	res.addDataType(AndroidTransport.MIME_TYPE_TRAFF);
+	        } catch (MalformedMimeTypeException e) {
+	        	// as long as the constant is a well-formed MIME type, this exception never gets thrown
+	        	e.printStackTrace();
+	        }
+			break;
+		default:
+			throw new IllegalArgumentException("Invalid version code: " + version);
+		}
+		return res;
+	}
+	
+	/**
+	 * Sends a TraFF intent to a source.
+	 * 
+	 * <p>This encapsulates most of the low-level Android handling.
+	 * 
+	 * <p>If the recipient specified in {@code packageName} declares multiple receivers for the intent in its
+	 * manifest, a separate intent will be delivered to each of them. The intent will not be delivered to
+	 * receivers registered at runtime.
+	 * 
+	 * <p>All intents are sent as explicit ordered broadcasts. This means two things:
+	 * 
+	 * <p>Any app which declares a matching receiver in its manifest will be woken up to process the intent.
+	 * This works even with certain Android 7 builds which restrict intent delivery to apps which are not
+	 * currently running.
+	 * 
+	 * <p>It is safe for the recipient to unconditionally set result data. If the recipient does not set
+	 * result data, the result will have a result code of
+	 * {@link org.traffxml.transport.android.AndroidTransport#RESULT_INTERNAL_ERROR}, no data and no extras.
+	 * 
+	 * @param context The context
+	 * @param action The intent action.
+	 * @param data The intent data (for TraFF, this is the content provider URI), or null
+	 * @param extras The extras for the intent
+	 * @param packageName The package name for the intent recipient, or null to deliver the intent to all matching receivers
+	 * @param receiverPermission A permission which the recipient must hold, or null if not required
+	 * @param resultReceiver A BroadcastReceiver which will receive the result for the intent
+	 */
+	public static void sendTraffIntent(Context context, String action, Uri data, Bundle extras, String packageName,
+			String receiverPermission, BroadcastReceiver resultReceiver) {
+		Intent outIntent = new Intent(action);
+		PackageManager pm = context.getPackageManager();
+		List<ResolveInfo> receivers = pm.queryBroadcastReceivers(outIntent, 0);
+		if (receivers != null)
+			for (ResolveInfo receiver : receivers) {
+				if ((packageName != null) && !packageName.equals(receiver.activityInfo.applicationInfo.packageName))
+					continue;
+				ComponentName cn = new ComponentName(receiver.activityInfo.applicationInfo.packageName,
+						receiver.activityInfo.name);
+				outIntent = new Intent(action);
+				if (data != null)
+					outIntent.setData(data);
+				if (extras != null)
+					outIntent.putExtras(extras);
+				outIntent.setComponent(cn);
+				context.sendOrderedBroadcast (outIntent, 
+		                receiverPermission, 
+		                resultReceiver, 
+		                null, // scheduler, 
+		                AndroidTransport.RESULT_INTERNAL_ERROR, // initialCode, 
+		                null, // initialData, 
+		                null);
+			}
+	}
+}

android/sdk/src/main/java/app/organicmaps/sdk/traffxml/AndroidTransport.java

@@ -0,0 +1,222 @@
+/*
+ * Copyright © 2019–2020 traffxml.org.
+ * 
+ * Relicensed to CoMaps by the original author.
+ */
+
+package app.organicmaps.sdk.traffxml;
+
+public class AndroidTransport {
+    /**
+     * Intent to poll a peer for its capabilities.
+     * 
+     * <p>This is a broadcast intent and must be sent as an explicit broadcast.
+     */
+    public static final String ACTION_TRAFF_GET_CAPABILITIES = "org.traffxml.traff.GET_CAPABILITIES";
+
+    /**
+     * Intent to send a heartbeat to a peer.
+     * 
+     * <p>This is a broadcast intent and must be sent as an explicit broadcast.
+     */
+    public static final String ACTION_TRAFF_HEARTBEAT = "org.traffxml.traff.GET_HEARTBEAT";
+
+    /**
+     * Intent to poll a source for information.
+     * 
+     * <p>This is a broadcast intent and must be sent as an explicit broadcast.
+     * 
+     * <p>Polling is a legacy feature on Android and deprecated in TraFF 0.8 (rather than polling, TraFF 0.8
+     * applications query the content provider). Therefore, poll operations are subscriptionless, and the
+     * source should either reply with all messages it currently holds, or ignore the request.
+     */
+    @Deprecated
+    public static final String ACTION_TRAFF_POLL = "org.traffxml.traff.POLL";
+
+    /**
+     * Intent for a push feed.
+     * 
+     * <p>This is a broadcast intent. It can be used in different forms:
+     * 
+     * <p>As of TraFF 0.8, it must be sent as an explicit broadcast and include the
+     * {@link #EXTRA_SUBSCRIPTION_ID} extra. The intent data must be a URI to the content provider from which
+     * the messages can be retrieved. The {@link #EXTRA_FEED} extra is not supported. The feed is part of a
+     * subscription and will contain only changes over feeds sent previously as part of the same
+     * subscription.
+     * 
+     * <p>Legacy applications omit the {@link #EXTRA_SUBSCRIPTION_ID} extra and may send it as an implicit
+     * broadcast. If an application supports both legacy transport and TraFF 0.8 or later, it must include
+     * the {@link #EXTRA_PACKAGE} extra. The feed is sent in the {@link #EXTRA_FEED} extra, as legacy
+     * applications may not support content providers. If sent as a response to a subscriptionless poll, the
+     * source should include all messages it holds, else the set of messages included is at the discretion of
+     * the source.
+     * 
+     * <p>Future applications may reintroduce unsolicited push operations for certain scenarios.
+     */
+    public static final String ACTION_TRAFF_PUSH = "org.traffxml.traff.FEED";
+
+    /**
+     * Intent for a subscription request.
+     * 
+     * <p>This is a broadcast intent and must be sent as an explicit broadcast.
+     * 
+     * <p>The filter list must be specified in the {@link #EXTRA_FILTER_LIST} extra.
+     * 
+     * <p>The sender must indicate its package name in the {@link #EXTRA_PACKAGE} extra.
+     */
+    public static final String ACTION_TRAFF_SUBSCRIBE = "org.traffxml.traff.SUBSCRIBE";
+
+    /**
+     * Intent for a subscription change request,
+     * 
+     * <p>This is a broadcast intent and must be sent as an explicit broadcast.
+     * 
+     * <p>This intent must have {@link #EXTRA_SUBSCRIPTION_ID} set to the ID of an existing subscription between
+     * the calling consumer and the source which receives the broadcast.
+     * 
+     * <p>The new filter list must be specified in the {@link #EXTRA_FILTER_LIST} extra.
+     */
+    public static final String ACTION_TRAFF_SUBSCRIPTION_CHANGE = "org.traffxml.traff.SUBSCRIPTION_CHANGE";
+
+    /**
+     * Intent for an unsubscribe request,
+     * 
+     * <p>This is a broadcast intent and must be sent as an explicit broadcast.
+     * 
+     * <p>This intent must have {@link #EXTRA_SUBSCRIPTION_ID} set to the ID of an existing subscription between
+     * the calling consumer and the source which receives the broadcast. It signals that the consumer is no
+     * longer interested in receiving messages related to that subscription, and that the source should stop
+     * sending updates. Unsubscribing from a nonexistent subscription is a no-op.
+     */
+    public static final String ACTION_TRAFF_UNSUBSCRIBE = "org.traffxml.traff.UNSUBSCRIBE";
+
+    /**
+     * Name for the column which holds the message data.
+     */
+    public static final String COLUMN_DATA = "data";
+
+    /**
+     * Schema for TraFF content URIs.
+     */
+    public static final String CONTENT_SCHEMA = "content";
+    
+    /**
+     * String representations of TraFF result codes
+     */
+    public static final String[] ERROR_STRINGS = {
+        "unknown (0)",
+        "invalid request (1)",
+        "subscription rejected by the source (2)",
+        "requested area not covered (3)",
+        "requested area partially covered (4)",
+        "subscription ID not recognized by the source (5)",
+        "unknown (6)",
+        "source reported an internal error (7)"
+    };
+
+    /**
+     * Extra which contains the capabilities of the peer.
+     * 
+     * <p>This is a String extra. It contains a {@code capabilities} XML element.
+     */
+    public static final String EXTRA_CAPABILITIES = "capabilities";
+
+   /**
+     * Extra which contains a TraFF feed.
+     * 
+     * <p>This is a String extra. It contains a {@code feed} XML element.
+     * 
+     * <p>The sender should be careful to keep the size of this extra low, as Android has a 1 MByte limit on all
+     * pending Binder transactions. However, there is no feedback to the sender about the capacity still
+     * available, or whether a request exceeds that limit. Therefore, senders should keep the size if each
+     * feed significantly below that limit. If necessary, they should split up a feed into multiple smaller
+     * ones and send them with a delay in between.
+     * 
+     * <p>This mechanism is deprecated since TraFF 0.8 and peers are no longer required to support it. Peers
+     * which support TraFF 0.8 must rely on content providers for message transport.
+     */
+    @Deprecated
+    public static final String EXTRA_FEED = "feed";
+
+    /**
+     * Extra which contains a filter list.
+     * 
+     * <p>This is a String extra. It contains a {@code filter_list} XML element.
+     */
+    public static final String EXTRA_FILTER_LIST = "filter_list";
+
+    /**
+     * Extra which contains the package name of the app sending it.
+     * 
+     * <p>This is a String extra.
+     */
+    public static final String EXTRA_PACKAGE = "package";
+
+    /**
+     * Extra which contains a subscription ID.
+     * 
+     * <p>This is a String extra.
+     */
+    public static final String EXTRA_SUBSCRIPTION_ID = "subscription_id";
+
+    /**
+     * Extra which contains the timeout duration for a subscription.
+     * 
+     * <p>This is an integer extra.
+     */
+    public static final String EXTRA_TIMEOUT = "timeout";
+
+    /**
+     * The MIME type for TraFF content providers.
+     */
+    public static final String MIME_TYPE_TRAFF = "vnd.android.cursor.dir/org.traffxml.message";
+
+    /**
+     * The operation completed successfully.
+     */
+    public static final int RESULT_OK = -1;
+
+    /**
+     * An internal error prevented the recipient from fulfilling the request.
+     */
+    public static final int RESULT_INTERNAL_ERROR = 7;
+
+    /**
+     * A nonexistent operation was attempted, or an operation was attempted with incomplete or otherwise
+     * invalid data.
+     */
+    public static final int RESULT_INVALID = 1;
+
+    /**
+     * The subscription was rejected, and no messages will be sent.
+     */
+    public static final int RESULT_SUBSCRIPTION_REJECTED = 2;
+
+    /**
+     * The subscription was rejected because the source will never provide messages matching the selection.
+     */
+    public static final int RESULT_NOT_COVERED = 3;
+
+    /**
+     * The subscription was accepted but the source can only provide messages for parts of the selection.
+     */
+    public static final int RESULT_PARTIALLY_COVERED = 4;
+
+    /**
+     * The request failed because it refers to a subscription which does not exist between the source and
+     * consumer involved.
+     */
+    public static final int RESULT_SUBSCRIPTION_UNKNOWN = 5;
+
+    /**
+     * The request failed because the aggregator does not accept unsolicited push requests from the sensor.
+     */
+    public static final int RESULT_PUSH_REJECTED = 6;
+    
+    public static String formatTraffError(int code) {
+      if ((code < 0) || (code >= ERROR_STRINGS.length))
+        return String.format("unknown (%d)", code);
+      else
+        return ERROR_STRINGS[code];
+    }
+}

android/sdk/src/main/java/app/organicmaps/sdk/traffxml/SourceImpl.java

@@ -0,0 +1,70 @@
+package app.organicmaps.sdk.traffxml;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+
+/**
+ * Abstract superclass for TraFF source implementations.
+ */
+public abstract class SourceImpl extends BroadcastReceiver
+{
+  /**
+   * Creates a new instance.
+   * 
+   * @param context The application context
+   */
+  public SourceImpl(Context context, long nativeManager)
+  {
+    super();
+    this.context = context;
+    this.nativeManager = nativeManager;
+  }
+  
+  protected Context context;
+  
+  /**
+   * The native `TraffSourceManager` instance.
+   */
+  protected long nativeManager;
+  
+  /**
+   * Subscribes to a traffic source.
+   * 
+   * @param filterList The filter list in XML format
+   */
+  public abstract void subscribe(String filterList);
+  
+  /**
+   * Changes an existing traffic subscription.
+   * 
+   * @param filterList The filter list in XML format
+   */
+  public abstract void changeSubscription(String filterList);
+  
+  /**
+   * Unsubscribes from a traffic source we are subscribed to.
+   */
+  public abstract void unsubscribe();
+  
+  /**
+   * Forwards a newly received TraFF feed to the traffic module for processing.
+   *
+   * Called when a TraFF feed is received. This is a wrapper around {@link #onFeedReceivedImpl(long, String)}.
+   *
+   * @param feed The TraFF feed
+   */
+  protected void onFeedReceived(String feed)
+  {
+    onFeedReceivedImpl(nativeManager, feed);
+  }
+  
+  /**
+   * Forwards a newly received TraFF feed to the traffic module for processing.
+   *
+   * Called when a TraFF feed is received.
+   *
+   * @param nativeManager The native `TraffSourceManager` instance
+   * @param feed The TraFF feed
+   */
+  protected static native void onFeedReceivedImpl(long nativeManager, String feed);
+}

android/sdk/src/main/java/app/organicmaps/sdk/traffxml/SourceImplV0_7.java

@@ -0,0 +1,127 @@
+package app.organicmaps.sdk.traffxml;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import android.Manifest;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import app.organicmaps.sdk.util.log.Logger;
+
+/**
+ * Implementation for a TraFF 0.7 source.
+ */
+public class SourceImplV0_7 extends SourceImpl
+{
+  private PackageManager pm;
+
+  /**
+   * Creates a new instance.
+   * 
+   * @param context The application context
+   */
+  public SourceImplV0_7(Context context, long nativeManager)
+  {
+    super(context, nativeManager);
+    // TODO Auto-generated constructor stub
+  }
+
+  /**
+   * Subscribes to a traffic source.
+   * 
+   * @param filterList The filter list in XML format
+   */
+  @Override
+  public void subscribe(String filterList)
+  {
+    IntentFilter traffFilter07 = new IntentFilter();
+    traffFilter07.addAction(AndroidTransport.ACTION_TRAFF_PUSH);
+
+    this.context.registerReceiver(this, traffFilter07);
+
+    // Broadcast a poll intent to all TraFF 0.7-only receivers
+    Intent outIntent = new Intent(AndroidTransport.ACTION_TRAFF_POLL);
+    pm = this.context.getPackageManager();
+    List<ResolveInfo> receivers07 = pm.queryBroadcastReceivers(outIntent, 0);
+    List<ResolveInfo> receivers08 = pm.queryBroadcastReceivers(new Intent(AndroidTransport.ACTION_TRAFF_GET_CAPABILITIES), 0);
+    if (receivers07 != null)
+    {
+      /*
+       * Get receivers which support only TraFF 0.7 and poll them.
+       * If there are no TraFF 0.7 sources at the moment, we register the receiver nonetheless.
+       * That way, if any new sources are added during the session, we get any messages they send.
+       */
+      if (receivers08 != null)
+        receivers07.removeAll(receivers08);
+      for (ResolveInfo receiver : receivers07)
+      {
+        ComponentName cn = new ComponentName(receiver.activityInfo.applicationInfo.packageName,
+            receiver.activityInfo.name);
+        outIntent = new Intent(AndroidTransport.ACTION_TRAFF_POLL);
+        outIntent.setComponent(cn);
+        this.context.sendBroadcast(outIntent, Manifest.permission.ACCESS_COARSE_LOCATION);
+      }
+    }
+  }
+
+  /**
+   * Changes an existing traffic subscription.
+   * 
+   * This implementation does nothing, as TraFF 0.7 does not support subscriptions.
+   *
+   * @param filterList The filter list in XML format
+   */
+  @Override
+  public void changeSubscription(String filterList)
+  {
+    // NOP
+  }
+
+  /**
+   * Unsubscribes from a traffic source we are subscribed to.
+   */
+  @Override
+  public void unsubscribe()
+  {
+    this.context.unregisterReceiver(this);
+  }
+
+  @Override
+  public void onReceive(Context context, Intent intent)
+  {
+    if (intent == null)
+      return;
+
+    if (intent.getAction().equals(AndroidTransport.ACTION_TRAFF_PUSH))
+    {
+      /* 0.7 feed */
+      String packageName = intent.getStringExtra(AndroidTransport.EXTRA_PACKAGE);
+      /*
+       * If the feed comes from a TraFF 0.8+ source, skip it (this may happen with “bilingual”
+       * TraFF 0.7/0.8 sources). That ensures the only way to get information from such sources is
+       * through a TraFF 0.8 subscription. Fetching the list from scratch each time ensures that
+       * apps installed during runtime get considered.)  
+       */
+      if (packageName != null)
+      {
+        for (ResolveInfo info : pm.queryBroadcastReceivers(new Intent(AndroidTransport.ACTION_TRAFF_GET_CAPABILITIES), 0))
+          if (packageName.equals(info.resolvePackageName))
+            return;
+      }
+      String feed = intent.getStringExtra(AndroidTransport.EXTRA_FEED);
+      if (feed == null)
+      {
+        Logger.w(this.getClass().getSimpleName(), "empty feed, ignoring");
+      }
+      else
+      {
+        onFeedReceived(feed);
+      }
+    }
+  }
+
+}

android/sdk/src/main/java/app/organicmaps/sdk/traffxml/SourceImplV0_8.java

@@ -0,0 +1,240 @@
+package app.organicmaps.sdk.traffxml;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.IntentFilter.MalformedMimeTypeException;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import app.organicmaps.sdk.util.log.Logger;
+
+/**
+ * Implementation for a TraFF 0.8 source.
+ */
+public class SourceImplV0_8 extends SourceImpl
+{
+  
+  private String packageName;
+  private String subscriptionId = null;
+
+  /**
+   * Creates a new instance.
+   * 
+   * @param context The application context
+   * @param packageName The package name for the source
+   */
+  public SourceImplV0_8(Context context, long nativeManager, String packageName)
+  {
+    super(context, nativeManager);
+    this.packageName = packageName;
+  }
+
+  /**
+   * Subscribes to a traffic source.
+   * 
+   * @param filterList The filter list in XML format
+   */
+  @Override
+  public void subscribe(String filterList)
+  {
+    IntentFilter filter = new IntentFilter();
+    filter.addAction(AndroidTransport.ACTION_TRAFF_PUSH);
+    filter.addDataScheme(AndroidTransport.CONTENT_SCHEMA);
+    try
+    {
+      filter.addDataType(AndroidTransport.MIME_TYPE_TRAFF);
+    }
+    catch (MalformedMimeTypeException e)
+    {
+      // as long as the constant is a well-formed MIME type, this exception never gets thrown
+      // TODO revisit logging
+      e.printStackTrace();
+    }
+
+    context.registerReceiver(this, filter);
+    
+    Bundle extras = new Bundle();
+    extras.putString(AndroidTransport.EXTRA_PACKAGE, context.getPackageName());
+    extras.putString(AndroidTransport.EXTRA_FILTER_LIST, filterList);
+    AndroidConsumer.sendTraffIntent(context, AndroidTransport.ACTION_TRAFF_SUBSCRIBE, null,
+        extras, packageName, Manifest.permission.ACCESS_COARSE_LOCATION, this);
+  }
+
+  /**
+   * Changes an existing traffic subscription.
+   * 
+   * @param filterList The filter list in XML format
+   */
+  @Override
+  public void changeSubscription(String filterList)
+  {
+    Bundle extras = new Bundle();
+    extras.putString(AndroidTransport.EXTRA_SUBSCRIPTION_ID, subscriptionId);
+    extras.putString(AndroidTransport.EXTRA_FILTER_LIST, filterList);
+    AndroidConsumer.sendTraffIntent(context, AndroidTransport.ACTION_TRAFF_SUBSCRIPTION_CHANGE, null,
+        extras, packageName, Manifest.permission.ACCESS_COARSE_LOCATION, this);
+  }
+
+  /**
+   * Unsubscribes from a traffic source we are subscribed to.
+   */
+  @Override
+  public void unsubscribe()
+  {
+    Bundle extras = new Bundle();
+    extras.putString(AndroidTransport.EXTRA_SUBSCRIPTION_ID, subscriptionId);
+    AndroidConsumer.sendTraffIntent(this.context, AndroidTransport.ACTION_TRAFF_UNSUBSCRIBE, null,
+        extras, packageName, Manifest.permission.ACCESS_COARSE_LOCATION, this);
+
+    this.context.unregisterReceiver(this);
+  }
+
+  @Override
+  public void onReceive(Context context, Intent intent)
+  {
+    if (intent == null)
+      return;
+    
+    if (intent.getAction().equals(AndroidTransport.ACTION_TRAFF_PUSH))
+    {
+      Uri uri = intent.getData();
+      if (uri != null)
+      {
+        /* 0.8 feed */
+        String subscriptionId = intent.getStringExtra(AndroidTransport.EXTRA_SUBSCRIPTION_ID);
+        if (subscriptionId.equals(this.subscriptionId))
+          fetchMessages(context, uri);
+      }
+      else
+      {
+        Logger.w(this.getClass().getSimpleName(), "no URI in feed, ignoring");
+      } // uri != null
+  } else if (intent.getAction().equals(AndroidTransport.ACTION_TRAFF_SUBSCRIBE)) {
+      if (this.getResultCode() != AndroidTransport.RESULT_OK) {
+          Bundle extras = this.getResultExtras(true);
+          if (extras != null)
+            Logger.e(this.getClass().getSimpleName(), String.format("subscription to %s failed, %s",
+                      extras.getString(AndroidTransport.EXTRA_PACKAGE), AndroidTransport.formatTraffError(this.getResultCode())));
+          else
+            Logger.e(this.getClass().getSimpleName(), String.format("subscription failed, %s",
+                      AndroidTransport.formatTraffError(this.getResultCode())));
+          if (this.getResultCode() == AndroidTransport.RESULT_INTERNAL_ERROR)
+            Logger.e(this.getClass().getSimpleName(), "Make sure the TraFF source app has at least coarse location permission, even when running in background");
+          return;
+      }
+      Bundle extras = this.getResultExtras(true);
+      String data = this.getResultData();
+      String packageName = extras.getString(AndroidTransport.EXTRA_PACKAGE);
+      if (!this.packageName.equals(packageName))
+        return;
+      String subscriptionId = extras.getString(AndroidTransport.EXTRA_SUBSCRIPTION_ID);
+      if (subscriptionId == null) {
+        Logger.e(this.getClass().getSimpleName(),
+                  String.format("subscription to %s failed: no subscription ID returned", packageName));
+          return;
+      } else if (packageName == null) {
+        Logger.e(this.getClass().getSimpleName(), "subscription failed: no package name");
+          return;
+      } else if (data == null) {
+        Logger.w(this.getClass().getSimpleName(),
+                  String.format("subscription to %s successful (ID: %s) but no content URI was supplied. "
+                          + "This is an issue with the source and may result in delayed message retrieval.",
+                          packageName, subscriptionId));
+          this.subscriptionId = subscriptionId;
+          return;
+      }
+      Logger.d(this.getClass().getSimpleName(),
+          "subscription to " + packageName + " successful, ID: " + subscriptionId);
+      this.subscriptionId = subscriptionId;
+      fetchMessages(context, Uri.parse(data));
+  } else if (intent.getAction().equals(AndroidTransport.ACTION_TRAFF_SUBSCRIPTION_CHANGE)) {
+      if (this.getResultCode() != AndroidTransport.RESULT_OK) {
+          Bundle extras = this.getResultExtras(true);
+          if (extras != null)
+            Logger.e(this.getClass().getSimpleName(),
+                      String.format("subscription change for %s failed: %s",
+                              extras.getString(AndroidTransport.EXTRA_SUBSCRIPTION_ID),
+                              AndroidTransport.formatTraffError(this.getResultCode())));
+          else
+            Logger.e(this.getClass().getSimpleName(),
+                      String.format("subscription change failed: %s",
+                              AndroidTransport.formatTraffError(this.getResultCode())));
+          return;
+      }
+      Bundle extras = intent.getExtras();
+      String data = this.getResultData();
+      String subscriptionId = extras.getString(AndroidTransport.EXTRA_SUBSCRIPTION_ID);
+      if (subscriptionId == null) {
+        Logger.w(this.getClass().getSimpleName(),
+                  "subscription change successful but the source did not specify the subscription ID. "
+                          + "This is an issue with the source and may result in delayed message retrieval. "
+                          + "URI: " + data);
+          return;
+      } else if (!subscriptionId.equals(this.subscriptionId)) {
+        return;
+      } else if (data == null) {
+        Logger.w(this.getClass().getSimpleName(),
+                  String.format("subscription change for %s successful but no content URI was supplied. "
+                          + "This is an issue with the source and may result in delayed message retrieval.",
+                          subscriptionId));
+          return;
+      }
+      Logger.d(this.getClass().getSimpleName(),
+          "subscription change for " + subscriptionId + " successful");
+      fetchMessages(context, Uri.parse(data));
+  } else if (intent.getAction().equals(AndroidTransport.ACTION_TRAFF_UNSUBSCRIBE)) {
+    String subscriptionId = intent.getStringExtra(AndroidTransport.EXTRA_SUBSCRIPTION_ID);
+    if (subscriptionId.equals(this.subscriptionId))
+      this.subscriptionId = null;
+    // TODO is there anything to do here? (Comment below is from Navit)
+      /*
+       * If we ever unsubscribe for reasons other than that we are shutting down or got a feed for
+       * a subscription we don’t recognize, or if we start keeping a persistent list of
+       * subscriptions, we need to delete the subscription from our list. Until then, there is
+       * nothing to do here: either the subscription isn’t in the list, or we are about to shut
+       * down and the whole list is about to get discarded.
+       */
+  } else if (intent.getAction().equals(AndroidTransport.ACTION_TRAFF_HEARTBEAT)) {
+      String subscriptionId = intent.getStringExtra(AndroidTransport.EXTRA_SUBSCRIPTION_ID);
+      if (subscriptionId.equals(this.subscriptionId)) {
+        Logger.d(this.getClass().getSimpleName(),
+                  String.format("got a heartbeat from %s for subscription %s; sending result",
+                  intent.getStringExtra(AndroidTransport.EXTRA_PACKAGE), subscriptionId));
+          this.setResult(AndroidTransport.RESULT_OK, null, null);
+      }
+  } // intent.getAction()
+    // TODO Auto-generated method stub
+
+  }
+
+  /**
+   * Fetches TraFF messages from a content provider.
+   *
+   * @param context The context to use for the content resolver
+   * @param uri The content provider URI
+   */
+  private void fetchMessages(Context context, Uri uri) {
+      try {
+          Cursor cursor = context.getContentResolver().query(uri, new String[] {AndroidTransport.COLUMN_DATA}, null, null, null);
+          if (cursor == null)
+              return;
+          if (cursor.getCount() < 1) {
+              cursor.close();
+              return;
+          }
+          StringBuilder builder = new StringBuilder("<feed>\n");
+          while (cursor.moveToNext())
+              builder.append(cursor.getString(cursor.getColumnIndex(AndroidTransport.COLUMN_DATA))).append("\n");
+          builder.append("</feed>");
+          cursor.close();
+          onFeedReceived(builder.toString());
+      } catch (Exception e) {
+        Logger.w(this.getClass().getSimpleName(),
+            String.format("Unable to fetch messages from %s", uri.toString()), e);
+          e.printStackTrace();
+      }
+  }
+
+}

android/sdk/src/main/java/app/organicmaps/sdk/traffxml/Version.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright © 2019–2020 traffxml.org.
+ * 
+ * Relicensed to CoMaps by the original author.
+ */
+
+package app.organicmaps.sdk.traffxml;
+
+/**
+ * Constants for versions.
+ */
+public class Version {
+	/** Version 0.7: introduced transport on Android. */
+	public static final int V0_7 = 7;
+
+	/** Version 0.8: introduced subscriptions and HTTP transport. */
+	public static final int V0_8 = 8;
+}

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

@@ -70,6 +70,16 @@ public final class Config
    * True if the first start animation has been seen.
    */
   private static final String KEY_MISC_FIRST_START_DIALOG_SEEN = "FirstStartDialogSeen";
+  
+  /**
+   * Whether feeds from legacy TraFF applications (TraFF 0.7, Android transport) are enabled.
+   */
+  private static final String KEY_TRAFFIC_LEGACY_ENABLED = "TrafficLegacyEnabled";
+
+  /**
+   * TraFF (0.8+) applications from which to request traffic data.
+   */
+  private static final String KEY_TRAFFIC_APPS = "TrafficApps";
 
   private Config() {}
 
@@ -393,6 +403,63 @@ public final class Config
     nativeSetTransliteration(value);
   }
 
+  public static boolean getTrafficHttpEnabled()
+  {
+    return nativeGetTrafficHttpEnabled();
+  }
+
+  public static void setTrafficHttpEnabled(boolean value)
+  {
+    nativeSetTrafficHttpEnabled(value);
+  }
+
+  public static String getTrafficHttpUrl()
+  {
+    return nativeGetTrafficHttpUrl();
+  }
+
+  public static void setTrafficHttpUrl(String value)
+  {
+    nativeSetTrafficHttpUrl(value);
+  }
+  
+  public static String[] getTrafficApps()
+  {
+    String appString = getString(KEY_TRAFFIC_APPS, "");
+    if (appString.length() == 0)
+      return new String[0];
+    return appString.split(",");
+  }
+  
+  public static void setTrafficApps(String[] value)
+  {
+    String valueString = "";
+    for (int i = 0; i < value.length; i++)
+    {
+      valueString = valueString + value[i];
+      if ((i + 1) < value.length)
+        valueString = valueString + ",";
+    }
+    setString(KEY_TRAFFIC_APPS, valueString);
+    applyTrafficApps(value);
+  }
+
+  public static boolean getTrafficLegacyEnabled()
+  {
+    return getBool(KEY_TRAFFIC_LEGACY_ENABLED, false);
+  }
+
+  public static void setTrafficLegacyEnabled(boolean value)
+  {
+    setBool(KEY_TRAFFIC_LEGACY_ENABLED, value);
+    applyTrafficLegacyEnabled(value);
+  }
+
+  public static boolean isNY()
+  {
+    return getBool("NY");
+  }
+
   @NonNull
   public static String getDonateUrl()
   {
@@ -536,4 +603,10 @@ public final class Config
   private static native void nativeSetLargeFontsSize(boolean value);
   private static native boolean nativeGetTransliteration();
   private static native void nativeSetTransliteration(boolean value);
+  private static native boolean nativeGetTrafficHttpEnabled();
+  private static native void nativeSetTrafficHttpEnabled(boolean value);
+  private static native String nativeGetTrafficHttpUrl();
+  private static native void nativeSetTrafficHttpUrl(String value);
+  private static native void applyTrafficApps(String[] value);
+  private static native void applyTrafficLegacyEnabled(boolean value);
 }

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

@@ -1497,4 +1497,5 @@
     <string name="type.shop.beauty.nails">Nehtový salón</string>
     <string name="type.xmas.tree">Vánoční strom</string>
     <string name="type.man_made.mast.communication">Komunikační stožár</string>
+    <string name="type.amenity.hydrant">Hydrant na zavlažování</string>
 </resources>

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

@@ -160,7 +160,7 @@
     <string name="type.amenity.public_bath">Baños públicos</string>
     <string name="type.amenity.shower">Ducha</string>
     <string name="type.amenity.stripclub">Club de estriptis</string>
-    <string name="type.amenity.taxi">Sitio de taxis</string>
+    <string name="type.amenity.taxi">Parada de taxis</string>
     <string name="type.amenity.telephone">Teléfono</string>
     <string name="type.amenity.theatre">Teatro</string>
     <string name="type.amenity.toilets">WC</string>
@@ -351,6 +351,7 @@
     <string name="type.emergency.assembly_point">Punto de reunión de emergencia</string>
     <string name="type.emergency.defibrillator">Desfibrilador</string>
     <string name="type.emergency.fire_hydrant">Boca de incendio</string>
+    <string name="type.amenity.hydrant">Boca de riego</string>
     <string name="type.emergency.phone">Teléfono de emergencias</string>
     <!-- A place where a lifeguard is on duty. -->
     <string name="type.emergency.lifeguard">Socorrista</string>
@@ -454,7 +455,7 @@
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.residential.bridge">Puente</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.residential.tunnel">Túnel de calle residencial</string>
+    <string name="type.highway.residential.tunnel">Túnel</string>
     <string name="type.highway.rest_area">Área de descanso</string>
     <string name="type.highway.road">Carretera</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
@@ -467,7 +468,7 @@
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.secondary.bridge">Puente</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.secondary.tunnel">Túnel de carretera secundaria</string>
+    <string name="type.highway.secondary.tunnel">Túnel</string>
     <string name="type.highway.secondary_link">Enlace de carretera secundaria</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.secondary_link.bridge">Puente</string>
@@ -706,7 +707,7 @@
     <string name="type.natural.beach.sand">Playa de arena</string>
     <string name="type.natural.beach.gravel">Playa de grava</string>
     <string name="type.natural.cape">Cabo</string>
-    <string name="type.natural.cave_entrance">Cueva</string>
+    <string name="type.natural.cave_entrance">Entrada de cueva</string>
     <string name="type.natural.cliff">Acantilado</string>
     <string name="type.natural.earth_bank">Talud de tierra</string>
     <string name="type.man_made.embankment">Terraplén</string>
@@ -742,7 +743,7 @@
     <string name="type.natural.wetland.marsh">Ciénaga</string>
     <string name="type.noexit">Sin salida</string>
     <string name="type.office">Oficina</string>
-    <string name="type.office.company">Oficina</string>
+    <string name="type.office.company">Oficina de compañía</string>
     <string name="type.office.estate_agent">Agente inmobiliario</string>
     <string name="type.office.government">Oficina gubernamental</string>
     <string name="type.office.insurance">Oficina de seguros</string>
@@ -783,13 +784,13 @@
     <string name="type.place.state">Estado</string>
     <string name="type.place.state.USA">Estado</string>
     <!-- Named part of a city or town, bigger than place=quarter (Wiki: https://wiki.openstreetmap.org/wiki/Tag:place%3Dsuburb) -->
-    <string name="type.place.suburb">Barrio</string>
+    <string name="type.place.suburb">Suburbio</string>
     <string name="type.place.town">Pueblo</string>
     <string name="type.place.village">Pueblo</string>
     <string name="type.power">Energía</string>
     <string name="type.power.generator">Generador</string>
     <string name="type.power.generator.solar">Generador solar</string>
-    <string name="type.power.generator.wind">Generador de viento</string>
+    <string name="type.power.generator.wind">Aerogenerador</string>
     <string name="type.power.generator.gas">Planta termoeléctrica de gas</string>
     <string name="type.power.generator.hydro">Planta hidroeléctrica</string>
     <string name="type.power.line">Línea eléctrica</string>
@@ -848,10 +849,10 @@
     <string name="type.railway.station">Estación de tren</string>
     <string name="type.railway.station.funicular">Funicular</string>
     <string name="type.railway.station.light_rail">Estación de tren</string>
-    <string name="type.railway.station.light_rail.berlin">Estación de tren</string>
+    <string name="type.railway.station.light_rail.berlin">Estación de tren (S-Bahn)</string>
     <string name="type.railway.station.light_rail.london">Estación de tren</string>
-    <string name="type.railway.station.light_rail.porto">Estación de tren</string>
-    <string name="type.railway.station.monorail">Estación de tren</string>
+    <string name="type.railway.station.light_rail.porto">Estación de metro</string>
+    <string name="type.railway.station.monorail">Estación de monoriel</string>
     <string name="type.railway.station.subway">Estación de metro</string>
     <string name="type.railway.station.subway.adana">Estación de metro</string>
     <string name="type.railway.station.subway.algiers">Estación de metro</string>
@@ -1121,7 +1122,7 @@
     <string name="type.shop.doityourself">Tienda de bricolaje</string>
     <string name="type.shop.dry_cleaning">Tintorería</string>
     <string name="type.shop.electronics">Electrónica</string>
-    <string name="type.shop.erotic">Sex Shop</string>
+    <string name="type.shop.erotic">Tienda erótica</string>
     <string name="type.shop.fabric">Tienda de telas</string>
     <string name="type.shop.farm">Tienda de alimentos de granja</string>
     <string name="type.shop.fashion_accessories">Accesorios de moda</string>
@@ -1206,7 +1207,7 @@
     <string name="type.shop.tobacco">Tabaco</string>
     <string name="type.shop.trade">Suministros comerciales</string>
     <string name="type.shop.watches">Relojes</string>
-    <string name="type.shop.wholesale">Almacén al por mayor</string>
+    <string name="type.shop.wholesale">Tienda al por mayor</string>
     <string name="type.sport">Deporte</string>
     <string name="type.sport.american_football">Fútbol americano</string>
     <string name="type.sport.archery">Tiro al arco</string>
@@ -1246,7 +1247,7 @@
     <string name="type.tourism.aquarium">Acuario</string>
     <!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
     <string name="type.tourism.alpine_hut">Albergue de montaña</string>
-    <string name="type.tourism.apartment">Apartamento de vacaciones</string>
+    <string name="type.tourism.apartment">Apartamento vacacional</string>
     <string name="type.tourism.artwork">Obra de arte</string>
     <string name="type.tourism.artwork.architecture">Arte arquitectónico</string>
     <string name="type.tourism.artwork.painting">Pintura</string>

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

@@ -1494,4 +1494,5 @@
     <string name="type.spherical_buoy.safe_water">Faarvaatri kerapoi</string>
     <string name="type.man_made.mast.communication">Sidemast</string>
     <string name="type.shop.beauty.nails">Küünestuudio</string>
+    <string name="type.amenity.hydrant">Kastmishüdrant</string>
 </resources>

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

@@ -337,6 +337,7 @@
     <string name="type.emergency.assembly_point">Point de rassemblement d’urgence</string>
     <string name="type.emergency.defibrillator">Défibrillateur</string>
     <string name="type.emergency.fire_hydrant">Point d’eau incendie</string>
+    <string name="type.amenity.hydrant">Borne d’puisage</string>
     <string name="type.emergency.phone">Téléphone d’urgence</string>
     <!-- A place where a lifeguard is on duty. -->
     <string name="type.emergency.lifeguard">Sauveteur</string>

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

@@ -179,34 +179,686 @@
     <string name="type.craft.shoemaker">Ewnans Eskis</string>
     <string name="type.craft.winery">Gwinyer</string>
     <string name="type.craft.tailor">Tregher</string>
-    <string name="type.cuisine.african">afrikan</string>
-    <string name="type.cuisine.american">amerikanek</string>
-    <string name="type.cuisine.arab">arabek</string>
-    <string name="type.cuisine.argentinian">arghantinek</string>
-    <string name="type.cuisine.asian">asiek</string>
-    <string name="type.cuisine.austrian">ostrian</string>
+    <string name="type.cuisine.african">Afrikan</string>
+    <string name="type.cuisine.american">Amerikanek</string>
+    <string name="type.cuisine.arab">Arabek</string>
+    <string name="type.cuisine.argentinian">Arghantinek</string>
+    <string name="type.cuisine.asian">Asiek</string>
+    <string name="type.cuisine.austrian">Ostrian</string>
     <string name="type.cuisine.barbecue">Barbakoa</string>
     <string name="type.cuisine.beef_bowl">Bolla Bewin</string>
-    <string name="type.cuisine.brazilian">brasiliek</string>
+    <string name="type.cuisine.brazilian">Brasiliek</string>
     <string name="type.cuisine.breakfast">Hansel</string>
     <string name="type.cuisine.bubble_tea">Te Hwethen</string>
     <string name="type.cuisine.burger">Borger</string>
     <string name="type.cuisine.cake">Tesen</string>
     <string name="type.cuisine.chicken">Kig Yar</string>
-    <string name="type.cuisine.chinese">chinek</string>
+    <string name="type.cuisine.chinese">Chinek</string>
     <string name="type.cuisine.coffee_shop">Koffi</string>
-    <string name="type.cuisine.croatian">kroatek</string>
+    <string name="type.cuisine.croatian">Kroatek</string>
     <string name="type.cuisine.curry">Kurri</string>
     <string name="type.cuisine.donut">Knowen Doos</string>
-    <string name="type.cuisine.ethiopian">ethiopek</string>
+    <string name="type.cuisine.ethiopian">Ethiopek</string>
     <string name="type.cuisine.fine_dining">Dybri Brav</string>
     <string name="type.cuisine.fish">Pysk</string>
     <string name="type.cuisine.fish_and_chips">Asklotti</string>
-    <string name="type.cuisine.french">frynkek</string>
-    <string name="type.cuisine.georgian">jorjiek</string>
-    <string name="type.cuisine.german">almaynek</string>
-    <string name="type.cuisine.greek">grek</string>
+    <string name="type.cuisine.french">Frynkek</string>
+    <string name="type.cuisine.georgian">Jorjiek</string>
+    <string name="type.cuisine.german">Almaynek</string>
+    <string name="type.cuisine.greek">Grek</string>
     <string name="type.cuisine.grill">Rastell</string>
-    <string name="type.cuisine.hungarian">hungarek</string>
+    <string name="type.cuisine.hungarian">Hungarek</string>
     <string name="type.cuisine.ice_cream">Dehen Rew</string>
+    <string name="type.cuisine.indian">Eyndek</string>
+    <string name="type.cuisine.indonesian">Indonesek</string>
+    <string name="type.cuisine.international">Keswlasek</string>
+    <string name="type.cuisine.irish">Iwerdhonek</string>
+    <string name="type.cuisine.italian">Italek</string>
+    <string name="type.cuisine.italian_pizza">Italek, Pitsa</string>
+    <string name="type.cuisine.japanese">Japanek</string>
+    <string name="type.cuisine.korean">Koreek</string>
+    <string name="type.cuisine.lao">Laosek</string>
+    <string name="type.cuisine.lebanese">Lebanek</string>
+    <string name="type.cuisine.local">Leel</string>
+    <string name="type.cuisine.malaysian">Malaysiek</string>
+    <string name="type.cuisine.mediterranean">Kresvorek</string>
+    <string name="type.cuisine.mexican">Meksikan</string>
+    <string name="type.cuisine.moroccan">Morockek</string>
+    <string name="type.cuisine.noodles">Noudlys</string>
+    <string name="type.cuisine.oriental">Asiek Est</string>
+    <string name="type.cuisine.pancake">Krampothennow</string>
+    <string name="type.cuisine.pasta">Pasta</string>
+    <string name="type.cuisine.persian">Persi</string>
+    <string name="type.cuisine.peruvian">Peruvianek</string>
+    <string name="type.cuisine.pizza">Pitsa</string>
+    <string name="type.cuisine.polish">Polonek</string>
+    <string name="type.cuisine.portuguese">Portyngalek</string>
+    <string name="type.cuisine.regional">Ranndirek</string>
+    <string name="type.cuisine.russian">Russek</string>
+    <string name="type.cuisine.sandwich">Baramanyn</string>
+    <string name="type.cuisine.sausage">Selsigen</string>
+    <string name="type.cuisine.spanish">Spaynek</string>
+    <string name="type.cuisine.steak_house">Bosti Tregh Kig</string>
+    <string name="type.cuisine.sushi">Sushi</string>
+    <string name="type.cuisine.tea">Te</string>
+    <string name="type.cuisine.thai">Tai</string>
+    <string name="type.cuisine.turkish">Turkek</string>
+    <string name="type.cuisine.vegan">Vegan</string>
+    <string name="type.cuisine.vegetarian">Losowek</string>
+    <string name="type.cuisine.vietnamese">Vietnamek</string>
+    <string name="type.emergency">Goredhom</string>
+    <string name="type.emergency.access_point">Tyller Sawyans Goredhom</string>
+    <string name="type.emergency.assembly_point">Tyller Kuntelles Goredhom</string>
+    <string name="type.emergency.life_ring">Grugys-Sawya</string>
+    <string name="type.emergency.phone">Fon Goredhom</string>
+    <string name="type.emergency.lifeguard">Tyller Gwithyades-Sawya</string>
+    <string name="type.lateral.port">Porth</string>
+    <string name="type.lateral.starboard">Lew</string>
+    <string name="type.cardinal.east">Est</string>
+    <string name="type.cardinal.north">North</string>
+    <string name="type.cardinal.south">Soth</string>
+    <string name="type.cardinal.west">West</string>
+    <string name="type.emergency.mountain_rescue">Sawyansva Menydh</string>
+    <string name="type.entrance">Entrans</string>
+    <string name="type.entrance.main">Entrans Chif</string>
+    <string name="type.entrance.house">Entrans Chi</string>
+    <string name="type.entrance.garage">Entrans Karrji</string>
+    <string name="type.entrance.service">Entrans Gonis</string>
+    <string name="type.entrance.entry">Entrans (Unsel)</string>
+    <string name="type.entrance.exit">Fordh \'Mes (Unsel)</string>
+    <string name="type.entrance.emergency">Daras Goredhom</string>
+    <string name="type.fee.yes">£</string>
+    <string name="type.fee.no">Heb Kost</string>
+    <string name="type.healthcare.laboratory">Arbrovji Medhegel</string>
+    <string name="type.healthcare.physiotherapist">Yaghheans Fisio</string>
+    <string name="type.healthcare.alternative">Medhegneth Euvergryjyk</string>
+    <string name="type.healthcare.audiologist">Medhek Klew</string>
+    <string name="type.healthcare.blood_donation">Kres Argevrians Goos</string>
+    <string name="type.healthcare.optometrist">Medhek Golok</string>
+    <string name="type.healthcare.podiatrist">Medhek Troos</string>
+    <string name="type.healthcare.psychotherapist">Yaghheans Brysoniethel</string>
+    <string name="type.healthcare.sample_collection">Kres Kuntel Sampel</string>
+    <string name="type.healthcare.speech_therapist">Pathologydh Kows ha Tavas</string>
+    <string name="type.highway">Fordh Veur</string>
+    <string name="type.highway.bridleway">Marghlergh</string>
+    <string name="type.highway.bridleway.bridge">Pons</string>
+    <string name="type.highway.bridleway.permissive">Marghlergh</string>
+    <string name="type.highway.bridleway.tunnel">Kowfordh</string>
+    <string name="type.highway.busway">Fordh rag Kyttrinyow yn Unsel</string>
+    <string name="type.highway.busway.bridge">Pons</string>
+    <string name="type.highway.busway.tunnel">Kowfordh</string>
+    <string name="type.highway.bus_stop">Kyttrinva</string>
+    <string name="type.highway.construction">Fordh y\'n Drehevyans</string>
+    <string name="type.highway.cycleway">Hyns rag Diwrosow</string>
+    <string name="type.highway.cycleway.bridge">Pons</string>
+    <string name="type.highway.cycleway.permissive">Hyns rag Diwrosow</string>
+    <string name="type.highway.cycleway.tunnel">Kowfordh</string>
+    <string name="type.highway.elevator">Yskynnell</string>
+    <string name="type.highway.footway">Kerdhva</string>
+    <string name="type.highway.footway.sidewalk">Kons</string>
+    <string name="type.highway.footway.crossing">Treusva Gerdhoryon</string>
+    <string name="type.highway.footway.area">Arenebedh Gerdhoryon</string>
+    <string name="type.highway.footway.bridge">Pons Gerdhoryon</string>
+    <string name="type.highway.footway.tunnel">Kowfordh Gerdhoryon</string>
+    <string name="type.highway.ford">Res</string>
+    <string name="type.highway.living_street">Stret Pur Byghan</string>
+    <string name="type.highway.living_street.bridge">Pons</string>
+    <string name="type.highway.living_street.tunnel">Kowfordh</string>
+    <string name="type.highway.motorway">Gorfordh</string>
+    <string name="type.highway.motorway.bridge">Pons Gorfordh</string>
+    <string name="type.highway.motorway.tunnel">Kowfordh Gorfordh</string>
+    <string name="type.highway.motorway_junction">Fordh \'Mes</string>
+    <string name="type.highway.motorway_link">Rybfordh</string>
+    <string name="type.highway.motorway_link.bridge">Pons</string>
+    <string name="type.highway.motorway_link.tunnel">Kowfordh</string>
+    <string name="type.highway.path">Hyns</string>
+    <string name="type.highway.path.difficult">Ol Kales bo Andhiblans</string>
+    <string name="type.highway.path.expert">Ol Anweladow</string>
+    <string name="type.highway.path.bicycle">Hyns rag Kerdhoryon ha Diwrosow</string>
+    <string name="type.highway.footway.bicycle">Hyns rag Kerdhoryon ha Diwrosow</string>
+    <string name="type.highway.path.bridge">Pons</string>
+    <string name="type.highway.path.horse">Marghlergh</string>
+    <string name="type.highway.path.tunnel">Kowfordh</string>
+    <string name="type.highway.pedestrian">Stret Gerdhoryon yn Unsel</string>
+    <string name="type.highway.pedestrian.area">Arenebedh Gerdhoryon</string>
+    <string name="type.highway.pedestrian.bridge">Pons Gerdhoryon</string>
+    <string name="type.highway.pedestrian.square">Plen</string>
+    <string name="type.highway.pedestrian.tunnel">Kowfordh Gerdhoryon</string>
+    <string name="type.highway.primary">Fordh Kynsa</string>
+    <string name="type.highway.primary.bridge">Pons</string>
+    <string name="type.highway.primary.tunnel">Kowfordh</string>
+    <string name="type.highway.primary_link">Rybfordh Kynsa</string>
+    <string name="type.highway.primary_link.bridge">Pons</string>
+    <string name="type.highway.primary_link.tunnel">Kowfordh</string>
+    <string name="type.highway.residential">Stret Anedhel</string>
+    <string name="type.highway.residential.area">Stret Anedhel</string>
+    <string name="type.highway.residential.bridge">Pons</string>
+    <string name="type.highway.residential.tunnel">Kowfordh</string>
+    <string name="type.highway.rest_area">Powesva</string>
+    <string name="type.highway.road">Fordh</string>
+    <string name="type.highway.road.bridge">Pons</string>
+    <string name="type.man_made.bridge">Pons</string>
+    <string name="type.highway.road.tunnel">Kowfordh</string>
+    <string name="type.highway.secondary">Fordh Nessa</string>
+    <string name="type.highway.secondary.bridge">Pons</string>
+    <string name="type.highway.secondary.tunnel">Kowfordh</string>
+    <string name="type.highway.secondary_link">Rybfordh Nessa</string>
+    <string name="type.highway.secondary_link.bridge">Pons</string>
+    <string name="type.highway.secondary_link.tunnel">Kowfordh</string>
+    <string name="type.highway.service">Fordh Gonis</string>
+    <string name="type.highway.service.area">Fordh Gonis</string>
+    <string name="type.highway.service.bridge">Pons</string>
+    <string name="type.highway.service.driveway">Fordh dhe Chi</string>
+    <string name="type.highway.service.parking_aisle">Fordh Parkyans</string>
+    <string name="type.highway.service.tunnel">Kowfordh</string>
+    <string name="type.highway.services">Edhommva</string>
+    <string name="type.highway.speed_camera">Kamera Skavder</string>
+    <string name="type.highway.steps">Grisyow</string>
+    <string name="type.highway.ladder">Skeul</string>
+    <string name="type.highway.steps.bridge">Pons</string>
+    <string name="type.highway.steps.tunnel">Kowfordh</string>
+    <string name="type.highway.tertiary">Fordh Tryja</string>
+    <string name="type.highway.tertiary.bridge">Pons</string>
+    <string name="type.highway.tertiary.tunnel">Kowfordh</string>
+    <string name="type.highway.tertiary_link">Rybfordh Tryja</string>
+    <string name="type.highway.tertiary_link.bridge">Pons</string>
+    <string name="type.highway.tertiary_link.tunnel">Kowfordh</string>
+    <string name="type.highway.track">Ol</string>
+    <string name="type.highway.track.area">Ol</string>
+    <string name="type.highway.track.bridge">Pons</string>
+    <string name="type.highway.track.grade1">Ol</string>
+    <string name="type.highway.track.no.access">Ol</string>
+    <string name="type.highway.track.tunnel">Kowfordh</string>
+    <string name="type.highway.traffic_signals">Sinell Traffik</string>
+    <string name="type.highway.trunk">Fordh Chif</string>
+    <string name="type.highway.trunk.bridge">Pons</string>
+    <string name="type.highway.trunk.tunnel">Kowfordh</string>
+    <string name="type.highway.trunk_link">Rybfordh Chif</string>
+    <string name="type.highway.trunk_link.bridge">Pons</string>
+    <string name="type.highway.trunk_link.tunnel">Kowfordh</string>
+    <string name="type.highway.unclassified">Fordh Le</string>
+    <string name="type.highway.unclassified.area">Fordh Le</string>
+    <string name="type.highway.unclassified.bridge">Pons</string>
+    <string name="type.highway.unclassified.tunnel">Kowfordh</string>
+    <string name="type.area_highway.cycleway">Hyns rag Diwrosow</string>
+    <string name="type.area_highway.footway">Kerdhva</string>
+    <string name="type.area_highway.living_street">Stret pur Byghan</string>
+    <string name="type.area_highway.motorway">Gorfordh</string>
+    <string name="type.area_highway.path">Hyns</string>
+    <string name="type.area_highway.pedestrian">Stret Gerdhoryon yn Unsel</string>
+    <string name="type.area_highway.primary">Fordh Kynsa</string>
+    <string name="type.area_highway.residential">Stret Anedhel</string>
+    <string name="type.area_highway.secondary">Fordh Nessa</string>
+    <string name="type.area_highway.service">Fordh Gonis</string>
+    <string name="type.area_highway.tertiary">Fordh Tryja</string>
+    <string name="type.area_highway.steps">Grisyow</string>
+    <string name="type.area_highway.track">Ol</string>
+    <string name="type.area_highway.trunk">Fordh Chif</string>
+    <string name="type.area_highway.unclassified">Fordh Le</string>
+    <string name="type.historic">Taklen Istorek</string>
+    <string name="type.historic.aircraft">Ayren Istorek</string>
+    <string name="type.historic.anchor">Ankor Istorek</string>
+    <string name="type.historic.archaeological_site">Tyller Hendhyskoniethel</string>
+    <string name="type.historic.battlefield">Tyller Batel Istorek</string>
+    <string name="type.historic.boundary_stone">Men Or</string>
+    <string name="type.historic.cannon">Kanon</string>
+    <string name="type.historic.castle">Kastel</string>
+    <string name="type.historic.castle.castrum">Dinas Romanek</string>
+    <string name="type.historic.castle.defensive">Kastel Krev</string>
+    <string name="type.historic.castle.fortified_church">Eglos rag Skons</string>
+    <string name="type.historic.castle.fortress">Skons</string>
+    <string name="type.historic.castle.hillfort">Ker</string>
+    <string name="type.historic.castle.kremlin">Kastel Europek a\'n Est</string>
+    <string name="type.historic.castle.manor">Manerji</string>
+    <string name="type.historic.castle.palace">Palys</string>
+    <string name="type.historic.castle.shiro">Kastel Japanek</string>
+    <string name="type.historic.castle.stately">Kastel Maner</string>
+    <string name="type.historic.city_gate">Porth Cita</string>
+    <string name="type.historic.citywalls">Fos Cita</string>
+    <string name="type.historic.fort">Dinas</string>
+    <string name="type.historic.gallows">Krogbren</string>
+    <string name="type.historic.locomotive">Tren Istorek</string>
+    <string name="type.historic.memorial">Men Kov</string>
+    <string name="type.historic.memorial.cross">Krows Men Kov</string>
+    <string name="type.historic.memorial.plaque">Leghen Men Kov</string>
+    <string name="type.historic.memorial.sculpture">Gravyans</string>
+    <string name="type.historic.memorial.statue">Delow</string>
+    <string name="type.historic.memorial.stolperstein">Men Kov rag Fethesigow a an Naziow</string>
+    <string name="type.historic.stone">Men Istorek</string>
+    <string name="type.historic.memorial.war_memorial">Men Kov Bell</string>
+    <string name="type.historic.mine">Hwel Istorek</string>
+    <string name="type.historic.monument">Men Kov Bras</string>
+    <string name="type.historic.pillory">Karghar Prenn</string>
+    <string name="type.historic.ruins">Kryllasow Istorek</string>
+    <string name="type.historic.ship">Gorhel</string>
+    <string name="type.historic.tank">Tank Istorek</string>
+    <string name="type.historic.tomb">Bedh</string>
+    <string name="type.man_made.cross">Krows</string>
+    <string name="type.historic.wayside_cross">Krows amal an Fordh</string>
+    <string name="type.historic.wayside_shrine">Krerva amal an Fordh</string>
+    <string name="type.historic.wreck">Gwreck</string>
+    <string name="type.internet_access">Kesrosweyth</string>
+    <string name="type.internet_access.wlan">Kesrosweyth</string>
+    <string name="type.junction">Fordh Dhibarth</string>
+    <string name="type.junction.circular">Fordh A-Dro</string>
+    <string name="type.junction.roundabout">Fordh A-Dro</string>
+    <string name="type.landuse">Devnydh Tir</string>
+    <string name="type.landuse.allotments">Pastellow Tir</string>
+    <string name="type.landuse.basin">Bason</string>
+    <string name="type.landuse.brownfield">Tir Ragdevnydhys</string>
+    <string name="type.landuse.cemetery">Korflan</string>
+    <string name="type.landuse.cemetery.christian">Korflan Kristyon</string>
+    <string name="type.landuse.religious">Tir Kryjyk</string>
+    <string name="type.landuse.commercial">Tir Kenwerthel</string>
+    <string name="type.landuse.construction">Tir Drehevyans</string>
+    <string name="type.landuse.education">Komodyta Adhyskansel</string>
+    <string name="type.landuse.farmland">Tir Ammeth</string>
+    <string name="type.landuse.farmyard">Garth an Dre</string>
+    <string name="type.landuse.flowerbed">Bleujyowek</string>
+    <string name="type.landuse.forest">Koos</string>
+    <string name="type.landuse.forest.coniferous">Koos Bydhlas</string>
+    <string name="type.landuse.forest.deciduous">Koos Kolldhel</string>
+    <string name="type.landuse.forest.mixed">Koos Gemyskys</string>
+    <string name="type.landuse.garages">Karrjiow</string>
+    <string name="type.landuse.grass">Gwels</string>
+    <string name="type.landuse.greenfield">Tir Gwyrgh</string>
+    <string name="type.landuse.greenhouse_horticulture">Chi Gweder</string>
+    <string name="type.landuse.industrial">Hwelbark</string>
+    <string name="type.landuse.landfill">Tirlanow</string>
+    <string name="type.landuse.meadow">Pras</string>
+    <string name="type.landuse.military">Selva</string>
+    <string name="type.landuse.orchard">Avalennek</string>
+    <string name="type.landuse.quarry">Mengleudh</string>
+    <string name="type.landuse.railway">Yyns Horn</string>
+    <string name="type.landuse.recreation_ground">Park</string>
+    <string name="type.landuse.reservoir">Kreun</string>
+    <string name="type.landuse.residential">Tir Anedhel</string>
+    <string name="type.landuse.retail">Tir Daskwerthans</string>
+    <string name="type.landuse.salt_pond">Poll Holan</string>
+    <string name="type.landuse.village_green">Plen Glas Gwig</string>
+    <string name="type.landuse.vineyard">Gwinlan</string>
+    <string name="type.leisure">Tir rag Termyn Syger</string>
+    <string name="type.leisure.bandstand">Gwariva Poblek</string>
+    <string name="type.leisure.common">Tir Poblek</string>
+    <string name="type.leisure.dog_park">Park rag Keun</string>
+    <string name="type.leisure.fitness_centre">Hel Sport</string>
+    <string name="type.leisure.dance">Hel Donsya</string>
+    <string name="type.leisure.garden">Jardin</string>
+    <string name="type.leisure.garden.residential">Jardin Anedhel</string>
+    <string name="type.leisure.golf_course">Gwel Golf</string>
+    <string name="type.leisure.miniature_golf">Gwel Golf Munys</string>
+    <string name="type.leisure.indoor_play">Garth-Gwari Pervedhek</string>
+    <string name="type.leisure.marina">Porth</string>
+    <string name="type.leisure.nature_reserve">Gwithva Natur</string>
+    <string name="type.leisure.outdoor_seating">Esedhow yn-mes</string>
+    <string name="type.leisure.firepit">Oles</string>
+    <string name="type.leisure.park">Park</string>
+    <string name="type.leisure.park.no.access">Park Privedh</string>
+    <string name="type.leisure.park.permissive">Park</string>
+    <string name="type.leisure.park.private">Park Privedh</string>
+    <string name="type.leisure.picnic_table">Bordh Kroust</string>
+    <string name="type.leisure.pitch">Len Sportys</string>
+    <string name="type.leisure.playground">Garth-Gwari</string>
+    <string name="type.leisure.recreation_ground">Park</string>
+    <string name="type.leisure.sauna">Sawna</string>
+    <string name="type.leisure.sports_centre">Kres Sportya</string>
+    <string name="type.leisure.sports_centre.sport.multi">Kres Sportya Liesek</string>
+    <string name="type.leisure.sports_centre.sport.american_football">Kres Pel Droos Amerikanek</string>
+    <string name="type.leisure.sports_centre.sport.archery">Kres Gwaregieth</string>
+    <string name="type.leisure.sports_centre.sport.athletics">Kres Athletek</string>
+    <string name="type.leisure.sports_centre.sport.australian_football">Kres Pel Droos Ostralek</string>
+    <string name="type.leisure.sports_centre.sport.badminton">Kres Badminton</string>
+    <string name="type.leisure.sports_centre.sport.baseball">Kres Pel Vas</string>
+    <string name="type.leisure.sports_centre.sport.basketball">Kres Pel Ganstel</string>
+    <string name="type.leisure.sports_centre.sport.beachvolleyball">Kres Pel Volli war an Treth</string>
+    <string name="type.leisure.sports_centre.sport.bowls">Kres Gwari Pelyow</string>
+    <string name="type.leisure.sports_centre.sport.climbing">Kres Krambla</string>
+    <string name="type.leisure.sports_centre.sport.cricket">Kres Krycket</string>
+    <string name="type.leisure.sports_centre.sport.curling">Kres Hurlya</string>
+    <string name="type.leisure.sports_centre.sport.equestrian">Kres Marghek</string>
+    <string name="type.leisure.sports_centre.sport.field_hockey">Kres Hocki</string>
+    <string name="type.leisure.sports_centre.sport.futsal">Kres Futsal</string>
+    <string name="type.leisure.sports_centre.sport.golf">Kres Golf</string>
+    <string name="type.leisure.sports_centre.sport.gymnastics">Kres Gymnastek</string>
+    <string name="type.leisure.sports_centre.sport.handball">Kres Pel Dhorn</string>
+    <string name="type.leisure.sports_centre.sport.ice_hockey">Kres Hocki Rew</string>
+    <string name="type.leisure.sports_centre.sport.skateboard">Kres Rostell</string>
+    <string name="type.leisure.sports_centre.sport.skiing">Kres Skia</string>
+    <string name="type.leisure.sports_centre.sport.soccer">Kres Pel Droos</string>
+    <string name="type.leisure.sports_centre.sport.swimming">Kres Poll-Neuvya</string>
+    <string name="type.leisure.sports_centre.sport.table_tennis">Kres Tennis Moos</string>
+    <string name="type.leisure.sports_centre.sport.tennis">Kres Tennis</string>
+    <string name="type.leisure.sports_centre.sport.volleyball">Kres Pel Volli</string>
+    <string name="type.leisure.stadium">Sportva</string>
+    <string name="type.leisure.swimming_pool">Poll-Neuvya</string>
+    <string name="type.leisure.swimming_pool.private">Poll-Neuvya Privedh</string>
+    <string name="type.leisure.track">Ol Athletek</string>
+    <string name="type.leisure.track.area">Ol Athletek</string>
+    <string name="type.leisure.beach_resort">Tyller-Havi war an Treth</string>
+    <string name="type.man_made">Dornwrys</string>
+    <string name="type.man_made.cairn">Karnedh</string>
+    <string name="type.man_made.chimney">Chymbla</string>
+    <string name="type.man_made.survey_point">Bleyn Arhwithra</string>
+    <string name="type.man_made.flagpole">Gwelen Baner</string>
+    <string name="type.man_made.lighthouse">Golowji</string>
+    <string name="type.man_made.mast">Gwern</string>
+    <string name="type.man_made.pier">Kay</string>
+    <string name="type.man_made.pipeline">Gooth</string>
+    <string name="type.man_made.pipeline.overground">Gooth a-ugh dhe Leur</string>
+    <string name="type.man_made.surveillance">Kamera Aspians</string>
+    <string name="type.man_made.tower">Tour</string>
+    <string name="type.man_made.communications_tower">Tour Keskomunyans</string>
+    <string name="type.man_made.tower.communication">Tour Keskomunyans</string>
+    <string name="type.man_made.mast.communication">Tour Keskomunyans</string>
+    <string name="type.man_made.petroleum_well">Fenten Oyl bo Petrol</string>
+    <string name="type.man_made.crane">Garan</string>
+    <string name="type.man_made.wastewater_plant">Komodyta Karth Karthyon</string>
+    <string name="type.man_made.water_tap">Tapp</string>
+    <string name="type.man_made.water_tap.drinking_water_no">Tapp</string>
+    <string name="type.man_made.water_tower">Tour Dowrargh</string>
+    <string name="type.man_made.water_well">Fenten</string>
+    <string name="type.man_made.water_well.drinking_water_no">Fenten</string>
+    <string name="type.man_made.windmill">Melin Wyns</string>
+    <string name="type.man_made.works">Tir Gonis</string>
+    <string name="type.military">Selva</string>
+    <string name="type.natural">Natur</string>
+    <string name="type.natural.bare_rock">Karrek</string>
+    <string name="type.natural.shingle">Biliennow</string>
+    <string name="type.natural.scree">Radel</string>
+    <string name="type.natural.bay">Pleg Mor</string>
+    <string name="type.natural.beach">Treth</string>
+    <string name="type.natural.beach.sand">Treth Tewesek</string>
+    <string name="type.natural.beach.gravel">Treth Growan</string>
+    <string name="type.natural.cape">Pennrynn</string>
+    <string name="type.natural.cave_entrance">Entrans Fow</string>
+    <string name="type.natural.cliff">Als</string>
+    <string name="type.natural.earth_bank">Banken</string>
+    <string name="type.man_made.embankment">Bour</string>
+    <string name="type.natural.coastline">Kost</string>
+    <string name="type.natural.desert">Difeyth</string>
+    <string name="type.natural.sand">Tewes</string>
+    <string name="type.natural.geyser">Fenten Gnasek</string>
+    <string name="type.natural.glacier">Rewiva</string>
+    <string name="type.natural.grassland">Tonn</string>
+    <string name="type.natural.heath">Grug</string>
+    <string name="type.natural.hot_spring">Fenten Pooth</string>
+    <string name="type.natural.water.lake">Lynn</string>
+    <string name="type.natural.water.lock">Poll Yet Dhowr</string>
+    <string name="type.natural.water.pond">Poll</string>
+    <string name="type.natural.water.reservoir">Kreun</string>
+    <string name="type.natural.water.basin">Bason</string>
+    <string name="type.natural.water.river">Avon</string>
+    <string name="type.natural.land">Tir</string>
+    <string name="type.natural.meadow">Pras</string>
+    <string name="type.natural.orchard">Avalennek</string>
+    <string name="type.natural.peak">Topp</string>
+    <string name="type.natural.rock">Men</string>
+    <string name="type.natural.scrub">Krann</string>
+    <string name="type.natural.spring">Fenten</string>
+    <string name="type.natural.spring.drinking_water_no">Fenten</string>
+    <string name="type.natural.tree">Gwedhen</string>
+    <string name="type.natural.tree_row">Rew a Gwedhennow</string>
+    <string name="type.natural.vineyard">Gwinlan</string>
+    <string name="type.natural.volcano">Loskvenydh</string>
+    <string name="type.natural.water">Dowr</string>
+    <string name="type.natural.wetland.bog">Keunegen</string>
+    <string name="type.natural.wetland.marsh">Keunek</string>
+    <string name="type.natural.wetland.saltmarsh">Keunek Sall</string>
+    <string name="type.natural.wetland.fen">Gwern</string>
+    <string name="type.natural.wetland.reedbed">Keunegen</string>
+    <string name="type.natural.wetland.swamp">Gwern</string>
+    <string name="type.natural.wetland.mangrove">Koos Liva</string>
+    <string name="type.noexit">Fordh Dhal</string>
+    <string name="type.office">Buro</string>
+    <string name="type.office.company">Buro Kowethyans</string>
+    <string name="type.office.government">Buro Governans</string>
+    <string name="type.office.insurance">Buro Surheans</string>
+    <string name="type.office.lawyer">Laghyas</string>
+    <string name="type.office.ngo">Buro Aluseneth</string>
+    <string name="type.office.telecommunication">Kowethyans Pellgomunyans</string>
+    <string name="type.organic.only">Organek</string>
+    <string name="type.organic.yes">Organek</string>
+    <string name="type.place.city">Cita</string>
+    <string name="type.place.city.capital">Chifcita</string>
+    <string name="type.place.city.capital.10">Cita</string>
+    <string name="type.place.city.capital.11">Cita</string>
+    <string name="type.place.city.capital.2">Chifcita</string>
+    <string name="type.place.city.capital.3">Cita</string>
+    <string name="type.place.city.capital.4">Cita</string>
+    <string name="type.place.city.capital.5">Cita</string>
+    <string name="type.place.city.capital.6">Cita</string>
+    <string name="type.place.city.capital.7">Cita</string>
+    <string name="type.place.city.capital.8">Cita</string>
+    <string name="type.place.city.capital.9">Cita</string>
+    <string name="type.place.continent">Brastir</string>
+    <string name="type.place.country">Bro</string>
+    <string name="type.place.county">Konteth</string>
+    <string name="type.place.farm">Amethva</string>
+    <string name="type.place.hamlet">Gwigbian</string>
+    <string name="type.place.island">Enys</string>
+    <string name="type.place.islet">Enesik</string>
+    <string name="type.place.isolated_dwelling">Tre Enyshes</string>
+    <string name="type.place.locality">Tyller</string>
+    <string name="type.place.quarter">Kwarter</string>
+    <string name="type.place.neighbourhood">Kentreveth</string>
+    <string name="type.place.ocean">Keynvor</string>
+    <string name="type.place.region">Pow</string>
+    <string name="type.place.sea">Mor</string>
+    <string name="type.place.square">Plen</string>
+    <string name="type.place.state">Gwlas</string>
+    <string name="type.place.state.USA">Gwlas Amerikanek</string>
+    <string name="type.place.suburb">Mestrev</string>
+    <string name="type.place.town">Tre</string>
+    <string name="type.place.village">Gwig</string>
+    <string name="type.power">Tredan</string>
+    <string name="type.power.generator">Dinythell Dredan</string>
+    <string name="type.power.generator.solar">Dinythell an Howl</string>
+    <string name="type.power.generator.wind">Dinythell an Awel</string>
+    <string name="type.power.line">Linen Tredanek</string>
+    <string name="type.power.line.underground">Linen Tredanek yn-dann Dhor</string>
+    <string name="type.power.minor_line">Linen Tredanek Le</string>
+    <string name="type.power.plant">Dinythva Dredan</string>
+    <string name="type.power.plant.coal">Tredanva Glow</string>
+    <string name="type.power.plant.gas">Tredanva Gass</string>
+    <string name="type.power.plant.hydro">Tredanva Dowr</string>
+    <string name="type.power.plant.solar">Tredanva an Howl</string>
+    <string name="type.power.plant.wind">Tredanva an Awel</string>
+    <string name="type.power.tower">Tour Tredanek</string>
+    <string name="type.power.pole">Gwelen Tredanek</string>
+    <string name="type.man_made.utility_pole">Gwelen Les</string>
+    <string name="type.public_transport">Karyans Poblek</string>
+    <string name="type.public_transport.platform">Kay</string>
+    <string name="type.railway">Hyns Horn</string>
+    <string name="type.railway.abandoned">Hyns Horn Gesys</string>
+    <string name="type.railway.abandoned.bridge">Pons Hyns Horn Gesys</string>
+    <string name="type.railway.abandoned.tunnel">Kowfordh Hyns Horn Gesys</string>
+    <string name="type.railway.construction">Hyns Horn Drehevyans</string>
+    <string name="type.railway.crossing">Treusva Hyns Horn</string>
+    <string name="type.railway.disused">Hyns Horn Undevnydhys</string>
+    <string name="type.railway.halt">Savla Tren</string>
+    <string name="type.railway.level_crossing">Treusva Hyns Horn</string>
+    <string name="type.railway.light_rail">Hyns Horn Byghan</string>
+    <string name="type.railway.light_rail.bridge">Pons Hyns Horn Byghan</string>
+    <string name="type.railway.light_rail.tunnel">Kowfordh Hyns Horn Byghan</string>
+    <string name="type.railway.monorail">Tren Ungledhren</string>
+    <string name="type.railway.monorail.bridge">Pons Tren Ungledhren</string>
+    <string name="type.railway.monorail.tunnel">Kowfordh Tren Ungledhren</string>
+    <string name="type.railway.platform">Kay</string>
+    <string name="type.railway.rail">Hyns Horn</string>
+    <string name="type.railway.rail.highspeed">Hyns Horn Tooth</string>
+    <string name="type.railway.rail.tourism">Hyns Horn Tourystek</string>
+    <string name="type.railway.rail.main">Hyns Horn</string>
+    <string name="type.railway.rail.branch">Hyns Horn Skorr</string>
+    <string name="type.railway.rail.utility">Hyns Horn Gonis</string>
+    <string name="type.railway.rail.bridge">Pons Hyns Horn</string>
+    <string name="type.railway.rail.highspeed.bridge">Pons Hyns Horn Tooth</string>
+    <string name="type.railway.rail.tourism.bridge">Pons Hyns Horn Tourystek</string>
+    <string name="type.railway.rail.main.bridge">Pons Hyns Horn</string>
+    <string name="type.railway.rail.branch.bridge">Pons Hyns Horn Skorr</string>
+    <string name="type.railway.rail.tunnel">Kowfordh Hyns Horn</string>
+    <string name="type.railway.rail.highspeed.tunnel">Kowfordh Hyns Horn Tooth</string>
+    <string name="type.railway.rail.tourism.tunnel">Kowfordh Hyns Horn Tourystek</string>
+    <string name="type.railway.rail.main.tunnel">Kowfordh Hyns Horn</string>
+    <string name="type.railway.rail.branch.tunnel">Kowfordh Hyns Horn Skorr</string>
+    <string name="type.railway.station">Gorsav</string>
+    <string name="type.railway.station.light_rail">Gorsav</string>
+    <string name="type.railway.station.light_rail.berlin">Gorsav S-Bahn</string>
+    <string name="type.railway.station.light_rail.london">Gorsav DLR</string>
+    <string name="type.railway.station.light_rail.porto">Gorsav Metro Porto</string>
+    <string name="type.railway.station.monorail">Gorsav Tren Ungledhren</string>
+    <string name="type.railway.station.subway">Gorsav Metro</string>
+    <string name="type.railway.station.subway.adana">Gorsav Metro</string>
+    <string name="type.railway.station.subway.algiers">Gorsav Metro</string>
+    <string name="type.railway.station.subway.almaty">Gorsav Metro</string>
+    <string name="type.railway.station.subway.amsterdam">Gorsav Metro</string>
+    <string name="type.railway.station.subway.ankara">Gorsav Metro</string>
+    <string name="type.railway.station.subway.athens">Gorsav Metro</string>
+    <string name="type.railway.station.subway.baku">Gorsav Metro</string>
+    <string name="type.railway.station.subway.bangkok">Gorsav Metro</string>
+    <string name="type.railway.station.subway.barcelona">Gorsav Metro</string>
+    <string name="type.railway.station.subway.beijing">Gorsav Metro</string>
+    <string name="type.railway.station.subway.bengalore">Gorsav Metro</string>
+    <string name="type.railway.station.subway.berlin">Gorsav Metro</string>
+    <string name="type.railway.station.subway.bilbao">Gorsav Metro</string>
+    <string name="type.railway.station.subway.brasilia">Gorsav Metro</string>
+    <string name="type.railway.station.subway.brescia">Gorsav Metro</string>
+    <string name="type.railway.station.subway.brussels">Gorsav Metro</string>
+    <string name="type.railway.station.subway.bucharest">Gorsav Metro</string>
+    <string name="type.railway.station.subway.budapest">Gorsav Metro</string>
+    <string name="type.railway.station.subway.buenos_aires">Gorsav Metro</string>
+    <string name="type.railway.station.subway.bursa">Gorsav Metro</string>
+    <string name="type.railway.station.subway.cairo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.caracas">Gorsav Metro</string>
+    <string name="type.railway.station.subway.catania">Gorsav Metro</string>
+    <string name="type.railway.station.subway.changchun">Gorsav Metro</string>
+    <string name="type.railway.station.subway.chengdu">Gorsav Metro</string>
+    <string name="type.railway.station.subway.chicago">Gorsav Metro</string>
+    <string name="type.railway.station.subway.chongqing">Gorsav Metro</string>
+    <string name="type.railway.station.subway.dalian">Gorsav Metro</string>
+    <string name="type.railway.station.subway.delhi">Gorsav Metro</string>
+    <string name="type.railway.station.subway.dnepro">Gorsav Metro</string>
+    <string name="type.railway.station.subway.dubai">Gorsav Metro</string>
+    <string name="type.railway.station.subway.ekb">Gorsav Metro</string>
+    <string name="type.railway.station.subway.fukuoka">Gorsav Metro</string>
+    <string name="type.railway.station.subway.glasgow">Gorsav Metro</string>
+    <string name="type.railway.station.subway.guangzhou">Gorsav Metro</string>
+    <string name="type.railway.station.subway.hamburg">Gorsav Metro</string>
+    <string name="type.railway.station.subway.helsinki">Gorsav Metro</string>
+    <string name="type.railway.station.subway.hiroshima">Gorsav Metro</string>
+    <string name="type.railway.station.subway.hongkong">Gorsav Metro</string>
+    <string name="type.railway.station.subway.isfahan">Gorsav Metro</string>
+    <string name="type.railway.station.subway.istanbul">Gorsav Metro</string>
+    <string name="type.railway.station.subway.izmir">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kazan">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kharkiv">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kiev">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kobe">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kolkata">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kunming">Gorsav Metro</string>
+    <string name="type.railway.station.subway.kyoto">Gorsav Metro</string>
+    <string name="type.railway.station.subway.la">Gorsav Metro</string>
+    <string name="type.railway.station.subway.lausanne">Gorsav Metro</string>
+    <string name="type.railway.station.subway.lille">Gorsav Metro</string>
+    <string name="type.railway.station.subway.lima">Gorsav Metro</string>
+    <string name="type.railway.station.subway.lisboa">Gorsav Metro</string>
+    <string name="type.railway.station.subway.london">Gorsav Tube</string>
+    <string name="type.railway.station.subway.lyon">Gorsav Metro</string>
+    <string name="type.railway.station.subway.madrid">Gorsav Metro</string>
+    <string name="type.railway.station.subway.malaga">Gorsav Metro</string>
+    <string name="type.railway.station.subway.manila">Gorsav Metro</string>
+    <string name="type.railway.station.subway.maracaibo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.mashhad">Gorsav Metro</string>
+    <string name="type.railway.station.subway.mecca">Gorsav Metro</string>
+    <string name="type.railway.station.subway.medellin">Gorsav Metro</string>
+    <string name="type.railway.station.subway.mexico">Gorsav Metro</string>
+    <string name="type.railway.station.subway.milan">Gorsav Metro</string>
+    <string name="type.railway.station.subway.minsk">Gorsav Metro</string>
+    <string name="type.railway.station.subway.montreal">Gorsav Metro</string>
+    <string name="type.railway.station.subway.moscow">Gorsav Metro</string>
+    <string name="type.railway.station.subway.munchen">Gorsav Metro</string>
+    <string name="type.railway.station.subway.nagoya">Gorsav Metro</string>
+    <string name="type.railway.station.subway.newyork">Gorsav Metro</string>
+    <string name="type.railway.station.subway.nnov">Gorsav Metro</string>
+    <string name="type.railway.station.subway.novosibirsk">Gorsav Metro</string>
+    <string name="type.railway.station.subway.osaka">Gorsav Metro</string>
+    <string name="type.railway.station.subway.oslo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.palma">Gorsav Metro</string>
+    <string name="type.railway.station.subway.panama">Gorsav Metro</string>
+    <string name="type.railway.station.subway.paris">Gorsav Metro</string>
+    <string name="type.railway.station.subway.philadelphia">Gorsav Metro</string>
+    <string name="type.railway.station.subway.pyongyang">Gorsav Metro</string>
+    <string name="type.railway.station.subway.qingdao">Gorsav Metro</string>
+    <string name="type.railway.station.subway.rennes">Gorsav Metro</string>
+    <string name="type.railway.station.subway.rio">Gorsav Metro</string>
+    <string name="type.railway.station.subway.roma">Gorsav Metro</string>
+    <string name="type.railway.station.subway.rotterdam">Gorsav Metro</string>
+    <string name="type.railway.station.subway.samara">Gorsav Metro</string>
+    <string name="type.railway.station.subway.santiago">Gorsav Metro</string>
+    <string name="type.railway.station.subway.santo_domingo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.saopaulo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.sapporo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.sendai">Gorsav Metro</string>
+    <string name="type.railway.station.subway.sf">Gorsav Metro</string>
+    <string name="type.railway.station.subway.shanghai">Gorsav Metro</string>
+    <string name="type.railway.station.subway.shenzhen">Gorsav Metro</string>
+    <string name="type.railway.station.subway.shiraz">Gorsav Metro</string>
+    <string name="type.railway.station.subway.singapore">Gorsav Metro</string>
+    <string name="type.railway.station.subway.sofia">Gorsav Metro</string>
+    <string name="type.railway.station.subway.spb">Gorsav Metro</string>
+    <string name="type.railway.station.subway.stockholm">Gorsav Metro</string>
+    <string name="type.railway.station.subway.tabriz">Gorsav Metro</string>
+    <string name="type.railway.station.subway.taipei">Gorsav Metro</string>
+    <string name="type.railway.station.subway.taoyuan">Gorsav Metro</string>
+    <string name="type.railway.station.subway.tashkent">Gorsav Metro</string>
+    <string name="type.railway.station.subway.tbilisi">Gorsav Metro</string>
+    <string name="type.railway.station.subway.tehran">Gorsav Metro</string>
+    <string name="type.railway.station.subway.tianjin">Gorsav Metro</string>
+    <string name="type.railway.station.subway.tokyo">Gorsav Metro</string>
+    <string name="type.railway.station.subway.valencia">Gorsav Metro</string>
+    <string name="type.railway.station.subway.vienna">Gorsav Metro</string>
+    <string name="type.railway.station.subway.warszawa">Gorsav Metro</string>
+    <string name="type.railway.station.subway.washington">Gorsav Metro</string>
+    <string name="type.railway.station.subway.wuhan">Gorsav Metro</string>
+    <string name="type.railway.station.subway.yerevan">Gorsav Metro</string>
+    <string name="type.railway.station.subway.yokohama">Gorsav Metro</string>
+    <string name="type.railway.subway">Gorsav Metro</string>
+    <string name="type.railway.subway_entrance">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.adana">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.algiers">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.almaty">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.amsterdam">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.ankara">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.athens">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.baku">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.bangkok">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.barcelona">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.beijing">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.bengalore">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.berlin">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.bilbao">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.brasilia">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.brescia">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.brussels">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.bucharest">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.budapest">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.buenos_aires">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.bursa">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.cairo">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.caracas">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.catania">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.changchun">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.chengdu">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.chicago">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.chongqing">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.dalian">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.delhi">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.dnepro">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.dubai">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.ekb">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.fukuoka">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.glasgow">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.guangzhou">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.hamburg">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.helsinki">Entrans Metro</string>
+    <string name="type.railway.subway_entrance.hiroshima">Entrans Metro</string>
 </resources>

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

@@ -1500,4 +1500,5 @@
     <string name="type.shop.beauty.nails">Nagelsalon</string>
     <string name="type.amenity.food_sharing">Voedsel delen</string>
     <string name="type.amenity.give_box">Giftenkist</string>
+    <string name="type.amenity.hydrant">Watertappunt|waterkraan</string>
 </resources>