[android] Use separate function to check for MapTooOldToEdit

Signed-off-by: map-per <map-per@gmx.de>

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

@@ -1,8 +1,10 @@
-• 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
+• 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

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

@@ -1,8 +1,10 @@
-• 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
+• 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
 More details on codeberg.org/comaps/comaps/releases

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

@@ -0,0 +1,11 @@
+• 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,8 +1,10 @@
-• 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
+• 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

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

@@ -0,0 +1,10 @@
+• 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/pl-PL/release-notes.txt

@@ -0,0 +1,10 @@
+• 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,8 +1,10 @@
-• 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
+• 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
 Mais detalhes em codeberg.org/comaps/comaps/releases

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

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

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

@@ -450,16 +450,12 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
                            .setTitle(titleId)
                            .setMessage(messageId)
                            .setCancelable(true)
-                           .setOnCancelListener((dialog) -> setAction(RESUME))
+                           .setOnCancelListener((dialog) -> setAction(PAUSE))
                            .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/editor/EditorFragment.java

@@ -948,7 +948,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
     mDisused.setVisibility(Editor.nativeCanMarkPlaceAsDisused() ? View.VISIBLE : View.GONE);
 
-    if (Editor.nativeAreSomeFeatureChangesUploaded())
+    if (Editor.nativeIsMapObjectUploaded())
     {
       mReset.setText(R.string.editor_place_doesnt_exist);
       return;
@@ -966,7 +966,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
   private void reset()
   {
-    if (Editor.nativeAreSomeFeatureChangesUploaded())
+    if (Editor.nativeIsMapObjectUploaded())
     {
       placeDoesntExist();
       return;

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_window"/>
+  <solid android:color="@color/bg_panel"/>
   <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_window"/>
+  <solid android:color="@color/bg_panel"/>
 </shape>

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="?windowBackgroundForced">
+    android:background="?panel">
     <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="?windowBackgroundForced"
+    android:background="?panel"
     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="?selectableItemBackground"
+      android:background="?attr/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="?cardBackground"
+  android:background="?attr/cardBackground"
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
@@ -11,6 +11,7 @@
     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="?selectableItemBackgroundBorderless"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:layout_gravity="end|center_vertical"
         android:scaleType="centerInside"
         android:contentDescription="@string/save" />

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

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

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

@@ -12,6 +12,7 @@
     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

@@ -15,20 +15,15 @@
     android:theme="@style/MwmWidget.ToolbarTheme">
     <com.google.android.material.textview.MaterialTextView
       android:id="@+id/save"
-      android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:gravity="center"
-      android:layout_gravity="end|center_vertical"
-      android:background="?selectableItemBackgroundBorderless"
-      android:padding="@dimen/margin_half"
-      android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"
+      style="@style/MwmWidget.Downloader.ToolbarButton"
       android:text="@string/editor_report_problem_send_button"/>
   </com.google.android.material.appbar.MaterialToolbar>
 
   <ScrollView
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?panel">
 
     <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="?colorPrimary"
+      android:background="?attr/colorPrimary"
       android:elevation="@dimen/dp_0"
       app:elevation="@dimen/dp_0">
         <include

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

@@ -6,6 +6,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:background="?windowBackgroundForced"
   android:animateLayoutChanges="true"
   android:clickable="true"
   android:clipToPadding="false"

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

@@ -6,7 +6,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_gravity="center"
   android:orientation="vertical"
-  android:background="?cardBackground"
+  android:background="?windowBackgroundForced"
   android:padding="@dimen/margin_base">
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"

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

@@ -7,7 +7,6 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
   android:minHeight="@dimen/height_item_oneline"
   android:paddingStart="@dimen/margin_base_plus"
   android:paddingEnd="@dimen/margin_base_plus">

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

@@ -7,7 +7,6 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
   android:minHeight="@dimen/height_item_oneline"
   android:paddingStart="@dimen/margin_base_plus"
   android:paddingEnd="@dimen/margin_base_plus">

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">
 
-    <com.google.android.material.divider.MaterialDivider
+    <View
       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="?windowBackgroundForced"
+  android:background="?panel"
   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="?selectableItemBackground"
+        android:background="?attr/selectableItemBackground"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingStart="@dimen/margin_quarter"

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

@@ -6,7 +6,6 @@
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
   android:layout_marginBottom="@dimen/margin_half_plus"
-  android:textSize="@dimen/text_size_headline"
-  android:fontFamily="@string/robotoMedium"
+  android:textAppearance="@style/MwmTextAppearance.Title.Toolbar"
   android:gravity="center_horizontal"
   tools:text="Some long long long placeholder title"/>

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="?cardBackground"
+    android:background="?panel"
     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="?windowBackgroundForced"
+  android:background="?ppButtonsBackground"
   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="?selectableItemBackgroundBorderless"
+            android:background="?attr/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="?drivingOptionsViewBg"
+    android:background="?attr/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="?selectableItemBackgroundBorderless"
+      android:background="?attr/selectableItemBackgroundBorderless"
       android:gravity="center"
       android:minHeight="@dimen/height_block_base">
       <LinearLayout

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textview.MaterialTextView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  style="@style/MwmWidget.Tab"
+  android:textAppearance="@style/MwmTextAppearance.Body3"
+  tools:drawableStart="@drawable/ic_menu_open"
+  tools:text="Some tab"/>

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="?selectableItemBackgroundBorderless"
+    android:background="?attr/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="?selectableItemBackgroundBorderless"
+    android:background="?attr/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="?selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackgroundBorderless"
     android:contentDescription="@null"
     android:scaleType="center"
     app:srcCompat="@drawable/ic_mic_white"

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 ændringer</string>
+    <string name="editor_reset_edits_button">Kassér</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>

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">Änderungen verwerfen</string>
+    <string name="editor_reset_edits_button">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,17 +902,9 @@
         <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 auf leerstehend setzen</string>
+    <string name="editor_mark_business_vacant_title">Geschäft als leerstehend markieren</string>
     <string name="editor_submit">Absenden</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="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="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-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 muudatustest</string>
+    <string name="editor_reset_edits_button">Loobu</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>
@@ -911,10 +911,4 @@
     <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

@@ -42,15 +42,15 @@
     <!-- Text in About screen -->
     <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="close">بستن</string>
-    <string name="unsupported_phone">برنامه به OpenGL نیازمند است.شوربختانه، از دستگاه شما پشتیبانی نمی‌شود.</string>
+    <string name="unsupported_phone">متأسفانه دستگاه شما از آن پشتیبانی نمی‌کندبرنامه برای اجرا به OpenGL نیازمند است.</string>
     <string name="download">بارگیری</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">لطفا پیش از بکارگیری برنامه، نخست کمی جا در کارت SD/ویر USB آزاد کنید</string>
-    <string name="download_resources">پیش از بکارگیری برنامه, لطفا نقشه پیش‌نمایش جهانی را بر روی دستگاه خویش بارگیری کنید.\nاندازه %s از ویر شما را می‌گیرد.</string>
+    <string name="not_enough_free_space_on_sdcard">لطفا مقداری از فضای ذخیره‌سازی را آزاد نمایید</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>
@@ -64,7 +64,7 @@
     <!-- "Add new bookmark list" dialog title -->
     <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 -->
@@ -784,6 +784,4 @@
     <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-kw/strings.xml

@@ -373,6 +373,4 @@
     <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

@@ -851,6 +851,4 @@
     <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 endringer</string>
+    <string name="editor_reset_edits_button">Forkast</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>
@@ -906,10 +906,4 @@
     <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,6 +88,19 @@
     <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-pt/strings.xml

@@ -909,10 +909,4 @@
     <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 editările hărții pentru întreaga lume</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>
     <!-- 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">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_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_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,13 +889,4 @@
     <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-tr/strings.xml

@@ -893,5 +893,4 @@
     <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>
@@ -917,10 +917,4 @@
     <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

@@ -44,7 +44,6 @@
   <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

@@ -544,7 +544,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 changes</string>
+    <string name="editor_reset_edits_button">Discard</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>
@@ -966,8 +966,6 @@
     <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>

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

@@ -15,6 +15,11 @@
     <item name="android:textStyle">bold</item>
   </style>
 
+  <style name="MwmTextAppearance.Title.Toolbar">
+    <item name="android:textSize">@dimen/text_size_toolbar</item>
+    <item name="android:fontFamily">@string/robotoMedium</item>
+  </style>
+
   <style name="MwmTextAppearance.Headline">
     <item name="android:textSize">@dimen/text_size_headline</item>
     <item name="android:textColor">?android:textColorPrimary</item>
@@ -116,6 +121,10 @@
     <item name="android:textColor">@color/bg_cards</item>
   </style>
 
+  <style name="MwmTextAppearance.Toolbar.Title.Button">
+    <item name="android:textSize">@dimen/text_size_body_3</item>
+  </style>
+
   <style name="MwmTextAppearance.NavMenu">
     <item name="android:textStyle">bold</item>
   </style>

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

@@ -287,6 +287,13 @@
     <item name="android:textColor">@color/text_light</item>
   </style>
 
+  <style name="MwmWidget.Tab">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
+    <item name="android:gravity">center</item>
+  </style>
+
   <style name="MwmWidget.TabLayout" parent="Widget.Design.TabLayout">
     <item name="tabMaxWidth">0dp</item>
     <item name="tabTextAppearance">@style/MwmTextAppearance.Tab</item>
@@ -298,6 +305,16 @@
     <item name="tabSelectedTextColor">@color/white_primary</item>
   </style>
 
+  <style name="MwmWidget.Downloader.ToolbarButton">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:gravity">center</item>
+    <item name="android:layout_gravity">end|center_vertical</item>
+    <item name="android:background">?selectableItemBackgroundBorderless</item>
+    <item name="android:padding">@dimen/margin_half</item>
+    <item name="android:textAppearance">@style/MwmTextAppearance.Toolbar.Title.Button</item>
+  </style>
+
   <style name="MwmWidget.MaterialCalendar.Theme.FullScreen.Dark"
     parent="ThemeOverlay.Material3.MaterialCalendar.Fullscreen">
     <item name="colorSurface">@color/material_calendar_surface_dark</item>
@@ -360,6 +377,9 @@
   <style name="MwmWidget.M3.Button" parent="Widget.Material3.Button">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
+    <item name="android:textColor">?accentButtonTextColor</item>
+    <item name="backgroundTint">@null</item>
+    <item name="cornerRadius">20dp</item>
     <item name="android:textSize">16sp</item>
   </style>
 
@@ -369,11 +389,13 @@
 
   <style name="MwmWidget.M3.Button.Secondary" parent="@style/Widget.Material3.Button.OutlinedButton">
     <item name="android:textSize">16sp</item>
+    <item name="strokeColor">?colorSecondary</item>
     <item name="android:textColor">?colorSecondary</item>
   </style>
 
   <style name="MwmWidget.M3.FAB.Primary" parent="@style/Widget.Material3.FloatingActionButton.Primary">
     <item name="shapeAppearance">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
+    <item name="rippleColor">@null</item>
     <item name="backgroundTint">?colorSecondary</item>
     <item name="tint">?android:textColorPrimaryInverse</item>
   </style>

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

@@ -69,4 +69,19 @@
     <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,6 +93,19 @@
     <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,8 +144,7 @@
       </intent>
     </PreferenceScreen>
   </androidx.preference.PreferenceCategory>
-
-  <PreferenceCategory
+<PreferenceCategory
     android:key="@string/pref_power"
     android:title="@string/power_management"
     android:order="4">
@@ -191,8 +190,7 @@
         android:defaultValue="true"
         android:widgetLayout="@layout/preference_switch"
         android:order="5"/>
-  </PreferenceCategory>
-
+</PreferenceCategory>
   <androidx.preference.PreferenceCategory
     android:key="@string/pref_privacy"
     android:title="@string/privacy"
@@ -214,18 +212,11 @@
       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>
+        android:key="@string/pref_custom_map_download_url"
+        android:title="@string/download_resources_custom_url_title"
+        app:icon="@drawable/ic_cloud_download"
+        android:order="3" />
 
+  </androidx.preference.PreferenceCategory>
 </androidx.preference.PreferenceScreen>

android/sdk/src/main/assets/mapcss-mapping.csv

@@ -1 +0,0 @@
-../../../../../data/mapcss-mapping.csv

android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp

@@ -580,10 +580,10 @@ JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetMapObject
   return static_cast<jint>(osm::Editor::Instance().GetFeatureStatus(g_editableMapObject.GetID()));
 }
 
-JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeAreSomeFeatureChangesUploaded(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsMapObjectUploaded(JNIEnv * env, jclass clazz)
 {
-  return osm::Editor::Instance().AreSomeFeatureChangesUploaded(g_editableMapObject.GetID().m_mwmId,
-                                                               g_editableMapObject.GetID().m_index);
+  return osm::Editor::Instance().IsFeatureUploaded(g_editableMapObject.GetID().m_mwmId,
+                                                   g_editableMapObject.GetID().m_index);
 }
 
 // static nativeMakeLocalizedName(String langCode, String name);

android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java

@@ -190,5 +190,5 @@ public final class Editor
 
   @FeatureStatus
   public static native int nativeGetMapObjectStatus();
-  public static native boolean nativeAreSomeFeatureChangesUploaded();
+  public static native boolean nativeIsMapObjectUploaded();
 }

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

@@ -707,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">Entrada de cueva</string>
+    <string name="type.natural.cave_entrance">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>
@@ -743,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 de compañía</string>
+    <string name="type.office.company">Oficina</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>
@@ -784,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">Suburbio</string>
+    <string name="type.place.suburb">Barrio</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">Aerogenerador</string>
+    <string name="type.power.generator.wind">Generador de viento</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>
@@ -849,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 (S-Bahn)</string>
+    <string name="type.railway.station.light_rail.berlin">Estación de tren</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 metro</string>
-    <string name="type.railway.station.monorail">Estación de monoriel</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.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>
@@ -1122,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">Tienda erótica</string>
+    <string name="type.shop.erotic">Sex Shop</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>
@@ -1207,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">Tienda al por mayor</string>
+    <string name="type.shop.wholesale">Almacén 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>
@@ -1247,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 vacacional</string>
+    <string name="type.tourism.apartment">Apartamento de vacaciones</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,5 +1494,4 @@
     <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-nl/types_strings.xml

@@ -1500,5 +1500,4 @@
     <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>

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

@@ -1501,5 +1501,4 @@
     <string name="type.natural.tree">Árvore</string>
     <string name="type.shop.beauty.nails">Salão de Unhas</string>
     <string name="type.xmas.tree">Árvore de Natal</string>
-    <string name="type.amenity.hydrant">Boca de Rega</string>
 </resources>

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

@@ -369,100 +369,4 @@
     <string name="type.cuisine.breakfast">Zajtrk</string>
     <string name="type.cuisine.bubble_tea">Čaj s tapiokinimi kroglicami (\'Bubble Tea\')</string>
     <string name="type.cuisine.chicken">Piščanec</string>
-    <string name="type.cuisine.greek">Grška kuhinja</string>
-    <string name="type.cuisine.hungarian">Madžarska kuhinja</string>
-    <string name="type.cuisine.ice_cream">Sladoled</string>
-    <string name="type.cuisine.indian">Indijska kuhinja</string>
-    <string name="type.cuisine.indonesian">Indonezijska kuhinja</string>
-    <string name="type.cuisine.international">Mednarodna kuhinja</string>
-    <string name="type.cuisine.irish">Irska kuhinja</string>
-    <string name="type.cuisine.italian">Italijanska kuhinja</string>
-    <string name="type.cuisine.italian_pizza">Italijanska kuhinja, pica</string>
-    <string name="type.cuisine.japanese">Japonska kuhinja</string>
-    <string name="type.cuisine.korean">Korejska kuhinja</string>
-    <string name="type.cuisine.lao">Laoška kuhinja</string>
-    <string name="type.cuisine.lebanese">Libanonska kuhinja</string>
-    <string name="type.cuisine.local">Krajevna kuhinja</string>
-    <string name="type.cuisine.malaysian">Malezijska kuhinja</string>
-    <string name="type.cuisine.mediterranean">Sredozemska kuhinja</string>
-    <string name="type.cuisine.mexican">Mehiška kuhinja</string>
-    <string name="type.cuisine.moroccan">Maroška kuhinja</string>
-    <string name="type.cuisine.oriental">Orientalska kuhinja</string>
-    <string name="type.cuisine.pancake">Palačinke</string>
-    <string name="type.cuisine.pasta">Testenine</string>
-    <string name="type.cuisine.persian">Perzijska kuhinja</string>
-    <string name="type.cuisine.peruvian">Perujska kuhinja</string>
-    <string name="type.cuisine.pizza">Pica</string>
-    <string name="type.cuisine.polish">Poljska kuhinja</string>
-    <string name="type.cuisine.portuguese">Portugalska kuhinja</string>
-    <string name="type.cuisine.russian">Ruska kuhinja</string>
-    <string name="type.cuisine.sandwich">Sendvič</string>
-    <string name="type.cuisine.sausage">Salama</string>
-    <string name="type.cuisine.savory_pancakes">Slane palačinke</string>
-    <string name="type.cuisine.seafood">Morska hrana</string>
-    <string name="type.cuisine.soba">Soba (ajdovi rezanci)</string>
-    <string name="type.cuisine.spanish">Španska kuhinja</string>
-    <string name="type.cuisine.steak_house">Zrezkarnica</string>
-    <string name="type.cuisine.sushi">Suši</string>
-    <string name="type.cuisine.tea">Čaj</string>
-    <string name="type.cuisine.turkish">Turška kuhinja</string>
-    <string name="type.cuisine.vegan">Veganska kuhinja</string>
-    <string name="type.cuisine.vegetarian">Vegetarijanska kuhinja</string>
-    <string name="type.cuisine.vietnamese">Vietnamska kuhinja</string>
-    <string name="type.emergency">V sili</string>
-    <string name="type.emergency.access_point">Reševalno mesto</string>
-    <string name="type.emergency.assembly_point">Zbirno mesto</string>
-    <string name="type.emergency.life_ring">Reševalni obroč</string>
-    <string name="type.emergency.defibrillator">Defibrilator</string>
-    <string name="type.emergency.fire_hydrant">Požarni hidrant</string>
-    <string name="type.amenity.hydrant">Namakalni hidrant</string>
-    <string name="type.emergency.phone">Telefon v sili</string>
-    <string name="type.emergency.lifeguard">Reševalec</string>
-    <string name="type.beacon.cardinal.east">Glavni usmerjevalni znak</string>
-    <string name="type.beacon.cardinal.north">Glavni usmerjevalni znak</string>
-    <string name="type.beacon.cardinal.south">Glavni usmerjevalni znak</string>
-    <string name="type.beacon.cardinal.west">Glavni usmerjevalni znak</string>
-    <string name="type.beacon.isolated_danger">Usmerjevalni znak ločene nevarnosti</string>
-    <string name="type.craft.caterer">Ponudnik cateringa</string>
-    <string name="type.cuisine.balkan">Balkanska kuhinja</string>
-    <string name="type.cuisine.barbecue">Jedi na žaru</string>
-    <string name="type.cuisine.bavarian">Bavarska kuhinja</string>
-    <string name="type.cuisine.brazilian">Brazilska kuhinja</string>
-    <string name="type.cuisine.burger">Burger</string>
-    <string name="type.cuisine.buschenschank">Vinotoč (Buschenschank)</string>
-    <string name="type.cuisine.deli">Delkatesa</string>
-    <string name="type.cuisine.regional">Regionalna kuhinja</string>
-    <string name="type.cuisine.tapas">Tapas (španski prigrizki)</string>
-    <string name="type.cuisine.thai">Tajska kuhinja</string>
-    <string name="type.beacon.lateral.port">Bočni usmerjevalni znak</string>
-    <string name="type.beacon.lateral.starboard">Bočni usmerjevalni znak</string>
-    <string name="type.beacon.safe_water">Znak varne plovne poti</string>
-    <string name="type.beacon.special_purpose">Usmerjevalni znak posebnega namena</string>
-    <string name="type.buoy.cardinal.east">Glavna boja</string>
-    <string name="type.buoy.cardinal.north">Glavna boja</string>
-    <string name="type.buoy.cardinal.south">Glavna boja</string>
-    <string name="type.buoy.cardinal.west">Glavna boja</string>
-    <string name="type.lateral.port">Pristanišče</string>
-    <string name="type.cardinal.east">Vzhod</string>
-    <string name="type.cardinal.north">Sever</string>
-    <string name="type.cardinal.south">Jug</string>
-    <string name="type.cardinal.west">Zahod</string>
-    <string name="type.emergency.mountain_rescue">Postaja gorskih reševalcev</string>
-    <string name="type.entrance">Vhod</string>
-    <string name="type.entrance.main">Glavni vhod</string>
-    <string name="type.entrance.house">Vhod hiše</string>
-    <string name="type.entrance.garage">Vhod garaže</string>
-    <string name="type.entrance.service">Servisni vhod</string>
-    <string name="type.entrance.entry">Vstop (samo)</string>
-    <string name="type.entrance.exit">Izhod (samo)</string>
-    <string name="type.healthcare.laboratory">Zdravstveni laboratorij</string>
-    <string name="type.healthcare.psychotherapist">Psihoterapevt</string>
-    <string name="type.highway.cycleway.tunnel">Predor</string>
-    <string name="type.highway.elevator">Dvigalo</string>
-    <string name="type.highway.footway">Pešpot</string>
-    <string name="type.highway.footway.sidewalk">Pločnik</string>
-    <string name="type.highway.footway.crossing">Prehod za pešce</string>
-    <string name="type.highway.footway.area">Površina za pešce</string>
-    <string name="type.highway.footway.bridge">Most za pešce</string>
-    <string name="type.highway.footway.tunnel">Predor za pešce</string>
 </resources>

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

@@ -1399,5 +1399,4 @@
     <string name="type.amenity.ranger_station">Orman Bekçisi</string>
     <string name="type.amenity.bench.backless">Sırtı Açık Bank</string>
     <string name="type.amenity.charging_station.motorcar.small">Araç Şarj Noktası</string>
-    <string name="type.amenity.sailing_school">Denizcilik Okulu</string>
 </resources>

data/categories-strings/en.json/localize.json

@@ -34,7 +34,7 @@
 "shop-farm|@category_food|@shop": "Farm food",
 "shop-garden_centre|@shop": "4Garden Centre|U+1F3E1",
 "shop-grocery|@category_food|@shop": "Grocery",
-"shop-health_food|@category_food|@shop": "7Health food|7Healthy food|healthfood|organic",
+"shop-health_food|@category_food|@shop": "7Health food|7Healthy food|healthfood|organic|vegan|vegetarian",
 "shop-hearing_aids|@shop": "7Hearing Aids",
 "shop-mobile_phone|@shop": "4Cell Phones|4Mobile Phones|6smartphones|electronics store|U+1F4F1|U+1F4F2",
 "shop-florist|@shop": "4Florist|U+1F337|U+1F338|U+1F339|U+1F33A|U+1F33B|U+1F33C|U+1F490|U+1F33E|4flowers|flower shop|floral shop|floral arrangements|same day flowers|bouquet",
@@ -453,7 +453,7 @@
 "shop-tattoo": "Tattoo Parlour|4tattoos",
 "shop-variety_store|@category_shopping|@shop": "4Variety|6Dollar store|5Pound shop|5Five and dime",
 "shop-video|@shop": "4Video|3DVD|videoshop|5video shop|video rental|video rental shop|video rental store",
-"shop-video_games|@shop": "Video games|4videogames|video games|videogames|gaming|games|video game|videogame|U+1F47E|U+1F579|U+1F3AE",
+"shop-video_games|@shop": "Video games|4videogames|video games|videogames|gaming|games|U+1F47E|U+1F579|U+1F3AE",
 "tourism-wilderness_hut|@category_hotel": "4Wilderness Hut|5backcountry hut|hut|mountain hut|bothy|bivvy",
 "tourism-gallery|@category_tourism": "3Art Gallery|3Gallery|museum",
 "tourism-theme_park|@category_tourism|@category_children": "5Theme park|Amusement park",

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

@@ -220,13 +220,13 @@
 "tourism-motel|@category_hotel": "3Motel|auberge de jeunesse",
 "tourism-alpine_hut|@category_hotel": "Refuge de montagne|auberge de jeunesse|cabane alpine",
 "shop-hairdresser": "3Coiffeur|salon de coiffure",
-"aeroway-aerodrome": "3Aéroport|3aérodrome|3avion|3aérogare",
+"aeroway-aerodrome": "3Aéroport|3aérodrome|3avion",
 "leisure-stadium": "4Stade|4sport",
-"leisure-playground|@category_children": "Terrain de jeu|aire de jeu|parc de jeux|espace de jeu",
-"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Centre sportif|salle omnisports|complexe sportif|sport",
+"leisure-playground|@category_children": "Terrain de jeu|aire de jeu",
+"leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "Centre sportif|sport",
 "leisure-golf_course": "Terrain de golf|Parcours de golf",
 "leisure-miniature_golf": "Minigolf",
-"leisure-escape_game": "Salle d'évasion|escape game",
+"leisure-escape_game": "Salle d'évasion",
 "leisure-pitch": "Terrain de sport|sport",
 "leisure-swimming_pool": "4Piscine|sport",
 "sport-american_football": "Football américain",
@@ -245,12 +245,12 @@
 "sport-gymnastics": "Gymnastique",
 "sport-handball": "Handball",
 "sport-scuba_diving": "Plongée sous-marine",
-"sport-shooting": "Stand de tir|Centre de tir|champ de tir|salle de tir",
+"sport-shooting": "Stand de tir|Centre de tir",
 "sport-skateboard": "Skateboard",
 "sport-skiing": "Ski",
 "sport-soccer": "Football",
 "sport-swimming": "Piscine|Natation",
-"sport-table_tennis": "Tennis de table|Ping Pong",
+"sport-table_tennis": "Tennis de table",
 "sport-tennis": "Tennis",
 "sport-padel": "Padel",
 "sport-volleyball": "Volley-ball",
@@ -272,27 +272,27 @@
 "natural-water-pond|@waterbody": "Étang|bassin",
 "natural-water-lake|@waterbody": "Lac",
 "natural-water-reservoir|landuse-reservoir|@waterbody": "5Réservoir",
-"waterway-river|waterway-stream|natural-water-river": "Rivière|fleuve|ruisseau|cours d'eau|torrent",
+"waterway-river|waterway-stream|natural-water-river": "Rivière|fleuve",
 "waterway-canal": "Canal",
 "shop-car_repair": "3Réparation d'automobiles|3garage|4station service|voiture|auto|garagiste|mécano|mécanicien automobile",
 "tourism-camp_site|@category_hotel": "4Camping|terrain de camping",
 "tourism-caravan_site|@category_rv||@category_hotel": "4Parc caravanier|VR|caravane|camping-car",
 "office": "Bureau|compagnie",
 "office-company": "Bureaux d'entreprise",
-"office-government": "Administration publique|service public|fonction publique|service civil|services administratifs",
-"office-lawyer": "Cabinet d'avocat|bureau d'avocat",
+"office-government": "Administration publique",
+"office-lawyer": "Cabinet d'avocat",
 "office-telecommunication": "Opérateur mobile",
 "craft-beekeeper": "Apiculteur",
 "craft-blacksmith": "Forgeron",
-"craft-brewery": "Brasserie artisanale|Brasseur|micro-brasserie",
+"craft-brewery": "Brasserie artisanale|Brasseur",
 "craft-caterer": "Traiteur",
 "craft-carpenter": "Menuisier|charpentier",
 "craft-confectionery": "Confiseur",
 "craft-electrician": "4Électricien",
 "craft-electronics_repair": "Réparation d'appareils électroniques",
-"craft-gardener": "Paysagiste|jardinier",
+"craft-gardener": "Paysagiste",
 "craft-grinding_mill": "Moulin",
-"craft-handicraft": "Artisanat|fait-main|métiers d'art",
+"craft-handicraft": "Artisanat",
 "craft-hvac": "Chauffage, ventilation et climatisation",
 "craft-metal_construction": "5Métallo|métallurgiste",
 "craft-key_cutter": "Reproduction de clé",
@@ -302,7 +302,7 @@
 "craft-plumber": "Plombier",
 "craft-sawmill": "Scierie",
 "craft-shoemaker": "Cordonnier",
-"craft-winery": "Chai|établissement vinicole",
+"craft-winery": "Chai",
 "craft-tailor": "5Tailleur",
 "area:highway-footway|area:highway-pedestrian|area:highway-steps|place-square": "Place",
 "place-sea": "Mer",
@@ -320,11 +320,11 @@
 "shop-copyshop": "Boutique de photocopies|5Imprimerie",
 "shop-photo|@shop": "5Matériel de photographie|5Photographie|Cadres",
 "shop-camera|@shop": "Boutique d'appareils photo",
-"shop-travel_agency": "Agence de voyages|Voyages organisés|agence de tourisme|voyagiste",
+"shop-travel_agency": "Agence de voyages|Voyages organisés",
 "shop-outdoor|@shop": "Matériel de loisirs de plein air|Randonnée|Escalade|Camping",
 "shop-dry_cleaning": "Nettoyage à sec|Pressing|Lavage",
 "shop-tyres|@shop": "Pneu|Pneus",
-"amenity-car_wash": "Station de lavage|lavage-auto|lavage de voiture",
+"amenity-car_wash": "Station de lavage|lavage-autp",
 "amenity-veterinary": "Docteur vétérinaire|véto|Clinique vétérinaire",
 "@charging_station": "Borne de recharge|station de recharge|4voiture électrique|4recharge|IRVE",
 "amenity-charging_station-bicycle|@charging_station": "Chargement des vélos",
@@ -332,14 +332,14 @@
 "amenity-bicycle_parking": "Parking à vélo|Stationnement vélo",
 "amenity-waste_basket": "Poubelle",
 "emergency-phone": "3Téléphone d'urgence",
-"leisure-fitness_centre": "Centre fitness|salle de gym|salle de sport|centre de remise en forme",
+"leisure-fitness_centre": "Centre fitness|salle de gym|salle de sport",
 "leisure-sauna": "3Sauna",
 "shop-car_repair-tyres|shop-car_repair": "Réparation de pneus",
 "shop-chemist|@shop": "4Droguerie",
-"shop-pet|@shop": "5Animalerie|magasin d'animaux",
-"tourism-zoo|@category_tourism|@category_children": "Zoo|Parc Animalier|ménagerie|parc zoologique",
+"shop-pet|@shop": "5Animalerie",
+"tourism-zoo|@category_tourism|@category_children": "Zoo|Parc Animalier",
 "attraction-animal": "Enclos pour animaux",
-"tourism-information-office|amenity-ranger_station|@category_tourism": "Office de tourisme|syndicat d'initiative|bureau d'information touristique",
+"tourism-information-office|amenity-ranger_station|@category_tourism": "Office de tourisme|syndicat d'initiative",
 "tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "centre de visite",
 "amenity-community_centre": "Centre communautaire|Salle polyvalente|Salle des fêtes",
 "amenity-compressed_air": "Air comprimé",
@@ -350,14 +350,14 @@
 "amenity-vending_machine-drinks": "Distributeur de boissons|cannettes",
 "amenity-vending_machine-food|@category_food": "Distributeur d'aliments|Aliments",
 "amenity-vending_machine-parking_tickets|@category_parking": "Horodateur|parcmètre",
-"amenity-vending_machine-public_transport_tickets|@category_transport": "Distributeur de billets de transport en commun|ticket de bus|ticket de tram|ticket de métro",
+"amenity-vending_machine-public_transport_tickets|@category_transport": "Distributeur de billets de transport en commun|ticket de bus",
 "amenity-vending_machine-newspapers": "Distributeur de journaux|Journaux",
 "amenity-vending_machine-sweets": "Distributeur de bonbons|Bonbons",
 "amenity-vending_machine-excrement_bags": "5Distributeur de sacs à excréments",
 "amenity-parcel_locker|@category_post": "Consigne automatique pour colis|3locker",
 "shop-outpost": "Point de retrait",
 "building-garage": "Garage",
-"highway-rest_area|highway-services": "Aire de repos|Aire de service|relais routier",
+"highway-rest_area|highway-services": "Aire de repos|Aire de service",
 "man_made-chimney": "Cheminée",
 "man_made-tower|man_made-flare": "Tour",
 "shop-bookmaker|@gambling": "Bookmaker",
@@ -371,12 +371,12 @@
 "tourism-information-board": "Panneau d'informations",
 "tourism-information-map": "Carte touristique|Plan",
 "aerialway-station": "Remontées mécaniques",
-"aeroway-helipad": "Hélisurface|zone d'atterrissage pour hélicoptères",
-"barrier-border_control": "Contrôle aux frontières|contrôle frontalier",
+"aeroway-helipad": "Hélisurface",
+"barrier-border_control": "Contrôle aux frontières",
 "leisure-water_park|@category_tourism|@category_children": "Centre aquatique|Parc aquatique",
 "man_made-water_tower": "Château d'eau",
 "man_made-windmill": "Moulin",
-"natural-cave_entrance": "4Grotte|caverne",
+"natural-cave_entrance": "4Grotte",
 "natural-volcano|@mountain": "4Volcan",
 "office-estate_agent": "Agence immobilière|agent immobilier",
 "waterway-lock_gate": "Écluse",
@@ -387,24 +387,24 @@
 "leisure-resort|@category_hotel": "Complexe touristique",
 "amenity-biergarten|@category_eat|@category_nightlife": "5Biergarten",
 "amenity-driving_school": "4Auto-école|École de conduite",
-"amenity-music_school": "École de musique|conservatoire de musique",
+"amenity-music_school": "École de musique",
 "amenity-language_school": "École de langue",
 "amenity-ice_cream": "Stand de crème glacée|Marchand de glaces|Glacier",
 "amenity-internet_cafe": "5Cybercafé",
 "amenity-motorcycle_parking": "Parking moto|Stationnement moto",
 "amenity-parking_space-disabled|@category_parking": "Place de stationnement handicapé|Stationnement PMR|Parking PMR",
-"amenity-nursing_home": "Maison de retraite|résidence pour personnes âgées|EHPAD",
+"amenity-nursing_home": "Maison de retraite|résidence pour personnes âgées",
 "amenity-payment_terminal": "Terminal de paiement",
 "amenity-public_bath": "Bain public",
 "amenity-shower": "Douche",
 "emergency-assembly_point": "Point de rassemblement d'urgence",
 "emergency-defibrillator": "4Défibrillateur|DAE",
-"emergency-fire_hydrant": "Bouche d’incendie|borne d’incendie|Poteau d’incendie|Hydrant",
-"amenity-hydrant": "Bouche de puisage|borne de puisage|Hydrant",
-"emergency-lifeguard": "Sauveteur d’urgence",
+"emergency-fire_hydrant": "Bouche d’incendie|bouche de incendie|borne d’incendie|borne de incendie|Borne hydratante|Poteau d’incendie|Hydrant|Hydrante",
+"amenity-hydrant": "Bouche d’puisage|bouche de puisage|borne d’puisage|bourne de puisage|Hydrant|Hydrante",
+"emergency-lifeguard": "Sauveteur d’urgence|Sauveteur",
 "emergency-mountain_rescue": "Sauveteurs en montagne d’urgence",
 "leisure-fitness_station": "Station de fitness|Parcours de santé",
-"office-insurance": "Bureau d’assurance|assureur|Agent d'assurance|courtier en assurance|compagnie d'assurance",
+"office-insurance": "Bureau d’assurance|assureur|Agent d'assurance",
 "office-ngo": "Bureau d'ONG|organisation non gouvernementale|Bureau ONG",
 "shop-erotic|@shop": "Boutique érotique",
 "shop-massage": "Salon de massage",
@@ -416,10 +416,10 @@
 "shop-tattoo": "Salon de tatouage|tatoueur",
 "shop-variety_store|@category_shopping|@shop": "Bazar",
 "shop-video|@shop": "Boutique de vidéos|videostore",
-"shop-video_games|@shop": "Boutique de jeux vidéos",
+"shop-video_games|@shop": "Boutique de jeux vidéo",
 "tourism-wilderness_hut|@category_hotel": "Refuge non gardé|Refuge-bivouac",
-"tourism-gallery|@category_tourism": "3Galerie d'art|musée d'art|galerie de peinture",
-"tourism-theme_park|@category_tourism|@category_children": "Parc d'attractions|Parc de loisirs|parc à thèmes",
+"tourism-gallery|@category_tourism": "3Galerie d'art|musée d'art",
+"tourism-theme_park|@category_tourism|@category_children": "Parc d'attractions|Parc de loisirs",
 "boundary-national_park|@category_tourism": "Parc national",
 "leisure-nature_reserve|@category_tourism": "Réserve naturelle",
 "natural-cape": "Cap",
@@ -447,7 +447,7 @@
 "shop-medical_supply|@shop": "Materiel médical",
 "shop-nutrition_supplements|@shop": "Suppléments nutritionnels",
 "shop-paint|@shop": "Magasin de peinture",
-"shop-perfumery|@category_shopping|@shop": "Parfumerie|boutique de parfum",
+"shop-perfumery|@category_shopping|@shop": "Parfumerie",
 "shop-sewing|@shop": "Mercerie|Couture",
 "shop-storage_rental": "Location de stockage",
 "shop-tobacco|@shop": "Bureau de tabac",
@@ -462,19 +462,19 @@
 "amenity-social_facility": "Établissement de services sociaux",
 "leisure-sports_hall": "Salle de sport",
 "amenity-arts_centre|@category_tourism": "Centre artistique",
-"amenity-prison": "prison|centre pénitentiaire|centre de détention",
+"amenity-prison": "prison",
 "amenity-exhibition_centre": "Centre d'exposition",
 "shop-bathroom_furnishing|@shop": "Mobilier de salle de bain",
 "shop-bed|@shop": "Magasin de literie",
 "shop-boutique|@shop": "Boutique",
-"amenity-food_court": "Aire de restauration|foodcourt",
+"amenity-food_court": "Aire de restauration",
 "shop-curtain|@shop": "Magasin de rideaux",
-"shop-gas|@shop": "Vente de gaz|bouteille de gaz",
+"shop-gas|@shop": "Vente de gaz",
 "shop-pet_grooming": "Salon de toilettage",
 "shop-hifi|@shop": "Matériel Hi-Fi",
 "amenity-conference_centre": "Centre de conférence",
 "shop-herbalist|@shop": "Herboristerie",
-"shop-appliance|@shop": "Magasin d'électroménager|boutique d'électroménager",
+"shop-appliance|@shop": "Magasin d'électroménager",
 "shop-agrarian|@shop": "Magasin d'agriculture",
 "shop-fashion_accessories|@shop": "Boutique d'accessoires de mode",
 "amenity-waste_transfer_station": "Station de transfert de déchets",
@@ -489,7 +489,7 @@
 "amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Chargeur automobile|Chargeur de voiture|Chargeur",
 "shop-lighting|@shop": "4Lumières|Luminaires|4Lampes",
 "office-security": "Bureau de sécurité",
-"building-guardhouse": "Garde|poste de sécurité|poste de gardiennage",
+"building-guardhouse": "Garde",
 "leisure-dance|@category_entertainment": "4Danse|École de danse",
 "shop-money_lender": "Prêteur d'argent",
 "attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "Attraction|Labyrinthe",

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

@@ -550,7 +550,7 @@
 "Italy_Emilia-Romagna_Forli-Cesena":"Покрајина Форли-Чезена",
 "Italy_Emilia-Romagna_Modena":"Покрајина Модена",
 "Italy_Emilia-Romagna_Parma":"Покрајина Парма",
-"Italy_Emilia-Romagna_Piacenza":"Покрајина Пјаченца",
+"Italy_Emilia-Romagna_Piacenza":"Покрајина Пјаћенца",
 "Italy_Emilia-Romagna_Ravenna":"Покрајина Равена",
 "Italy_Emilia-Romagna_Reggio Emilia":"Покрајина Ређо Емилија",
 "Italy_Emilia-Romagna_Rimini":"Покрајина Римини",
@@ -1881,7 +1881,7 @@
 "Italy_Veneto_Treviso Description":"Тревизо, Конелијано, Кастелфранко Венето",
 "Italy_Veneto_Venezia Description":"Венеција, Местре, Кјоџа",
 "Italy_Veneto_Verona Description":"Верона, Вилафранка ди Верона, Лењаго",
-"Italy_Veneto_Vicenza Description":"Виченца, Басано дел Грапа, Скио",
+"Italy_Veneto_Vicenza Description":"Вићенца, Басано дел Грапа, Скио",
 "Jamaica Description":"Кингстон, Монтего Беј, Спениш Таун",
 "Japan_Chubu Region_Aichi_Nagoya Description":"Нагоја, Цушима, Кијосу",
 "Japan_Chubu Region_Aichi_Toyohashi Description":"Тахара, Гамагори, Нишио",

data/editor.config

@@ -394,25 +394,32 @@
       <type id="amenity-pharmacy" group="shop">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-place_of_worship-buddhist">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-buddhist" can_add="no">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-place_of_worship-christian">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-christian" can_add="no">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-place_of_worship-hindu">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-hindu" can_add="no">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-place_of_worship-jewish">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-jewish" can_add="no">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-place_of_worship-muslim">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-muslim" can_add="no">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-place_of_worship-shinto">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-shinto" can_add="no">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-place_of_worship-taoist">
+      <!-- Can not be added because it is a complex type -->
+      <type id="amenity-place_of_worship-taoist" can_add="no">
         <include group="poi_internet" />
       </type>
       <type id="amenity-place_of_worship">
@@ -698,9 +705,6 @@
       <type id="leisure-resort">
         <include group="poi_internet" />
       </type>
-      <type id="leisure-sports_centre-sport-swimming">
-        <include group="poi_internet" />
-      </type>
       <type id="leisure-sports_centre">
         <include group="poi_internet" />
       </type>
@@ -1111,7 +1115,6 @@
       <type id="tourism-artwork">
         <include field="name" />
       </type>
-      <!-- Not addable because OSM category is too broad and due to vandalism problems -->
       <type id="tourism-attraction" can_add="no">
         <include group="poi_internet" />
 <!--        <include field="wikipedia" />-->
@@ -1141,22 +1144,26 @@
         <include group="poi_internet" />
         <include field="self_service" />
       </type>
-      <type id="tourism-information-office">
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-office" can_add="no">
         <include group="poi_internet" />
       </type>
-      <type id="tourism-information-visitor_centre">
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-visitor_centre" can_add="no">
         <include group="poi_internet" />
       </type>
-      <type id="tourism-information-board">
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-board" can_add="no">
         <include field="name" />
       </type>
-      <type id="tourism-information-map">
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-map" can_add="no">
         <include field="name" />
       </type>
-      <type id="tourism-information-guidepost">
+      <!-- Can not be added because it is a complex type -->
+      <type id="tourism-information-guidepost" can_add="no">
       </type>
-      <!-- Too generic to add -->
-      <type id="tourism-information" can_add="no">
+      <type id="tourism-information">
         <include group="poi" />
       </type>
       <type id="amenity-ranger_station">
@@ -1502,50 +1509,67 @@
       <type id="leisure-escape_game">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-vending_machine-parking_tickets">
-        <include field="operator" />
-        <include field="level" />
-      </type>
-      <type id="amenity-vending_machine-public_transport_tickets">
-        <include field="operator" />
-        <include field="level" />
-      </type>
+      <!-- Uncomment this after our editor core supports complex types
       <type id="amenity-vending_machine-cigarettes">
+        <tag k="amenity" v="vending_machine" />
+        <tag k="vending" v="cigarettes" />
         <include field="operator" />
-        <include field="level" />
-      </type>
-      <type id="amenity-vending_machine-drinks">
-        <include field="operator" />
-        <include field="level" />
-      </type>
-      <type id="amenity-vending_machine-excrement_bags">
-        <include field="operator" />
-        <include field="level" />
       </type>
       <type id="amenity-vending_machine-coffee">
+        <tag k="amenity" v="vending_machine" />
+        <tag k="vending" v="coffee" />
         <include field="operator" />
-        <include field="level" />
       </type>
       <type id="amenity-vending_machine-condoms">
+        <tag k="amenity" v="vending_machine" />
+        <tag k="vending" v="condoms" />
+        <include field="operator" />
+      </type>
+      <type id="amenity-vending_machine-drinks">
+        <tag k="amenity" v="vending_machine" />
+        <tag k="vending" v="drinks" />
         <include field="operator" />
-        <include field="level" />
       </type>
       <type id="amenity-vending_machine-food">
+        <tag k="amenity" v="vending_machine" />
+        <tag k="vending" v="food" />
         <include field="operator" />
-        <include field="level" />
       </type>
       <type id="amenity-vending_machine-newspapers">
+        <tag k="amenity" v="vending_machine" />
+        <tag k="vending" v="newspapers" />
         <include field="operator" />
-        <include field="level" />
       </type>
       <type id="amenity-vending_machine-sweets">
+        <tag k="amenity" v="vending_machine" />
+        <tag k="vending" v="sweets" />
         <include field="operator" />
-        <include field="level" />
       </type>
-      <type id="amenity-vending_machine">
-        <include field="operator" />
-        <include field="level" />
+      <type id="shop-car_repair-tyres">
+        <tag k="shop" v="car_repair" />
+        <tag k="service" v="tyres" />
+        <include group="poi_internet" />
       </type>
+      <type id="leisure-sports_centre-climbing">
+        <tag k="leisure" v="sports_centre" />
+        <tag k="sport" v="climbing" />
+        <include group="poi_internet" />
+      </type>
+      <type id="leisure-sports_centre-shooting">
+        <tag k="leisure" v="sports_centre" />
+        <tag k="sport" v="shooting" />
+        <include group="poi_internet" />
+      </type>
+      <type id="leisure-sports_centre-swimming">
+        <tag k="leisure" v="sports_centre" />
+        <tag k="sport" v="swimming" />
+        <include group="poi_internet" />
+      </type>
+      <type id="leisure-sports_centre-yoga">
+        <tag k="leisure" v="sports_centre" />
+        <tag k="sport" v="yoga" />
+        <include group="poi_internet" />
+      </type-->
       <!-- Not addable as mapping as a node is uncommon -->
       <type id="natural-beach" can_add="no">
         <include field="name" />

data/mapcss-mapping.csv

@@ -5,7 +5,7 @@
 #   highway|bus_stop;[highway=bus_stop];;name;int_name;22;
 # It contains:
 # - type name: "highway|bus_stop" ("|" is converted to "-" internally)
-# - mapcss selectors for tags: "[highway=bus_stop]", multiple selectors are separated with commas, best practice tagging for OSM editor is listed first
+# - mapcss selectors for tags: "[highway=bus_stop]", multiple selectors are separated with commas
 # - "x" for a deprecated type or an empty cell otherwise
 # - primary title tag (usually "name")
 # - secondary title tag (usually "int_name")
@@ -626,7 +626,7 @@ highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503;
 drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504;
 drinking_water|no;505;
 amenity|sailing_school;[amenity=sailing_school],[education=sailing_school];;name;int_name;506;
-amenity|flight_school;[amenity=flight_school],[education=flight_school];;name;int_name;507;
+amenity|flight_school;[amenity=sailing_school],[education=flight_school];;name;int_name;507;
 amenity|prep_school;[amenity=prep_school],[education=prep_school];;name;int_name;508;
 amenity|car_pooling;509;
 social_facility|soup_kitchen;510;

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

@@ -28,7 +28,7 @@
 "take_exit_number":"Nehmen Sie die Ausfahrt auf",
 "take_exit_number_street_verb":"NULL",
 "route_recalculating":"Neuberechnung der Route",
-"destination":"erreichen Sie ihr Ziel.",
+"destination":"Werden Sie ankommen.",
 "you_have_reached_the_destination":"Sie haben Ihr Ziel erreicht.",
 "in_50_meters":"In fünfzig Metern",
 "in_100_meters":"In einhundert Metern",

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

@@ -1,32 +1,32 @@
 {
 "make_a_slight_right_turn":"Rechts aanhouden.",
-"make_a_slight_right_turn_street":"een flauwe bocht naar rechts",
+"make_a_slight_right_turn_street":"flauwe bocht naar rechts",
 "make_a_right_turn":"Sla rechtsaf.",
 "make_a_right_turn_street":"Sla rechtsaf",
 "make_a_sharp_right_turn":"Scherp rechtsaf.",
 "make_a_sharp_right_turn_street":"scherp naar rechts afslaan",
 "enter_the_roundabout":"Rij de rotonde op.",
-"enter_the_roundabout_street":"de rotonde op",
-"enter_the_roundabout_street_verb":"Rij",
+"enter_the_roundabout_street":"de rotonde",
+"enter_the_roundabout_street_verb":"Rijd",
 "leave_the_roundabout":"Verlaat de rotonde.",
 "leave_the_roundabout_street":"de rotonde",
 "leave_the_roundabout_street_verb":"Verlaat",
 "make_a_slight_left_turn":"Links aanhouden.",
-"make_a_slight_left_turn_street":"een flauwe bocht naar links",
+"make_a_slight_left_turn_street":"de flauwe bocht naar links",
 "make_a_slight_left_turn_street_verb":"Neem",
 "make_a_left_turn":"Sla linksaf.",
-"make_a_left_turn_street":"Sla linksaf",
+"make_a_left_turn_street":"naar links afslaan",
 "make_a_sharp_left_turn":"Scherp linksaf.",
 "make_a_sharp_left_turn_street":"scherp naar links afslaan",
 "make_a_u_turn":"Keer om.",
-"make_a_u_turn_street":"om",
-"make_a_u_turn_street_verb":"Keer",
+"make_a_u_turn_street":"NULL",
+"make_a_u_turn_street_verb":"NULL",
 "go_straight":"Rij rechtdoor.",
 "exit":"Verlaat.",
 "onto":"naar",
 "take_exit_number":"Verlaat naar",
 "take_exit_number_street_verb":"Neem",
-"route_recalculating":"Route herberekenen",
+"route_recalculating":"De route herberekenen",
 "destination":"Arriveert u.",
 "you_have_reached_the_destination":"Bestemming bereikt.",
 "in_50_meters":"Over vijftig meter",
@@ -104,5 +104,5 @@
 "in_1_5_miles":"Over anderhalve mijl",
 "in_2_miles":"Over twee mijl",
 "unknown_camera":"Camera in zicht",
-"make_a_slight_right_turn_street_verb":"Neem"
+"make_a_slight_right_turn_street_verb":"NULL"
 }

data/styles/default/dark/symbols/shield-ro-dj-scaled.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg3604"
+   width="41"
+   height="35.213001"
+   viewBox="0 0 820 704.26"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" />
+  <g
+     id="g3612"
+     transform="matrix(0,-0.08,-0.08,0,1056,751.84)">
+    <path
+       id="path3660"
+       style="fill:#999999;fill-opacity:1;stroke-width:10.9979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+       d="M 2787,4111 C 3245,3388 4042,2950 4898,2950 H 9398 V 13200 H 4898 c -856,0 -1653,-440 -2112,-1160 L 866.3,9013 C 504.2,8440 504.2,7710 866.3,7137 L 2786,4110" />
+    <path
+       d="M 9021,12820 H 4898 c -728,0 -1405,-370 -1795,-990 L 1183,8811 C 898.3,8362 898.3,7788 1183,7338 L 3103,4311 c 390,-613 1067,-986 1795,-986 h 4123 z"
+       style="fill:#294c88;stroke-width:10.9979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"
+       id="path3628" />
+  </g>
+</svg>

data/styles/default/dark/symbols/shield-ro-dj.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg3604"
+   width="34.599998"
+   height="30.212999"
+   viewBox="0 0 823.80951 719.35714"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" />
+  <g
+     id="g3612"
+     transform="matrix(0,-0.08,-0.08,0,1056,751.84)">
+    <path
+       id="path3660"
+       style="fill:#999999;fill-opacity:1;stroke-width:10.9979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+       d="m 2692.6554,4087.1907 c 458,-723 1255,-1161 2111,-1161 h 4500 V 13176.19 h -4500 c -856,0 -1653,-440 -2112,-1160 L 771.95535,8989.1907 c -362.1,-573 -362.1,-1303 0,-1876 l 1919.70005,-3027" />
+    <path
+       d="m 8926.6554,12796.19 h -4123 c -728,0 -1405,-370 -1795,-990 l -1920,-3018.9993 c -284.70005,-449 -284.70005,-1023 0,-1473 l 1920,-3027 c 390,-613 1067,-986 1795,-986 h 4123 z"
+       style="fill:#294c88;fill-opacity:1;stroke-width:10.9979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+       id="path3628" />
+  </g>
+</svg>

data/styles/default/dark/symbols/shield-ro-dn-scaled.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg848"
+   xml:space="preserve"
+   width="38.514999"
+   height="37"
+   viewBox="0 0 770.29999 740"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs1" />
+   <path
+   id="path874"
+   style="fill:#999999;stroke-width:0.9312;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"
+   d="m 612.9,7.16 -7.6,7.04 -7.7,6.64 -8,6.48 -8.2,6.24 -8.2,6 -8.6,5.68 -8.7,5.44 -8.8,5.12 -9,4.96 -9.1,4.64 -9.4,4.24 -9.4,4.08 -9.6,3.68 -9.6,3.52 -9.8,3.12 -9.8,2.8 -10,2.56 -10,2.24 -10,1.84 -10.3,1.6 -10.1,1.28 -10.3,0.88 -10.2,0.72 -10.3,0.32 H 380 l -10.2,-0.32 -10.3,-0.72 -10.2,-0.88 -10.2,-1.28 -10.1,-1.6 -10,-1.84 -10,-2.24 -10,-2.56 -9.9,-2.8 -9.7,-3.12 -9.7,-3.52 -9.5,-3.68 -9.5,-4.08 -9.3,-4.24 -9.2,-4.64 -8.9,-4.96 -8.5,-5.12 -9.6,-5.44 -8,-5.68 -8,-6 -8.8,-6.24 -8,-6.48 -7.2,-6.64 -8,-7.04 L 150,-0.04 0.4,150 l 4.8,5.5 5.6,5.7 4,5.9 4.8,6.1 4,6.4 4,6.4 4,6.6 4,6.7 2.4,6.8 3.2,7.1 2.4,7.1 2.4,7.2 2.4,7.3 1.6,7.3 1.6,7.5 0.8,7.6 1.6,7.5 v 7.5 l 0.8,7.6 v 7.6 l -0.8,7.6 -0.8,7.5 -0.8,7.5 -0.8,7.6 -1.6,7.3 -2.4,7.5 -1.6,7.2 -2.4,7.2 -3.2,7.1 -2.4,7 -3.2,6.9 -3.2,6.7 -4,6.6 c -36,58.7 -36.8,131.8 -3.2,191.5 34.4,59.6 96.8,96.5 165.6,96.5 l 1.6,-0.1 8.8,0.2 10.4,0.4 9.6,0.8 9.2,1.1 9.5,1.3 9.4,1.7 9.3,2 9.4,2.3 9.2,2.6 9.2,2.8 9,3.1 8.9,3.5 8.8,3.7 8.7,4 8.6,4.3 8.4,4.5 8.3,4.8 8.1,5.1 8,5.3 7.8,5.6 7.6,5.8 7.3,6.1 7.5,-6.1 7.6,-5.8 7.7,-5.6 7.9,-5.3 8.2,-5.1 8.3,-4.8 8.4,-4.5 8.5,-4.3 8.8,-4 8.8,-3.7 8.9,-3.5 9.1,-3.1 9.1,-2.8 9.2,-2.6 9.3,-2.3 9.4,-2 9.4,-1.7 9.4,-1.3 9.6,-1.1 9.6,-0.8 9.5,-0.4 10.1,-0.2 c 69.2,0 132.4,-36.9 166.1,-96.5 33.7,-59.6 32.7,-132.8 -2.5,-191.4 l -3.9,-6.6 -3.4,-6.7 -3.3,-6.9 -3,-7 -2.7,-7.1 -2.4,-7.2 -2.1,-7.2 -1.7,-7.5 -1.6,-7.3 -1.2,-7.6 -1,-7.5 -0.6,-7.5 -0.3,-7.6 v -7.6 l 0.2,-7.6 0.6,-7.5 0.9,-7.5 1.2,-7.6 1.5,-7.5 1.8,-7.3 2.1,-7.3 2.3,-7.2 2.6,-7.1 3,-7.1 3.2,-6.8 3.5,-6.7 3.8,-6.6 4,-6.4 4.2,-6.4 4.5,-6.1 4.8,-5.9 5,-5.7 5.2,-5.5 -150,-150.04 z" />
+   <path
+   id="path872"
+   style="fill:#9f1a17;stroke-width:0.9312;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"
+   d="m 729.4,151.6 -4.8,6.6 -4.4,6.8 -4.3,7 -4,7 -3.7,7.2 -3.4,7.4 -3.2,7.5 -2.9,7.6 -2.6,7.7 -2.3,7.7 -2,7.9 -1.8,8 -1.4,8 -1.2,8 -0.8,8.1 -0.6,8.2 -0.2,8.1 v 8.1 l 0.4,8.1 0.7,8.1 0.9,8.1 1.2,8 1.6,8 1.7,8 2.3,7.8 2.4,7.8 2.7,7.6 2.9,7.6 3.2,7.4 3.6,7.3 3.8,7.2 4,7 c 29.6,49.5 30.5,111.1 2.2,161.2 -28.4,50.3 -81.6,81.4 -140,81.4 l -10.9,0.1 -10.3,0.5 -10.4,0.8 -10.3,1.1 -10.2,1.5 -10.2,1.8 -10.1,2.1 -10,2.4 -10,2.7 -10,3.1 -9.7,3.2 -9.8,3.7 -9.5,4 -9.4,4.3 -9.3,4.5 -9.1,4.8 -9.1,5.1 -8.8,5.5 -8.7,5.7 -8.5,5.9 -8.4,-5.9 -8.7,-5.7 -8.8,-5.5 -9,-5.1 -9.2,-4.8 -9.2,-4.5 -9.5,-4.3 -9.6,-4 -9.7,-3.7 -9.7,-3.2 -9.9,-3.1 -10,-2.7 -10.1,-2.4 -10.1,-2.1 -10.2,-1.8 -10.3,-1.5 -10.2,-1.1 -10.1,-0.8 -11.2,-0.5 H 190.8 C 132.4,639.2 78.8,608 50.8,557.8 22,507.6 22.8,446 53.2,396.5 l 4,-7 4,-7.2 2.4,-7.3 4,-7.4 3.2,-7.6 2.4,-7.6 2.4,-7.8 2.4,-7.8 1.6,-8 1.6,-8 1.6,-8 0.8,-8.1 0.8,-8.1 v -8.1 -8.1 -8.1 l -0.8,-8.2 -0.8,-8.1 -0.8,-8 -1.6,-8 -1.6,-8 -2.4,-7.9 -2.4,-7.7 -2.4,-7.7 -3.2,-7.6 -3.2,-7.5 -3.2,-7.4 -3.2,-7.2 -4,-7 -4.8,-7 -4.8,-6.8 -4.8,-6.6 110.4,-109.96 8,6.64 8,6.48 8.8,6.16 8.8,5.92 8.8,5.76 8,5.44 9.6,5.12 8.8,4.96 9.5,4.64 9.5,4.4 9.6,4.04 9.6,3.8 9.9,3.6 9.8,3.3 10,2.9 10,2.7 10.2,2.4 10.1,2.1 10.3,1.7 10.3,1.6 10.3,1.1 10.4,1 10.4,0.6 10.4,0.2 h 10.4 l 10.4,-0.2 10.4,-0.6 10.4,-1 10.3,-1.1 10.4,-1.6 10.2,-1.7 10.2,-2.1 10.1,-2.4 10.1,-2.7 10,-2.9 9.9,-3.3 9.8,-3.6 9.7,-3.8 9.6,-4.04 9.4,-4.4 9.3,-4.64 9.2,-4.96 9,-5.12 8.9,-5.44 8.6,-5.76 8.7,-5.92 8.3,-6.16 8.2,-6.48 8,-6.64 z" />
+   </svg>

data/styles/default/dark/symbols/shield-ro-dn.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg848"
+   xml:space="preserve"
+   width="32.514999"
+   height="31"
+   viewBox="0 0 774.16667 738.09526"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs1" />
+  <path
+   id="path874"
+   style="fill:#999999;fill-opacity:1;stroke-width:0.9312;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+   d="m 612.9,7.16 -7.6,7.04 -7.7,6.64 -8,6.48 -8.2,6.24 -8.2,6 -8.6,5.68 -8.7,5.44 -8.8,5.12 -9,4.96 -9.1,4.64 -9.4,4.24 -9.4,4.08 -9.6,3.68 -9.6,3.52 -9.8,3.12 -9.8,2.8 -10,2.56 -10,2.24 -10,1.84 -10.3,1.6 -10.1,1.28 -10.3,0.88 -10.2,0.72 -10.3,0.32 H 380 l -10.2,-0.32 -10.3,-0.72 -10.2,-0.88 -10.2,-1.28 -10.1,-1.6 -10,-1.84 -10,-2.24 -10,-2.56 -9.9,-2.8 -9.7,-3.12 -9.7,-3.52 -9.5,-3.68 -9.5,-4.08 -9.3,-4.24 -9.2,-4.64 -8.9,-4.96 -8.5,-5.12 -9.6,-5.44 -8,-5.68 -8,-6 -8.8,-6.24 -8,-6.48 -7.2,-6.64 -8,-7.04 L 150,-0.04 0.4,150 l 4.8,5.5 5.6,5.7 4,5.9 4.8,6.1 4,6.4 4,6.4 4,6.6 4,6.7 2.4,6.8 3.2,7.1 2.4,7.1 2.4,7.2 2.4,7.3 1.6,7.3 1.6,7.5 0.8,7.6 1.6,7.5 v 7.5 l 0.8,7.6 v 7.6 l -0.8,7.6 -0.8,7.5 -0.8,7.5 -0.8,7.6 -1.6,7.3 -2.4,7.5 -1.6,7.2 -2.4,7.2 -3.2,7.1 -2.4,7 -3.2,6.9 -3.2,6.7 -4,6.6 c -36,58.7 -36.8,131.8 -3.2,191.5 34.4,59.6 96.8,96.5 165.6,96.5 l 1.6,-0.1 8.8,0.2 10.4,0.4 9.6,0.8 9.2,1.1 9.5,1.3 9.4,1.7 9.3,2 9.4,2.3 9.2,2.6 9.2,2.8 9,3.1 8.9,3.5 8.8,3.7 8.7,4 8.6,4.3 8.4,4.5 8.3,4.8 8.1,5.1 8,5.3 7.8,5.6 7.6,5.8 7.3,6.1 7.5,-6.1 7.6,-5.8 7.7,-5.6 7.9,-5.3 8.2,-5.1 8.3,-4.8 8.4,-4.5 8.5,-4.3 8.8,-4 8.8,-3.7 8.9,-3.5 9.1,-3.1 9.1,-2.8 9.2,-2.6 9.3,-2.3 9.4,-2 9.4,-1.7 9.4,-1.3 9.6,-1.1 9.6,-0.8 9.5,-0.4 10.1,-0.2 c 69.2,0 132.4,-36.9 166.1,-96.5 33.7,-59.6 32.7,-132.8 -2.5,-191.4 l -3.9,-6.6 -3.4,-6.7 -3.3,-6.9 -3,-7 -2.7,-7.1 -2.4,-7.2 -2.1,-7.2 -1.7,-7.5 -1.6,-7.3 -1.2,-7.6 -1,-7.5 -0.6,-7.5 -0.3,-7.6 v -7.6 l 0.2,-7.6 0.6,-7.5 0.9,-7.5 1.2,-7.6 1.5,-7.5 1.8,-7.3 2.1,-7.3 2.3,-7.2 2.6,-7.1 3,-7.1 3.2,-6.8 3.5,-6.7 3.8,-6.6 4,-6.4 4.2,-6.4 4.5,-6.1 4.8,-5.9 5,-5.7 5.2,-5.5 -150,-150.04 z" />
+  <path
+   id="path872"
+   style="fill:#9f1a17;fill-opacity:1;stroke-width:0.9312;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+   d="m 729.4,151.6 -4.8,6.6 -4.4,6.8 -4.3,7 -4,7 -3.7,7.2 -3.4,7.4 -3.2,7.5 -2.9,7.6 -2.6,7.7 -2.3,7.7 -2,7.9 -1.8,8 -1.4,8 -1.2,8 -0.8,8.1 -0.6,8.2 -0.2,8.1 v 8.1 l 0.4,8.1 0.7,8.1 0.9,8.1 1.2,8 1.6,8 1.7,8 2.3,7.8 2.4,7.8 2.7,7.6 2.9,7.6 3.2,7.4 3.6,7.3 3.8,7.2 4,7 c 29.6,49.5 30.5,111.1 2.2,161.2 -28.4,50.3 -81.6,81.4 -140,81.4 l -10.9,0.1 -10.3,0.5 -10.4,0.8 -10.3,1.1 -10.2,1.5 -10.2,1.8 -10.1,2.1 -10,2.4 -10,2.7 -10,3.1 -9.7,3.2 -9.8,3.7 -9.5,4 -9.4,4.3 -9.3,4.5 -9.1,4.8 -9.1,5.1 -8.8,5.5 -8.7,5.7 -8.5,5.9 -8.4,-5.9 -8.7,-5.7 -8.8,-5.5 -9,-5.1 -9.2,-4.8 -9.2,-4.5 -9.5,-4.3 -9.6,-4 -9.7,-3.7 -9.7,-3.2 -9.9,-3.1 -10,-2.7 -10.1,-2.4 -10.1,-2.1 -10.2,-1.8 -10.3,-1.5 -10.2,-1.1 -10.1,-0.8 -11.2,-0.5 H 190.8 C 132.4,639.2 78.8,608 50.8,557.8 22,507.6 22.8,446 53.2,396.5 l 4,-7 4,-7.2 2.4,-7.3 4,-7.4 3.2,-7.6 2.4,-7.6 2.4,-7.8 2.4,-7.8 1.6,-8 1.6,-8 1.6,-8 0.8,-8.1 0.8,-8.1 v -8.1 -8.1 -8.1 l -0.8,-8.2 -0.8,-8.1 -0.8,-8 -1.6,-8 -1.6,-8 -2.4,-7.9 -2.4,-7.7 -2.4,-7.7 -3.2,-7.6 -3.2,-7.5 -3.2,-7.4 -3.2,-7.2 -4,-7 -4.8,-7 -4.8,-6.8 -4.8,-6.6 110.4,-109.96 8,6.64 8,6.48 8.8,6.16 8.8,5.92 8.8,5.76 8,5.44 9.6,5.12 8.8,4.96 9.5,4.64 9.5,4.4 9.6,4.04 9.6,3.8 9.9,3.6 9.8,3.3 10,2.9 10,2.7 10.2,2.4 10.1,2.1 10.3,1.7 10.3,1.6 10.3,1.1 10.4,1 10.4,0.6 10.4,0.2 h 10.4 l 10.4,-0.2 10.4,-0.6 10.4,-1 10.3,-1.1 10.4,-1.6 10.2,-1.7 10.2,-2.1 10.1,-2.4 10.1,-2.7 10,-2.9 9.9,-3.3 9.8,-3.6 9.7,-3.8 9.6,-4.04 9.4,-4.4 9.3,-4.64 9.2,-4.96 9,-5.12 8.9,-5.44 8.6,-5.76 8.7,-5.92 8.3,-6.16 8.2,-6.48 8,-6.64 z" />
+  </svg>

data/styles/default/include/Icons.mapcss

@@ -2455,9 +2455,9 @@ node|z17-[amenity=parking],
 {icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10}
 
 node|z16-[amenity=car_pooling],
-{icon-image: parking_pooling-s.svg;icon-min-distance: 5;}
+{icon-image: parking-pooling-s.svg;icon-min-distance: 5;}
 node|z17-[amenity=car_pooling],
-{icon-image: parking_pooling-m.svg;font-size: 11;icon-min-distance: 10}
+{icon-image: parking-pooling-m.svg;font-size: 11;icon-min-distance: 10}
 
 node|z16-[amenity=parking][location=underground],
 {icon-image:parking_underground-m.svg;}

data/styles/default/light/symbols/shield-ro-dj-scaled.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg3604"
+   width="41"
+   height="35.213001"
+   viewBox="0 0 820 704.26"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" />
+  <g
+     id="g3612"
+     transform="matrix(0,-0.08,-0.08,0,1056,751.84)">
+    <path
+       id="path3660"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:10.9979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+       d="M 2787,4111 C 3245,3388 4042,2950 4898,2950 H 9398 V 13200 H 4898 c -856,0 -1653,-440 -2112,-1160 L 866.3,9013 C 504.2,8440 504.2,7710 866.3,7137 L 2786,4110" />
+    <path
+       d="M 9021,12820 H 4898 c -728,0 -1405,-370 -1795,-990 L 1183,8811 C 898.3,8362 898.3,7788 1183,7338 L 3103,4311 c 390,-613 1067,-986 1795,-986 h 4123 z"
+       style="fill:#1A5EC1;stroke-width:10.9979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"
+       id="path3628" />
+  </g>
+</svg>

data/styles/default/light/symbols/shield-ro-dj.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg3604"
+   width="34.599998"
+   height="30.212999"
+   viewBox="0 0 823.80951 719.35714"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" />
+  <g
+     id="g3612"
+     transform="matrix(0,-0.08,-0.08,0,1056,751.84)">
+    <path
+       id="path3660"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:10.9979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+       d="m 2692.6554,4087.1907 c 458,-723 1255,-1161 2111,-1161 h 4500 V 13176.19 h -4500 c -856,0 -1653,-440 -2112,-1160 L 771.95535,8989.1907 c -362.1,-573 -362.1,-1303 0,-1876 l 1919.70005,-3027" />
+    <path
+       d="m 8926.6554,12796.19 h -4123 c -728,0 -1405,-370 -1795,-990 l -1920,-3018.9993 c -284.70005,-449 -284.70005,-1023 0,-1473 l 1920,-3027 c 390,-613 1067,-986 1795,-986 h 4123 z"
+       style="fill:#1A5EC1;fill-opacity:1;stroke-width:10.9979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+       id="path3628" />
+  </g>
+</svg>

data/styles/default/light/symbols/shield-ro-dn-scaled.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg848"
+   xml:space="preserve"
+   width="38.514999"
+   height="37"
+   viewBox="0 0 770.29999 740"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs1" />
+   <path
+   id="path874"
+   style="fill:#ffffff;stroke-width:0.9312;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"
+   d="m 612.9,7.16 -7.6,7.04 -7.7,6.64 -8,6.48 -8.2,6.24 -8.2,6 -8.6,5.68 -8.7,5.44 -8.8,5.12 -9,4.96 -9.1,4.64 -9.4,4.24 -9.4,4.08 -9.6,3.68 -9.6,3.52 -9.8,3.12 -9.8,2.8 -10,2.56 -10,2.24 -10,1.84 -10.3,1.6 -10.1,1.28 -10.3,0.88 -10.2,0.72 -10.3,0.32 H 380 l -10.2,-0.32 -10.3,-0.72 -10.2,-0.88 -10.2,-1.28 -10.1,-1.6 -10,-1.84 -10,-2.24 -10,-2.56 -9.9,-2.8 -9.7,-3.12 -9.7,-3.52 -9.5,-3.68 -9.5,-4.08 -9.3,-4.24 -9.2,-4.64 -8.9,-4.96 -8.5,-5.12 -9.6,-5.44 -8,-5.68 -8,-6 -8.8,-6.24 -8,-6.48 -7.2,-6.64 -8,-7.04 L 150,-0.04 0.4,150 l 4.8,5.5 5.6,5.7 4,5.9 4.8,6.1 4,6.4 4,6.4 4,6.6 4,6.7 2.4,6.8 3.2,7.1 2.4,7.1 2.4,7.2 2.4,7.3 1.6,7.3 1.6,7.5 0.8,7.6 1.6,7.5 v 7.5 l 0.8,7.6 v 7.6 l -0.8,7.6 -0.8,7.5 -0.8,7.5 -0.8,7.6 -1.6,7.3 -2.4,7.5 -1.6,7.2 -2.4,7.2 -3.2,7.1 -2.4,7 -3.2,6.9 -3.2,6.7 -4,6.6 c -36,58.7 -36.8,131.8 -3.2,191.5 34.4,59.6 96.8,96.5 165.6,96.5 l 1.6,-0.1 8.8,0.2 10.4,0.4 9.6,0.8 9.2,1.1 9.5,1.3 9.4,1.7 9.3,2 9.4,2.3 9.2,2.6 9.2,2.8 9,3.1 8.9,3.5 8.8,3.7 8.7,4 8.6,4.3 8.4,4.5 8.3,4.8 8.1,5.1 8,5.3 7.8,5.6 7.6,5.8 7.3,6.1 7.5,-6.1 7.6,-5.8 7.7,-5.6 7.9,-5.3 8.2,-5.1 8.3,-4.8 8.4,-4.5 8.5,-4.3 8.8,-4 8.8,-3.7 8.9,-3.5 9.1,-3.1 9.1,-2.8 9.2,-2.6 9.3,-2.3 9.4,-2 9.4,-1.7 9.4,-1.3 9.6,-1.1 9.6,-0.8 9.5,-0.4 10.1,-0.2 c 69.2,0 132.4,-36.9 166.1,-96.5 33.7,-59.6 32.7,-132.8 -2.5,-191.4 l -3.9,-6.6 -3.4,-6.7 -3.3,-6.9 -3,-7 -2.7,-7.1 -2.4,-7.2 -2.1,-7.2 -1.7,-7.5 -1.6,-7.3 -1.2,-7.6 -1,-7.5 -0.6,-7.5 -0.3,-7.6 v -7.6 l 0.2,-7.6 0.6,-7.5 0.9,-7.5 1.2,-7.6 1.5,-7.5 1.8,-7.3 2.1,-7.3 2.3,-7.2 2.6,-7.1 3,-7.1 3.2,-6.8 3.5,-6.7 3.8,-6.6 4,-6.4 4.2,-6.4 4.5,-6.1 4.8,-5.9 5,-5.7 5.2,-5.5 -150,-150.04 z" />
+   <path
+   id="path872"
+   style="fill:#E63534;stroke-width:0.9312;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;fill-opacity:1"
+   d="m 729.4,151.6 -4.8,6.6 -4.4,6.8 -4.3,7 -4,7 -3.7,7.2 -3.4,7.4 -3.2,7.5 -2.9,7.6 -2.6,7.7 -2.3,7.7 -2,7.9 -1.8,8 -1.4,8 -1.2,8 -0.8,8.1 -0.6,8.2 -0.2,8.1 v 8.1 l 0.4,8.1 0.7,8.1 0.9,8.1 1.2,8 1.6,8 1.7,8 2.3,7.8 2.4,7.8 2.7,7.6 2.9,7.6 3.2,7.4 3.6,7.3 3.8,7.2 4,7 c 29.6,49.5 30.5,111.1 2.2,161.2 -28.4,50.3 -81.6,81.4 -140,81.4 l -10.9,0.1 -10.3,0.5 -10.4,0.8 -10.3,1.1 -10.2,1.5 -10.2,1.8 -10.1,2.1 -10,2.4 -10,2.7 -10,3.1 -9.7,3.2 -9.8,3.7 -9.5,4 -9.4,4.3 -9.3,4.5 -9.1,4.8 -9.1,5.1 -8.8,5.5 -8.7,5.7 -8.5,5.9 -8.4,-5.9 -8.7,-5.7 -8.8,-5.5 -9,-5.1 -9.2,-4.8 -9.2,-4.5 -9.5,-4.3 -9.6,-4 -9.7,-3.7 -9.7,-3.2 -9.9,-3.1 -10,-2.7 -10.1,-2.4 -10.1,-2.1 -10.2,-1.8 -10.3,-1.5 -10.2,-1.1 -10.1,-0.8 -11.2,-0.5 H 190.8 C 132.4,639.2 78.8,608 50.8,557.8 22,507.6 22.8,446 53.2,396.5 l 4,-7 4,-7.2 2.4,-7.3 4,-7.4 3.2,-7.6 2.4,-7.6 2.4,-7.8 2.4,-7.8 1.6,-8 1.6,-8 1.6,-8 0.8,-8.1 0.8,-8.1 v -8.1 -8.1 -8.1 l -0.8,-8.2 -0.8,-8.1 -0.8,-8 -1.6,-8 -1.6,-8 -2.4,-7.9 -2.4,-7.7 -2.4,-7.7 -3.2,-7.6 -3.2,-7.5 -3.2,-7.4 -3.2,-7.2 -4,-7 -4.8,-7 -4.8,-6.8 -4.8,-6.6 110.4,-109.96 8,6.64 8,6.48 8.8,6.16 8.8,5.92 8.8,5.76 8,5.44 9.6,5.12 8.8,4.96 9.5,4.64 9.5,4.4 9.6,4.04 9.6,3.8 9.9,3.6 9.8,3.3 10,2.9 10,2.7 10.2,2.4 10.1,2.1 10.3,1.7 10.3,1.6 10.3,1.1 10.4,1 10.4,0.6 10.4,0.2 h 10.4 l 10.4,-0.2 10.4,-0.6 10.4,-1 10.3,-1.1 10.4,-1.6 10.2,-1.7 10.2,-2.1 10.1,-2.4 10.1,-2.7 10,-2.9 9.9,-3.3 9.8,-3.6 9.7,-3.8 9.6,-4.04 9.4,-4.4 9.3,-4.64 9.2,-4.96 9,-5.12 8.9,-5.44 8.6,-5.76 8.7,-5.92 8.3,-6.16 8.2,-6.48 8,-6.64 z" />
+   </svg>

data/styles/default/light/symbols/shield-ro-dn.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg848"
+   xml:space="preserve"
+   width="32.514999"
+   height="31"
+   viewBox="0 0 774.16667 738.09526"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs1" />
+  <path
+   id="path874"
+   style="fill:#ffffff;fill-opacity:1;stroke-width:0.9312;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+   d="m 612.9,7.16 -7.6,7.04 -7.7,6.64 -8,6.48 -8.2,6.24 -8.2,6 -8.6,5.68 -8.7,5.44 -8.8,5.12 -9,4.96 -9.1,4.64 -9.4,4.24 -9.4,4.08 -9.6,3.68 -9.6,3.52 -9.8,3.12 -9.8,2.8 -10,2.56 -10,2.24 -10,1.84 -10.3,1.6 -10.1,1.28 -10.3,0.88 -10.2,0.72 -10.3,0.32 H 380 l -10.2,-0.32 -10.3,-0.72 -10.2,-0.88 -10.2,-1.28 -10.1,-1.6 -10,-1.84 -10,-2.24 -10,-2.56 -9.9,-2.8 -9.7,-3.12 -9.7,-3.52 -9.5,-3.68 -9.5,-4.08 -9.3,-4.24 -9.2,-4.64 -8.9,-4.96 -8.5,-5.12 -9.6,-5.44 -8,-5.68 -8,-6 -8.8,-6.24 -8,-6.48 -7.2,-6.64 -8,-7.04 L 150,-0.04 0.4,150 l 4.8,5.5 5.6,5.7 4,5.9 4.8,6.1 4,6.4 4,6.4 4,6.6 4,6.7 2.4,6.8 3.2,7.1 2.4,7.1 2.4,7.2 2.4,7.3 1.6,7.3 1.6,7.5 0.8,7.6 1.6,7.5 v 7.5 l 0.8,7.6 v 7.6 l -0.8,7.6 -0.8,7.5 -0.8,7.5 -0.8,7.6 -1.6,7.3 -2.4,7.5 -1.6,7.2 -2.4,7.2 -3.2,7.1 -2.4,7 -3.2,6.9 -3.2,6.7 -4,6.6 c -36,58.7 -36.8,131.8 -3.2,191.5 34.4,59.6 96.8,96.5 165.6,96.5 l 1.6,-0.1 8.8,0.2 10.4,0.4 9.6,0.8 9.2,1.1 9.5,1.3 9.4,1.7 9.3,2 9.4,2.3 9.2,2.6 9.2,2.8 9,3.1 8.9,3.5 8.8,3.7 8.7,4 8.6,4.3 8.4,4.5 8.3,4.8 8.1,5.1 8,5.3 7.8,5.6 7.6,5.8 7.3,6.1 7.5,-6.1 7.6,-5.8 7.7,-5.6 7.9,-5.3 8.2,-5.1 8.3,-4.8 8.4,-4.5 8.5,-4.3 8.8,-4 8.8,-3.7 8.9,-3.5 9.1,-3.1 9.1,-2.8 9.2,-2.6 9.3,-2.3 9.4,-2 9.4,-1.7 9.4,-1.3 9.6,-1.1 9.6,-0.8 9.5,-0.4 10.1,-0.2 c 69.2,0 132.4,-36.9 166.1,-96.5 33.7,-59.6 32.7,-132.8 -2.5,-191.4 l -3.9,-6.6 -3.4,-6.7 -3.3,-6.9 -3,-7 -2.7,-7.1 -2.4,-7.2 -2.1,-7.2 -1.7,-7.5 -1.6,-7.3 -1.2,-7.6 -1,-7.5 -0.6,-7.5 -0.3,-7.6 v -7.6 l 0.2,-7.6 0.6,-7.5 0.9,-7.5 1.2,-7.6 1.5,-7.5 1.8,-7.3 2.1,-7.3 2.3,-7.2 2.6,-7.1 3,-7.1 3.2,-6.8 3.5,-6.7 3.8,-6.6 4,-6.4 4.2,-6.4 4.5,-6.1 4.8,-5.9 5,-5.7 5.2,-5.5 -150,-150.04 z" />
+  <path
+   id="path872"
+   style="fill:#E63534;fill-opacity:1;stroke-width:0.9312;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10"
+   d="m 729.4,151.6 -4.8,6.6 -4.4,6.8 -4.3,7 -4,7 -3.7,7.2 -3.4,7.4 -3.2,7.5 -2.9,7.6 -2.6,7.7 -2.3,7.7 -2,7.9 -1.8,8 -1.4,8 -1.2,8 -0.8,8.1 -0.6,8.2 -0.2,8.1 v 8.1 l 0.4,8.1 0.7,8.1 0.9,8.1 1.2,8 1.6,8 1.7,8 2.3,7.8 2.4,7.8 2.7,7.6 2.9,7.6 3.2,7.4 3.6,7.3 3.8,7.2 4,7 c 29.6,49.5 30.5,111.1 2.2,161.2 -28.4,50.3 -81.6,81.4 -140,81.4 l -10.9,0.1 -10.3,0.5 -10.4,0.8 -10.3,1.1 -10.2,1.5 -10.2,1.8 -10.1,2.1 -10,2.4 -10,2.7 -10,3.1 -9.7,3.2 -9.8,3.7 -9.5,4 -9.4,4.3 -9.3,4.5 -9.1,4.8 -9.1,5.1 -8.8,5.5 -8.7,5.7 -8.5,5.9 -8.4,-5.9 -8.7,-5.7 -8.8,-5.5 -9,-5.1 -9.2,-4.8 -9.2,-4.5 -9.5,-4.3 -9.6,-4 -9.7,-3.7 -9.7,-3.2 -9.9,-3.1 -10,-2.7 -10.1,-2.4 -10.1,-2.1 -10.2,-1.8 -10.3,-1.5 -10.2,-1.1 -10.1,-0.8 -11.2,-0.5 H 190.8 C 132.4,639.2 78.8,608 50.8,557.8 22,507.6 22.8,446 53.2,396.5 l 4,-7 4,-7.2 2.4,-7.3 4,-7.4 3.2,-7.6 2.4,-7.6 2.4,-7.8 2.4,-7.8 1.6,-8 1.6,-8 1.6,-8 0.8,-8.1 0.8,-8.1 v -8.1 -8.1 -8.1 l -0.8,-8.2 -0.8,-8.1 -0.8,-8 -1.6,-8 -1.6,-8 -2.4,-7.9 -2.4,-7.7 -2.4,-7.7 -3.2,-7.6 -3.2,-7.5 -3.2,-7.4 -3.2,-7.2 -4,-7 -4.8,-7 -4.8,-6.8 -4.8,-6.6 110.4,-109.96 8,6.64 8,6.48 8.8,6.16 8.8,5.92 8.8,5.76 8,5.44 9.6,5.12 8.8,4.96 9.5,4.64 9.5,4.4 9.6,4.04 9.6,3.8 9.9,3.6 9.8,3.3 10,2.9 10,2.7 10.2,2.4 10.1,2.1 10.3,1.7 10.3,1.6 10.3,1.1 10.4,1 10.4,0.6 10.4,0.2 h 10.4 l 10.4,-0.2 10.4,-0.6 10.4,-1 10.3,-1.1 10.4,-1.6 10.2,-1.7 10.2,-2.1 10.1,-2.4 10.1,-2.7 10,-2.9 9.9,-3.3 9.8,-3.6 9.7,-3.8 9.6,-4.04 9.4,-4.4 9.3,-4.64 9.2,-4.96 9,-5.12 8.9,-5.44 8.6,-5.76 8.7,-5.92 8.3,-6.16 8.2,-6.48 8,-6.64 z" />
+  </svg>

data/styles/vehicle/include/Icons.mapcss

@@ -734,7 +734,7 @@ node|z18-[amenity=water_point][drinking_water=not],
 node|z15-[amenity=parking],
 {icon-image: parking-m.svg;icon-min-distance: 10;font-size: 12.5;}
 node|z15-[amenity=car_pooling],
-{icon-image: parking_pooling-m.svg;icon-min-distance: 10;font-size: 12.5;}
+{icon-image: parking-pooling-m.svg;icon-min-distance: 10;font-size: 12.5;}
 node|z17[amenity=parking],
 node|z17[amenity=car_pooling],
 {icon-min-distance: 15;font-size: 13.75;}

docs/INSTALL_DESKTOP.md

@@ -68,10 +68,6 @@ and apply the [Ubuntu workarounds accordingly](#workarounds-for-older-ubuntu-ver
 
 ```bash
 sudo dnf install -y \
-    awk \
-    wget \
-    optipng \
-    git \
     clang \
     cmake \
     ninja-build \
@@ -84,13 +80,8 @@ sudo dnf install -y \
     qt6-qtpositioning \
     qt6-qtpositioning-devel \
     qt6-qtsvg-devel \
-    python3-pip \
-    sqlite-devel \
-    libXrandr-devel \
-    libXinerama-devel \
-    libXcursor-devel \
-    libXi-devel
-pip3 install "protobuf<3.21" --break-system-packages
+    python3-protobuf \
+    sqlite-devel
 ```
 
 #### Alpine

iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings

@@ -680,7 +680,7 @@
 "editor_edits_sent_message" = "Din note vil blive sendt til OpenStreetMap";
 "editor_comment_hint" = "Kommentar…";
 "editor_reset_edits_message" = "Kassér alle lokale ændringer?";
-"editor_reset_edits_button" = "Kassér ændringer";
+"editor_reset_edits_button" = "Kassér";
 "editor_remove_place_message" = "Slet tilføjet sted?";
 "editor_remove_place_button" = "Slet";
 "editor_place_doesnt_exist" = "Stedet eksisterer ikke";

iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings

@@ -685,7 +685,7 @@
 "editor_edits_sent_message" = "Ihre Notiz wird an OpenStreetMap gesendet";
 "editor_comment_hint" = "Kommentar…";
 "editor_reset_edits_message" = "Alle lokalen Korrekturen verwerfen?";
-"editor_reset_edits_button" = "Änderungen verwerfen";
+"editor_reset_edits_button" = "Verwerfen";
 "editor_remove_place_message" = "Hinzugefügtes Objekt löschen?";
 "editor_remove_place_button" = "Löschen";
 "editor_place_doesnt_exist" = "Dieser Ort existiert nicht";

iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings

@@ -730,7 +730,7 @@
 "editor_edits_sent_message" = "Your note will be sent to OpenStreetMap";
 "editor_comment_hint" = "Comment…";
 "editor_reset_edits_message" = "Discard all local changes?";
-"editor_reset_edits_button" = "Discard changes";
+"editor_reset_edits_button" = "Discard";
 "editor_remove_place_message" = "Delete added place?";
 "editor_remove_place_button" = "Delete";
 "editor_place_doesnt_exist" = "Place does not exist";

iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings

@@ -779,7 +779,7 @@
 "type.natural.beach.sand" = "Playa de arena";
 "type.natural.beach.gravel" = "Playa de grava";
 "type.natural.cape" = "Cabo";
-"type.natural.cave_entrance" = "Entrada de cueva";
+"type.natural.cave_entrance" = "Cueva";
 "type.natural.cliff" = "Acantilado";
 "type.natural.earth_bank" = "Talud de tierra";
 "type.man_made.embankment" = "Terraplén";
@@ -815,7 +815,7 @@
 "type.natural.wetland.marsh" = "Ciénaga";
 "type.noexit" = "Sin salida";
 "type.office" = "Oficina";
-"type.office.company" = "Oficina de compañía";
+"type.office.company" = "Oficina";
 "type.office.estate_agent" = "Agente inmobiliario";
 "type.office.government" = "Oficina gubernamental";
 "type.office.insurance" = "Oficina de seguros";
@@ -859,13 +859,13 @@
 "type.place.state.USA" = "Estado";
 
 /* Named part of a city or town, bigger than place=quarter (Wiki: https://wiki.openstreetmap.org/wiki/Tag:place%3Dsuburb) */
-"type.place.suburb" = "Suburbio";
+"type.place.suburb" = "Barrio";
 "type.place.town" = "Pueblo";
 "type.place.village" = "Pueblo";
 "type.power" = "Energía";
 "type.power.generator" = "Generador";
 "type.power.generator.solar" = "Generador solar";
-"type.power.generator.wind" = "Aerogenerador";
+"type.power.generator.wind" = "Generador de viento";
 "type.power.generator.gas" = "Planta termoeléctrica de gas";
 "type.power.generator.hydro" = "Planta hidroeléctrica";
 "type.power.line" = "Línea eléctrica";
@@ -947,10 +947,10 @@
 "type.railway.station" = "Estación de tren";
 "type.railway.station.funicular" = "Funicular";
 "type.railway.station.light_rail" = "Estación de tren";
-"type.railway.station.light_rail.berlin" = "Estación de tren (S-Bahn)";
+"type.railway.station.light_rail.berlin" = "Estación de tren";
 "type.railway.station.light_rail.london" = "Estación de tren";
-"type.railway.station.light_rail.porto" = "Estación de metro";
-"type.railway.station.monorail" = "Estación de monoriel";
+"type.railway.station.light_rail.porto" = "Estación de tren";
+"type.railway.station.monorail" = "Estación de tren";
 "type.railway.station.subway" = "Estación de metro";
 "type.railway.station.subway.adana" = "Estación de metro";
 "type.railway.station.subway.algiers" = "Estación de metro";
@@ -1220,7 +1220,7 @@
 "type.shop.doityourself" = "Tienda de bricolaje";
 "type.shop.dry_cleaning" = "Tintorería";
 "type.shop.electronics" = "Electrónica";
-"type.shop.erotic" = "Tienda erótica";
+"type.shop.erotic" = "Sex Shop";
 "type.shop.fabric" = "Tienda de telas";
 "type.shop.farm" = "Tienda de alimentos de granja";
 "type.shop.fashion_accessories" = "Accesorios de moda";
@@ -1306,7 +1306,7 @@
 "type.shop.tobacco" = "Tabaco";
 "type.shop.trade" = "Suministros comerciales";
 "type.shop.watches" = "Relojes";
-"type.shop.wholesale" = "Tienda al por mayor";
+"type.shop.wholesale" = "Almacén al por mayor";
 "type.sport" = "Deporte";
 "type.sport.american_football" = "Fútbol americano";
 "type.sport.archery" = "Tiro al arco";
@@ -1348,7 +1348,7 @@
 
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Albergue de montaña";
-"type.tourism.apartment" = "Apartamento vacacional";
+"type.tourism.apartment" = "Apartamento de vacaciones";
 "type.tourism.artwork" = "Obra de arte";
 "type.tourism.artwork.architecture" = "Arte arquitectónico";
 "type.tourism.artwork.painting" = "Pintura";

iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings

@@ -681,7 +681,7 @@
 "editor_edits_sent_message" = "Sinu märkus saadetakse OpenStreetMapile";
 "editor_comment_hint" = "Kommenteeri…";
 "editor_reset_edits_message" = "Kas loobud kõigist kohalikest muudatustest?";
-"editor_reset_edits_button" = "Loobu muudatustest";
+"editor_reset_edits_button" = "Loobu";
 "editor_remove_place_message" = "Kas kustutad lisatud koha?";
 "editor_remove_place_button" = "Kustuta";
 "editor_place_doesnt_exist" = "Kohta pole olemas";

iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings

@@ -1585,4 +1585,3 @@
 "type.spherical_buoy.safe_water" = "Faarvaatri kerapoi";
 "type.man_made.mast.communication" = "Sidemast";
 "type.shop.beauty.nails" = "Küünestuudio";
-"type.amenity.hydrant" = "Kastmishüdrant";

iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings

@@ -57,13 +57,13 @@
 "add_new_set" = "افزودن پهرستی نو";
 
 /* Add Bookmark list dialog - hint when the list name is empty */
-"bookmark_set_name" = "نام پهرست نشانگ‌ها";
+"bookmark_set_name" = "Bookmark List Name";
 
 /* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bookmark Lists";
 
 /* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
-"bookmarks" = "نشانگ‌ها";
+"bookmarks" = "نشانه‌ها";
 
 /* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
 "bookmarks_and_tracks" = "نشانه‌ها و مسیر ها";
@@ -151,7 +151,7 @@
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in CoMaps. If you don't have it installed you can download it here: https://www.comaps.app/download/\n\nEnjoy travelling with CoMaps!";
 
 /* message title of loading file */
-"load_kmz_title" = "بارگذاری نشانگ‌ها";
+"load_kmz_title" = "در حال بارگیری نشانه‌ها";
 
 /* Kmz file successful loading */
 "load_kmz_successful" = "نشانه‌ها با موفقیت بارگذاری شد!شما می توانید آنها را در نقشه یا بخش مدیریت نشانه‌ها بیابید.";

iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings

@@ -680,7 +680,7 @@
 "editor_edits_sent_message" = "Notatet ditt vil bli sendt til OpenStreetMap";
 "editor_comment_hint" = "Kommentar…";
 "editor_reset_edits_message" = "Forkaste alle lokale endringer?";
-"editor_reset_edits_button" = "Forkast endringer";
+"editor_reset_edits_button" = "Forkast";
 "editor_remove_place_message" = "Slette tillagt sted?";
 "editor_remove_place_button" = "Slett";
 "editor_place_doesnt_exist" = "Sted finnes ikke";

iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings

@@ -1591,4 +1591,3 @@
 "type.shop.beauty.nails" = "Nagelsalon";
 "type.amenity.food_sharing" = "Voedsel delen";
 "type.amenity.give_box" = "Giftenkist";
-"type.amenity.hydrant" = "Watertappunt|waterkraan";

iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings

@@ -1591,4 +1591,3 @@
 "type.natural.tree" = "Árvore";
 "type.shop.beauty.nails" = "Salão de Unhas";
 "type.xmas.tree" = "Árvore de Natal";
-"type.amenity.hydrant" = "Boca de Rega";

iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings

@@ -543,7 +543,7 @@
 
 /* OpenStreetMap Profile */
 "osm_profile" = "Profil OpenStreetMap";
-"osm_profile_promt" = "Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica editările hărții pentru întreaga lume.";
+"osm_profile_promt" = "Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica edițiile de hartă în întreaga lume.";
 "osm_profile_explanation" = "[OpenStreetMap.org](https://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!";
 "osm_profile_login" = "Conectează-te la contul OpenStreetMap";
 "osm_profile_reauthorize_promt" = "Contul OpenStreetMap a fost deconectat de la această aplicație";

iphone/Maps/LocalizedStrings/sl.lproj/LocalizableTypes.strings

@@ -368,99 +368,3 @@
 "type.cuisine.bubble_tea" = "Čaj s tapiokinimi kroglicami ('Bubble Tea')";
 "type.cuisine.breakfast" = "Zajtrk";
 "type.cuisine.chicken" = "Piščanec";
-"type.amenity.hydrant" = "Namakalni hidrant";
-"type.cuisine.greek" = "Grška kuhinja";
-"type.cuisine.hungarian" = "Madžarska kuhinja";
-"type.cuisine.ice_cream" = "Sladoled";
-"type.cuisine.indian" = "Indijska kuhinja";
-"type.cuisine.indonesian" = "Indonezijska kuhinja";
-"type.cuisine.international" = "Mednarodna kuhinja";
-"type.cuisine.irish" = "Irska kuhinja";
-"type.cuisine.italian" = "Italijanska kuhinja";
-"type.cuisine.italian_pizza" = "Italijanska kuhinja, pica";
-"type.cuisine.japanese" = "Japonska kuhinja";
-"type.cuisine.korean" = "Korejska kuhinja";
-"type.cuisine.lao" = "Laoška kuhinja";
-"type.cuisine.lebanese" = "Libanonska kuhinja";
-"type.cuisine.local" = "Krajevna kuhinja";
-"type.cuisine.malaysian" = "Malezijska kuhinja";
-"type.cuisine.mediterranean" = "Sredozemska kuhinja";
-"type.cuisine.mexican" = "Mehiška kuhinja";
-"type.cuisine.moroccan" = "Maroška kuhinja";
-"type.cuisine.oriental" = "Orientalska kuhinja";
-"type.cuisine.pancake" = "Palačinke";
-"type.cuisine.pasta" = "Testenine";
-"type.cuisine.persian" = "Perzijska kuhinja";
-"type.cuisine.peruvian" = "Perujska kuhinja";
-"type.cuisine.pizza" = "Pica";
-"type.cuisine.polish" = "Poljska kuhinja";
-"type.cuisine.portuguese" = "Portugalska kuhinja";
-"type.cuisine.russian" = "Ruska kuhinja";
-"type.cuisine.sandwich" = "Sendvič";
-"type.cuisine.sausage" = "Salama";
-"type.cuisine.savory_pancakes" = "Slane palačinke";
-"type.cuisine.seafood" = "Morska hrana";
-"type.cuisine.soba" = "Soba (ajdovi rezanci)";
-"type.cuisine.spanish" = "Španska kuhinja";
-"type.cuisine.steak_house" = "Zrezkarnica";
-"type.cuisine.sushi" = "Suši";
-"type.cuisine.tea" = "Čaj";
-"type.cuisine.turkish" = "Turška kuhinja";
-"type.cuisine.vegan" = "Veganska kuhinja";
-"type.cuisine.vegetarian" = "Vegetarijanska kuhinja";
-"type.cuisine.vietnamese" = "Vietnamska kuhinja";
-"type.emergency" = "V sili";
-"type.emergency.access_point" = "Reševalno mesto";
-"type.emergency.assembly_point" = "Zbirno mesto";
-"type.emergency.life_ring" = "Reševalni obroč";
-"type.emergency.defibrillator" = "Defibrilator";
-"type.emergency.fire_hydrant" = "Požarni hidrant";
-"type.emergency.phone" = "Telefon v sili";
-"type.emergency.lifeguard" = "Reševalec";
-"type.beacon.cardinal.east" = "Glavni usmerjevalni znak";
-"type.beacon.cardinal.north" = "Glavni usmerjevalni znak";
-"type.beacon.cardinal.south" = "Glavni usmerjevalni znak";
-"type.beacon.cardinal.west" = "Glavni usmerjevalni znak";
-"type.beacon.isolated_danger" = "Usmerjevalni znak ločene nevarnosti";
-"type.cuisine.burger" = "Burger";
-"type.craft.caterer" = "Ponudnik cateringa";
-"type.cuisine.balkan" = "Balkanska kuhinja";
-"type.cuisine.barbecue" = "Jedi na žaru";
-"type.cuisine.bavarian" = "Bavarska kuhinja";
-"type.cuisine.brazilian" = "Brazilska kuhinja";
-"type.cuisine.buschenschank" = "Vinotoč (Buschenschank)";
-"type.cuisine.deli" = "Delkatesa";
-"type.cuisine.regional" = "Regionalna kuhinja";
-"type.cuisine.tapas" = "Tapas (španski prigrizki)";
-"type.cuisine.thai" = "Tajska kuhinja";
-"type.beacon.lateral.port" = "Bočni usmerjevalni znak";
-"type.beacon.lateral.starboard" = "Bočni usmerjevalni znak";
-"type.beacon.safe_water" = "Znak varne plovne poti";
-"type.beacon.special_purpose" = "Usmerjevalni znak posebnega namena";
-"type.buoy.cardinal.east" = "Glavna boja";
-"type.buoy.cardinal.north" = "Glavna boja";
-"type.buoy.cardinal.south" = "Glavna boja";
-"type.buoy.cardinal.west" = "Glavna boja";
-"type.lateral.port" = "Pristanišče";
-"type.cardinal.east" = "Vzhod";
-"type.cardinal.north" = "Sever";
-"type.cardinal.south" = "Jug";
-"type.cardinal.west" = "Zahod";
-"type.emergency.mountain_rescue" = "Postaja gorskih reševalcev";
-"type.entrance" = "Vhod";
-"type.entrance.main" = "Glavni vhod";
-"type.entrance.house" = "Vhod hiše";
-"type.entrance.garage" = "Vhod garaže";
-"type.entrance.service" = "Servisni vhod";
-"type.entrance.entry" = "Vstop (samo)";
-"type.entrance.exit" = "Izhod (samo)";
-"type.healthcare.laboratory" = "Zdravstveni laboratorij";
-"type.healthcare.psychotherapist" = "Psihoterapevt";
-"type.highway.cycleway.tunnel" = "Predor";
-"type.highway.elevator" = "Dvigalo";
-"type.highway.footway" = "Pešpot";
-"type.highway.footway.sidewalk" = "Pločnik";
-"type.highway.footway.crossing" = "Prehod za pešce";
-"type.highway.footway.area" = "Površina za pešce";
-"type.highway.footway.bridge" = "Most za pešce";
-"type.highway.footway.tunnel" = "Predor za pešce";

iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings

@@ -1101,4 +1101,3 @@
 "offline_explanation_title" = "Çevrimdışı Haritalar";
 "avoid_steps" = "Merdivenlerden kaçın";
 "editor_place_doesnt_exist_description" = "OpeenStreetMap topluluğuna bir hata notu göndermek için şimdi mekanın nasıl gözüktüğünü tarif et";
-"avoid_paved" = "Asfalt yollardan kaçın";

iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings

@@ -1491,4 +1491,3 @@
 "type.shop.lighting" = "Aydınlatma dükkanı";
 "type.amenity.charging_station.motorcar.small" = "Araç Şarj Noktası";
 "type.amenity.bench.backless" = "Sırtı Açık Bank";
-"type.amenity.sailing_school" = "Denizcilik Okulu";

iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings

@@ -683,7 +683,7 @@
 "editor_edits_sent_message" = "您的说明将发送至 OpenStreetMap";
 "editor_comment_hint" = "备注…";
 "editor_reset_edits_message" = "舍弃所有本地更改？";
-"editor_reset_edits_button" = "舍弃更改";
+"editor_reset_edits_button" = "舍弃";
 "editor_remove_place_message" = "删除已添加的地点？";
 "editor_remove_place_button" = "删除";
 "editor_place_doesnt_exist" = "该地点不存在";

iphone/Maps/Maps.xcodeproj/project.pbxproj

@@ -40,7 +40,6 @@
 		27AF18562E1DB63000CD41E2 /* PowerSavingMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF18552E1DB62F00CD41E2 /* PowerSavingMode.swift */; };
 		27AF18582E1DB63A00CD41E2 /* Appearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF18572E1DB63900CD41E2 /* Appearance.swift */; };
 		27AF185A2E1DB64500CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27AF18592E1DB64400CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift */; };
-		27FDBF212EEEFC830045621D /* mapcss-mapping.csv in Resources */ = {isa = PBXBuildFile; fileRef = 27FDBF202EEEFC830045621D /* mapcss-mapping.csv */; };
 		3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */; };
 		33046832219C57180041F3A8 /* CategorySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33046831219C57180041F3A8 /* CategorySettingsViewController.swift */; };
 		337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */; };
@@ -790,7 +789,6 @@
 		27AF18552E1DB62F00CD41E2 /* PowerSavingMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PowerSavingMode.swift; sourceTree = "<group>"; };
 		27AF18572E1DB63900CD41E2 /* Appearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Appearance.swift; sourceTree = "<group>"; };
 		27AF18592E1DB64400CD41E2 /* AnnouncingSpeedTrapsWhileVoiceRouting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnouncingSpeedTrapsWhileVoiceRouting.swift; sourceTree = "<group>"; };
-		27FDBF202EEEFC830045621D /* mapcss-mapping.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = "mapcss-mapping.csv"; path = "/Users/yannikbloscheck/Apps/CoMaps/Code/data/mapcss-mapping.csv"; sourceTree = "<absolute>"; };
 		28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 2; path = main.mm; sourceTree = "<group>"; tabWidth = 2; };
 		30034C5C2B3F0B74005D961A /* az */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = az; path = az.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -3950,7 +3948,6 @@
 				6B9978341C89A316003B8AA0 /* editor.config */,
 				978D4A30199A11E600D72CA7 /* faq.html */,
 				BB7626B41E8559980031D71C /* icudt75l.dat */,
-				27FDBF202EEEFC830045621D /* mapcss-mapping.csv */,
 				F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */,
 				FA85F632145DDDC20090E1A0 /* packed_polygons.bin */,
 				451950391B7A3E070085DA05 /* patterns.txt */,
@@ -4204,7 +4201,6 @@
 				34F73F9F1E082FF800AC1FD6 /* Localizable.strings in Resources */,
 				340E1EF21E2F614400CE49BF /* Main.storyboard in Resources */,
 				F6E2FE521E097BA00083EBEC /* MWMActionBarButton.xib in Resources */,
-				27FDBF212EEEFC830045621D /* mapcss-mapping.csv in Resources */,
 				EDBD68072B625724005DD151 /* LocationServicesDisabledAlert.xib in Resources */,
 				993DF0CA23F6BD0600AC231A /* ElevationDetailsViewController.xib in Resources */,
 				F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */,

iphone/Maps/UI/Editor/MWMEditorViewController.mm

@@ -158,7 +158,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
   [self configNavBar];
   auto const & fid = m_mapObject.GetID();
   self.featureStatus = osm::Editor::Instance().GetFeatureStatus(fid.m_mwmId, fid.m_index);
-  self.isFeatureUploaded = osm::Editor::Instance().AreSomeFeatureChangesUploaded(fid.m_mwmId, fid.m_index);
+  self.isFeatureUploaded = osm::Editor::Instance().IsFeatureUploaded(fid.m_mwmId, fid.m_index);
   m_newAdditionalLanguages.clear();
   if (self.isCreating)
   {
@@ -1089,7 +1089,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
 - (void)tapOnButtonCell:(UITableViewCell *)cell
 {
   auto const & fid = m_mapObject.GetID();
-  self.isFeatureUploaded = osm::Editor::Instance().AreSomeFeatureChangesUploaded(fid.m_mwmId, fid.m_index);
+  self.isFeatureUploaded = osm::Editor::Instance().IsFeatureUploaded(fid.m_mwmId, fid.m_index);
   NSIndexPath * ip = [self.tableView indexPathForCell:cell];
   [self.tableView reloadRowsAtIndexPaths:@[ ip ] withRowAnimation:UITableViewRowAnimationFade];
 

iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm

@@ -260,14 +260,6 @@ WeekDayView getWeekDayView()
   });
 }
 
-- (IBAction)extendedToggleButtonTap
-{
-  id<MWMPlacePageOpeningHoursCellProtocol> delegate = self.delegate;
-  if (delegate.isEditor) {
-    [delegate setOpeningHoursCellExpanded:!delegate.openingHoursCellExpanded];
-  }
-}
-
 #pragma mark - Properties
 
 - (BOOL)isExpanded

iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.xib

@@ -172,30 +172,17 @@
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fNU-1q-AiR">
                         <rect key="frame" x="0.0" y="127" width="320" height="122"/>
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                        <gestureRecognizers/>
                         <constraints>
                             <constraint firstAttribute="height" constant="122" id="Ifb-EB-LIb"/>
                         </constraints>
                     </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hYN-dO-J0e" userLabel="Editor Button">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="249"/>
-                        <state key="normal" title="Button"/>
-                        <buttonConfiguration key="configuration" style="plain"/>
-                        <connections>
-                            <action selector="extendedToggleButtonTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="BSf-KC-HgD"/>
-                        </connections>
-                    </button>
                 </subviews>
                 <constraints>
                     <constraint firstItem="fNU-1q-AiR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="08I-np-9jr"/>
-                    <constraint firstAttribute="trailing" secondItem="hYN-dO-J0e" secondAttribute="trailing" id="0Vo-1D-dPq"/>
                     <constraint firstAttribute="trailing" secondItem="fNU-1q-AiR" secondAttribute="trailing" id="2Hz-cA-KuN"/>
-                    <constraint firstItem="hYN-dO-J0e" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="GVQ-l4-vnQ"/>
                     <constraint firstItem="0kQ-hh-2Cy" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="60" id="KwF-TF-PmH"/>
                     <constraint firstAttribute="trailing" secondItem="0kQ-hh-2Cy" secondAttribute="trailing" constant="32" id="RqH-0b-AyG"/>
-                    <constraint firstItem="hYN-dO-J0e" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Sav-rp-wo2"/>
                     <constraint firstItem="swk-um-XzG" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="VsQ-qI-dIi"/>
-                    <constraint firstAttribute="bottom" secondItem="hYN-dO-J0e" secondAttribute="bottom" id="Xe1-4J-wRh"/>
                     <constraint firstItem="0kQ-hh-2Cy" firstAttribute="top" secondItem="swk-um-XzG" secondAttribute="bottom" id="Xrh-Vg-VYg"/>
                     <constraint firstItem="swk-um-XzG" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="p14-Mi-kcR"/>
                     <constraint firstItem="fNU-1q-AiR" firstAttribute="top" secondItem="0kQ-hh-2Cy" secondAttribute="bottom" id="uKD-bb-yHT"/>
@@ -205,7 +192,6 @@
                     <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
                 </userDefinedRuntimeAttributes>
             </tableViewCellContentView>
-            <gestureRecognizers/>
             <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
             <connections>
                 <outlet property="currentDay" destination="swk-um-XzG" id="CJG-LQ-Pu8"/>