[generator] Make PBF planet update job more verbose

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

.forgejo/workflows/map-generator.yml

@@ -277,7 +277,7 @@ jobs:
         run: |
           cd /home/planet/planet/
           rm -f planet-latest-new.osm.pbf
-          pyosmium-up-to-date planet-latest.osm.pbf -o planet-latest-new.osm.pbf -v --size 16384
+          pyosmium-up-to-date planet-latest.osm.pbf -o planet-latest-new.osm.pbf -vv --size 16384
           mv planet-latest-new.osm.pbf planet-latest.osm.pbf
       - name: Notify Zulip
         run: |

.gitignore

@@ -31,9 +31,10 @@ data/types.txt*
 data/visibility.txt*
 data/colors.txt*
 data/patterns.txt*
-data/symbols/*/design/
-data/colors_design.txt
-data/patterns_design.txt
+# TODO: designer is not used at the moment
+# data/symbols/*/design/
+# data/colors_design.txt
+# data/patterns_design.txt
 
 # Auto-generated from data/categories-strings/* by tools/unix/generate_categories.sh
 data/categories.txt

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

@@ -1 +0,0 @@
-CoMaps- Navigasi Offline dengan Privasi

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

@@ -1,36 +1,36 @@
-Besplatna aplikacija za karte otvorenog koda koju vodi zajednica, a temelji se na podacima OpenStreetMapa, a pojačana je predanošću transparentnosti, privatnosti i neprofitnosti.
+Besplatna aplikacija otvorenog koda koju vodi zajednica i temelji se na podacima OpenStreetMap-a, usmjerana transparentnosti, privatnosti i neprofitnosti. 
 
-Pridružite se zajednici i pomozite u izradi najbolje aplikacije za karte
-• Koristite aplikaciju i širite vijest o njoj
+Pridružite se otvorenoj zajednici i pomozite izraditi najbolju aplikaciju za karte
+• Koristite aplikaciju i proširite glas o njoj
 • Dajte povratne informacije i prijavite probleme
-• Ažurirajte podatke karte u aplikaciji ili na web stranici OpenStreetMap
+• Ažurirajte podatke na karti u aplikaciji ili na web stranici OpenStreetMap-a
 
 <i>Vaše povratne informacije i recenzije s 5 zvjezdica najbolja su nam podrška!</i>
 
-‣ <b>Jednostavno i dotjerano</b>: bitne značajke koje su jednostavne za korištenje i jednostavno rade.
-‣ <b>Usmjereno na rad izvan mreže</b>: Planirajte i upravljajte svojim putovanjem u inozemstvo bez potrebe za mobilnom mrežom, pretražujte točke puta tijekom udaljenog planinarenja itd. Sve funkcije aplikacije dizajnirane su za rad izvan mreže.
-‣ <b>Poštivanje privatnosti</b>: Aplikacija je dizajnirana imajući na umu privatnost - ne identificira ljude, ne prati i ne prikuplja osobne podatke. Bez oglasa.
-‣ <b>Štedi bateriju i prostor</b>: Ne prazni bateriju kao druge navigacijske aplikacije. Kompaktne karte štede dragocjeni prostor na vašem telefonu.
-‣ <b>Besplatno i izrađeno od strane zajednice</b>: Ljudi poput vas pomogli su u izgradnji aplikacije dodavanjem mjesta u OpenStreetMap, testiranjem i davanjem povratnih informacija o značajkama te doprinosom svojim razvojnim vještinama i novcem.
-‣ <b>Otvoreno i transparentno donošenje odluka i financije, neprofitno i potpuno otvorenog koda.</b>
+‣ <b>Jednostavna i dotjerana</b>: aplikacija je trivijalna za korištenje i jednostavno radi.
+‣ <b>Fokusirana na Offline rad</b>: Planirajte i upravljajte svojim putovanjem u inozemstvo bez potrebe za mobilnom uslugom, tražite putne točke dok ste na udaljenom pješačenju itd. Sve funkcije aplikacije dizajnirane su za offline rad.
+‣ <b>Poštivanje privatnosti</b>: Aplikacija je dizajnirana imajući na umu privatnost - ne identificira ljude, ne prati i ne prikuplja osobne podatke. Bez reklama.
+‣ <b>Štedi vašu bateriju i prostor</b>: Ne troši bateriju kao druge navigacijske aplikacije. Kompaktne karte štede dragocjeni prostor na vašem telefonu.
+‣ <b>Otvorena i izrađena od strane zajednice</b>: Ljudi poput vas pomogli su izraditi aplikaciju dodavanjem lokacija na OpenStreetMap-u, testiranjem i davanjem povratnih informacija o aplikaciji te doprinoseći svojim razvojnim vještinama i novcem.
+‣ <b>Otvoreno i transparentno donošenje odluka i korištenja financija, Neprofitna i potpuno Otvorenog koda.</b>
 
 <b>Glavne značajke</b>:
-• Detaljne karte za preuzimanje s mjestima koja nisu dostupna na Google kartama
-• Vanjski način rada s označenim planinarskim stazama, kampovima, izvorima vode, vrhovima, konturnim linijama itd.
+• Preuzimanje detaljnih karti s lokacijama koje nisu dostupne s Google kartama
+• Karte za izlete s istaknutim pješačkim stazama, kampovima, izvorima vode, planinskim vrhovima, konturnim linijama itd.
 • Pješačke i biciklističke staze
-• Znamenitosti poput restorana, benzinskih postaja, hotela, trgovina, znamenitosti i mnogih drugih
-• Pretraživanje po imenu ili adresi ili po kategoriji znamenitosti
-• Navigacija s glasovnim najavama za hodanje, vožnju biciklom ili vožnju
-• Označavanje omiljenih mjesta jednim dodirom
-• Članci na Wikipediji izvan mreže
-• Sloj i upute za podzemnu željeznicu
-• Snimanje tragova
-• Izvoz i uvoz oznaka i tragova u KML, KMZ, GPX formatima
+• Točke interesa kao što su restorani, benzinske crpke, hoteli, trgovine, vidikovci i još mnogo toga
+• Pretražujte po nazivu ili adresi ili po kategoriji interesa
+• Navigacija s glasovnim najavama za hodanje, vožnju biciklom ili automobilom
+• Obilježite svoja omiljena mjesta jednim dodirom
+• Offline članci Wikipedije
+• Tranzitni sloj podzemne željeznice sa navigacijom
+• Snimanje GPS tragova
+• Izvoz i uvoz oznaka i staza u KML, KMZ, i GPX formatima
 • Tamni način rada za korištenje tijekom noći
-• Poboljšajte podatke karte za sve pomoću osnovnog ugrađenog uređivača
-• Podrška za Android Auto
+• Poboljšajte kartu za sve korisnike, koristeći osnovni ugrađeni uređivač karte
+• Android Auto podrška
 
 Prijavite probleme s aplikacijom, predložite ideje i pridružite se našoj zajednici na web stranici <b><i>comaps.app</i></b>.
 
 <b>Sloboda je ovdje</b>
-Otkrijte svoje putovanje, snađite se u svijetu s privatnošću i zajednicom u prvom planu!
+Otkrijte svoje putovanje, navigirajte svijetom s privatnošću i zajednicom na prvom mjestu!

android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java

@@ -237,7 +237,7 @@ public class EditorHostFragment
     for (LocalizedName name : sNames)
       languages.add(name.lang);
     args.putStringArrayList(LanguagesFragment.EXISTING_LOCALIZED_NAMES, languages);
-    args.putBoolean(LanguagesFragment.IS_MAP_LANGUAGE_SELECTION, false);
+    args.putBoolean(LanguagesFragment.INCLUDE_LOCAL_LANGUAGE, false);
     editWithFragment(Mode.LANGUAGE, R.string.choose_language, args, LanguagesFragment.class, false);
   }
 

android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java

@@ -25,7 +25,7 @@ import java.util.Set;
 public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
 {
   final static String EXISTING_LOCALIZED_NAMES = "ExistingLocalizedNames";
-  final static String IS_MAP_LANGUAGE_SELECTION = "IsMapLanguageSelection";
+  final static String INCLUDE_LOCAL_LANGUAGE = "IncludeLocalLanguage";
 
   public interface Listener
   {
@@ -39,8 +39,8 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
   protected LanguagesAdapter createAdapter()
   {
     Bundle args = getArguments();
-    boolean isMapLanguageSelection =
-        args != null ? args.getBoolean(IS_MAP_LANGUAGE_SELECTION) : true;
+    boolean includeLocalLanguage =
+        args != null ? args.getBoolean(INCLUDE_LOCAL_LANGUAGE) : true;
     Set<String> existingLanguages =
         args != null ? new HashSet<>(args.getStringArrayList(EXISTING_LOCALIZED_NAMES)) : new HashSet<>();
 
@@ -52,14 +52,8 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
     for (int i = 0; i < systemLocales.size(); i++)
       systemLanguages.add(null);
 
-    // service languages are old_name, alt_name, ...
-    boolean includeServiceLangs = !isMapLanguageSelection;
-
-    for (Language lang : Editor.nativeGetSupportedLanguages(includeServiceLangs))
+    for (Language lang : Editor.nativeGetSupportedLanguages(false))
     {
-      if (existingLanguages.contains(lang.code))
-        continue;
-
       // Separately extract system languages
       for (int i = 0; i < systemLocales.size(); i++)
       {
@@ -71,7 +65,7 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
         }
       }
 
-      if (systemLanguages.contains(lang))
+      if (existingLanguages.contains(lang.code) || systemLanguages.contains(lang))
         continue;
 
       languages.add(lang);
@@ -81,7 +75,7 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
 
     languages.addAll(0, systemLanguages.stream().filter(Objects::nonNull).toList());
 
-    if (isMapLanguageSelection) {
+    if (includeLocalLanguage) {
       String localLanguageLabel = getString(R.string.pref_maplanguage_local);
       Language localLanguage = new Language(DEFAULT_LANG_CODE, localLanguageLabel);
       languages.add(0, localLanguage);

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

@@ -3,13 +3,12 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  style="@style/Widget.Material3.CardView.Elevated"
+  style="@style/Widget.Material3.CardView.Filled"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:paddingBottom="@dimen/margin_half"
   app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp"
-  app:cardElevation="@dimen/m3_sys_elevation_level3">
+  app:cardCornerRadius="28dp">
 <LinearLayout
   android:orientation="vertical"
   android:layout_width="match_parent"

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

@@ -5,10 +5,9 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  style="@style/Widget.Material3.CardView.Elevated"
+  style="@style/Widget.Material3.CardView.Filled"
   app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp"
-  app:cardElevation="@dimen/m3_sys_elevation_level3">
+  app:cardCornerRadius="28dp">
 <LinearLayout
   android:orientation="vertical"
   android:minWidth="@dimen/bookmark_purchase_img_width"

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

@@ -2,15 +2,14 @@
 <com.google.android.material.card.MaterialCardView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  style="@style/Widget.Material3.CardView.Elevated"
+  style="@style/Widget.Material3.CardView.Filled"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:layout_margin="@dimen/margin_double_and_half"
   android:minWidth="@dimen/dialog_min_width"
   android:minHeight="@dimen/dialog_min_height"
   app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp"
-  app:cardElevation="@dimen/m3_sys_elevation_level3">
+  app:cardCornerRadius="28dp">
 <LinearLayout
   android:layout_width="match_parent"
   android:layout_height="wrap_content"

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

@@ -3,13 +3,12 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  style="@style/Widget.Material3.CardView.Elevated"
+  style="@style/Widget.Material3.CardView.Filled"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:paddingBottom="@dimen/margin_half"
   app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp"
-  app:cardElevation="@dimen/m3_sys_elevation_level3">
+  app:cardCornerRadius="28dp">
 <LinearLayout
   android:orientation="vertical"
   android:layout_width="match_parent"

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

@@ -3,7 +3,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="wrap_content"
   android:layout_height="match_parent"
-  android:layout_marginTop="@dimen/margin_base_plus_quarter"
+  android:layout_marginTop="@dimen/margin_direction_big"
   android:orientation="vertical">
 
   <FrameLayout

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

@@ -9,7 +9,7 @@
     <string name="delete">Изтриване</string>
     <string name="download_maps">Изтегляне на карти</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Изтеглянето се провали, затиснете, за да опитате отново</string>
+    <string name="download_has_failed">Изтеглянето се провали. Натиснете, за да опитате отново.</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Теглене…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -27,7 +27,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Ограничена точност</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">За да осигурите точна навигация, активирайте функцията \"Точно местоположение\" в настройките</string>
+    <string name="precise_location_is_disabled_long_text">За да осигурите точна навигация, активирайте функцията \"Точно местоположение\" в настройките.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Показване на картата</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -66,11 +66,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Добавяне на нова група</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Име на списък</string>
+    <string name="bookmark_set_name">Име на група</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>
+    <string name="bookmarks_and_tracks">Отметки и пътеки</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Име</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->

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

@@ -66,11 +66,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Afegeix una llista nova</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nom de la llista</string>
+    <string name="bookmark_set_name">Nom de la llista de marcadors</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Llocs</string>
+    <string name="bookmarks">Marcadors</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Preferits</string>
+    <string name="bookmarks_and_tracks">Marcadors i recorreguts</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nom</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -146,14 +146,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notes</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Els meus preferits de CoMaps</string>
-    <string name="share_bookmarks_email_body">Hola! \n \nAdjunto els meus marcadors de l\'aplicació CoMaps. Obriu-los si teniu l\'CoMaps instal·lat. O, si no teniu l\'aplicació, baixeu-la per al vostre dispositiu iOS o Android seguint aquest enllaç: https://www.comaps.app/download/ \n \nGaudiu viatjant amb l\'CoMaps!</string>
+    <string name="share_bookmarks_email_subject">Marcadors d\'CoMaps compartits</string>
+    <string name="share_bookmarks_email_body">Hola! \n \nAdjunto els meus marcadors de l\'aplicació CoMaps. Obriu-los si teniu l\'CoMaps instal·lat. O, si no teniu l\'aplicació, baixeu-la per al vostre aparell iOS o Android seguint aquest enllaç: https://www.comaps.app/download/ \n \nGaudiu viatjant amb l\'CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Carregant Preferits</string>
+    <string name="load_kmz_title">S\'estan carregant els marcadors</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Els preferits s’han carregat correctament. Els trobareu al mapa i a la pantalla de gestió de preferits.</string>
+    <string name="load_kmz_successful">Els marcadors s’han carregat correctament. Els trobareu al mapa i a la pantalla de gestió de marcadors.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">No s\'han pogut carregar els preferits. El fitxer pot estar corromput o ser defectuós.</string>
+    <string name="load_kmz_failed">No s\'ha pogut carregar els marcadors. El fitxer pot ser malmès o defectuós.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">L\'aplicació no reconeix el tipus de fitxer: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -499,7 +499,7 @@
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Més</string>
-    <string name="placepage_edit_bookmark_button">Edita el Lloc Desat</string>
+    <string name="placepage_edit_bookmark_button">Edita el marcador</string>
     <string name="placepage_personal_notes_hint">Notes personals (text o html)</string>
     <string name="editor_reset_edits_message">Voleu descartar tots els canvis locals?</string>
     <string name="editor_reset_edits_button">Descartar canvis</string>
@@ -564,18 +564,18 @@
     <string name="dialog_error_storage_message">L\'emmagatzematg extern no és accessible. La targeta SD potser s\'ha retirat, malmès, o el sistema de fitxer és de només lectura. Comproveu la targeta SD o contacteu amb nosaltres a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emula un emmagatzematge malmès</string>
     <string name="error_enter_correct_name">Introduïu un nom correcte</string>
-    <string name="bookmark_lists">Llista de Preferits</string>
+    <string name="bookmark_lists">Llistes</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Amaga-ho tot</string>
     <string name="bookmark_lists_show_all">Mostra-ho tot</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d lloc desat</item>
-        <item quantity="many">%d llocs desats</item>
-        <item quantity="other">%d llocs desats</item>
+        <item quantity="one">%d marcador</item>
+        <item quantity="many">%d marcadors</item>
+        <item quantity="other">%d marcadors</item>
     </plurals>
     <string name="bookmarks_create_new_group">Crea una llista</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importar preferits</string>
+    <string name="bookmarks_import">Importa marcadors i recorreguts</string>
     <string name="bookmarks_error_message_share_general">No s\'ha pogut compartir a causa d\'un error de l\'aplicació</string>
     <string name="bookmarks_error_title_share_empty">Error al compartir</string>
     <string name="bookmarks_error_message_share_empty">No es pot compartir una llista buida</string>
@@ -606,7 +606,7 @@
     <string name="subway">Metro</string>
     <string name="layers_title">Estils i capes del mapa</string>
     <string name="bookmarks_empty_list_title">Aquesta llista és buida</string>
-    <string name="bookmarks_empty_list_message">Per a desar un lloc, toqueu-ne un en el mapa i després toqueu la icona d\'estrella</string>
+    <string name="bookmarks_empty_list_message">Per a afegir un marcador, toqueu un lloc en el mapa i després toqueu la icona d\'estrella</string>
     <string name="category_desc_more">…més</string>
     <string name="export_file">Exporta KMZ</string>
     <string name="export_file_gpx">Exporta GPX</string>
@@ -659,7 +659,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Ordena…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Ordenar preferits</string>
+    <string name="sort_bookmarks">Ordena els marcadors</string>
     <!-- Android -->
     <string name="by_default">Per defecte</string>
     <!-- Android -->
@@ -777,7 +777,7 @@
     <string name="browser_not_available">El navegador web no està disponible</string>
     <string name="volume">Volum</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exporta tots els llocs i recorreguts</string>
+    <string name="bookmarks_export">Exporta tots els marcadors i recorreguts</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Paràmetres de la síntesi de veu del sistema</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -809,7 +809,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Continuar enregistrant</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Desar en preferits?</string>
+    <string name="track_recording_alert_title">Voleu desar l’enregistrament a Marcadors i recorreguts?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">El recorregut està buit; no hi ha res a desar</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -839,11 +839,11 @@
     <string name="pref_left_button_disable">Desactivar</string>
     <string name="editor_level">Pis (0 és la planta baixa)</string>
     <string name="error_enter_correct_bluesky_page">Introdueix un nom d\'usuari o una adreça web de Bluesky vàlids</string>
-    <string name="pref_backup_title">Còpia de seguretat de preferits</string>
+    <string name="pref_backup_title">Còpia de seguretat de marcadors i recorreguts</string>
     <string name="pref_left_button_title">Configuració del botó esquerre</string>
     <string name="pref_backup_summary">Còpia de seguretat automàtica a un directori del teu dispositiu</string>
     <string name="pref_backup_now_summary_ok">Còpia de seguretat completada amb èxit</string>
-    <string name="pref_backup_now_summary_empty_lists">No hi ha llocs o recorreguts per a fer una còpia de seguretat</string>
+    <string name="pref_backup_now_summary_empty_lists">No hi ha marcadors o recorreguts per a fer una còpia de seguretat</string>
     <string name="pref_backup_now_summary_failed">Còpia de seguretat fallida</string>
     <string name="pref_backup_now_summary_folder_unavailable">El directori de la còpia de seguretat no està disponible</string>
     <string name="pref_backup_status_summary_success">Última còpia de seguretat amb èxit</string>
@@ -860,7 +860,7 @@
     <string name="pedestrian">A peu</string>
     <string name="bicycle">Bicicleta</string>
     <string name="ruler">Regle</string>
-    <string name="bookmark_color">Color del preferit</string>
+    <string name="bookmark_color">Color del marcador</string>
     <string name="about_help">Quant a i Ajuda</string>
     <string name="open_now">Obert ara</string>
     <string name="closed_now">Tancat ara</string>
@@ -925,5 +925,4 @@
     <string name="download_resources_custom_url_message">Sobreescriu el servidor de descàrrega de mapes per defecte. Deixa en blanc per a emprar el servidor per defecte de CoMaps.</string>
     <string name="download_resources_custom_url_summary_none">No establert</string>
     <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL que comence amb http:// o https://</string>
-    <string name="pref_maplanguage_local">Idioma Local</string>
 </resources>

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

@@ -892,7 +892,7 @@
     <string name="avoid_paved">Vyhnout se zpevněným cestám</string>
     <string name="opens_at">Otevírá v %s</string>
     <string name="closes_at">Zavírá v %s</string>
-    <string name="opens_day_at">Otevírá v %1$s v %2$s</string>
+    <string name="opens_day_at">Otevírá %1$s v %2$s</string>
     <string name="closes_day_at">Zavírá %1$s v %2$s</string>
     <string name="editor_business_vacant_button">Podnik je volný</string>
     <string name="editor_mark_business_vacant_title">Označit podnik jako volný</string>

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

@@ -153,7 +153,7 @@
     <!-- message title of loading file -->
     <string name="load_kmz_title">Favoriten laden</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Lesezeichen erfolgreich geladen! Du kannst diese auf deiner Karte oder im Lesezeichen-Manager anzeigen lassen.</string>
+    <string name="load_kmz_successful">Lesezeichen erfolgreich geladen! Du kannst dieses nun auf deiner Karte oder im Lesezeichen-Manager anzeigen lassen.</string>
     <!-- Kml file loading failed -->
     <string name="load_kmz_failed">Laden der Lesezeichen fehlgeschlagen. Die Datei könnte beschädigt oder defekt sein.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
@@ -258,7 +258,7 @@
     <!-- Update all button text -->
     <string name="downloader_update_all_button">Alle Karten aktualisieren</string>
     <!-- Cancel all button text -->
-    <string name="downloader_cancel_all">Alles abbrechen</string>
+    <string name="downloader_cancel_all">Alle abbrechen</string>
     <!-- Downloaded maps list header -->
     <string name="downloader_downloaded_subtitle">Heruntergeladen</string>
     <!-- Country queued for download -->
@@ -281,7 +281,7 @@
     <!-- Item in context menu. -->
     <string name="downloader_update_map">Karte aktualisieren</string>
     <!-- Preference title -->
-    <string name="google_play_services">Google-Standortverknüpfungsdienst</string>
+    <string name="google_play_services">Google Fused-Standortdienste</string>
     <!-- Preference text -->
     <string name="pref_use_google_play">Ein proprietärer Dienst, der GPS, Wi-Fi, Mobilfunknetzwerke etc. kombiniert, um den Standort genauer zu bestimmen. Er kann sich mit Google-Servern verbinden.</string>
     <!-- Preference title -->
@@ -370,13 +370,13 @@
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Lade die Region herunter, in der du suchst, oder füge den Namen einer nahe gelegenen Stadt oder eines Dorfes hinzu.</string>
     <string name="search_history_title">Suchverlauf</string>
-    <string name="search_history_text">Deine letzten Suchanfragen anzeigen</string>
+    <string name="search_history_text">Ihre letzten Suchanfragen anzeigen</string>
     <string name="clear_search">Suchverlauf löschen</string>
     <string name="p2p_your_location">Dein Standort</string>
     <string name="p2p_start">Start</string>
     <string name="p2p_from_here">Route von</string>
     <string name="p2p_to_here">Route nach</string>
-    <string name="p2p_only_from_current">Die Navigation ist nur von deinem aktuellen Standort aus möglich</string>
+    <string name="p2p_only_from_current">Die Navigation ist nur von Ihrem aktuellen Standort aus möglich</string>
     <string name="p2p_reroute_from_current">Soll eine Route von deinem aktuellen Standort aus berechnet werden?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Weiter</string>
@@ -417,14 +417,14 @@
     <string name="edit_opening_hours">Öffnungszeiten bearbeiten</string>
     <string name="no_osm_account">Kein Konto bei OpenStreetMap?</string>
     <string name="register_at_openstreetmap">Bei OpenStreetMap registrieren</string>
-    <string name="login">Anmelden</string>
+    <string name="login">Bei OpenStreetMap anmelden</string>
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Nicht angemeldet</string>
     <string name="login_osm">Bei OpenStreetMap anmelden</string>
     <string name="logout">Abmelden</string>
     <string name="edit_place">Eintrag bearbeiten</string>
     <string name="add_language">Eine Sprache hinzufügen</string>
-    <string name="street">Innerortsstraße</string>
+    <string name="street">Straße</string>
     <!-- Editable House Number text field (in address block). -->
     <string name="house_number">Hausnummer</string>
     <string name="details">Einzelheiten</string>
@@ -505,7 +505,7 @@
     <string name="editor_reset_edits_button">Änderungen verwerfen</string>
     <string name="editor_remove_place_message">Hinzugefügtes Objekt löschen?</string>
     <string name="editor_remove_place_button">Löschen</string>
-    <string name="editor_place_doesnt_exist">Ort existiert nicht</string>
+    <string name="editor_place_doesnt_exist">Dieser Ort existiert nicht</string>
     <!-- Error message for "Place doesn't exist" dialog when comment is empty -->
     <string name="delete_place_empty_comment_error">Gebe bitte den Grund für die Löschung an</string>
     <!-- Phone number error message -->
@@ -844,7 +844,7 @@
     <string name="pref_backup_summary">Backup automatisch in einem Ordner auf deinem Gerät erstellen</string>
     <string name="pref_backup_now_summary">Backup sofort erstellen</string>
     <string name="pref_backup_now_summary_ok">Backup erfolgreich abgeschlossen</string>
-    <string name="pref_backup_now_summary_empty_lists">Keine Orte und Tracks für ein Backup vorhanden</string>
+    <string name="pref_backup_now_summary_empty_lists">Keine Orte und Tracks zum Sichern</string>
     <string name="pref_backup_now_summary_failed">Backup fehlgeschlagen</string>
     <string name="pref_backup_now_summary_folder_unavailable">Der Backup-Ordner ist nicht verfügbar</string>
     <string name="pref_backup_location_summary_initial">Bitte wähle zuerst einen Ordner und erteile die Berechtigung</string>

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

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>

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

@@ -68,9 +68,9 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Agregar una lista nueva</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nombre de la lista</string>
+    <string name="bookmark_set_name">Nombre de la lista de marcadores</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Lugares</string>
+    <string name="bookmarks">Marcadores</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Favoritos</string>
     <!-- Add bookmark dialog - bookmark name -->
@@ -107,7 +107,7 @@
     <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
     <string name="category_transport">Transporte</string>
     <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
-    <string name="category_fuel">Estación de servicio</string>
+    <string name="category_fuel">Estación de Servicio</string>
     <!-- Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! -->
     <string name="category_parking">Aparcamiento</string>
     <!-- Search category for malls/clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @category_shopping! -->
@@ -524,7 +524,7 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">¿Quieres enviarlo a todos los usuarios?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Asegúrate de que no has introducido ningún dato privado o personal.</string>
+    <string name="editor_share_to_all_dialog_message_1">Asegúrate de que no has introducido ningún dato privado o personal</string>
     <string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta.</string>
     <string name="navigation_stop_button">Detener</string>
     <!-- Shown as toast when starting the recent track recording -->
@@ -578,7 +578,7 @@
     </plurals>
     <string name="bookmarks_create_new_group">Crear nueva lista</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importar favoritos</string>
+    <string name="bookmarks_import">Importar marcadores y trazas</string>
     <string name="bookmarks_error_message_share_general">No se puede compartir debido a un error de la aplicación</string>
     <string name="bookmarks_error_title_share_empty">Error al compartir</string>
     <string name="bookmarks_error_message_share_empty">No se puede compartir una lista vacía</string>
@@ -662,7 +662,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Ordenar…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Exportar favoritos</string>
+    <string name="sort_bookmarks">Ordenar marcadores</string>
     <!-- Android -->
     <string name="by_default">Por defecto</string>
     <!-- Android -->
@@ -814,7 +814,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Continuar grabación</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">¿Guardar en Favoritos?</string>
+    <string name="track_recording_alert_title">¿Guardar en Marcadores y trayectos?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">El trayecto está vacío; no hay nada que guardar</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -845,14 +845,14 @@
     <string name="about_help">Acerca de y Ayuda</string>
     <string name="clear">Limpiar</string>
     <string name="ruler">Regla</string>
-    <string name="bookmark_color">Color del favorito</string>
-    <string name="pref_backup_title">Respaldar favoritos</string>
+    <string name="bookmark_color">Color del marcador</string>
+    <string name="pref_backup_title">Copia de seguridad de marcadores y trayectos</string>
     <string name="pref_backup_summary">Copia de seguridad automática a una carpeta de tu dispositivo</string>
     <string name="pref_backup_now_title">Realizar copia de seguridad ahora</string>
     <string name="pref_backup_now_summary">Crear copia de seguridad inmediatamente</string>
     <string name="pref_backup_now_summary_progress">Copia de seguridad en progreso…</string>
     <string name="pref_backup_now_summary_ok">Copia de seguridad completada con éxito</string>
-    <string name="pref_backup_now_summary_empty_lists">No hay marcadores ni trayectos para hacer un respaldo</string>
+    <string name="pref_backup_now_summary_empty_lists">No hay marcadores ni trayectos para hacer una copia de seguridad</string>
     <string name="pref_backup_now_summary_failed">Copia de seguridad fallida</string>
     <string name="pref_backup_now_summary_folder_unavailable">La carpeta de copia de seguridad no está disponible</string>
     <string name="pref_backup_location_summary_initial">Selecciona por favor primero una carpeta y concede permiso</string>
@@ -927,5 +927,4 @@
     <string name="download_resources_custom_url_message">Sobreescribe el servidor de mapas por defecto. Déjalo en blanco para usar el servidor de CoMaps por defecto.</string>
     <string name="download_resources_custom_url_summary_none">No establecido</string>
     <string name="download_resources_custom_url_error_scheme">Por favor introduce un URL empezando con http:// o https://</string>
-    <string name="pref_maplanguage_local">Idioma local</string>
 </resources>

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

@@ -70,7 +70,7 @@
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
     <string name="bookmark_set_name">Nom du groupe de signets</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Lieux</string>
+    <string name="bookmarks">Signets</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Signets et traces</string>
     <!-- Add bookmark dialog - bookmark name -->
@@ -148,14 +148,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notes</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Mes favoris CoMaps.</string>
-    <string name="share_bookmarks_email_body">Bonjour,\n \nVous trouverez ci-joint mes favoris, veuillez les ouvrir dans l’application CoMaps. Si vous ne l’avez pas encore installée, téléchargez l\'application depuis : https://www.comaps.app/download/ \n \nBon voyage avec CoMaps !</string>
+    <string name="share_bookmarks_email_subject">Signets CoMaps partagés avec vous</string>
+    <string name="share_bookmarks_email_body">Bonjour !\n \nVous trouverez ci-joint mes signets de l’appli CoMaps, à ouvrir dans l’application CoMaps. Si vous ne l’avez pas, téléchargez-la en suivant ce lien : https://www.comaps.app/download/ \n \nBon voyage avec CoMaps !</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Chargement des Favoris</string>
+    <string name="load_kmz_title">Chargement des signets</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Les favoris ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l’écran du Gestionnaire des Favoris.</string>
+    <string name="load_kmz_successful">Les signets ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l’écran du Gestionnaire de signets.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Erreur lors du chargement des Favoris. Le fichier pourrait être corrompu ou défectueux.</string>
+    <string name="load_kmz_failed">Échec lors du chargement des signets. Le fichier pourrait être corrompu ou défectueux.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Le type de fichier n’est pas reconnu par l’appli :\n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -567,7 +567,7 @@
     <string name="dialog_error_storage_message">Le stockage externe n’est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier votre carte SD ou nous contacter via support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Émuler le mauvais stockage</string>
     <string name="error_enter_correct_name">Veuillez saisir un nom correct</string>
-    <string name="bookmark_lists">Listes de favoris</string>
+    <string name="bookmark_lists">Listes</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Tout masquer</string>
     <string name="bookmark_lists_show_all">Tout afficher</string>
@@ -843,7 +843,7 @@
     <string name="pedestrian">À pied</string>
     <string name="bicycle">À vélo</string>
     <string name="ruler">Règle</string>
-    <string name="bookmark_color">Couleur des Favoris</string>
+    <string name="bookmark_color">Couleur du marque-page</string>
     <string name="panoramax">Image Panoramax</string>
     <string name="pref_backup_now_title">Enregistrer maintenant</string>
     <string name="backup_interval_every_day">Quotidien</string>
@@ -926,5 +926,4 @@
     <string name="download_resources_custom_url_title">Serveur de cartes personnalisé</string>
     <string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète commençant par http:// ou https://</string>
     <string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string>
-    <string name="pref_maplanguage_local">Langue locale</string>
 </resources>

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

@@ -15,7 +15,7 @@
     <string name="zoom_to_country">Prikaži na karti</string>
     <string name="country_status_download_failed">Preuzimanje neuspješno</string>
     <string name="try_again">Pokušaj ponovo</string>
-    <string name="about_proposition_2">• Usmjereno na privatnost i bez oglasa</string>
+    <string name="about_proposition_2">• Fokusiran na privatnost i bez reklama</string>
     <string name="close">Zatvori</string>
     <string name="download">Preuzmi</string>
     <string name="download_resources_continue">Prikaži kartu</string>
@@ -65,7 +65,7 @@
     <string name="downloader_retry">Pokušaj ponovno</string>
     <string name="red">Crvena</string>
     <string name="name">Naziv</string>
-    <string name="category_post">Poštanski ured</string>
+    <string name="category_post">Pošta</string>
     <string name="email">E-mail</string>
     <string name="done">Gotovo</string>
     <string name="rate_the_app">Ocijeni aplikaciju</string>
@@ -73,7 +73,7 @@
     <string name="search_history_title">Povijest pretraživanja</string>
     <string name="not_now">Ne sada</string>
     <string name="pref_map_style_title">Noćni način</string>
-    <string name="create">Kreiraj</string>
+    <string name="create">Napravi</string>
     <string name="editor_time_close">Zatvoreno</string>
     <string name="p2p_start">Početak</string>
     <string name="editor_time_to">Do</string>
@@ -115,9 +115,9 @@
     <string name="sort">Sortiraj…</string>
     <string name="money">Novac</string>
     <string name="app_site_url">https://comaps.app/hr/</string>
-    <string name="location_is_disabled_long_text">Trenutno su vam sve lokacijske usluge onemogućene za ovaj uređaj ili aplikaciju. Omogućite ih u Postavkama.</string>
-    <string name="precise_location_is_disabled_long_text">Kako biste osigurali točnu navigaciju, uključite Preciznu lokaciju u postavkama</string>
-    <string name="about_menu_title">O CoMapsu</string>
+    <string name="location_is_disabled_long_text">Trenutno su vam onemogućene sve usluge lokacije za ovaj uređaj ili aplikaciju. Molim omogućite ih u Postavkama.</string>
+    <string name="precise_location_is_disabled_long_text">Za točnu navigaciju omogućite Preciznu lokaciju u postavkama</string>
+    <string name="about_menu_title">O CoMaps aplikaciji</string>
     <string name="about_headline">Otvoreni projekt kojeg pokreće zajednica</string>
     <string name="about_proposition_1">• Jednostavan za korištenje i dotjeran</string>
     <string name="about_proposition_3">• Izvanmrežno, brz i kompaktan</string>
@@ -160,7 +160,7 @@
     <string name="category_eat">Gdje jesti</string>
     <string name="category_food">Namirnice</string>
     <string name="category_transport">Prijevoz</string>
-    <string name="category_fuel">Benzin</string>
+    <string name="category_fuel">Benzinske stanice</string>
     <string name="category_shopping">Kupovina</string>
     <string name="category_secondhand">Rabljena roba</string>
     <string name="category_tourism">Znamenitosti</string>
@@ -199,21 +199,21 @@
         <item quantity="few">%d rute</item>
         <item quantity="other">%d ruta</item>
     </plurals>
-    <string name="bookmarks_export">Izvoz svih Mjesta i Ruta</string>
+    <string name="bookmarks_export">Izvoz svih Oznaka i Ruta</string>
     <string name="start_track_recording">Snimi Rutu</string>
     <string name="stop_track_recording">Zaustavi snimanje Rute</string>
-    <string name="track_recording_alert_title">Spremi u favorite?</string>
+    <string name="track_recording_alert_title">Spremi u Oznake i Rute?</string>
     <string name="track_recording_toast_nothing_to_save">Ruta je prazna - nema ništa za spremiti</string>
     <string name="edit_track">Izmijeni Rutu</string>
-    <string name="pref_backup_title">Sigurnosna kopija favorita</string>
-    <string name="pref_backup_now_summary_empty_lists">Nema Mjesta i Ruta za izradu sigurnosne kopije</string>
+    <string name="pref_backup_title">Sigurnosna kopija Oznaka i Ruta</string>
+    <string name="pref_backup_now_summary_empty_lists">Nema Oznaka i Ruta za izradu sigurnosne kopije</string>
     <string name="share_track">Podijeli Rutu</string>
     <string name="placepage_edit_bookmark_button">Uredi spremljeno mjesto</string>
     <string name="bookmark_lists_hide_all">Sakrij sve</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d spremljeno mjesto</item>
-        <item quantity="few">%d spremljena mjesta</item>
-        <item quantity="other">%d spremljenih mjesta</item>
+        <item quantity="one">%d Oznaka</item>
+        <item quantity="few">%d Oznake</item>
+        <item quantity="other">%d Oznaka</item>
     </plurals>
     <string name="bookmarks_create_new_group">Kreiraj novu Listu</string>
     <string name="bookmarks_error_message_share_general">Nije moguće podijeliti zbog greške u aplikaciji</string>
@@ -225,8 +225,8 @@
     <string name="bookmarks_error_message_list_name_already_taken">Molimo odaberite drugi naziv</string>
     <string name="bookmarks_empty_list_title">Ova Lista je prazna</string>
     <string name="bookmarks_empty_list_message">Za spremanje mjesta dodirnite mjesto na karti, a zatim dodirnite ikonu zvjezdice</string>
-    <string name="sort_bookmarks">Sortiraj favorite</string>
-    <string name="bookmark_color">Boja Favorita</string>
+    <string name="sort_bookmarks">Sortiraj Oznake</string>
+    <string name="bookmark_color">Boja Oznake</string>
     <string name="share_my_location">Podijeli moju lokaciju</string>
     <string name="pref_zoom_title">Gumbi za zumiranje</string>
     <string name="pref_map_3d_title">Pogled iz perspektive</string>
@@ -361,7 +361,7 @@
     <string name="editor_business_vacant_button">Objekt više ne posluje</string>
     <string name="editor_mark_business_vacant_title">Označi da nema aktivnog poslovanja</string>
     <string name="editor_mark_business_vacant_description">Koristite ovo ako se tvrtka iselila, a prostor je prazan i spreman za novog najmoprimca.</string>
-    <string name="editor_submit">Predaj</string>
+    <string name="editor_submit">Pošalji</string>
     <string name="error_enter_correct_phone">Unesite važeći telefonski broj</string>
     <string name="error_enter_correct_web">Unesite valjanu web-adresu</string>
     <string name="error_enter_correct_email">Unesite važeću e-adresu</string>
@@ -401,7 +401,7 @@
     <string name="enable_logging">Omogući zapisivanje</string>
     <string name="feedback_general">Opće povratne informacije</string>
     <string name="prefs_languages_information">Za glasovne upute koristimo sistemski TTS. Mnogi Android uređaji koriste Google TTS, možete ga preuzeti ili ažurirati s Google Playa (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
-    <string name="prefs_languages_information_off">Za neke jezike morat ćete instalirati sintetizator govora ili dodatni jezični paket iz trgovine aplikacija (Google Play, Galaxy Store, App Gallery, FDroid). . \nOtvorite postavke uređaja → Jezik i unos → Govor → Izlaz teksta u govor. \nOvdje možete upravljati postavkama za sintezu govora (na primjer, preuzeti jezični paket za izvanmrežnu upotrebu) i odabrati drugi program za pretvaranje teksta u govor.</string>
+    <string name="prefs_languages_information_off">Za neke jezike morat ćete instalirati sintetizator govora ili dodatni jezični paket iz trgovine aplikacija (Google Play, Galaxy Store, App Gallery, FDroid). \nOtvorite postavke uređaja → Jezik i unos → Govor → Izlaz teksta u govor. Ovdje možete upravljati postavkama za sintezu govora (na primjer, preuzeti jezični paket za izvanmrežnu upotrebu) i odabrati drugi program za pretvaranje teksta u govor.</string>
     <string name="prefs_languages_information_off_link">Za više informacija molimo provjerite ovaj vodič</string>
     <string name="prefs_speed_cameras_information">Upozorenja na kamere za nadzor brzine onemogućena su u državama u kojima su takva upozorenja zabranjena lokalnim zakonima.</string>
     <string name="transliteration_title">Prikaži u latinici</string>
@@ -552,111 +552,4 @@
     <string name="aa_grant_permissions">Dodijeli dopuštenja</string>
     <string name="button_layer_outdoor">Na otvorenom</string>
     <string name="browser_not_available">Web preglednik nije dostupan</string>
-    <string name="hours_confirmed_time_ago">Potvrđeno %s</string>
-    <string name="existence_confirmed_time_ago">Postojanje potvrđeno %s</string>
-    <string name="edit_opening_hours">Uredi radno vrijeme</string>
-    <string name="no_osm_account">Nemate OpenStreetMap račun?</string>
-    <string name="register_at_openstreetmap">Registrirajte se na OpenStreetMap-u</string>
-    <string name="not_signed_in">Niste prijavljeni</string>
-    <string name="login_osm">Prijava na OpenStreetMap</string>
-    <string name="edit_place">Uredi mjesto</string>
-    <string name="add_language">Dodaj jezik</string>
-    <string name="street">Ulica</string>
-    <string name="house_number">Broj zgrade</string>
-    <string name="building">Zgrada</string>
-    <string name="add_street">Dodaj ulicu</string>
-    <string name="empty_street_name_error">Unesite naziv ulice</string>
-    <string name="choose_language">Odaberite jezik</string>
-    <string name="choose_street">Odaberite ulicu</string>
-    <string name="cuisine">Kuhinja</string>
-    <string name="select_cuisine">Odaberite kuhinju</string>
-    <string name="editor_add_phone">Dodaj telefon</string>
-    <string name="level">Kat</string>
-    <string name="level_value_generic">Razina: %s</string>
-    <string name="volume">Volumen</string>
-    <string name="pref_tts_open_system_settings">Postavke sustava za sintezu govora</string>
-    <string name="pref_tts_no_system_tts">Postavke sinteze govora nisu pronađene, jeste li sigurni da vaš uređaj to podržava?</string>
-    <string name="drive_through">Prolaz za automobile</string>
-    <string name="clear_the_search">Obriši pretragu</string>
-    <string name="website_menu">Poveznica na Jelovnik</string>
-    <string name="view_menu">Pogledaj Jelovnik</string>
-    <string name="open_in_app">Otvori u drugoj aplikaciji</string>
-    <string name="select_option">Odaberite opciju</string>
-    <string name="outdoor_seating">Vanjski prostor za sjedenje</string>
-    <string name="power_save_dialog_summary">Za najtočniju navigaciju preporučujemo isključivanje načina uštede energije u postavkama baterije telefona.</string>
-    <string name="stop_without_saving">Zaustavi bez spremanja</string>
-    <string name="continue_recording">Nastavi snimanje</string>
-    <string name="error_no_file_manager_app">Dijalog za odabir mape nije moguće prikazati jer na vašem uređaju nije instalirana odgovarajuća aplikacija. Instalirajte aplikaciju za upravljanje datotekama i pokušajte ponovno.</string>
-    <string name="choose_color">Odaberi boju</string>
-    <string name="uri_open_location_failed">Nije instalirana aplikacija koja može otvoriti lokaciju</string>
-    <string name="nav_auto">Automatska tema u navigaciji</string>
-    <string name="pref_left_button_title">Postavke lijevog gumba</string>
-    <string name="pref_left_button_disable">Onemogući</string>
-    <string name="pref_backup_summary">Automatsko sigurnosno kopiranje u mapu na vašem uređaju</string>
-    <string name="pref_backup_now_title">Sigurnosno kopiraj sada</string>
-    <string name="pref_backup_now_summary">Odmah stvorite sigurnosnu kopiju</string>
-    <string name="pref_backup_now_summary_progress">Sigurnosno kopiranje u tijeku…</string>
-    <string name="pref_backup_now_summary_ok">Sigurnosna kopija uspješno dovršena</string>
-    <string name="pref_backup_now_summary_failed">Sigurnosna kopija nije uspjela</string>
-    <string name="pref_backup_now_summary_folder_unavailable">Mapa za sigurnosnu kopiju nije dostupna</string>
-    <string name="pref_backup_status_summary_success">Posljednja uspješna sigurnosna kopija</string>
-    <string name="pref_backup_location_title">Lokacija sigurnosne kopije</string>
-    <string name="pref_backup_location_summary_initial">Najprije odaberite mapu i dodijelite dopuštenje</string>
-    <string name="pref_backup_history_title">Broj sigurnosnih kopija koje treba čuvati</string>
-    <string name="pref_backup_interval_title">Automatsko sigurnosno kopiranje</string>
-    <string name="backup_interval_every_day">Dnevno</string>
-    <string name="backup_interval_every_week">Tjedno</string>
-    <string name="backup_interval_manual_only">Isključeno (samo ručno)</string>
-    <string name="dialog_report_error_missing_folder">Odabrana lokacija za sigurnosnu kopiju nije dostupna ili na nju nije moguće zapisivati. Odaberite drugu lokaciju.</string>
-    <string name="dialog_report_error_with_logs">Molimo vas da nam pošaljete izvješće o pogrešci:\n- \"Omogući zapisivanje\" u postavkama\n- reproducirajte problem\n- na zaslonu \"O nama i pomoć\" pritisnite gumb \"Prijavi grešku\" i pošaljite putem e-pošte ili chata\n- onemogućite zapisivanje</string>
-    <string name="clear">Očisti</string>
-    <string name="route_type">Vrsta rute</string>
-    <string name="vehicle">Vozilo</string>
-    <string name="pedestrian">Pješak</string>
-    <string name="bicycle">Bicikla</string>
-    <string name="ruler">Ravnalo</string>
-    <string name="about_help">O nama &amp; Pomoć</string>
-    <string name="open_now">Otvoreno sada</string>
-    <string name="closed_now">Zatvoreno sada</string>
-    <string name="at">u %s</string>
-    <string name="delete_track_dialog_title">Izbrisati %s?</string>
-    <string name="pref_tts_no_system_tts_short">Nije pronađen program za pretvaranje teksta u govor, provjerite postavke aplikacije</string>
-    <string name="navigation_start_tts_message">"Pokretanje navigacije, jezik glasovnih uputa: "</string>
-    <string name="navigation_start_tts_disabled_message">Glasovne upute onemogućene: TTS mehanizam nije dostupan</string>
-    <string name="unknown_power_output">nepoznato</string>
-    <string name="charge_socket_type2">Tip 2 (bez kabela)</string>
-    <string name="charge_socket_type2_cable">Tip 2 (s kabelom)</string>
-    <string name="charge_socket_type2_combo">Tip 2 kombinacija</string>
-    <string name="charge_socket_type1">Tip 1</string>
-    <string name="charge_socket_nacs">NACS</string>
-    <string name="charge_socket_chademo">CHAdeMO priključak</string>
-    <string name="charge_socket_schuko">Domaći EU</string>
-    <string name="unknown_socket_type">nepoznata utičnica</string>
-    <string name="edit_socket_info_tooltip">Izradite nove utičnice ili uredite postojeće.</string>
-    <string name="charging_station_available_sockets">Dostupne utičnice</string>
-    <string name="charge_socket_unknown_other">Drugo ili nepoznato</string>
-    <string name="charge_socket_count">Broj</string>
-    <string name="charge_socket_power">Snaga (kW)</string>
-    <string name="editor_socket">Uredi utičnicu</string>
-    <string name="unknown_count">nepoznato</string>
-    <string name="error_value_must_be_positive">Vrijednost mora biti pozitivna</string>
-    <string name="error_invalid_number">Nevažeći broj</string>
-    <string name="offline_explanation_title">Izvanmrežne karte</string>
-    <string name="offline_explanation_text">Za prikaz i navigaciju područjem potrebno je preuzeti kartu.\nPreuzmite karte za područja u koja želite putovati.</string>
-    <string name="list_description_empty">Uredite popis kako biste dodali opis</string>
-    <string name="advanced">Napredno</string>
-    <string name="download_resources_custom_url_title">Prilagođeni poslužitelj karata</string>
-    <string name="download_resources_custom_url_message">Zamijenite zadani poslužitelj za preuzimanje karata. Ostavite prazno za korištenje CoMaps zadanog poslužitelja.</string>
-    <string name="download_resources_custom_url_summary_none">Nije postavljeno</string>
-    <string name="download_resources_custom_url_error_scheme">Molimo unesite URL koji počinje s http:// ili https://</string>
-    <plurals name="minutes_short">
-        <item quantity="one">%d minuta</item>
-        <item quantity="few">%d minute</item>
-        <item quantity="other">%d minuta</item>
-    </plurals>
-    <plurals name="bookmarks_detect_message">
-        <item quantity="one">Pronađena je %d datoteka. Možete je vidjeti nakon pretvorbe.</item>
-        <item quantity="few">Pronađeno je %d datoteka. Možete ih vidjeti nakon pretvorbe.</item>
-        <item quantity="other">Pronađeno je %d datoteka. Možete ih vidjeti nakon pretvorbe.</item>
-    </plurals>
 </resources>

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

@@ -72,7 +72,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Luoghi preferiti</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Preferiti</string>
+    <string name="bookmarks_and_tracks">Luoghi preferiti e tracce</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nome</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -144,7 +144,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Informazioni</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">I miei luoghi preferiti su CoMaps</string>
+    <string name="share_bookmarks_email_subject">Questi sono i miei luoghi preferiti su CoMaps</string>
     <string name="share_bookmarks_email_body">Ciao!\n\nIn allegato ci sono i miei luoghi preferiti. Aprili se hai installato CoMaps. Oppure, se non ce l\'hai, scarica l\'app per iOS o Android seguendo questo link: https://www.comaps.app/\n\nDivertiti a viaggiare con CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Caricamento luoghi preferiti</string>
@@ -803,7 +803,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Continua a registrare</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Salvare in Preferiti?</string>
+    <string name="track_recording_alert_title">Salvare in Luoghi preferiti e tracce?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">La traccia è vuota - non c\'è nulla da salvare</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->

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

@@ -140,14 +140,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Pastabos</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Mano „CoMaps“ žymės</string>
-    <string name="share_bookmarks_email_body">Labas! \n \nČia prisegtas mano „CoMaps“ programėlės žymių failas. Jei jos neturi, gali ją parsisiųsti iš https://www.comaps.app/download/ \n \nSmagių kelionių su „CoMaps“!</string>
+    <string name="share_bookmarks_email_subject">Su jumis bendrinamas „CoMaps“ žymių sąrašas</string>
+    <string name="share_bookmarks_email_body">Labas! \n \nČia prisegtas mano žymių sąrašas iš „CoMaps“ programėlės. Jei jos neturi, gali ją parsisiųsti iš https://www.comaps.app/download/ \n \nSmagių kelionių su „CoMaps“!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Žymės įkeliamos</string>
+    <string name="load_kmz_title">Žymių sąrašas įkeliamas</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Žymės įkeltos! Galite jas rasti žemėlapyje arba žymių tvarkytuvės ekrane.</string>
+    <string name="load_kmz_successful">Žymių sąrašas įkeltas! Galite rasti jį žemėlapyje arba žymių tvarkytuvės ekrane.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Žymių įkelti nepavyko. Gali būti, kad failas sugadintas.</string>
+    <string name="load_kmz_failed">Žymių sąrašo nepavyko įkelti. Gali būti, kad failas sugadintas.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Programėlė neatpažįsta failo tipo: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -553,13 +553,13 @@
     <string name="dialog_error_storage_message">Išorinė saugykla yra nepasiekiama. SD kortelė galimai yra pašalinta, pažeista, arba failų sistema joje yra nustatyta tik skaitymui. Patikrinkite SD kortelę arba susisiekite su mumis adresu support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuliuoti blogą saugyklą</string>
     <string name="error_enter_correct_name">Įveskite teisingą pavadinimą</string>
-    <string name="bookmark_lists">Žymių sąrašai</string>
+    <string name="bookmark_lists">Sąrašai</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Nerodyti visų</string>
     <string name="bookmark_lists_show_all">Rodyti visus</string>
     <string name="bookmarks_create_new_group">Kurti naują sąrašą</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importuoti žymes</string>
+    <string name="bookmarks_import">Importuoti žymes ir trasas</string>
     <string name="bookmarks_error_message_share_general">Nepavyko bendrinti dėl programinės klaidos</string>
     <string name="bookmarks_error_title_share_empty">Klaida bendrinant</string>
     <string name="bookmarks_error_message_share_empty">Negalima bendrinti tuščio sąrašo</string>
@@ -580,7 +580,7 @@
     <string name="subway">Metro</string>
     <string name="layers_title">Žemėlapio stiliai ir sluoksniai</string>
     <string name="bookmarks_empty_list_title">Sąrašas tuščias</string>
-    <string name="bookmarks_empty_list_message">Jeigu norite pasižymėti, bakstelėkite ją žemėlapyje, o tada – bakstelėkite žvaigždutės piktogramą</string>
+    <string name="bookmarks_empty_list_message">Jeigu norite pridėti žymę, bakstelėkite vietą žemėlapyje, o tada – žvaigždutės piktogramą</string>
     <string name="category_desc_more">…daugiau</string>
     <string name="export_file">Eksportuoti KMZ</string>
     <string name="export_file_gpx">Eksportuoti GPX</string>
@@ -711,7 +711,7 @@
     <string name="browser_not_available">Saityno naršyklė nepasiekiama</string>
     <string name="volume">Garsumas</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Eksportuoti pasižymėtas žymes ir trasas</string>
+    <string name="bookmarks_export">Eksportuoti visas žymes ir trasas</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Šnekos sintezės sistemos nustatymai</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -743,7 +743,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Tęsti įrašymą</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Pridėti žymę?</string>
+    <string name="track_recording_alert_title">Įrašyti į žymių ir trasų sąrašą?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Trasa tuščia – nėra ką įrašyti</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -753,7 +753,7 @@
     <string name="uri_open_location_failed">Neįdiegta programėlė, galinti atverti vietą</string>
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Automatinė naviguojant</string>
-    <string name="bookmarks_and_tracks">Žymės</string>
+    <string name="bookmarks_and_tracks">Žymės ir trasos</string>
     <string name="location_settings">Vietos nustatymai</string>
     <string name="maps_storage_summary">Pasirinkite aplanką atsiųstiems žemėlapiams įrašyti</string>
     <string name="category_secondhand">Naudotos prekės</string>
@@ -780,10 +780,9 @@
     <string name="car_used_on_the_phone_screen">Dabar naudojatės „CoMaps“ telefono ekrane</string>
     <string name="car_used_on_the_car_screen">Dabar naudojatės „CoMaps“ automobilio ekrane</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d pasižymėta vieta</item>
-        <item quantity="few">%d pasižymėtos vietos</item>
-        <item quantity="many">%d pasižymėtų vietų</item>
-        <item quantity="other">%d pasižymėtų vietų</item>
+        <item quantity="one">%d žymė</item>
+        <item quantity="few">%d žymės</item>
+        <item quantity="other">%d žymių</item>
     </plurals>
     <string name="app_tip_01">Su jūsų parama ir palaikymu mes galime sukurti geriausius žemėlapius pasaulyje!</string>
     <string name="enable_keep_screen_on_description">Įgalinus šią parinktį, ekranas visada liks įjungtas, kol rodomas žemėlapis.</string>
@@ -808,12 +807,12 @@
     <string name="saved">Įrašyta</string>
     <string name="ruler">Liniuotė</string>
     <string name="pref_left_button_title">Kairiojo mygtuko funkcija</string>
-    <string name="pref_backup_now_summary_empty_lists">Nėra pasižymėtų vietų ar trasų atsarginei kopijai sudaryti</string>
+    <string name="pref_backup_now_summary_empty_lists">Neturite jokių žymių ar trasų atsarginei kopijai sudaryti</string>
     <string name="pref_backup_interval_title">Automatinis atsarginis kopijavimas</string>
     <string name="dialog_report_error_missing_folder">Pasirinktas atsarginių kopijų aplankas nepasiekiamas, bent jau rašymui. Pasirinkite kitą aplanką.</string>
     <string name="dialog_report_error_with_logs">Būsime dėkingi, jei atsiųsti klaidos pranešimą:\n - programos nustatymuose pažymėkite „Įgalinti derinimo žurnalą“\n - atkartokite problemą\n - „Žinyno ir pagalbos“ ekrane bakstelėkite mygtuką „Pranešti apie klaidą“ ir išsiųskite pranešimą el. paštu ar per pokalbių programėlę\n - išjunkite derinimo žurnalą</string>
     <string name="bicycle">Dviračiu</string>
-    <string name="pref_backup_title">Žymių atsarginis kopijavimas</string>
+    <string name="pref_backup_title">Žymių ir trasų atsarginis kopijavimas</string>
     <string name="editor_building_levels">Aukštų skaičius (skaičiuojant pirmą aukštą, neskaičiuojant stogo)</string>
     <string name="editor_level">Aukštas (0 reiškia pirmą aukštą)</string>
     <string name="error_enter_correct_level">Įveskite leistiną aukšto numerį</string>
@@ -902,5 +901,4 @@
     <string name="download_resources_custom_url_message">Žemėlapiams parsisiųsti galite nurodyti kitą, nei numatytasis, serverį. Palikite lauką tuščią, jei norite naudoti numatytąjį „CoMaps“ serverį.</string>
     <string name="download_resources_custom_url_summary_none">Nenurodytas</string>
     <string name="download_resources_custom_url_error_scheme">Įveskite URL adresą, prasidedantį „http://“ arba „https://“</string>
-    <string name="pref_maplanguage_local">Vietos kalba</string>
 </resources>

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

@@ -516,10 +516,10 @@
     <string name="error_enter_correct_line_page">Ierakstiet LINE vietnes adresi vai LINE ID</string>
     <string name="placepage_add_place_button">Pievienot vietu „OpenStreetMap“</string>
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
-    <string name="editor_share_to_all_dialog_title">Vai nosūtīt to visiem lietotājiem?</string>
+    <string name="editor_share_to_all_dialog_title">Vai vēlaties to nosūtīt visiem lietotājiem?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka nav ievadīti nekādi privāti vai personīgi dati.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.</string>
+    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.</string>
     <string name="navigation_stop_button">Apturēt</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Maršruta reģistrēšana</string>
@@ -862,25 +862,4 @@
         <item quantity="other">%d min.</item>
     </plurals>
     <string name="pref_maplanguage_local">Vietējā valoda</string>
-    <string name="opens_day_at">Atver %1$s plkst. %2$s</string>
-    <string name="closes_at">Slēdz %s</string>
-    <string name="opens_at">Atver %s</string>
-    <string name="closes_day_at">Slēdz %1$s plkst. %2$s</string>
-    <string name="osm_note_toast">Piezīme tiks nosūtīta “OpenStreetMap”</string>
-    <string name="pref_backup_now_summary_ok">Rezerves kopēšana sekmīgi pabeigta</string>
-    <string name="pref_backup_now_summary_empty_lists">Nav vietu un ceļu, kam veikt rezerves kopēšanu</string>
-    <string name="pref_backup_now_summary_failed">Rezerves kopēšana neizdevās</string>
-    <string name="pref_backup_now_summary_folder_unavailable">Rezerves kopiju mape nav pieejama</string>
-    <string name="pref_backup_status_summary_success">Pēdējā sekmīgā rezerves kopēšana</string>
-    <string name="pref_backup_location_title">Rezerves kopiju atrašanās vieta</string>
-    <string name="pref_backup_location_summary_initial">Lūgums vispirms atlasīt mapi un nodrošināt atļauju</string>
-    <string name="pref_backup_history_title">Paturamo rezerves kopiju daudzums</string>
-    <string name="pref_backup_interval_title">Automātiskā rezerves kopēšana</string>
-    <string name="pref_backup_title">Izveidot izlases rezerves kopiju</string>
-    <string name="pref_backup_summary">Automātiski veikt rezerves kopēšanu ierīces mapē</string>
-    <string name="pref_backup_now_title">Veikt rezerves kopēšanu tagad</string>
-    <string name="pref_backup_now_summary">Nekavējoties izveidot rezerves kopiju</string>
-    <string name="pref_backup_now_summary_progress">Notiek rezerves kopēšana…</string>
-    <string name="pedestrian">Kājāmgājēju</string>
-    <string name="bicycle">Divriteņu</string>
 </resources>

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

@@ -21,30 +21,30 @@
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
     <string name="search">Zoeken</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
-    <string name="search_map">Zoeken op kaart</string>
+    <string name="search_map">Zoeken op de kaart</string>
     <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">U heeft momenteel alle locatiediensten voor dit apparaat of deze app uitgeschakeld. Schakel ze in bij Instellingen.</string>
+    <string name="location_is_disabled_long_text">U heeft momenteel alle locatieservices voor dit apparaat of deze app uitgeschakeld. Schakel ze in bij Instellingen.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Beperkte nauwkeurigheid</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie moet Nauwkeurige Locatie worden ingesteld in de instellingen</string>
+    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie moet Nauwkeurige Locatie worden ingesteld bij Instellingen</string>
     <!-- View and button titles for accessibility -->
-    <string name="zoom_to_country">Weergeven op kaart</string>
+    <string name="zoom_to_country">Weergeven op de kaart</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
     <string name="country_status_download_failed">Downloaden is mislukt</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Opnieuw proberen</string>
     <string name="about_menu_title">Over CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Open project gedreven door de community</string>
+    <string name="about_headline">Open project, gemaakt door de community</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• Gebruiksvriendelijk en afgewerkt</string>
+    <string name="about_proposition_1">• Gebruiksvriendelijk en gestroomlijnd</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Privacygericht en vrij van advertenties</string>
     <!-- Text in About screen -->
     <string name="about_proposition_3">• Offline, snel en compact</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Volledige open source, non-profit, transparante besluitvorming en financiering.</string>
+    <string name="about_developed_by_enthusiasts">Volledig open source, non-profit, transparante besluitvorming en financiering.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">Locatie-instellingen</string>
     <string name="close">Sluiten</string>
@@ -55,7 +55,7 @@
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Maak eerst ruimte vrij op de SD-kaart/USB-opslag om de app te gebruiken</string>
     <string name="download_resources">Laten we, voor de eerste start, de algemene wereldkaart downloaden. \nDeze gebruikt %s aan opslag.</string>
-    <string name="download_resources_continue">Ga naar kaart</string>
+    <string name="download_resources_continue">Ga naar de kaart</string>
     <string name="downloading_country_can_proceed">%1$s (%2$s) downloaden. U kunt nu \ndoorgaan naar de kaart.</string>
     <string name="download_country_ask">%1$s downloaden? (%2$s)</string>
     <string name="update_country_ask">%1$s bijwerken? (%2$s)</string>
@@ -66,7 +66,7 @@
     <!-- Show popup notification on top of the map when country download has failed. -->
     <string name="download_country_failed">%s download is mislukt</string>
     <!-- "Add new bookmark list" dialog title -->
-    <string name="add_new_set">Nieuwe lijst toevoegen</string>
+    <string name="add_new_set">Nieuwe groep toevoegen</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
     <string name="bookmark_set_name">Naam van lijst</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
@@ -96,7 +96,7 @@
     <!-- Ask user to wait several minutes (some long process in modal dialog). -->
     <string name="wait_several_minutes">Dit kan enkele minuten duren. \nEven geduld…</string>
     <!-- Measurement units title in settings activity -->
-    <string name="measurement_units">Eenheid van afstand</string>
+    <string name="measurement_units">Afstandseenheid</string>
     <!-- Detailed description of Measurement Units settings button -->
     <string name="measurement_units_summary">Kies tussen mijlen en kilometers</string>
     <!-- SECTION: Search categories -->
@@ -143,7 +143,7 @@
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
     <string name="category_water">Water</string>
     <!-- Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! -->
-    <string name="category_rv">Camperfaciliteiten</string>
+    <string name="category_rv">Caravanfaciliteiten</string>
     <!-- SECTION: Other translations -->
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notities</string>
@@ -159,7 +159,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Het bestandstype wordt niet herkend door de app: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
-    <string name="failed_to_open_file">Bestand openen is mislukt %1$s \n \n%2$s</string>
+    <string name="failed_to_open_file">Bestand openen mislukt %1$s \n \n%2$s</string>
     <!-- resource for context menu -->
     <string name="edit">Bewerken</string>
     <!-- Warning message when doing search around current position -->
@@ -841,21 +841,21 @@
     <string name="bookmark_color">Kleur voor favoriet</string>
     <string name="backup_interval_every_day">Dagelijks</string>
     <string name="backup_interval_manual_only">Uit (alleen handmatig)</string>
-    <string name="pref_backup_title">Back-up maken van favorieten</string>
+    <string name="pref_backup_title">Back-up van favorieten</string>
     <string name="pref_backup_summary">Automatisch back-up maken naar een map op je apparaat</string>
-    <string name="pref_backup_now_title">Nu back-up maken</string>
-    <string name="pref_backup_now_summary">Onmiddellijk een back-up maken</string>
-    <string name="pref_backup_now_summary_progress">Bezig met back-up maken…</string>
-    <string name="pref_backup_now_summary_ok">Back-up met succes voltooid</string>
+    <string name="pref_backup_now_title">Nu back-uppen</string>
+    <string name="pref_backup_now_summary">Maak onmiddellijk een back-up</string>
+    <string name="pref_backup_now_summary_progress">Bezig met het maken van back-up…</string>
+    <string name="pref_backup_now_summary_ok">Back-up succesvol voltooid</string>
     <string name="pref_backup_now_summary_empty_lists">Geen plaatsen en sporen voor een back-up</string>
     <string name="pref_backup_status_summary_success">Laatste succesvolle back-up</string>
     <string name="pref_backup_interval_title">Automatische back-up</string>
-    <string name="pref_backup_location_title">Back-uplocatie</string>
-    <string name="pref_backup_now_summary_failed">Backup is mislukt</string>
+    <string name="pref_backup_location_title">Back-up locatie</string>
+    <string name="pref_backup_now_summary_failed">Backup mislukt</string>
     <string name="pref_backup_history_title">Aantal back-ups om te bewaren</string>
     <string name="dialog_report_error_missing_folder">De geselecteerde back-uplocatie is niet beschikbaar of niet beschrijfbaar. Kies een andere locatie.</string>
     <string name="backup_interval_every_week">Wekelijks</string>
-    <string name="pref_backup_now_summary_folder_unavailable">De back-upmap is niet beschikbaar</string>
+    <string name="pref_backup_now_summary_folder_unavailable">De back-up map is niet beschikbaar</string>
     <string name="panoramax">Panoramax-afbeelding</string>
     <string name="pref_backup_location_summary_initial">Selecteer eerst een map en geef toestemming</string>
     <string name="pref_left_button_title">Linkerknop configuratie</string>

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

@@ -68,11 +68,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Adicionar conjunto novo</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nome da Lista</string>
+    <string name="bookmark_set_name">Nome do conjunto de favoritos</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Lugares</string>
+    <string name="bookmarks">Favoritos</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Favoritos</string>
+    <string name="bookmarks_and_tracks">Favoritos e trajetos</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nome</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -144,10 +144,10 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notas</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Os meus Favoritos do CoMaps</string>
-    <string name="share_bookmarks_email_body">Olá! \n \nSegue em anexo os meus favoritos; por favor abra-os com o CoMaps. Caso não tenha, descarregue a aplicação aqui: https://www.comaps.app/download/ \n \nDivirta-se a viajar com o CoMaps!</string>
+    <string name="share_bookmarks_email_subject">Os favoritos do CoMaps foram partilhados consigo</string>
+    <string name="share_bookmarks_email_body">Olá! \n \nSegue em anexo os meus favoritos da aplicação CoMaps. Por favor abra-os se tiver o CoMaps instalado. Caso não tenha, descarregue a aplicação para o seu dispositivo iOS ou Android com a hiperligação https://www.comaps.app/download/ \n \nDivirta-se a viajar com o CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Carregando Favoritos</string>
+    <string name="load_kmz_title">A carregar favoritos</string>
     <!-- Kmz file successful loading -->
     <string name="load_kmz_successful">Os favoritos foram carregados com sucesso! Pode encontrá-los no mapa ou no ecrã de gestão dos favoritos.</string>
     <!-- Kml file loading failed -->

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

@@ -54,12 +54,12 @@
     <string name="maps_storage_free_size">%1$s prosto od %2$s</string>
     <string name="move_maps">Premaknem zemljevide?</string>
     <string name="move_maps_error">Napaka med premikanjem datotek zemljevidov</string>
-    <string name="wait_several_minutes">To lahko traja nekaj minut. \nPočakajte …</string>
+    <string name="wait_several_minutes">To lahko traja nekaj minut. \nProsimo, počakajte …</string>
     <string name="measurement_units">Merske enote</string>
     <string name="measurement_units_summary">Izberite med miljami in kilometri</string>
     <string name="category_eat">Kje jesti</string>
     <string name="category_food">Špecerija</string>
-    <string name="category_transport">Prevoz</string>
+    <string name="category_transport">Javni prevoz</string>
     <string name="category_fuel">Gorivo</string>
     <string name="category_parking">Parkiranje</string>
     <string name="category_shopping">Nakupovanje</string>
@@ -80,7 +80,7 @@
     <string name="category_water">Voda</string>
     <string name="category_rv">Prostori za avtodome</string>
     <string name="description">Pripis</string>
-    <string name="share_bookmarks_email_subject">Moji zaznamki na CoMaps</string>
+    <string name="share_bookmarks_email_subject">Nekdo je z vami delil zaznamke CoMaps</string>
     <string name="share_bookmarks_email_body">Živjo! \n \nV priponki so moji zaznamki. Prosim, odpri jih v orodju CoMaps. Če ga še nisi namestil, ga lahko preneseš tukaj: https://www.comaps.app/download/ \n \nUživaj v potovanju s CoMaps!</string>
     <string name="load_kmz_title">Nalagam zaznamke</string>
     <string name="load_kmz_successful">Zaznamki so uspešno naloženi! Najdete jih lahko na zemljevidu ali v upravitelju zaznamkov.</string>
@@ -239,7 +239,7 @@
     <string name="editor_example_values">Primeri vrednosti</string>
     <string name="editor_correct_mistake">Popravi napako</string>
     <string name="editor_add_select_location">Izberi lokacijo</string>
-    <string name="editor_report_problem_desription_1">Podrobno opišite težavo, da jo lahko skupnost OpenStreetMap odpravi.</string>
+    <string name="editor_report_problem_desription_1">Prosimo, podrobno opišite težavo, da jo lahko skupnost OpenStreetMap odpravi.</string>
     <string name="editor_report_problem_desription_2">Ali pa jo popravite sami na https://www.openstreetmap.org/</string>
     <string name="editor_report_problem_send_button">Pošlji</string>
     <string name="editor_report_problem_title">Težava</string>
@@ -271,7 +271,7 @@
     <string name="social_media">Družbena omrežja</string>
     <string name="building">Stavba</string>
     <string name="add_street">Dodaj ulico</string>
-    <string name="empty_street_name_error">Vnesite ime ulice</string>
+    <string name="empty_street_name_error">Prosimo, vnesite ime ulice</string>
     <string name="choose_language">Izberite jezik</string>
     <string name="choose_street">Izberite ulico</string>
     <string name="cuisine">Kuhinja</string>
@@ -285,7 +285,7 @@
     <string name="downloader_search_field_hint">Najdi zemljevid</string>
     <string name="common_check_internet_connection_dialog">Preverite, da je vaša naprava povezana na internet</string>
     <string name="downloader_no_space_title">Ni dovolj prostora</string>
-    <string name="downloader_no_space_message">Izbrišite vse nepotrebne podatke</string>
+    <string name="downloader_no_space_message">Prosimo, izbrišite vse nepotrebne podatke</string>
     <string name="editor_login_error_dialog">Napaka pri prijavi</string>
     <string name="editor_profile_changes">Potrjene spremembe</string>
     <string name="editor_focus_map_on_location">Povlecite zemljevid tako, da bo križ na lokaciji kraja ali podjetja.</string>
@@ -308,7 +308,7 @@
     <string name="error_enter_correct_zip_code">Vnesite veljavno poštno številko</string>
     <string name="editor_other_info">Komentar za prostovoljce na OpenStreetMap (neobvezno)</string>
     <string name="editor_note_hint">Opišite napake na zemljevidu ali stvari, ki jih ni mogoče urediti prek CoMaps</string>
-    <string name="editor_about_osm">Vaša urejanja se naložijo v javno podatkovno bazo <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Ne dodajajte osebnih ali avtorsko zaščitenih podatkov.</string>
+    <string name="editor_about_osm">Vaša urejanja se naložijo v javno podatkovno bazo <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Prosimo, da ne dodajate osebnih ali avtorsko zaščitenih podatkov.</string>
     <string name="editor_more_about_osm">Več o OpenStreetMap</string>
     <string name="editor_osm_history">Vaša zgodovina urejanja</string>
     <string name="editor_osm_notes">Vaši komentarji za zemljevid</string>
@@ -365,7 +365,7 @@
     <string name="mobile_data_option_ask">Vedno vprašaj</string>
     <string name="traffic_update_maps_text">Za prikazovanje podatkov o prometu je treba posodobiti zemljevide</string>
     <string name="big_font">Povečajte velikost oznak na zemljevidu</string>
-    <string name="traffic_update_app">Posodobite CoMaps</string>
+    <string name="traffic_update_app">Prosimo, posodobite CoMaps</string>
     <string name="traffic_data_unavailable">Prometni podatki niso na voljo</string>
     <string name="enable_logging">Omogoči dnevniške zapise</string>
     <string name="feedback_general">Splošne povratne informacije</string>
@@ -384,7 +384,7 @@
     <string name="dialog_error_storage_message">Zunanja shramba ni dostopna. SD kartica je bila morda odstranjena, je poškodovana ali pa datotečni sistem ne podpira zapisovanja. Preverite svojo SD kartico ali stopite v stik z nami prek support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuliraj pokvarjeno shrambo</string>
     <string name="error_enter_correct_name">Vnesite pravilno ime</string>
-    <string name="bookmark_lists">Seznam priljubljenih</string>
+    <string name="bookmark_lists">Seznami</string>
     <string name="bookmark_lists_hide_all">Skrij vse</string>
     <string name="bookmark_lists_show_all">Pokaži vse</string>
     <plurals name="bookmarks_places">
@@ -394,7 +394,7 @@
         <item quantity="other">%d zaznamkov</item>
     </plurals>
     <string name="bookmarks_create_new_group">Ustvarite nov seznam</string>
-    <string name="bookmarks_import">Uvozi zaznamke</string>
+    <string name="bookmarks_import">Uvozi zaznamke in poti</string>
     <string name="bookmarks_error_message_share_general">Ni bilo mogoče deliti zaradi aplikacijske napake</string>
     <string name="bookmarks_error_title_share_empty">Napaka pri deljenju</string>
     <string name="bookmarks_error_message_share_empty">Ni mogoče deliti praznega seznama</string>
@@ -448,7 +448,7 @@
     <string name="avoid_ferry">Brez trajektov</string>
     <string name="avoid_motorways">Brez avtocest</string>
     <string name="unable_to_calc_alert_title">Ne morem izračunati poti</string>
-    <string name="unable_to_calc_alert_subtitle">Ni bilo mogoče najti povezave. Mogoče so krive vaše zahteve za pot ali pa nepopolni podatki OpenStreetMapa. Spremenite možnosti iskanja povezave in poskusite ponovno.</string>
+    <string name="unable_to_calc_alert_subtitle">Ni bilo mogoče najti relacije. Mogoče so krive vaše zahteve za pot ali pa nepopolni podatki OpenStreetMap. Prosimo, spremenite možnosti relacije in poskusite ponovno.</string>
     <string name="define_to_avoid_btn">Definirajte, katerim cestam naj se izognemo</string>
     <string name="change_driving_options_btn">Možnosti relacije so omogočene</string>
     <string name="toll_road">Cesta s cestnino</string>
@@ -524,7 +524,7 @@
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="app_tip_00">Hvala, ker uporabljate naše javno narejene zemljevide!</string>
     <string name="app_tip_01">Z vašo podporo lahko ustvarimo najboljše zemljevide na svetu!</string>
-    <string name="app_tip_02">Ali vam je naša aplikacija všeč? Vabimo vas, da finančno podprete njen razvoj! Ali niste zadovoljni z njo? Prosimo, da nam sporočite zakaj, in jo bomo popravili!</string>
+    <string name="app_tip_02">Ali vam je naša aplikacija všeč? Vabimo vas, da finančno podprete njen razvoj! Ali niste zadovoljni z njo? Prosimo, da nam sporočite, zakaj, in jo bomo popravili!</string>
     <string name="app_tip_03">Če poznate kakega_o razvijalca_ko programske opreme, ga_jo lahko prosite, da implementira funkcionalnost, ki jo potrebujete.</string>
     <string name="app_tip_04">S kratkim pritiskom na zemljevid lahko izberete kateri koli element. Z dolgim pritiskom lahko skrijete ali pokažete vmesnik.</string>
     <string name="app_tip_05">Ali ste vedeli, da lahko na zemljevidu izberete svojo trenutno lokacijo?</string>
@@ -571,7 +571,7 @@
     <string name="stop_track_recording">Ustavi snemanje sledi</string>
     <string name="stop_without_saving">Ustavi brez shranjevanja</string>
     <string name="continue_recording">Nadaljuj snemanje</string>
-    <string name="track_recording_alert_title">Shrani med zaznamke?</string>
+    <string name="track_recording_alert_title">Shrani med Zaznamke in sledi?</string>
     <string name="track_recording_toast_nothing_to_save">Sled je prazna – ničesar ni za shraniti</string>
     <string name="error_no_file_manager_app">Pogovornega okna za izbiro mape ni mogoče prikazati, ker na vaši napravi ni nameščenega ustreznega orodja. Namestite upravitelja datotek in poskusite znova.</string>
     <string name="choose_color">Izberi barvo</string>
@@ -581,7 +581,7 @@
     <string name="zoom_in">Približaj</string>
     <string name="zoom_out">Oddalji</string>
     <string name="pref_left_button_title">Nastavitev levega gumba</string>
-    <string name="pref_backup_title">Varnostno kopiranje priljubljenih</string>
+    <string name="pref_backup_title">Varnostno kopiranje zaznamkov in sledi</string>
     <string name="pref_backup_summary">Samodejno varnostno kopiraj v mapo na vaši napravi</string>
     <string name="pref_backup_now_title">Ustvari varnostno kopijo zdaj</string>
     <string name="pref_left_button_disable">Onemogoči</string>
@@ -593,14 +593,14 @@
     <string name="pref_backup_now_summary_folder_unavailable">Mapa za varnostno kopijo ni na voljo</string>
     <string name="pref_backup_status_summary_success">Zadnje uspešno kopiranje</string>
     <string name="pref_backup_location_title">Mesto varnostne kopije</string>
-    <string name="pref_backup_location_summary_initial">Najprej izberite mapo in dodelite dovoljenja</string>
+    <string name="pref_backup_location_summary_initial">Prosimo, najprej izberite mapo in podelite dovoljenja</string>
     <string name="pref_backup_history_title">Število varnostnih kopij, ki jih je treba hraniti</string>
     <string name="pref_backup_interval_title">Samodejno varnostno kopiranje</string>
     <string name="backup_interval_manual_only">Izklopljeno (samo ročno)</string>
     <string name="dialog_report_error_missing_folder">Izbrano mesto za varnostno kopijo ni na voljo ali vanjo ni mogoče pisati. Izberite drugo mesto.</string>
     <string name="backup_interval_every_day">Dnevno</string>
     <string name="backup_interval_every_week">Tedensko</string>
-    <string name="dialog_report_error_with_logs">Pošljite nam poročilo o napaki:\n - \"Omogoči beleženje\" v nastavitvah\n - poustvarite težavo\n - na zaslonu »O programu in Pomoč« pritisnite gumb »Prijavi napako« in jo pošljite po e-pošti ali klepetu\n - onemogočite beleženje</string>
+    <string name="dialog_report_error_with_logs">Prosimo, pošljite nam poročilo o napaki:\n - \"Omogoči beleženje\" v nastavitvah\n - poustvarite težavo\n - na zaslonu »O programu in Pomoč« pritisnite gumb »Prijavi napako« in jo pošljite po e-pošti ali klepetu\n - onemogoči beleženje</string>
     <string name="route_type">Vrsta poti</string>
     <string name="vehicle">Vozilo</string>
     <string name="pedestrian">Za pešce</string>
@@ -646,8 +646,8 @@
     <string name="editor_mark_business_vacant_description">To uporabite, če se je podjetje izselilo in so prostori prazni in pripravljeni za novega zakupnika.</string>
     <string name="editor_submit">Potrdi</string>
     <string name="place_page_map_too_old_title">Podatki zemljevida so zastareli</string>
-    <string name="place_page_map_too_old_description">Vaši trenutni podatki zemljevida so zelo stari, posodobite zemljevid.</string>
-    <string name="place_page_app_too_old_description">Vaši trenutni podatki zemljevida so zelo stari, posodobite orodje CoMaps.</string>
+    <string name="place_page_map_too_old_description">Vaši trenutni podatki zemljevida so zelo stari; prosimo, posodobite zemljevid.</string>
+    <string name="place_page_app_too_old_description">Vaši trenutni podatki zemljevida so zelo stari; prosimo, posodobite orodje CoMaps.</string>
     <string name="place_page_update_too_old_map">Posodobi področje zemljevida</string>
     <string name="place_page_too_old_to_edit">Urejanje OpenStreetMap je onemogočeno, ker so podatki zemljevida prestari.</string>
     <string name="prefs_speed_cameras_information">Opozorila o merilnikih hitrosti so onemogočena v državah, kjer so prepovedana s tamkajšnjimi zakoni.</string>
@@ -661,6 +661,5 @@
     <string name="download_resources_custom_url_title">Strežnik zemljevida po meri</string>
     <string name="download_resources_custom_url_message">Prepiši privzeti strežnik za prenos zemljevidov, ki se uporablja za prenos zemljevidov. Pustite prazno, če želite uporabiti privzeti strežnik CoMaps.</string>
     <string name="download_resources_custom_url_summary_none">Ni nastavljeno</string>
-    <string name="download_resources_custom_url_error_scheme">Vnesite polni URL, ki se začne z http:// ali https://</string>
-    <string name="pref_maplanguage_local">Krajevni jezik</string>
+    <string name="download_resources_custom_url_error_scheme">Prosimo, vnesite polni URL, ki se začne z https:// in konča z /</string>
 </resources>

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

@@ -66,11 +66,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Lägg till ny samling</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Listans namn</string>
+    <string name="bookmark_set_name">Bokmärkessamlingens namn</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Platser</string>
+    <string name="bookmarks">Bokmärken</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Favoriter</string>
+    <string name="bookmarks_and_tracks">Bokmärken och rutter</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Namn</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -142,13 +142,13 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Anteckningar</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Mina CoMaps-favoriter</string>
+    <string name="share_bookmarks_email_subject">CoMaps bokmärken har delats med dig</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Läser in favoriter</string>
+    <string name="load_kmz_title">Läser in bokmärken</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Favoriterna lästes in! Du kan hitta dem på kartan eller i favorithanteraren.</string>
+    <string name="load_kmz_successful">Bokmärkena lästes in! Du kan hitta dem på kartan eller i Bokmärkeshanteraren.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Inläsningen av favoriterna misslyckades. Filen kan vara skadad eller defekt.</string>
+    <string name="load_kmz_failed">Inläsningen av bokmärkena misslyckades. Filen kan vara skadad eller defekt.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Filtypen känns inte igen av appen: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -210,7 +210,7 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Röstspråk</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Testa röstinstruktioner</string>
+    <string name="pref_tts_test_voice_title">Testa röstinstruktioner (TTS, Text-To-Speech)</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Kontrollera volymen eller systemets text-till-tal-inställningar om du inte hör rösten nu</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -793,7 +793,7 @@
     <string name="connection_failure">Anslutningen bröts</string>
     <string name="disk_error_title">Diskfel</string>
     <string name="enable_show_on_lock_screen">Visa på låsskärmen</string>
-    <string name="share_bookmarks_email_body">Hej! \n \nJag bifogar mina favoriter, öppna gärna dem med CoMaps. Om du inte redan har appen installerad, kan du ladda ner den här: https://www.comaps.app/download/ \n \nTrevlig resa med CoMaps!</string>
+    <string name="share_bookmarks_email_body">Hej! \n \nJag bifogar mina bokmärken, öppna gärna dem med CoMaps. Om du inte redan har appen installerad, kan du ladda ner den här: https://www.comaps.app/download/ \n \nTrevlig resa med CoMaps!</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Sv:Om_OpenStreetMap</string>
@@ -850,5 +850,4 @@
     <string name="bicycle">Cykel</string>
     <string name="pedestrian">Gående</string>
     <string name="error_enter_correct_line_page">Ange en giltig webbadress</string>
-    <string name="move_maps_error">Kunde inte flytta kartfiler</string>
 </resources>

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

@@ -288,15 +288,5 @@
         <item name="cornerFamily">rounded</item>
         <item name="android:colorBackground">?attr/colorSurfaceContainerHigh</item>
         <item name="android:layout">@layout/m3_alert_dialog</item>
-        <item name="buttonBarPositiveButtonStyle">@style/MwmTheme.M3.AlertDialog.Button</item>
-        <item name="buttonBarNegativeButtonStyle">@style/MwmTheme.M3.AlertDialog.Button</item>
-        <item name="buttonBarNeutralButtonStyle">@style/MwmTheme.M3.AlertDialog.Button.Neutral</item>
     </style>
-
-  <style name="MwmTheme.M3.AlertDialog.Button" parent="@style/Widget.Material3.Button.TextButton.Dialog">
-       <item name="android:textColor">?colorSecondary</item>
-  </style>
-  <style name="MwmTheme.M3.AlertDialog.Button.Neutral" parent="@style/Widget.Material3.Button.TextButton.Dialog.Flush">
-       <item name="android:textColor">?colorSecondary</item>
-  </style>
 </resources>

android/sdk/build.gradle

@@ -131,12 +131,6 @@ dependencies {
   testImplementation libs.junit
 }
 
-android {
-  androidResources {
-    ignoreAssetsPatterns.add("!design")
-  }
-}
-
 // TODO: Running lint task triggers native build. Find a better solution.
 project.afterEvaluate {
   boolean isLintRun = project.gradle.startParameter.taskNames.any { it.toLowerCase().contains('lint') }

android/sdk/src/main/assets/subtypes.csv

@@ -1 +0,0 @@
-../../../../../data/subtypes.csv

android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml

@@ -335,7 +335,7 @@
     <string name="type.cuisine.noodles">Nudle</string>
     <string name="type.cuisine.oriental">Orijentalna</string>
     <string name="type.cuisine.pancake">Palačinke</string>
-    <string name="type.cuisine.pasta">Testenine</string>
+    <string name="type.cuisine.pasta">Pasta</string>
     <string name="type.cuisine.persian">Persijska</string>
     <string name="type.cuisine.peruvian">Peruanska</string>
     <string name="type.cuisine.pizza">Pica</string>

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

@@ -34,11 +34,4 @@
     <string name="today">Днес</string>
     <string name="maps_storage_internal">Вътрешно частно хранилище</string>
     <string name="yesterday">Вчера</string>
-    <string name="week_ago">преди %s седмица</string>
-    <string name="days_ago">преди %s дни</string>
-    <string name="weeks_ago">преди %s седмици</string>
-    <string name="month_ago">преди %s месец</string>
-    <string name="months_ago">преди %s месеца</string>
-    <string name="year_ago">преди %s година</string>
-    <string name="years_ago">преди %s години</string>
 </resources>

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

@@ -1374,5 +1374,4 @@
     <string name="type.amenity.animal_shelter">Приют за животни</string>
     <string name="type.internet_access">Интернет</string>
     <string name="type.internet_access.wlan">Интернет</string>
-    <string name="type.man_made.telescope">Телескоп</string>
 </resources>

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

@@ -339,9 +339,7 @@
     <string name="type.cuisine.vietnamese">Vietnamesisch</string>
     <string name="type.emergency">Notfall</string>
     <string name="type.emergency.access_point">Rettungspunkt</string>
-    <string name="type.emergency.access_point.address">Rettungsadresse</string>
     <string name="type.emergency.assembly_point">Notfall-Sammelpunkt</string>
-    <string name="type.emergency.disaster_help_point">Notfall-Treffpunkt</string>
     <string name="type.emergency.life_ring">Rettungsring</string>
     <string name="type.emergency.defibrillator">Defibrillator</string>
     <string name="type.emergency.fire_hydrant">Hydrant</string>
@@ -435,11 +433,11 @@
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.footway.tunnel">Fußgängertunnel</string>
     <string name="type.highway.ford">Furt</string>
-    <string name="type.highway.living_street">Verkehrsberuhigter Bereich</string>
+    <string name="type.highway.living_street">Spielstraße</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.living_street.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.living_street.tunnel">Tunnel</string>
+    <string name="type.highway.living_street.tunnel">Spielstraßentunnel</string>
     <string name="type.highway.motorway">Autobahn</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.motorway.bridge">Autobahnbrücke</string>
@@ -488,23 +486,23 @@
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.residential.tunnel">Wohnstraßentunnel</string>
     <string name="type.highway.rest_area">Rastplatz</string>
-    <string name="type.highway.road">Landstraße</string>
+    <string name="type.highway.road">Straße</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.road.bridge">Brücke</string>
     <!-- A bridge structure outline. -->
     <string name="type.man_made.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.road.tunnel">Tunnel</string>
-    <string name="type.highway.secondary">Überregionale Verbindungsstraße</string>
+    <string name="type.highway.secondary">Straße</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.secondary.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.secondary.tunnel">Tunnel</string>
-    <string name="type.highway.secondary_link">Überregionale Verbindungsstraßenauffahrt</string>
+    <string name="type.highway.secondary.tunnel">Straßentunnel</string>
+    <string name="type.highway.secondary_link">Straße</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.secondary_link.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.secondary_link.tunnel">Tunnel</string>
+    <string name="type.highway.secondary_link.tunnel">Straßentunnel</string>
     <string name="type.highway.service">Zufahrtsweg</string>
     <string name="type.highway.service.area">Zufahrtsweg</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
@@ -520,12 +518,12 @@
     <string name="type.highway.steps.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.steps.tunnel">Tunnel</string>
-    <string name="type.highway.tertiary">Verbindungsstraße</string>
+    <string name="type.highway.tertiary">Straße</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.tertiary.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.tertiary.tunnel">Straßentunnel</string>
-    <string name="type.highway.tertiary_link">Verbindungsstraßenauffahrt</string>
+    <string name="type.highway.tertiary_link">Straße</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.tertiary_link.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
@@ -557,15 +555,15 @@
     <string name="type.highway.unclassified.tunnel">Straßentunnel</string>
     <string name="type.area_highway.cycleway">Radweg</string>
     <string name="type.area_highway.footway">Fußweg</string>
-    <string name="type.area_highway.living_street">Verkehrsberuhigter Bereich</string>
+    <string name="type.area_highway.living_street">Spielstraße</string>
     <string name="type.area_highway.motorway">Autobahn</string>
     <string name="type.area_highway.path">Pfad</string>
     <string name="type.area_highway.pedestrian">Fußgängerzone</string>
     <string name="type.area_highway.primary">Hauptstraße</string>
     <string name="type.area_highway.residential">Wohnstraße</string>
-    <string name="type.area_highway.secondary">Landstraße</string>
+    <string name="type.area_highway.secondary">Straße</string>
     <string name="type.area_highway.service">Zufahrtsweg</string>
-    <string name="type.area_highway.tertiary">Verbindungsstraße</string>
+    <string name="type.area_highway.tertiary">Straße</string>
     <string name="type.area_highway.steps">Treppe</string>
     <string name="type.area_highway.track">Forst-/Feldweg</string>
     <string name="type.area_highway.trunk">Schnellstraße</string>

android/sdk/src/main/res/values-en-rCA/strings.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>

android/sdk/src/main/res/values-en-rCA/types_strings.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>

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

@@ -20,7 +20,7 @@
     <string name="type.aeroway.runway">Pista de despegue</string>
     <string name="type.aeroway.taxiway">Pista de rodaje</string>
     <string name="type.aeroway.terminal">Terminal</string>
-    <string name="type.amenity">Establecimiento</string>
+    <string name="type.amenity">Instalación</string>
     <string name="type.amenity.arts_centre">Centro de arte</string>
     <string name="type.amenity.atm">Cajero automático</string>
     <string name="type.amenity.bank">Banco</string>
@@ -37,15 +37,15 @@
     <string name="type.amenity.cafe">Café</string>
     <string name="type.amenity.car_rental">Alquiler de coches</string>
     <string name="type.amenity.motorcycle_rental">Alquiler de motocicletas</string>
-    <string name="type.amenity.car_sharing">Estación de uso temporal de vehículos</string>
+    <string name="type.amenity.car_sharing">Car Sharing</string>
     <string name="type.amenity.car_wash">Lavado de coches</string>
     <string name="type.amenity.casino">Casino</string>
     <string name="type.amenity.gambling">Apuestas</string>
     <string name="type.leisure.adult_gaming_centre">Centro de juegos para adultos</string>
     <string name="type.leisure.amusement_arcade">Sala de juegos arcade</string>
     <string name="type.amenity.charging_station">Estación de carga</string>
-    <string name="type.amenity.charging_station.bicycle">Bicicletas</string>
-    <string name="type.amenity.charging_station.motorcar">Automóviles</string>
+    <string name="type.amenity.charging_station.bicycle">Estación de carga de bicicletas</string>
+    <string name="type.amenity.charging_station.motorcar">Estación de carga de automóviles</string>
     <string name="type.amenity.childcare">Guardería</string>
     <string name="type.amenity.cinema">Cine</string>
     <string name="type.leisure.bowling_alley">Bolera</string>
@@ -163,8 +163,8 @@
     <string name="type.amenity.taxi">Parada de taxis</string>
     <string name="type.amenity.telephone">Teléfono</string>
     <string name="type.amenity.theatre">Teatro</string>
-    <string name="type.amenity.toilets">Baño</string>
-    <string name="type.toilets.yes">Baños</string>
+    <string name="type.amenity.toilets">WC</string>
+    <string name="type.toilets.yes">WC</string>
     <string name="type.amenity.townhall">Ayuntamiento</string>
     <string name="type.amenity.university">Universidad</string>
     <string name="type.amenity.vending_machine">Máquina expendedora</string>
@@ -200,9 +200,9 @@
     <string name="type.natural.water.wastewater">Aguas residuales</string>
     <string name="type.barrier.entrance">Entrada</string>
     <string name="type.barrier.fence">Valla</string>
-    <string name="type.barrier.gate">Portón</string>
+    <string name="type.barrier.gate">Verja</string>
     <string name="type.barrier.hedge">Seto</string>
-    <string name="type.barrier.kissing_gate">Tranquera</string>
+    <string name="type.barrier.kissing_gate">Puerta peatonal</string>
     <string name="type.barrier.lift_gate">Barrera levadiza</string>
     <string name="type.barrier.retaining_wall">Muro de contención</string>
     <string name="type.barrier.stile">Escalón</string>
@@ -557,8 +557,8 @@
     <string name="type.historic.castle.manor">Casa solariega</string>
     <string name="type.historic.castle.palace">Palacio</string>
     <string name="type.historic.castle.shiro">Castillo japonés</string>
-    <string name="type.historic.castle.stately">Castillo señorial</string>
-    <string name="type.historic.city_gate">Puerta de ciudad</string>
+    <string name="type.historic.castle.stately">Castillo</string>
+    <string name="type.historic.city_gate">Portón de la ciudad</string>
     <string name="type.historic.citywalls">Muralla</string>
     <string name="type.historic.fort">Fuerte</string>
     <string name="type.historic.gallows">Horca</string>
@@ -597,7 +597,7 @@
     <string name="type.landuse.cemetery">Cementerio</string>
     <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
     <string name="type.landuse.cemetery.christian">Cementerio cristiano</string>
-    <string name="type.landuse.commercial">Área de servicios comerciales</string>
+    <string name="type.landuse.commercial">Zona comercial</string>
     <string name="type.landuse.construction">Construcción</string>
     <string name="type.landuse.education">Instalaciones educativas</string>
     <string name="type.landuse.farmland">Tierras agrícolas</string>
@@ -621,15 +621,15 @@
     <string name="type.landuse.recreation_ground">Área recreativa</string>
     <string name="type.landuse.reservoir">Embalse</string>
     <string name="type.landuse.residential">Zona residencial</string>
-    <string name="type.landuse.retail">Área de tiendas comerciales</string>
+    <string name="type.landuse.retail">Zona comercial</string>
     <string name="type.landuse.salt_pond">Salina</string>
-    <string name="type.landuse.village_green">Espacio verde común</string>
+    <string name="type.landuse.village_green">Espacio verde</string>
     <string name="type.landuse.vineyard">Viñedo</string>
     <string name="type.leisure">Ocio</string>
-    <string name="type.leisure.common">Terreno comunal</string>
+    <string name="type.leisure.common">Zona pública</string>
     <string name="type.leisure.dog_park">Parque canino</string>
     <string name="type.leisure.fitness_centre">Centro de fitnes</string>
-    <string name="type.leisure.fitness_station">Parque de gimnasia</string>
+    <string name="type.leisure.fitness_station">Parque de fitnes</string>
     <string name="type.leisure.dance">Salón de baile</string>
     <string name="type.leisure.garden">Jardín</string>
     <string name="type.leisure.garden.residential">Jardín residencial</string>
@@ -637,7 +637,7 @@
     <string name="type.leisure.miniature_golf">Minigolf</string>
     <string name="type.leisure.hackerspace">Espacio para hackers</string>
     <string name="type.leisure.ice_rink">Pisa de patinaje</string>
-    <string name="type.leisure.marina">Marina</string>
+    <string name="type.leisure.marina">Puerto o amarradero</string>
     <string name="type.leisure.nature_reserve">Reserva natural</string>
     <string name="type.leisure.outdoor_seating">Asientos al aire libre</string>
     <string name="type.leisure.park">Parque</string>
@@ -646,7 +646,7 @@
     <string name="type.leisure.park.private">Parque privado</string>
     <string name="type.leisure.picnic_table">Mesa de picnic</string>
     <string name="type.leisure.pitch">Cancha</string>
-    <string name="type.leisure.playground">Parque infantil</string>
+    <string name="type.leisure.playground">Patio de recreo</string>
     <string name="type.leisure.recreation_ground">Zona recreativa</string>
     <string name="type.leisure.sauna">Sauna</string>
     <string name="type.leisure.slipway">Rampa de barcos</string>
@@ -671,7 +671,7 @@
     <string name="type.man_made.mast">Mástil</string>
     <string name="type.man_made.pier">Muelle</string>
     <string name="type.man_made.pipeline">Ducto</string>
-    <string name="type.man_made.pipeline.overground">Ducto exterior</string>
+    <string name="type.man_made.pipeline.overground">Ducto a cielo abierto</string>
     <string name="type.man_made.silo">Silo</string>
     <string name="type.man_made.storage_tank">Cisterna</string>
     <string name="type.man_made.surveillance">Cámara de vigilancia</string>
@@ -694,10 +694,10 @@
     <string name="type.man_made.works">Fábrica</string>
     <string name="type.military">Militar</string>
     <string name="type.military.bunker">Búnker</string>
-    <string name="type.mountain_pass">Paso de montaña</string>
+    <string name="type.mountain_pass">Puerto de montaña</string>
     <string name="type.natural">Naturaleza</string>
     <!-- A rocky land cover. -->
-    <string name="type.natural.bare_rock">Lecho rocoso</string>
+    <string name="type.natural.bare_rock">Roca desnuda</string>
     <!-- A land cover consisting of rounded rock fragments (pebbles) on a beach or riverbed. -->
     <string name="type.natural.shingle">Guijarros</string>
     <!-- A loose surface consisting of angular, sharp stones. Usually on a mountain slope and prone to landslides. -->
@@ -709,7 +709,7 @@
     <string name="type.natural.cape">Cabo</string>
     <string name="type.natural.cave_entrance">Entrada de cueva</string>
     <string name="type.natural.cliff">Acantilado</string>
-    <string name="type.natural.earth_bank">Talud de tierra escarpado</string>
+    <string name="type.natural.earth_bank">Talud de tierra</string>
     <string name="type.man_made.embankment">Terraplén</string>
     <string name="type.natural.coastline">Costa</string>
     <string name="type.natural.desert">Desierto</string>
@@ -791,7 +791,7 @@
     <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.gas">Planta termoeléctrica a gas</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>
     <string name="type.power.line.underground">Línea eléctrica subterránea</string>
@@ -1129,7 +1129,7 @@
     <string name="type.shop.florist">Floristería</string>
     <string name="type.shop.funeral_directors">Funeraria</string>
     <string name="type.shop.furniture">Tienda de muebles</string>
-    <string name="type.shop.garden_centre">Centro de jardinería</string>
+    <string name="type.shop.garden_centre">Vivero</string>
     <string name="type.shop.gas">Tienda de gas</string>
     <string name="type.shop.gift">Tienda de regalos</string>
     <string name="type.shop.greengrocer">Frutería</string>
@@ -1186,15 +1186,15 @@
     <string name="type.shop.appliance">Tienda de electrodomésticos</string>
     <!-- maybe change to Art Gallery for en-US when supported -->
     <string name="type.shop.art">Tienda de arte</string>
-    <string name="type.shop.baby_goods">Tienda de artículos para bebés</string>
+    <string name="type.shop.baby_goods">Tienda de niños</string>
     <string name="type.shop.bag">Tienda de bolsos</string>
     <string name="type.shop.bed">Tienda de camas</string>
     <string name="type.shop.boutique">Boutique</string>
     <string name="type.shop.charity">Tienda de caridad</string>
     <string name="type.shop.cheese">Tienda de quesos</string>
-    <string name="type.shop.craft">Tienda de materiales para manualidades</string>
+    <string name="type.shop.craft">Artes y manualidades</string>
     <string name="type.shop.dairy">Productos lácteos</string>
-    <string name="type.shop.electrical">Tienda de suministros eléctricos</string>
+    <string name="type.shop.electrical">Tienda de electricidad</string>
     <string name="type.shop.fishing">Tienda de pesca</string>
     <string name="type.shop.interior_decoration">Decoración de interiores</string>
     <string name="type.shop.lottery">Boletos de lotería</string>
@@ -1264,17 +1264,17 @@
     <string name="type.attraction.roller_coaster">Montaña rusa</string>
     <string name="type.attraction.water_slide">Tobogán acuático</string>
     <string name="type.tourism.attraction.specified">Atracción turística</string>
-    <string name="type.tourism.camp_site">Paraje de acampada</string>
+    <string name="type.tourism.camp_site">Paraje de campamento</string>
     <string name="type.tourism.caravan_site">Zona de autocaravanas</string>
     <!-- A rentable countryside vacation house. -->
-    <string name="type.tourism.chalet">Cabaña vacacional</string>
+    <string name="type.tourism.chalet">Casa de vacaciones</string>
     <string name="type.tourism.gallery">Galería</string>
     <string name="type.tourism.guest_house">Casa de huéspedes</string>
     <string name="type.tourism.hostel">Albergue juvenil</string>
     <string name="type.tourism.hotel">Hotel</string>
     <string name="type.tourism.information">Información turística</string>
     <string name="type.tourism.information.board">Tablón de información</string>
-    <string name="type.tourism.information.guidepost">Poste guía</string>
+    <string name="type.tourism.information.guidepost">Poste indicador</string>
     <string name="type.tourism.information.map">Mapa turístico</string>
     <string name="type.tourism.information.office">Oficina de turismo</string>
     <string name="type.tourism.information.visitor_centre">Centro de visitantes</string>
@@ -1285,7 +1285,7 @@
     <string name="type.tourism.theme_park">Parque temático</string>
     <string name="type.tourism.viewpoint">Mirador</string>
     <!-- Typically more basic, not staffed and free (compared to alpine_hut). -->
-    <string name="type.tourism.wilderness_hut">Refugio de paraje natural</string>
+    <string name="type.tourism.wilderness_hut">Cabaña</string>
     <string name="type.tourism.zoo">Zoológico</string>
     <string name="type.tourism.zoo.petting">Zoológico interactivo</string>
     <string name="type.traffic_calming">Pacificación del tráfico</string>
@@ -1296,13 +1296,13 @@
     <string name="type.waterway.canal.tunnel">Túnel de canal</string>
     <string name="type.waterway.fish_pass">Escalera de peces</string>
     <string name="type.waterway.dam">Presa</string>
-    <string name="type.barrier.ditch">Acequia</string>
+    <string name="type.barrier.ditch">Zanja</string>
     <string name="type.natural.water.ditch">Zanja de drenaje</string>
-    <string name="type.waterway.ditch.tunnel">Alcantarilla</string>
-    <string name="type.waterway.dock">Dique seco</string>
+    <string name="type.waterway.ditch.tunnel">Obra de drenaje</string>
+    <string name="type.waterway.dock">Muelle</string>
     <string name="type.waterway.drain">Desagüe</string>
     <string name="type.natural.water.drain">Desagüe</string>
-    <string name="type.waterway.drain.tunnel">Alcantarilla</string>
+    <string name="type.waterway.drain.tunnel">Obra de drenaje</string>
     <string name="type.waterway.lock_gate">Compuerta</string>
     <string name="type.waterway.river">Río</string>
     <string name="type.waterway.river.tunnel">Río</string>
@@ -1319,21 +1319,21 @@
     <string name="type.aerialway.j.bar">Telesilla barra en J</string>
     <string name="type.aerialway.magic_carpet">Alfombra mágica</string>
     <string name="type.aerialway.platter">Telesilla de disco</string>
-    <string name="type.aerialway.rope_tow">Remolque de cuerda</string>
-    <string name="type.aerialway.t.bar">Ascensor de barra en T</string>
+    <string name="type.aerialway.rope_tow">Telesilla de cuerda</string>
+    <string name="type.aerialway.t.bar">Telesilla barra en T</string>
     <string name="type.piste_type.downhill">Pista de esquí alpino</string>
     <string name="type.piste_type.downhill.area">Pista de esquí alpino</string>
-    <string name="type.piste_type.downhill.advanced">Pista de esquí alpino nivel avanzado</string>
-    <string name="type.piste_type.downhill.advanced.area">Pista de esquí alpino nivel avanzado</string>
-    <string name="type.piste_type.downhill.easy">Pista de esquí alpino nivel fácil</string>
-    <string name="type.piste_type.downhill.easy.area">Pista de esquí alpino nivel fácil</string>
-    <string name="type.piste_type.downhill.expert">Pista de esquí alpino nivel experto</string>
-    <string name="type.piste_type.downhill.expert.area">Pista de esquí alpino nivel experto</string>
-    <string name="type.piste_type.downhill.freeride">Zona de esquí alpino fuera de pista</string>
-    <string name="type.piste_type.downhill.intermediate">Pista de esquí alpino nivel intermedio</string>
-    <string name="type.piste_type.downhill.intermediate.area">Pista de esquí alpino nivel intermedio</string>
-    <string name="type.piste_type.downhill.novice">Pista de esquí alpino nivel principiante</string>
-    <string name="type.piste_type.downhill.novice.area">Pista de esquí alpino nivel principiante</string>
+    <string name="type.piste_type.downhill.advanced">Pista de esquí alpino</string>
+    <string name="type.piste_type.downhill.advanced.area">Pista de esquí alpino</string>
+    <string name="type.piste_type.downhill.easy">Pista de esquí alpino</string>
+    <string name="type.piste_type.downhill.easy.area">Pista de esquí alpino</string>
+    <string name="type.piste_type.downhill.expert">Pista de esquí alpino</string>
+    <string name="type.piste_type.downhill.expert.area">Pista de esquí alpino</string>
+    <string name="type.piste_type.downhill.freeride">Pista de esquí alpino</string>
+    <string name="type.piste_type.downhill.intermediate">Pista de esquí alpino</string>
+    <string name="type.piste_type.downhill.intermediate.area">Pista de esquí alpino</string>
+    <string name="type.piste_type.downhill.novice">Pista de esquí alpino</string>
+    <string name="type.piste_type.downhill.novice.area">Pista de esquí alpino</string>
     <string name="type.piste_type.nordic">Pista de esquí nórdico</string>
     <string name="type.piste_type.sled">Pista para trineos</string>
     <string name="type.piste_type.sled.area">Pista para trineos</string>
@@ -1380,14 +1380,14 @@
     <string name="type.man_made.crane">Grúa</string>
     <string name="type.amenity.bicycle_parking.covered">Parking de bici cubierto</string>
     <string name="type.post_office.post_partner">Asociado de Correo</string>
-    <string name="type.natural.wetland.tidalflat">Llanura mareal</string>
+    <string name="type.natural.wetland.tidalflat">Llanura de marea</string>
     <string name="type.natural.wetland.swamp">Pantano</string>
     <string name="type.amenity.ranger_station">Estación de guardabosques</string>
     <string name="type.amenity.luggage_locker">Casillero de maletas</string>
     <string name="type.natural.wetland.mangrove">Manglares</string>
     <string name="type.landuse.religious">Terrenos religiosos</string>
     <string name="type.natural.wetland.saltmarsh">Marisma salina</string>
-    <string name="type.natural.wetland.saltmarsh.tidal">Marisma salina mareal</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Marisma Salina de Marea</string>
     <string name="type.natural.wetland.fen">Tollo</string>
     <string name="type.natural.wetland.reedbed">Juncal</string>
     <string name="type.railway.station.subway.qingdao">Estación de Metro</string>
@@ -1451,7 +1451,7 @@
     <string name="type.leisure.indoor_play">Centro de actividades en interior</string>
     <string name="type.social_facility.soup_kitchen">Comedor social</string>
     <string name="type.amenity.food_sharing">Alimentos compartidos</string>
-    <string name="type.amenity.give_box">Caja libre</string>
+    <string name="type.amenity.give_box">Give Box</string>
     <string name="type.amenity.sailing_school">Escuela de vela</string>
     <string name="type.amenity.flight_school">Escuela de aviación</string>
     <string name="type.amenity.prep_school">Escuela de tutoría</string>
@@ -1499,13 +1499,4 @@
     <string name="type.xmas.tree">Árbol de Navidad</string>
     <string name="type.man_made.mast.communication">Mástil de telecomunicaciones</string>
     <string name="type.shop.beauty.nails">Salón de manicura</string>
-    <string name="type.amenity.charging_station.motorcycle">Motocicletas</string>
-    <string name="type.amenity.charging_station.small">Capacidad limitada</string>
-    <string name="type.railway.disused.bridge">Puente ferroviario en desuso</string>
-    <string name="type.railway.disused.tunnel">Túnel ferroviario en desuso</string>
-    <string name="type.railway.miniature">Ferrocarril miniatura</string>
-    <string name="type.railway.miniature.bridge">Puente de ferrocarril miniatura</string>
-    <string name="type.railway.miniature.tunnel">Túnel de ferrocarril miniatura</string>
-    <string name="type.railway.turntable">Plataforma giratoria ferroviaria</string>
-    <string name="type.tourism.information.tactile_map">Mapa táctil</string>
 </resources>

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

@@ -41,8 +41,8 @@
     <string name="type.leisure.adult_gaming_centre">Centre de jeux pour adultes</string>
     <string name="type.leisure.amusement_arcade">Salle de jeux d’arcade</string>
     <string name="type.amenity.charging_station">Borne de recharge</string>
-    <string name="type.amenity.charging_station.bicycle">Vélos</string>
-    <string name="type.amenity.charging_station.motorcar">Voitures</string>
+    <string name="type.amenity.charging_station.bicycle">Borne de recharge pour vélo</string>
+    <string name="type.amenity.charging_station.motorcar">Borne de recharge pour voiture</string>
     <string name="type.amenity.childcare">Garderie</string>
     <string name="type.amenity.cinema">Cinéma</string>
     <string name="type.leisure.bowling_alley">Salle de bowling</string>
@@ -1498,13 +1498,4 @@
     <string name="type.natural.sand">Sable</string>
     <string name="type.man_made.mast.communication">Antenne de télécommunications</string>
     <string name="type.shop.beauty.nails">Salon de manucure</string>
-    <string name="type.amenity.charging_station.motorcycle">Motos</string>
-    <string name="type.amenity.charging_station.small">Capacité limitée</string>
-    <string name="type.railway.disused.bridge">Pont de chemin de fer désaffecté</string>
-    <string name="type.railway.disused.tunnel">Tunnel de chemin de fer désaffecté</string>
-    <string name="type.railway.miniature.bridge">Pont de chemin de fer miniature</string>
-    <string name="type.railway.miniature.tunnel">Tunnel de chemin de fer miniature</string>
-    <string name="type.tourism.information.tactile_map">Carte tactile</string>
-    <string name="type.railway.miniature">Chemin de fer miniature</string>
-    <string name="type.railway.turntable">Rotonde de chemin de fer</string>
 </resources>

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

@@ -18,7 +18,7 @@
     <string name="core_placepage_unknown_place">Točka na karti</string>
     <string name="mi">mi</string>
     <string name="ft">ft</string>
-    <string name="core_entrance">Glavni Ulaz</string>
+    <string name="core_entrance">Ulaz</string>
     <string name="subway_data_unavailable">Karta podzemne željeznice nije dostupna</string>
     <string name="public_access">Javni pristup</string>
     <string name="limited_access">Ograničen pristup</string>

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

@@ -4,254 +4,6 @@
     <string name="type.man_made.silo">Silo</string>
     <string name="type.addr_interpolation.even">adresa/blok</string>
     <string name="type.addr_interpolation.odd">adresa/blok</string>
-    <string name="type.aerialway">Vučnica</string>
+    <string name="type.aerialway">Žičara</string>
     <string name="type.addr_interpolation">adresa/blok</string>
-    <string name="type.aerialway.cable_car">Žičara</string>
-    <string name="type.aerialway.chair_lift">Sjedežnica</string>
-    <string name="type.aerialway.drag_lift">Vućnica</string>
-    <string name="type.aerialway.gondola">Gondola</string>
-    <string name="type.aerialway.mixed_lift">Mješovita žičara</string>
-    <string name="type.aerialway.station">Stanica žičare</string>
-    <string name="type.aeroway">Infrastruktura zračnog prostora</string>
-    <string name="type.aeroway.aerodrome">Zračna luka</string>
-    <string name="type.aeroway.aerodrome.international">Međunarodna zračna lika</string>
-    <string name="type.aeroway.apron">Stajanka</string>
-    <string name="type.aeroway.gate">Izlaz</string>
-    <string name="type.aeroway.helipad">Heliodrom</string>
-    <string name="type.aeroway.runway">Pista</string>
-    <string name="type.aeroway.taxiway">Rulna staza</string>
-    <string name="type.aeroway.terminal">Terminal</string>
-    <string name="type.amenity">Pogodnosti</string>
-    <string name="type.amenity.arts_centre">Umjetnički centar</string>
-    <string name="type.amenity.atm">ATM</string>
-    <string name="type.amenity.bank">Banka</string>
-    <string name="type.amenity.bar">Bar</string>
-    <string name="type.amenity.bbq">Roštilj</string>
-    <string name="type.amenity.bench">Klupa</string>
-    <string name="type.amenity.bench.backless">Klupa bez naslona</string>
-    <string name="type.amenity.bicycle_parking">Parkiralište za bicikle</string>
-    <string name="type.amenity.bicycle_parking.covered">Natkriveno parkiralište za bicikle</string>
-    <string name="type.amenity.boat_rental">Najam brodova</string>
-    <string name="type.amenity.bicycle_rental">Najam bicikala</string>
-    <string name="type.amenity.bicycle_repair_station">Stanica za popravak bicikala</string>
-    <string name="type.amenity.biergarten">Pivski vrt</string>
-    <string name="type.amenity.brothel">Bordel</string>
-    <string name="type.amenity.love_hotel">Hotel za kratki boravak</string>
-    <string name="type.amenity.bureau_de_change">Mjenjačnica</string>
-    <string name="type.amenity.bus_station">Autobusna stanica</string>
-    <string name="type.amenity.cafe">Kafić</string>
-    <string name="type.amenity.car_rental">Najam automobila</string>
-    <string name="type.amenity.motorcycle_rental">Najam motocikala</string>
-    <string name="type.amenity.car_sharing">Dijeljenje automobila</string>
-    <string name="type.amenity.car_wash">Autopraonica</string>
-    <string name="type.man_made.telescope">Teleskop</string>
-    <string name="type.man_made.telescope.optical">Teleskop (optički)</string>
-    <string name="type.man_made.telescope.radio">Teleskop (radio)</string>
-    <string name="type.man_made.telescope.gamma">Teleskop (Gama)</string>
-    <string name="type.man_made.observatory">Zvjezdarnica</string>
-    <string name="type.amenity.casino">Kasino</string>
-    <string name="type.amenity.gambling">Kockanje</string>
-    <string name="type.leisure.adult_gaming_centre">Centar za igre za odrasle</string>
-    <string name="type.leisure.amusement_arcade">Arkada</string>
-    <string name="type.amenity.charging_station">Stanica za punjenje</string>
-    <string name="type.amenity.charging_station.bicycle">Stanica za punjenje bicikala</string>
-    <string name="type.amenity.charging_station.motorcar">Stanica za punjenje automobila</string>
-    <string name="type.amenity.childcare">Rasadnik</string>
-    <string name="type.amenity.cinema">Kino</string>
-    <string name="type.amenity.studio">Medijski studio</string>
-    <string name="type.leisure.bowling_alley">Kuglana</string>
-    <string name="type.amenity.clinic">Klinika</string>
-    <string name="type.amenity.college">Koledž</string>
-    <string name="type.amenity.community_centre">Društveni centar</string>
-    <string name="type.amenity.compressed_air">Komprimirani zrak</string>
-    <string name="type.amenity.conference_centre">Konferencijski centar</string>
-    <string name="type.amenity.courthouse">Sudnica</string>
-    <string name="type.amenity.dentist">Zubar</string>
-    <string name="type.amenity.doctors">Liječnik</string>
-    <string name="type.amenity.drinking_water">Voda za piće</string>
-    <string name="type.amenity.driving_school">Autoškola</string>
-    <string name="type.amenity.exhibition_centre">Izložbeni centar</string>
-    <string name="type.amenity.money_transfer">Prijenos novca</string>
-    <string name="type.amenity.music_school">Muzička škola</string>
-    <string name="type.amenity.sailing_school">Škola jedrenja</string>
-    <string name="type.amenity.flight_school">Škola letenja</string>
-    <string name="type.amenity.prep_school">Škola za podučavanje</string>
-    <string name="type.amenity.language_school">Škola stranih jezika</string>
-    <string name="type.office.diplomatic">Veleposlanstvo</string>
-    <string name="type.office.security">Ured zaštitara</string>
-    <string name="type.building.guardhouse">Zaštitarska kabina</string>
-    <string name="type.drinking_water.yes">Pitka voda</string>
-    <string name="type.power.portal">Portalni stup (elektroenergetski)</string>
-    <string name="type.amenity.fast_food">Brza hrana</string>
-    <string name="type.amenity.ferry_terminal">Trajekt</string>
-    <string name="type.amenity.fire_station">Vatrogasna postaja</string>
-    <string name="type.amenity.food_court">Gastro zona</string>
-    <string name="type.amenity.fountain">Fontana</string>
-    <string name="type.amenity.fuel">Benzinska postaja</string>
-    <string name="type.amenity.grave_yard">Malo groblje</string>
-    <string name="type.amenity.grave_yard.christian">Kršćansko groblje</string>
-    <string name="type.amenity.hospital">Bolnica</string>
-    <string name="type.amenity.hunting_stand">Lovna čeka</string>
-    <string name="type.amenity.ice_cream">Sladoled</string>
-    <string name="type.amenity.internet_cafe">Internet kafić</string>
-    <string name="type.amenity.kindergarten">Dječji vrtić</string>
-    <string name="type.amenity.library">Knjižnica</string>
-    <string name="type.amenity.loading_dock">Utovarno pristanište</string>
-    <string name="type.amenity.lounger">Ležaljka</string>
-    <string name="type.amenity.luggage_locker">Ormar za prtljagu</string>
-    <string name="type.amenity.mobile_money_agent">Agent za mobilno plaćanje</string>
-    <string name="type.amenity.marketplace">Tržnica</string>
-    <string name="type.amenity.motorcycle_parking">Parkiralište za motocikle</string>
-    <string name="type.amenity.nightclub">Noćni klub</string>
-    <string name="type.amenity.nursing_home">Starački dom</string>
-    <string name="type.amenity.parking">Parkiralište</string>
-    <string name="type.amenity.parking.fee">Parkiralište</string>
-    <string name="type.amenity.parking.multi.storey">Višekatna garaža</string>
-    <string name="type.amenity.parking.multi.storey.fee">Višekatna garaža</string>
-    <string name="type.amenity.parking.no.access">Privatno parkiralište</string>
-    <string name="type.amenity.parking.permissive">Privatno parkiralište</string>
-    <string name="type.amenity.parking.private">Privatno parkiralište</string>
-    <string name="type.amenity.parking.park_and_ride">Park &amp; Ride parkiralište</string>
-    <string name="type.amenity.parking.underground">Podzemna garaža</string>
-    <string name="type.amenity.parking.underground.fee">Podzemna garaža</string>
-    <string name="type.amenity.parking.underground.private">Privatna podzemna garaža</string>
-    <string name="type.amenity.parking.street_side">Parkiranje uz ulicu</string>
-    <string name="type.amenity.parking.street_side.fee">Parkiranje uz ulicu</string>
-    <string name="type.amenity.parking.street_side.private">Privatno parkiranje uz ulicu</string>
-    <string name="type.amenity.parking.lane">Parkiranje uz traku</string>
-    <string name="type.amenity.parking.lane.fee">Parkiranje uz traku</string>
-    <string name="type.amenity.parking.lane.private">Privatno parkiranje uz traku</string>
-    <string name="type.amenity.parking_entrance">Ulaz u parkiralište</string>
-    <string name="type.amenity.parking_entrance.private">Ulaz u privatno parkiralište</string>
-    <string name="type.amenity.parking_entrance.permissive">Ulaz u parkiralište</string>
-    <string name="type.amenity.parking_space">Parkirno mjesto</string>
-    <string name="type.amenity.parking_space.permissive">Parkirno mjesto</string>
-    <string name="type.amenity.parking_space.private">Parkirno mjesto</string>
-    <string name="type.amenity.parking_space.underground">Parkirno mjesto</string>
-    <string name="type.amenity.parking_space.disabled">Parkirno mjesto za osobe s invaliditetom</string>
-    <string name="type.amenity.car_pooling">Zajednička vožnja automobilom</string>
-    <string name="type.amenity.payment_centre">Centar za plaćanja</string>
-    <string name="type.amenity.payment_terminal">Platni terminal</string>
-    <string name="type.amenity.pharmacy">Ljekarna</string>
-    <string name="type.amenity.place_of_worship">Vjerski objekt</string>
-    <string name="type.amenity.place_of_worship.buddhist">Budistički hram</string>
-    <string name="type.amenity.place_of_worship.christian">Crkva</string>
-    <string name="type.amenity.place_of_worship.christian.mormon">Crkva Isusa Krista svetaca posljednjih dana</string>
-    <string name="type.amenity.place_of_worship.christian.jehovahs_witness">Dvorana Kraljevstva Jehovinih svjedoka</string>
-    <string name="type.amenity.place_of_worship.hindu">Hinduistički hram</string>
-    <string name="type.amenity.place_of_worship.jewish">Sinagoga</string>
-    <string name="type.amenity.place_of_worship.muslim">Džamija</string>
-    <string name="type.amenity.place_of_worship.shinto">Šintoističko svetište</string>
-    <string name="type.amenity.place_of_worship.taoist">Taoistički hram</string>
-    <string name="type.amenity.police">Policija</string>
-    <string name="type.amenity.post_box">Poštanski sandučić</string>
-    <string name="type.amenity.post_office">Pošta</string>
-    <string name="type.post_office.post_partner">Poštanski partner</string>
-    <string name="type.amenity.prison">Zatvor</string>
-    <string name="type.amenity.pub">Pub</string>
-    <string name="type.amenity.public_bookcase">Razmjena knjiga</string>
-    <string name="type.amenity.recycling.centre">Centar za recikliranje</string>
-    <string name="type.amenity.recycling">Kontejner za recikliranje</string>
-    <string name="type.amenity.recycling.container">Kontejner za recikliranje</string>
-    <string name="type.recycling.batteries">Baterije</string>
-    <string name="type.recycling.clothes">Odjeća</string>
-    <string name="type.recycling.glass_bottles">Staklene boce</string>
-    <string name="type.recycling.paper">Papir</string>
-    <string name="type.recycling.plastic">Plastika</string>
-    <string name="type.recycling.plastic_bottles">Plastične boce</string>
-    <string name="type.recycling.scrap_metal">Metalni otpad</string>
-    <string name="type.recycling.small_appliances">Elektronički otpad</string>
-    <string name="type.recycling.cardboard">Karton</string>
-    <string name="type.recycling.cans">Limenke</string>
-    <string name="type.recycling.shoes">Obuća</string>
-    <string name="type.recycling.green_waste">Zeleni/organski otpad</string>
-    <string name="type.recycling.cartons">Kartonska ambalaža</string>
-    <string name="type.amenity.sanitary_dump_station">Stanica za pražnjenje otpadnih voda</string>
-    <string name="type.amenity.school">Škola</string>
-    <string name="type.amenity.shelter.basic_hut">Bivak sklonište</string>
-    <string name="type.amenity.shelter.lean_to">Lean‑to sklonište za spavanje</string>
-    <string name="type.amenity.public_bath">Javno kupalište - kupka</string>
-    <string name="type.amenity.shower">Tuš</string>
-    <string name="type.amenity.stripclub">Striptiz klub</string>
-    <string name="type.amenity.taxi">Taksi stajalište</string>
-    <string name="type.amenity.telephone">Telefon</string>
-    <string name="type.amenity.theatre">Kazalište</string>
-    <string name="type.amenity.toilets">WC</string>
-    <string name="type.toilets.yes">WC</string>
-    <string name="type.amenity.townhall">Gradska vijećnica</string>
-    <string name="type.amenity.university">Sveučilište</string>
-    <string name="type.amenity.vending_machine">Automat za prodaju</string>
-    <string name="type.amenity.vending_machine.cigarettes">Automat za cigarete</string>
-    <string name="type.amenity.vending_machine.coffee">Automat za kavu</string>
-    <string name="type.amenity.vending_machine.condoms">Automat za kondome</string>
-    <string name="type.amenity.vending_machine.drinks">Automat za piće</string>
-    <string name="type.amenity.vending_machine.food">Automat za hranu</string>
-    <string name="type.amenity.vending_machine.newspapers">Automat za novine</string>
-    <string name="type.amenity.vending_machine.parking_tickets">Parkirni automat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Automat za karte za javni prijevoz</string>
-    <string name="type.amenity.vending_machine.sweets">Automat za slatkiše</string>
-    <string name="type.amenity.vending_machine.excrement_bags">Vrećice za pseći izmet (dispenzer)</string>
-    <string name="type.amenity.parcel_locker">Ormarić za pakete</string>
-    <string name="type.amenity.vehicle_inspection">Centar za tehnički pregled vozila</string>
-    <string name="type.amenity.vending_machine.fuel">Pumpa za gorivo</string>
-    <string name="type.amenity.veterinary">Veterinar</string>
-    <string name="type.amenity.animal_shelter">Azil za životinje</string>
-    <string name="type.amenity.waste_basket">Kanta za smeće</string>
-    <string name="type.amenity.waste_disposal">Veliki kontejner za otpad</string>
-    <string name="type.amenity.restaurant">Restoran</string>
-    <string name="type.amenity.shelter">Sklonište</string>
-    <string name="type.amenity.shelter.public_transport">Sklonište</string>
-    <string name="type.amenity.waste_transfer_station">Stanica za pretovar otpada</string>
-    <string name="type.amenity.water_point">Točka za dopunu spremnika vodom</string>
-    <string name="type.amenity.water_point.drinking_water_no">Točka za dopunu spremnika vodom</string>
-    <string name="type.barrier">Barijera</string>
-    <string name="type.barrier.yes">Barijera</string>
-    <string name="type.barrier.bollard">Stupić</string>
-    <string name="type.barrier.border_control">Granična kontrola</string>
-    <string name="type.barrier.chain">Lančana barijera</string>
-    <string name="type.barrier.city_wall">Gradske zidine</string>
-    <string name="type.barrier.cycle_barrier">Biciklistička barijera</string>
-    <string name="type.waterway.ditch">Odvodni jarak</string>
-    <string name="type.natural.water.moat">Opkop</string>
-    <string name="type.natural.water.wastewater">Otpadne vode</string>
-    <string name="type.barrier.entrance">Ulaz</string>
-    <string name="type.barrier.fence">Ograda</string>
-    <string name="type.barrier.guard_rail">Zaštitna ograda</string>
-    <string name="type.barrier.gate">Vrata</string>
-    <string name="type.barrier.hedge">Živica</string>
-    <string name="type.barrier.kissing_gate">Zakretna pješačka vrata</string>
-    <string name="type.barrier.lift_gate">Podizna rampa</string>
-    <string name="type.barrier.retaining_wall">Potporni zid</string>
-    <string name="type.barrier.stile">Pješački prijelaz preko ograde</string>
-    <string name="type.barrier.turnstile">Okretna vrata</string>
-    <string name="type.barrier.wicket_gate">Mala pješačka vrata</string>
-    <string name="type.barrier.swing_gate">Zakretna vrata</string>
-    <string name="type.barrier.toll_booth">Naplatna kućica</string>
-    <string name="type.barrier.wall">Zid</string>
-    <string name="type.boundary">Granica</string>
-    <string name="type.boundary.administrative">Administrativna granica</string>
-    <string name="type.boundary.administrative.2">Državna granica</string>
-    <string name="type.boundary.administrative.3">Granica regije</string>
-    <string name="type.boundary.administrative.4">Granica regije</string>
-    <string name="type.boundary.national_park">Nacionalni park</string>
-    <string name="type.boundary.aboriginal_lands">Autohtona područja</string>
-    <string name="type.boundary.protected_area">Zaštićeno područje</string>
-    <string name="type.boundary.protected_area.1">Zaštićeno područje</string>
-    <string name="type.boundary.protected_area.2">Zaštićeno područje</string>
-    <string name="type.boundary.protected_area.3">Zaštićeno područje</string>
-    <string name="type.boundary.protected_area.4">Zaštićeno područje</string>
-    <string name="type.boundary.protected_area.5">Zaštićeno područje</string>
-    <string name="type.boundary.protected_area.6">Zaštićeno područje</string>
-    <string name="type.building">Zgrada</string>
-    <string name="type.building.has_parts">Zgrada</string>
-    <string name="type.building_part">Zgrada</string>
-    <string name="type.building.garage">Garaža</string>
-    <string name="type.building.train_station">Zgrada kolodvora</string>
-    <string name="type.building.warehouse">Skladište</string>
-    <string name="type.cemetery.grave">Grob</string>
-    <string name="type.craft">Obrt</string>
-    <string name="type.craft.beekeeper">Pčelar</string>
-    <string name="type.craft.blacksmith">Kovač</string>
-    <string name="type.craft.brewery">Craft pivovara</string>
-    <string name="type.building.address">Adresa</string>
 </resources>

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

@@ -44,8 +44,8 @@
     <string name="type.leisure.adult_gaming_centre">Centro giochi per adulti</string>
     <string name="type.leisure.amusement_arcade">Sala giochi</string>
     <string name="type.amenity.charging_station">Stazione di ricarica</string>
-    <string name="type.amenity.charging_station.bicycle">Biciclette</string>
-    <string name="type.amenity.charging_station.motorcar">Automobili</string>
+    <string name="type.amenity.charging_station.bicycle">Stazione di ricarica per biciclette</string>
+    <string name="type.amenity.charging_station.motorcar">Stazione di ricarica per autoveicoli</string>
     <string name="type.amenity.childcare">Asilo</string>
     <string name="type.amenity.cinema">Cinema</string>
     <string name="type.leisure.bowling_alley">Sala da bowling</string>

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

@@ -873,8 +873,8 @@
     <string name="type.amenity.gambling">Hapwaryans</string>
     <string name="type.leisure.adult_gaming_centre">Kres Gwariow Tevesik</string>
     <string name="type.amenity.charging_station">Poyntys-karga</string>
-    <string name="type.amenity.charging_station.bicycle">Diwrosow</string>
-    <string name="type.amenity.charging_station.motorcar">Kerri</string>
+    <string name="type.amenity.charging_station.bicycle">Poyntys-karga Diwros</string>
+    <string name="type.amenity.charging_station.motorcar">Poyntys-karga Karr</string>
     <string name="type.leisure.bowling_alley">Kres Gwari Pelyow</string>
     <string name="type.amenity.compressed_air">Ayr Strooth</string>
     <string name="type.amenity.driving_school">Skol Lewya</string>
@@ -1409,8 +1409,4 @@
     <string name="type.railway.miniature.tunnel">Kowfordh Hyns Horn Munys</string>
     <string name="type.railway.turntable">Tabel-Tro Hyns Horn</string>
     <string name="type.tourism.information.tactile_map">Mappa rag Toch</string>
-    <string name="type.amenity.charging_station.motorcycle">Jynnys Diwros</string>
-    <string name="type.amenity.charging_station.small">Dalghuster Strothys</string>
-    <string name="type.railway.disused.bridge">Pons Hyns Horn Andevnydhys</string>
-    <string name="type.railway.disused.tunnel">Kowfordh Hyns Horn Andevnydhys</string>
 </resources>

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

@@ -1431,6 +1431,4 @@
     <string name="type.railway.miniature.tunnel">Mažojo geležinkelio tunelis</string>
     <string name="type.railway.turntable">Grįžratis</string>
     <string name="type.tourism.information.tactile_map">Taktilinis žemėlapis</string>
-    <string name="type.railway.disused.bridge">Apleistas geležinkelio tiltas</string>
-    <string name="type.railway.disused.tunnel">Apleistas geležinkelio tunelis</string>
 </resources>

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

@@ -35,8 +35,8 @@
     <string name="type.leisure.adult_gaming_centre">Spillsenter for voksne</string>
     <string name="type.leisure.amusement_arcade">Arcade</string>
     <string name="type.amenity.charging_station">Ladestasjon</string>
-    <string name="type.amenity.charging_station.bicycle">Sykler</string>
-    <string name="type.amenity.charging_station.motorcar">Biler</string>
+    <string name="type.amenity.charging_station.bicycle">Ladestasjon for sykkel</string>
+    <string name="type.amenity.charging_station.motorcar">Ladestasjon for biler</string>
     <string name="type.amenity.childcare">Daghjem</string>
     <string name="type.amenity.cinema">Kino</string>
     <string name="type.leisure.bowling_alley">Bowlinghall</string>
@@ -1389,9 +1389,4 @@
     <string name="type.man_made.mast.communication">Kommunikasjonsmast</string>
     <string name="type.man_made.wastewater_plant">Avløpsrenseanlegg</string>
     <string name="type.tourism.information.tactile_map">Berøringskart</string>
-    <string name="type.man_made.telescope.optical">Teleskop (Optisk)</string>
-    <string name="type.amenity.charging_station.small">Begrenset kapasitet</string>
-    <string name="type.amenity.charging_station.motorcycle">Motorsykler</string>
-    <string name="type.railway.disused.tunnel">Ubenyttet jernbanetunnel</string>
-    <string name="type.railway.disused.bridge">Ubenyttet jernbanebru</string>
 </resources>

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

@@ -44,8 +44,8 @@
     <string name="type.leisure.adult_gaming_centre">Centro de jogos para adultos</string>
     <string name="type.leisure.amusement_arcade">Salão de jogos</string>
     <string name="type.amenity.charging_station">Posto de carregamento elétrico</string>
-    <string name="type.amenity.charging_station.bicycle">Bicicletas</string>
-    <string name="type.amenity.charging_station.motorcar">Automóveis</string>
+    <string name="type.amenity.charging_station.bicycle">Estação de carregamento de bicicletas</string>
+    <string name="type.amenity.charging_station.motorcar">Posto de carregamento de veículo elétrico</string>
     <string name="type.amenity.childcare">Creche</string>
     <string name="type.amenity.cinema">Cinema</string>
     <string name="type.leisure.bowling_alley">Pista de bowling</string>
@@ -1499,13 +1499,4 @@
     <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>
-    <string name="type.amenity.charging_station.motorcycle">Motociclos</string>
-    <string name="type.amenity.charging_station.small">Capacidade Limitada</string>
-    <string name="type.railway.disused.bridge">Ponte Ferroviária Desativada</string>
-    <string name="type.railway.disused.tunnel">Túnel Ferroviário Desativada</string>
-    <string name="type.railway.miniature">Ferrovia em Miniatura</string>
-    <string name="type.railway.miniature.bridge">Ponte Ferroviária em Miniatura</string>
-    <string name="type.railway.miniature.tunnel">Túnel Ferroviário em Miniatura</string>
-    <string name="type.railway.turntable">Plataforma Giratória Ferroviária</string>
-    <string name="type.tourism.information.tactile_map">Mapa tátil</string>
 </resources>

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

@@ -46,8 +46,8 @@
     <string name="type.amenity.gambling">Igre na srečo</string>
     <string name="type.leisure.adult_gaming_centre">Igralnica na srečo za odrasle</string>
     <string name="type.amenity.charging_station">Polnilna postaja</string>
-    <string name="type.amenity.charging_station.bicycle">Kolesa</string>
-    <string name="type.amenity.charging_station.motorcar">Avtomobili</string>
+    <string name="type.amenity.charging_station.bicycle">Polnilna postaja za kolesa</string>
+    <string name="type.amenity.charging_station.motorcar">Polnilna postaja za avtomobile</string>
     <string name="type.amenity.dentist">Zobozdravnik</string>
     <string name="type.amenity.doctors">Zdravnik</string>
     <string name="type.amenity.drinking_water">Pitna voda</string>
@@ -668,7 +668,7 @@
     <string name="type.landuse.greenhouse_horticulture">Rastlinjak</string>
     <string name="type.landuse.industrial">Industrijsko območje</string>
     <string name="type.landuse.landfill">Odlagališče odpadkov</string>
-    <string name="type.landuse.meadow">Kmetijski travnik</string>
+    <string name="type.landuse.meadow">Travnik</string>
     <string name="type.landuse.military">Vojaško območje</string>
     <string name="type.landuse.orchard">Sadovnjak</string>
     <string name="type.landuse.quarry">Kamnolom</string>
@@ -759,7 +759,7 @@
     <string name="type.man_made.water_well.drinking_water_no">Vodnjak</string>
     <string name="type.man_made.windmill">Mlin na veter</string>
     <string name="type.man_made.works">Industrijski obrat</string>
-    <string name="type.military">Vojska</string>
+    <string name="type.military">Vojaško</string>
     <string name="type.military.bunker">Vojaško zaklonišče</string>
     <string name="type.mountain_pass">Gorski prelaz</string>
     <string name="type.natural">Narava</string>
@@ -789,17 +789,17 @@
     <string name="type.place.square">Trg</string>
     <string name="type.place.state">Zvezna država</string>
     <string name="type.place.state.USA">Zvezna država ZDA</string>
-    <string name="type.place.suburb">Predmestje</string>
+    <string name="type.place.suburb">Mestna četrt</string>
     <string name="type.place.town">Manjše mesto</string>
     <string name="type.place.village">Vas</string>
     <string name="type.power">Energetika</string>
     <string name="type.power.generator">Generator</string>
     <string name="type.power.generator.solar">Sončni generator</string>
     <string name="type.power.generator.wind">Vetrni generator</string>
-    <string name="type.power.plant.hydro">Vodna elektrarna</string>
+    <string name="type.power.plant.hydro">Hidroelektrarna</string>
     <string name="type.power.plant.wind">Vetrna elektrarna</string>
     <string name="type.power.generator.gas">Plinska turbinska elektrarna</string>
-    <string name="type.power.generator.hydro">Vodna elektrarna</string>
+    <string name="type.power.generator.hydro">Hidroelektrarna</string>
     <string name="type.power.line">Daljnovod</string>
     <string name="type.power.line.underground">Podzemni vod</string>
     <string name="type.power.minor_line">Manjši daljnovod</string>
@@ -807,281 +807,4 @@
     <string name="type.power.plant.coal">Elektrarna na premog</string>
     <string name="type.power.plant.gas">Plinska turbinska elektrarna</string>
     <string name="type.power.plant.solar">Sončna elektrarna</string>
-    <string name="type.amenity.charging_station.motorcycle">Motorna kolesa</string>
-    <string name="type.amenity.charging_station.small">Omejena kapaciteta</string>
-    <string name="type.landuse.greenfield">Nezazidano zemljišče</string>
-    <string name="type.leisure.sports_centre">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.multi">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.american_football">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.archery">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.athletics">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.australian_football">Športno središče</string>
-    <string name="type.natural.earth_bank">Breg</string>
-    <string name="type.man_made.embankment">Nasip</string>
-    <string name="type.natural.coastline">Meja kopnega</string>
-    <string name="type.natural.desert">Puščava</string>
-    <string name="type.natural.sand">Pesek</string>
-    <string name="type.natural.geyser">Vroči vrelec</string>
-    <string name="type.natural.glacier">Ledenik</string>
-    <string name="type.natural.grassland">Travnik</string>
-    <string name="type.natural.heath">Ruševje</string>
-    <string name="type.natural.hot_spring">Vroči izvir</string>
-    <string name="type.natural.water.lake">Jezero</string>
-    <string name="type.natural.water.pond">Ribnik</string>
-    <string name="type.natural.water.reservoir">Vodni zbiralnik</string>
-    <string name="type.natural.water.basin">Vodni zadrževalnik</string>
-    <string name="type.natural.water.river">Reka</string>
-    <string name="type.natural.land">Kopno</string>
-    <string name="type.natural.meadow">Travnik</string>
-    <string name="type.natural.orchard">Sadovnjak</string>
-    <string name="type.natural.peak">Vrh</string>
-    <string name="type.natural.saddle">Gorsko sedlo</string>
-    <string name="type.natural.rock">Skala</string>
-    <string name="type.natural.scrub">Grmičevje</string>
-    <string name="type.natural.spring">Naravni izvir</string>
-    <string name="type.natural.spring.drinking_water_no">Naravni izvir</string>
-    <string name="type.natural.strait">Ožina</string>
-    <string name="type.natural.tree">Drevo</string>
-    <string name="type.natural.tree_row">Vrsta dreves</string>
-    <string name="type.natural.vineyard">Vinograd</string>
-    <string name="type.natural.volcano">Ognjenik</string>
-    <string name="type.natural.water">Voda</string>
-    <string name="type.natural.wetland">Mokrišče</string>
-    <string name="type.natural.wetland.bog">Barje</string>
-    <string name="type.natural.wetland.marsh">Močvirje</string>
-    <string name="type.natural.wetland.saltmarsh">Slano močvirje</string>
-    <string name="type.natural.wetland.saltmarsh.tidal">Plimno slano močvirje</string>
-    <string name="type.natural.wetland.fen">Travno barje</string>
-    <string name="type.natural.wetland.reedbed">Trstišče</string>
-    <string name="type.natural.wetland.swamp">Močvirni gozd</string>
-    <string name="type.natural.wetland.tidalflat">Plimno blato</string>
-    <string name="type.noexit">Brez izhoda</string>
-    <string name="type.office">Pisarna</string>
-    <string name="type.office.company">Pisarna podjetja</string>
-    <string name="type.office.estate_agent">Nepremičninsko posredništvo</string>
-    <string name="type.office.government">Vladna pisarna</string>
-    <string name="type.office.insurance">Zavarovalnica</string>
-    <string name="type.office.lawyer">Odvetniška pisarna</string>
-    <string name="type.office.ngo">Nevladna organizacija</string>
-    <string name="type.office.telecommunication">Telekomunikacijsko podjetje</string>
-    <string name="type.organic.only">Organsko</string>
-    <string name="type.organic.yes">Organsko</string>
-    <string name="type.place.city">Mesto</string>
-    <string name="type.place.city.capital">Glavno mesto</string>
-    <string name="type.place.city.capital.10">Mesto</string>
-    <string name="type.place.city.capital.2">Glavno mesto</string>
-    <string name="type.place.city.capital.3">Mesto</string>
-    <string name="type.place.locality">Kraj</string>
-    <string name="type.place.quarter">Mestna četrt</string>
-    <string name="type.place.neighbourhood">Soseska</string>
-    <string name="type.leisure.sports_centre.sport.badminton">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.baseball">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.basketball">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.beachvolleyball">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.bowls">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.climbing">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.cricket">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.curling">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.equestrian">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.field_hockey">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.futsal">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.golf">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.gymnastics">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.handball">Športno središče</string>
-    <string name="type.leisure.sports_centre.sport.ice_hockey">Športno središče</string>
-    <string name="type.place.city.capital.11">Mesto</string>
-    <string name="type.place.city.capital.4">Mesto</string>
-    <string name="type.place.city.capital.5">Mesto</string>
-    <string name="type.place.city.capital.6">Mesto</string>
-    <string name="type.place.city.capital.7">Mesto</string>
-    <string name="type.power.substation">Transformatorska postaja</string>
-    <string name="type.power.tower">Daljnovodni stolp</string>
-    <string name="type.power.pole">Daljnovodni steber</string>
-    <string name="type.man_made.utility_pole">Steber javne napeljave</string>
-    <string name="type.public_transport">Javni prevoz</string>
-    <string name="type.public_transport.platform">Postajališče</string>
-    <string name="type.railway">Železnica</string>
-    <string name="type.railway.abandoned">Opuščena železnica</string>
-    <string name="type.railway.construction">Železnica v gradnji</string>
-    <string name="type.railway.crossing">Železniški prehod za pešce</string>
-    <string name="type.railway.disused">Neuporabljana železnica</string>
-    <string name="type.railway.disused.bridge">Neuporabljan železniški most</string>
-    <string name="type.railway.disused.tunnel">Neuporabljan železniški predor</string>
-    <string name="type.railway.funicular">Vzpenjača</string>
-    <string name="type.railway.funicular.bridge">Most vzpenjače</string>
-    <string name="type.railway.funicular.tunnel">Predor vzpenjače</string>
-    <string name="type.railway.halt">Železniško postajališče</string>
-    <string name="type.railway.level_crossing">Železniški prehod</string>
-    <string name="type.railway.light_rail">Lahka železnica</string>
-    <string name="type.railway.light_rail.bridge">Most lahke železnice</string>
-    <string name="type.railway.light_rail.tunnel">Predor lahke železnice</string>
-    <string name="type.railway.monorail">Enotirna železnica</string>
-    <string name="type.railway.monorail.bridge">Most enotirne železnice</string>
-    <string name="type.railway.monorail.tunnel">Predor enotirne železnice</string>
-    <string name="type.railway.miniature">Miniaturna železnica</string>
-    <string name="type.railway.miniature.bridge">Most miniaturne železnice</string>
-    <string name="type.railway.miniature.tunnel">Predor miniaturne železnice</string>
-    <string name="type.railway.narrow_gauge">Ozkotirna železnica</string>
-    <string name="type.railway.narrow_gauge.tunnel">Ozkotirni železniški predor</string>
-    <string name="type.railway.platform">Ploščad železniškega postajališča</string>
-    <string name="type.railway.preserved">Muzejska železnica</string>
-    <string name="type.railway.preserved.bridge">Muzejski železniški most</string>
-    <string name="type.railway.preserved.tunnel">Muzejski železniški predor</string>
-    <string name="type.railway.rail">Železniški tir</string>
-    <string name="type.railway.rail.highspeed">Visokohitrostna železnica</string>
-    <string name="type.railway.rail.tourism">Turistična železnica</string>
-    <string name="type.railway.rail.main">Železnica</string>
-    <string name="type.railway.turntable">Vrtljiva plošča za vlake</string>
-    <string name="type.railway.rail.branch">Stranska veja železnice</string>
-    <string name="type.railway.rail.utility">Industrijska železnica</string>
-    <string name="type.railway.rail.spur">Industrijska veja železnice</string>
-    <string name="type.railway.rail.service">Pomožna železnica</string>
-    <string name="type.railway.rail.bridge">Železniški most</string>
-    <string name="type.railway.rail.highspeed.bridge">Železniški most</string>
-    <string name="type.railway.rail.tourism.bridge">Železniški most</string>
-    <string name="type.railway.rail.main.bridge">Železniški most</string>
-    <string name="type.railway.rail.branch.bridge">Železniški most</string>
-    <string name="type.railway.rail.utility.bridge">Železniški most</string>
-    <string name="type.railway.rail.spur.bridge">Železniški most</string>
-    <string name="type.railway.rail.service.bridge">Železniški most</string>
-    <string name="type.railway.rail.tunnel">Železniški predor</string>
-    <string name="type.railway.rail.highspeed.tunnel">Železniški predor</string>
-    <string name="type.railway.rail.tourism.tunnel">Železniški predor</string>
-    <string name="type.railway.rail.main.tunnel">Železniški predor</string>
-    <string name="type.railway.rail.branch.tunnel">Železniški predor</string>
-    <string name="type.railway.rail.utility.tunnel">Železniški predor</string>
-    <string name="type.railway.rail.spur.tunnel">Železniški predor</string>
-    <string name="type.railway.rail.service.tunnel">Železniški predor</string>
-    <string name="type.railway.station">Železniška postaja</string>
-    <string name="type.railway.station.funicular">Postaja vzpenjače</string>
-    <string name="type.railway.station.light_rail">Postaja lahke železnice</string>
-    <string name="type.railway.station.light_rail.berlin">Postaja mestne železnice</string>
-    <string name="type.railway.station.light_rail.london">Postaja DLR</string>
-    <string name="type.railway.station.light_rail.porto">Postaja podzemne železnice v Portoju</string>
-    <string name="type.railway.station.monorail">Postaja enotirne železnice</string>
-    <string name="type.railway.station.subway">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.adana">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.algiers">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.almaty">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.amsterdam">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.ankara">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.athens">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.baku">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.bangkok">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.barcelona">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.beijing">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.bengalore">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.berlin">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.bilbao">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.brasilia">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.brescia">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.brussels">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.bucharest">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.budapest">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.buenos_aires">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.bursa">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.cairo">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.caracas">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.catania">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.changchun">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.chengdu">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.chicago">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.chongqing">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.dalian">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.delhi">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.dnepro">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.dubai">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.ekb">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.fukuoka">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.glasgow">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.guangzhou">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.hamburg">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.helsinki">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.hiroshima">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.hongkong">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.isfahan">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.istanbul">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.izmir">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.kazan">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.kharkiv">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.kiev">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.kobe">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.kolkata">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.kunming">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.kyoto">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.la">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.lausanne">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.lille">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.lima">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.lisboa">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.london">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.lyon">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.madrid">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.malaga">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.manila">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.maracaibo">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.mashhad">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.mecca">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.medellin">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.mexico">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.milan">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.minsk">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.montreal">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.moscow">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.munchen">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.nagoya">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.newyork">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.nnov">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.novosibirsk">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.osaka">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.oslo">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.palma">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.panama">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.paris">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.philadelphia">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.pyongyang">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.qingdao">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.rennes">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.rio">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.roma">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.rotterdam">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.samara">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.santiago">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.santo_domingo">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.saopaulo">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.sapporo">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.sendai">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.sf">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.shanghai">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.shenzhen">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.shiraz">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.singapore">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.sofia">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.spb">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.stockholm">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.tabriz">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.taipei">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.taoyuan">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.tashkent">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.tbilisi">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.tehran">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.tianjin">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.tokyo">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.valencia">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.vienna">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.warszawa">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.washington">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.wuhan">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.yerevan">Postaja podzemne železnice</string>
-    <string name="type.railway.station.subway.yokohama">Postaja podzemne železnice</string>
-    <string name="type.railway.subway">Podzemna železnica</string>
-    <string name="type.railway.subway.bridge">Most podzemne železnice</string>
-    <string name="type.railway.subway.tunnel">Predor podzemne železnice</string>
-    <string name="type.railway.subway_entrance">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.adana">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.algiers">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.almaty">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.amsterdam">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.ankara">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.athens">Vhod v podzemno železnico</string>
 </resources>

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

@@ -309,7 +309,7 @@
     <string name="type.cuisine.italian">Italijanska</string>
     <string name="type.cuisine.italian_pizza">Pica</string>
     <string name="type.cuisine.japanese">Japanska</string>
-    <string name="type.cuisine.kebab">Кебаб</string>
+    <string name="type.cuisine.kebab">Kebab</string>
     <string name="type.cuisine.korean">Korejska</string>
     <string name="type.cuisine.lao">Laoska</string>
     <string name="type.cuisine.lebanese">Libanska</string>

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

@@ -376,9 +376,7 @@
     <string name="type.cuisine.vietnamese">Vietnamese</string>
     <string name="type.emergency">Emergency</string>
     <string name="type.emergency.access_point">Emergency Rescue Point</string>
-    <string name="type.emergency.access_point.address">Emergency Rescue Address</string>
     <string name="type.emergency.assembly_point">Emergency Assembly Point</string>
-    <string name="type.emergency.disaster_help_point">Emergency Disaster Help Point</string>
     <string name="type.emergency.life_ring">Lifebuoy</string>
     <string name="type.emergency.defibrillator">Defibrillator</string>
     <string name="type.emergency.fire_hydrant">Fire Hydrant</string>

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

@@ -186,7 +186,7 @@
 "place-state": "Щат|провинция",
 "place-region": "Район|Регион",
 "place-island|place-islet": "Остров",
-"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|окръг|квартал|Предградие|Жилищен комплекс|ЖК",
+"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|окръг|квартал|Предградие|Жилищен комплекс|ж.к.|ЖК",
 "place-hamlet": "Село",
 "place-village": "Село",
 "place-locality": "местност|регион|Място",

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

@@ -405,9 +405,8 @@
 "amenity-payment_terminal": "3Bezahlterminal",
 "amenity-public_bath": "4Öffentliches Bad|4Hallenbad|5Schwimmen|5Schwimmbad|U+1F3CA",
 "amenity-shower": "Dusche",
-"emergency-access_point": "4Rettungspunkt|Notfallpunkt|Notfall-Rettungspunkt|Notfalltrettungspunkt",
-"emergency-assembly_point": "4Notfall-Sammelpunkt|4Sammelstelle|Notfallsammelpunkt|U+1F46A|U+2795",
-"emergency-disaster_help_point": "4Notfall-Treffpunkt|Notfalltreffpunkt|4Notfall-Infopunkt|Notfallinfopunkt|7Katastrophenschutz-Leuchtturm|Katastrophenschutzleuchtturm",
+"emergency-access_point": "4Rettungspunkt|Notfallpunkt|Notfall-Rettungspunkt|Notfall-Treffpunkt",
+"emergency-assembly_point": "4Notfall-Sammelpunkt|4Sammelstelle|U+1F46A|U+2795",
 "emergency-life_ring": "4Rettungsring",
 "emergency-defibrillator": "4Defibrillator",
 "emergency-fire_hydrant": "4Hydrant|4Feuerhydrant|4Löschwasser",

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

@@ -440,7 +440,6 @@
 "amenity-shower": "Shower",
 "emergency-access_point": "5Emergency Rescue Point|Emergency Location|Emergency Marker|Emergency Access Point",
 "emergency-assembly_point": "5Emergency assembly point",
-"emergency-disaster_help_point": "5Emergency Disaster Help Point|5Disaster Help Point",
 "emergency-life_ring": "5Lifebuoy|6Life Ring|life-ring|lifering|flotation device|floatation device",
 "emergency-defibrillator": "4Defibrillator|AED",
 "emergency-fire_hydrant": "4Fire Hydrant|Fire Plug|Hydrant",

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

@@ -190,7 +190,7 @@
 "amenity-shelter-lean_to": "Alpende|Cobertizo|4Refugio de alpende|resguardo",
 "amenity-stripclub": "Club de striptease|Club de estriptis|Striptease|Estriptis",
 "amenity-telephone": "3Teléfono|teléfono público|cabina telefónica",
-"@category_toilet": "Baño|Aseo|Lavabo|lavabos|Servicio|sanitario|4Sanitarios|3Baños|3Aseos|3Servicios|3Lavabos|Inodoro|WC|váter|lavatorio|wc",
+"@category_toilet": "Baño|Aseo|Lavabo|Servicio|4Sanitarios|3Baños|3Aseos|3Servicios|3Lavabos|Inodoro|WC",
 "amenity-university": "3Universidad",
 "place-continent": "Continente",
 "place-country": "País",
@@ -522,8 +522,8 @@
 "amenity-sailing_school": "Escuela de vela|Escuela de navegación",
 "amenity-flight_school": "Escuela de aviación|Escuela de aeronáutica|Escuela de pilotos|aeronáutica|vuelo|aviación",
 "amenity-prep_school": "Propedéutico|Tutoría",
-"emergency-access_point": "Punto de emergencia|emergencia|acceso de emergencia|marca de emergencia|Punto de rescate de emergencia|Lugar de emergencia|Punto de acceso de emergencia",
-"emergency-life_ring": "Salvavidas|Aro salavidas|dispositivo flotante",
+"emergency-access_point": "Punto de emergencia|emergencia|acceso de emergencia|marca de emergencia",
+"emergency-life_ring": "Salvavidas|Aro salavidas",
 "shop-beauty-day_spa": "3Spa diurno|spa|wellness",
 "leisure-indoor_play": "parque interior|parque infantil interior|parque indoor|parque recreativo interior",
 "amenity-food_sharing": "Comida compartida|compartir comida|rescate de comida|Alimentos compartidos|Alimentos",

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

@@ -2,130 +2,130 @@
 "@category_eat": "Waar iets gaan eten|Eten",
 "@category_food": "Boodschappen|Kruidenier|Eten",
 "@category_transport": "5Transport",
-"@category_fuel": "4Benzine|4Diesel|5Brandstof",
+"@category_fuel": "3Benzine",
 "@category_parking": "4Parkeerplaats",
-"@category_shopping": "4Winkelen|winkels",
-"@category_hotel": "3Hotel|hotels|4Accomodatie|5overnachten",
+"@category_shopping": "Winkelen",
+"@category_hotel": "Hotel|Hotels",
 "@category_tourism": "5Bezienswaardigheden|4Toerisme",
-"@category_entertainment": "4Amusement|4Uitgaan",
-"@category_nightlife": "4Nachtleven",
-"@category_children": "4Gezinsvakantie|kinderen|baby's|gezin|familie|gezinsvriendelijk",
+"@category_entertainment": "Amusement|Uitgaan",
+"@category_nightlife": "Nachtleven",
+"@category_children": "Gezinsvakantie",
 "@category_atm": "3Geldautomaat",
-"@category_rv": "4Caravanfaciliteiten|4Caravan|4Camper|camper",
-"amenity-atm|@category_atm": "geld|cash|U+1F3E7|U+1F4B2|U+1F4B3|U+1F4B4|U+1F4B5|U+1F4B6|U+1F4B7",
+"@category_rv": "Caravan faciliteiten|4Caravans|5Campers",
+"amenity-atm|@category_atm": "geld",
 "@category_bank": "3Bank",
-"@category_secondhand": "4Tweedehands|tweedehands|tweede-kans|tweede kans|4Gebruikte artikelen",
+"@category_secondhand": "Tweedehands",
 "amenity-bank|@category_bank": "geld",
 "@category_recycling": "Recycling|Afvalgebruik|Recyclebaar materiaal|Gescheiden afvalinzameling|Afval sorteren|Hergebruik",
 "amenity-bureau_de_change": "3Wisselkantoor|3geld wisselen|wisselen|geld",
 "amenity-bar|amenity-pub|@category_eat|@category_nightlife": "2Bar|2pub|kroeg|bier|drinken",
-"amenity-cafe|@category_eat": "3Café|koffie|thee|cafeteria",
-"amenity-fast_food|@category_eat": "4Fastfood|4Snackbar|4afhalen|4afhaaleten|afhaalvoedsel",
-"amenity-restaurant|@category_eat": "4Restaurant",
-"amenity-fuel|@category_fuel": "4Tankstation|4brandstof",
+"amenity-cafe|@category_eat": "3Tearoom|3brasserie|3café|3restaurant",
+"amenity-fast_food|@category_eat": "4Fast food|3frituur|fritkot|3restaurant|afhaaleten",
+"amenity-restaurant|@category_eat": "3Restaurant|3café",
+"amenity-fuel|@category_fuel": "3Tankstation|3brandstof",
 "@shop": "Winkel",
 "shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Bakkerij|Bakker|Gebak|Taart|3Taarten",
 "shop-cannabis|@shop": "Coffeeshop",
-"shop-cosmetics|@category_shopping|@shop": "4Cosmetica|5Schoonheidsmiddelen|4makeup|make-up",
+"shop-cosmetics|@category_shopping|@shop": "4Cosmetica|drogist|Schoonheidsmiddelen",
 "shop-convenience|@category_food|@shop": "Buurtwinkel|kruidenier|supermarktje",
 "shop-deli|@category_food|@shop": "Delicatessenwinkel",
 "shop-garden_centre|@shop": "Tuincentrum",
-"shop-hearing_aids|@shop": "4Hoortoestellen|6Gehoortoestellen",
+"shop-hearing_aids|@shop": "Hoortoestellen",
 "shop-mobile_phone|@shop": "4Mobiele telefoonwinkel|elektronicawinkel",
 "shop-florist|@shop": "Bloemist|bloemenwinkel",
-"shop-butcher|@category_food|@shop": "4Slager|beenhouwer|vlees",
+"shop-butcher|@category_food|@shop": "Slager|beenhouwer",
 "shop-furniture|@shop": "4Meubelzaak",
-"shop-kitchen|@shop": "4Keuken|keukenattributen",
+"shop-kitchen|@shop": "Keukenwinkel",
 "shop-alcohol|@category_food|@shop": "Slijterij|drankhandel",
 "shop-books|@shop": "Boeken|Boekenwinkel|boekwinkel|boekhandel",
 "shop-shoes|@category_shopping|@shop": "Schoenenwinkel|schoenwinkel",
 "shop-electronics|@shop": "4Elektronicazaak",
-"shop-hardware|shop-doityourself|@shop": "6Gereedschap|4Klussen|Bouwmarkt|DHZ|3doe het zelf|doe-het-zelf",
+"shop-hardware|shop-doityourself|@shop": "Ijzerhandel|Bouwmarkt|ijzer",
 "shop-houseware|@shop": "4Huishouden",
 "shop-jewelry|@category_shopping|@shop": "4Juwelier|sieraden",
-"shop-optician|@shop": "4Opticien|4brillen|5zonnebrillen",
-"shop-gift|@category_shopping|@shop": "5Geschenken|4souvenir|souvenirs|geschenk|6cadeaus|5Souvenir shop",
-"shop-beauty": "5Schoonheidssalon|schoonheidsspecialiste|schoonheidssalon|4haarkleuring|permanent",
+"shop-optician|@shop": "4Opticien|brillen",
+"shop-gift|@category_shopping|@shop": "Cadeau",
+"shop-beauty": "Schoonheidssalon|kapper|nagelstudio",
 "shop-greengrocer|@category_food|@shop": "Groentenwinkel|groenteboer",
 "shop-sports|@category_shopping|@shop": "4Sportartikelen",
 "shop-supermarket|@category_food|@shop": "3Supermarkt",
-"shop-mall|@category_shopping|@shop": "6Winkelcentrum|Gallerij|winkelgalerij|winkels",
-"shop-department_store|@category_shopping|@shop": "5Warenhuis",
+"shop-mall|@category_shopping|@shop": "Winkelcentrum",
+"shop-department_store|@category_shopping|@shop": "Warenhuis",
 "shop-beverages|@category_food|@shop": "Drank|slijterij",
-"shop-computer|@shop": "4Computerzaak|computer|computers",
+"shop-computer|@shop": "4Computerwinkel",
 "shop-confectionery|craft-confectionery|@category_food|@shop": "Banketbakker|snoepwinkel|snoep|snoepjes|zoetigheden",
 "shop-laundry": "4Wasserette",
 "shop-toys|@category_children|@shop": "Speelgoed|Speelgoedwinkel|kinderen",
 "amenity-marketplace|@category_food": "3Markt",
-"amenity-money_transfer": "4Overschrijving|4Geld overmaken",
-"shop-clothes|@category_shopping|@shop": "4Kleding|kleding|mode|kledingstukken ",
-"shop-car|@shop": "4Autohandelaar|Autodealer|autos",
-"shop-bicycle|@shop": "5Fietsenwinkel|fiets|fietsen",
+"amenity-money_transfer": "Overschrijving",
+"shop-clothes|@category_shopping|@shop": "Kledingwinkel|4kleding",
+"shop-car|@shop": "Autohandelaar",
+"shop-bicycle|@shop": "4Fietsenwinkel|fiets",
 "shop-kiosk": "3Kiosk",
 "highway-bus_stop|@category_transport": "3Bushalte|bus|halte",
 "railway-tram_stop|@category_transport": "3Tramhalte",
 "amenity-bus_station|@category_transport": "Busstation|2bus|station",
 "railway-station|railway-halt|building-train_station|@category_transport": "4Station|4spoorwegen|spoor|3trein",
-"railway-station-funicular": "4Funicular|Kabelspoorweg",
-"railway-station-subway|@category_transport": "4Metrosation|5ondergrondse|metro",
+"railway-station-funicular": "Tunnel",
+"railway-station-subway|@category_transport": "3Metro",
 "amenity-ferry_terminal|@category_transport": "3Veerpont|veerboot|veer|pont|overzetboot",
-"amenity-taxi|@category_transport": "3Taxi|Taxistandplaats",
+"amenity-taxi|@category_transport": "3Taxi",
 "amenity-townhall": "3Gemeentehuis",
 "tourism-attraction|@category_tourism": "3Attractie|3toerisme",
 "tourism-artwork": "3Kunstwerk",
 "tourism-viewpoint|@category_tourism": "4Uitzicht|panorama|Uitkijkpunt",
 "tourism-information": "4Toeristische informatie|3VVV|4informatie",
-"tourism-picnic_site|amenity-bbq|leisure-picnic_table": "4Picknickplaats|picknickweide|picknicktafel|4barbecue",
-"amenity-place_of_worship": "5Gebedshuis|5gebedsplaats|3tempel",
-"amenity-place_of_worship-christian": "Kerk|5gebedshuis|3tempel|4cathedraal|4basiliek|6christendom",
-"amenity-place_of_worship-muslim": "4Moskee|3tempel|5gebedsplaats|gebedshuis|3islam",
-"amenity-place_of_worship-buddhist": "3Tempel|5gebedshuis|4boeddhistische tempel|4boeddhisme|",
-"amenity-place_of_worship-hindu": "3Tempel|5gebedshuis|4hindoetempel|4hindoeïsme",
-"amenity-place_of_worship-shinto": "6Heiligdom|5gebedshuis|3tempel|4shinto tempel|4shinto",
-"amenity-place_of_worship-jewish": "4Synagoge|5gebedshuis|3tempel|3jodendom",
-"amenity-place_of_worship-taoist": "3Tempel|5gebedshuis|3taoïstische tempel|3taoïsme",
+"tourism-picnic_site|amenity-bbq|leisure-picnic_table": "3Picknickplaats|picknickweide|picknicktafel|Barbecue",
+"amenity-place_of_worship": "3Gebedsplaats|3gebedshuis|3tempel",
+"amenity-place_of_worship-christian": "Kerk|tempel|kathedraal|gebedsplaats|gebedshuis",
+"amenity-place_of_worship-muslim": "4Moskee|tempel|gebedsplaats|gebedshuis",
+"amenity-place_of_worship-buddhist": "Tempel|gebedsplaats|gebedshuis",
+"amenity-place_of_worship-hindu": "Tempel|gebedsplaats|gebedshuis",
+"amenity-place_of_worship-shinto": "Heiligdom|tempel|gebedsplaats|gebedshuis",
+"amenity-place_of_worship-jewish": "4Synagoge|tempel|gebedsplaats|gebedshuis",
+"amenity-place_of_worship-taoist": "Tempel|gebedsplaats|gebedshuis",
 "tourism-museum|@category_tourism": "2Museum|attractie",
 "waterway-waterfall|@category_tourism": "2Watervallen|waterval",
 "historic-archaeological_site|@category_tourism": "4Archeologische site|opgravingen|attractie",
 "historic-battlefield": "Slagveld",
-"historic-stone": "5Historische steen",
-"historic-boundary_stone": "5Grenssteen",
+"historic-stone": "Historische steen",
+"historic-boundary_stone": "Grenssteen",
 "historic-castle|@category_tourism": "4Kasteel|burcht|attractie|Castra|Weerkerk|Vesting|Heuvelfort|Kremlin|Manoir|Paleis",
-"historic-city_gate|@category_tourism": "5Stadspoort",
-"historic-citywalls|@category_tourism": "5Stadsmuur",
+"historic-city_gate|@category_tourism": "Stadspoort",
+"historic-citywalls|@category_tourism": "Stadsmuur",
 "historic-fort|@category_tourism": "Fort",
 "historic-gallows|@category_tourism": "Galg",
 "historic-memorial|@category_tourism": "Gedenkteken|monument|attractie",
 "historic-memorial-cross": "Herdenkingskruis",
 "historic-memorial-plaque": "Gedenkplaat",
-"historic-memorial-sculpture|@category_tourism": "5Sculptuur",
-"historic-memorial-statue|@category_tourism": "5Standbeeld",
+"historic-memorial-sculpture|@category_tourism": "Sculptuur",
+"historic-memorial-statue|@category_tourism": "Standbeeld",
 "historic-memorial-stolperstein": "Struikelsteen|Struikelsteentje",
 "historic-memorial-war_memorial|@category_tourism": "Oorlogsmonument",
 "historic-monument|@category_tourism": "4Monument|attractie",
 "historic-pillory|@category_tourism": "Schandpaal",
 "historic-cannon": "Kanon",
-"historic-anchor": "4Historisch anker",
-"historic-ruins|@category_tourism": "3Historische ruïne|3ruïne",
-"historic-mine": "4Historische mijn",
+"historic-anchor": "Historisch anker",
+"historic-ruins|@category_tourism": "3Ruïne|attractie",
+"historic-mine": "Historische mijn",
 "historic-ship|@category_tourism": "Schip|boot",
 "historic-wreck": "Schipbreuk",
-"historic-locomotive|@category_tourism": "4Historische locomotief",
-"historic-tank|@category_tourism": "4Historische tank",
-"historic-aircraft|@category_tourism": "4Historisch vliegtuig",
+"historic-locomotive|@category_tourism": "Historische locomotief",
+"historic-tank|@category_tourism": "Historische tank",
+"historic-aircraft|@category_tourism": "Historische vliegtuigen",
 "historic-tomb|@category_tourism": "Tombe|graf|gedenkteken",
 "historic-wayside_cross": "Wegkruis",
 "historic-wayside_shrine": "Kruisbeeld",
 "leisure-dog_park": "4Hondenpark|Hondengebied",
 "leisure-garden": "2Tuin",
 "amenity-bench|amenity-bench-backless": "Zitbank|bankje",
-"amenity-bicycle_rental": "5Fietsverhuur|fietsen|fiets|3Verhuur|fietsenhuur",
-"amenity-bicycle_repair_station": "5Fietsenreparatie|fiets|4reparatie van fietsen",
-"amenity-car_sharing": "5Autodelen|autodelen|auto|delen",
-"amenity-car_rental": "4Autoverhuur|4huurauto|auto delen|auto|huur",
-"amenity-motorcycle_rental": "5Motorverhuur|motor|verhuur|5scooter|4Verhuur van motorfietsen|motorfietsen",
-"amenity-cinema|@category_entertainment": "3Cinema|4Filmtheater|4bioscoop|film",
-"leisure-bowling_alley|@category_entertainment": "4Bowlingbaan",
+"amenity-bicycle_rental": "4Fietsverhuur|2huur",
+"amenity-bicycle_repair_station": "4Fiets reparatie",
+"amenity-car_sharing": "3Carpool|Carpoolen|Auto delen|Autodelen",
+"amenity-car_rental": "3Autoverhuur|4huurauto|auto delen|auto|huur",
+"amenity-motorcycle_rental": "Motorverhuur",
+"amenity-cinema|@category_entertainment": "3Bioscoop|filmtheater|cinema",
+"leisure-bowling_alley|@category_entertainment": "Bowlingbaan",
 "amenity-theatre|@category_entertainment": "3Theater|schouwburg",
 "amenity-nightclub|@category_entertainment|@category_nightlife": "3Discotheek|3disco|dansen|nachtclub",
 "amenity-brothel": "Bordeel",
@@ -152,10 +152,10 @@
 "healthcare-podiatrist": "Podologie|Podotherapeut",
 "healthcare-psychotherapist": "Psychotherapie|Psychotherapeut",
 "healthcare-speech_therapist": "Logopedie|Logopedist|Spraaktherapie",
-"amenity-hunting_stand": "4Jagershut",
+"amenity-hunting_stand": "Jachtplaats|jaagplek",
 "amenity-kindergarten": "Kleuterschool",
-"amenity-library": "3Bibliotheek|4leenbibliotheek|3boek|boeken",
-"amenity-parking|amenity-parking_entrance|@category_parking": "4Parkeren|parkeerplaats|parking",
+"amenity-library": "3Bibliotheek",
+"amenity-parking|amenity-parking_entrance|@category_parking": "3Parkeren|parkeerplaats|parking",
 "@category_pharmacy": "3Apotheek",
 "amenity-pharmacy|@category_pharmacy": "Apotheek|drogist",
 "@category_post": "3Post",
@@ -167,20 +167,20 @@
 "amenity-recycling-container|amenity-recycling|@category_recycling": "Recycling container",
 "recycling-batteries|@category_recycling": "Batterijen",
 "recycling-clothes|@category_recycling": "Oude kleding|Oude kleding recyclen",
-"recycling-glass_bottles|@category_recycling": "4Recycling van glasflessen|4Glasrecycling|Glasafval|Glascontainer|Glasbak",
-"recycling-paper|@category_recycling": "4Recycling van papier|4Papierrecycling|Papierafval|Papiercontainer|Papierbak",
-"recycling-plastic|@category_recycling": "4Recycling van plastic|5Plasticrecycling|Plastic afval|Plasticcontainer|Plasticbak",
-"recycling-plastic_bottles|@category_recycling": "4Recycling van plastic flessen|5Plastic flessen recycling|Plasticcontainer|Plasticbak",
-"recycling-scrap_metal|@category_recycling": "4Recycling van metaal|4Metaalrecycling|Metaal container|Metaalbak",
+"recycling-glass_bottles|@category_recycling": "Glazen flessen",
+"recycling-paper|@category_recycling": "Papierafval",
+"recycling-plastic|@category_recycling": "Plastic afval",
+"recycling-plastic_bottles|@category_recycling": "Plastic flessen",
+"recycling-scrap_metal|@category_recycling": "Schroot",
 "recycling-small_appliances|@category_recycling": "Elektronisch afval",
 "amenity-school": "3School|basisschool|middelbare school",
 "amenity-shelter": "Beschutting",
-"amenity-shelter-basic_hut": "Hut|3Bivakhut",
-"amenity-shelter-lean_to": "5Schuilplaats tegen de wind|Schuilplaats|5toevluchtsoord|5beschutting",
-"amenity-stripclub": "5Stripclub",
+"amenity-shelter-basic_hut": "Bivakhut",
+"amenity-shelter-lean_to": "Beschutting",
+"amenity-stripclub": "Stripclub",
 "amenity-telephone": "2Telefoon|publieke telefoon",
-"@category_toilet": "3Toilet|toiletten|4Sanitair|WC",
-"amenity-toilets|toilets-yes|@category_toilet": "wc|4Toilet|pot|4sanitair",
+"@category_toilet": "3Toilet|WC",
+"amenity-toilets|toilets-yes|@category_toilet": "WC|toilet",
 "amenity-university": "4Universiteit",
 "place-continent": "Continent",
 "place-country": "Land|staat",
@@ -192,8 +192,8 @@
 "place-region": "Regio",
 "place-island|place-islet": "Eiland|eilandje",
 "place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Buitenwijken|voorstad|wijk|Buurt",
-"place-hamlet": "4Gehucht|dorp|5buurtschap|5nederzetting",
-"place-village": "Dorp|gehucht|5nederzetting",
+"place-hamlet": "Gehucht|buurtschap|dorpje|dorp",
+"place-village": "Dorp|dorpje",
 "place-locality": "Plaats|streek|localiteit",
 "place-farm": "Boerderij",
 "highway-raceway": "Renbaan|racebaan",
@@ -210,12 +210,12 @@
 "tourism-guest_house|@category_hotel": "Gasthuis|B&B|bed and breakfast|hostel",
 "tourism-motel|@category_hotel": "3Motel|hostel",
 "tourism-alpine_hut|@category_hotel": "3Berghut|alpenhut|hotel",
-"shop-hairdresser": "3Kapper|kapsalon|4haarsalon|kapperszaak|4barbier|6schoonheidssalon|kleuring|5permanent",
-"aeroway-aerodrome": "5Vliegveld|5Luchthaven|5vliegtuig",
-"leisure-stadium": "4Stadion|stadium|4sport|sportstadion|4Olympisch stadion|sportcomplex|sportarena",
+"shop-hairdresser": "3Kapper|kapsalon|haarsalon|kapperszaak",
+"aeroway-aerodrome": "3Vliegveld|3vliegtuig",
+"leisure-stadium": "4Stadion|stadium|4sport|arena",
 "leisure-playground|@category_children": "Speeltuin|speelplaats",
-"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": "4Sportcentrum|sportcomplex|sport|sporten",
-"leisure-golf_course": "4Golfbaan|golf",
+"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": "4Sportcentrum|sport",
+"leisure-golf_course": "Golfbaan",
 "leisure-miniature_golf": "Minigolf",
 "leisure-escape_game": "Escaperoom",
 "leisure-pitch": "4Sportveld|veld|sport",
@@ -236,7 +236,7 @@
 "sport-gymnastics": "Gymnastiek",
 "sport-handball": "Handbal",
 "sport-scuba_diving": "Duiken",
-"sport-shooting": "6Schietbaan",
+"sport-shooting": "Schietbaan",
 "sport-skateboard": "Skateboarden",
 "sport-skiing": "Skiën",
 "sport-soccer": "Voetbal",
@@ -248,15 +248,15 @@
 "building": "Gebouw",
 "building-address": "Adres",
 "@category_police": "4Politie",
-"office-diplomatic": "4Ambassade|5Consulaat",
+"office-diplomatic": "4Ambassade",
 "natural-bay": "Baai",
 "@category_water": "3Water",
 "amenity-drinking_water|drinking_water-yes|@category_water": "4Drinkwater",
 "natural-hot_spring|@category_water": "Hete bron|Warmwaterbron",
 "natural-spring|@category_water": "Bron",
 "man_made-water_well|@category_water": "Waterbron",
-"amenity-water_point|@category_water|@category_rv": "5Watertappunt|5Camper-waterpunt|water voor camper|water voor caravan",
-"man_made-water_tap|@category_water": "5Waterkraan",
+"amenity-water_point|@category_water|@category_rv": "Waterpunt",
+"man_made-water_tap|@category_water": "Waterkraan",
 "@waterbody": "Waterlichaam",
 "natural-water-basin|landuse-basin|@waterbody": "Waterbassin",
 "natural-water-pond|@waterbody": "Plas",
@@ -264,18 +264,18 @@
 "natural-water-reservoir|landuse-reservoir|@waterbody": "5Reservoir",
 "waterway-river|waterway-stream|natural-water-river": "Rivier|beek|stroom|waterloop",
 "waterway-canal": "Kanaal|waterloop|gracht",
-"shop-car_repair": "3Autoreparatie|9onderhoudsstation|auto|4garage|4reparateur|4Reparatie van auto's",
-"tourism-camp_site|@category_hotel": "4Camping|4kamperen|kampeerterrein|kampeerveld",
+"shop-car_repair": "3Auto reparatie|auto|wagen|garage",
+"tourism-camp_site|@category_hotel": "4Camping|kamperen|kampeerplek",
 "tourism-caravan_site|@category_rv||@category_hotel": "4Caravan site|camping|woonwagenkamp",
 "office": "Kantoor|ambt|bedrijf|bedrijfspand|bedrijfskantoor",
 "office-company": "Bedrijfskantoor|bedrijfspand",
-"office-government": "8Overheidskantoor|overheidsgebouw|regeringskantoor",
-"office-lawyer": "4Advocatenkantoor|advocaat|raadsheer",
-"office-telecommunication": "6Telecombedrijf|Telecommunicatiekantoor",
+"office-government": "Overheidskantoor|overheidspand|regeringskantoor",
+"office-lawyer": "4Advocatenkantoor|advocaat",
+"office-telecommunication": "Mobiele provider|provider",
 "craft-beekeeper": "Imker",
 "craft-blacksmith": "Smid",
 "craft-brewery": "Brouwerij|bier|ambachtelijk bier|brouwhuis",
-"craft-caterer": "4Cateraar|4Traiteur",
+"craft-caterer": "Traiteur",
 "craft-carpenter": "4Timmerman|houtbewerker",
 "craft-confectionery": "Banketbakkerij",
 "craft-electrician": "4Elektricien",
@@ -283,107 +283,107 @@
 "craft-gardener": "Tuinarchitect",
 "craft-grinding_mill": "Molen",
 "craft-handicraft": "Handwerk",
-"craft-hvac": "3HVAC|AC|4airco|verwarming|air conditioner|4ventilatie|4klimaat|klimaatbeheer",
+"craft-hvac": "Airconditioning",
 "craft-metal_construction": "5Metaalarbeider",
-"craft-key_cutter": "4Sleutels|sleutelbar",
+"craft-key_cutter": "Sleutel snijden",
 "craft-locksmith": "Slotenmaker",
 "craft-painter": "Schilder",
 "craft-photographer": "4Fotograaf|fotografiestudio",
-"craft-plumber": "4Loodgieter",
+"craft-plumber": "Loodgieter",
 "craft-sawmill": "Zagerij",
 "craft-shoemaker": "Schoenmaker|schoenmakerij",
-"craft-winery": "4Wijnhandel|Wijn",
+"craft-winery": "Wijnhandel|Wijn",
 "craft-tailor": "4Kleermaker|kledingreparatie",
 "area:highway-footway|area:highway-pedestrian|area:highway-steps|place-square": "Plein",
 "place-sea": "Zee",
 "place-ocean": "Oceaan",
-"@category_wifi": "WiFi|Wi-Fi|WLAN|draadloos netwerk",
+"@category_wifi": "WiFi|Wi-Fi",
 "internet_access|internet_access-wlan|@category_wifi": "3Internet",
 "natural-beach|natural-beach-sand|natural-beach-gravel|leisure-beach_resort": "Strand",
-"man_made-lighthouse": "5Vuurtoren",
-"man_made-flagpole": "4Vlaggenmast",
+"man_made-lighthouse": "Vuurtoren",
+"man_made-flagpole": "Vlaggenmast",
 "man_made-mast": "Mast",
 "man_made-communications_tower|man_made-tower-communication": "Communicatietoren|Telefoniemast|mast",
-"man_made-petroleum_well": "4Oliebron|Olieput|Boorput|Boring",
+"man_made-petroleum_well": "4Oliebron",
 "organic-only|organic-yes": "4Organisch|bio|biologisch|eco|ecologisch|gezond",
 "shop-copyshop": "4Kopieerwinkel|Kopieerwinkel|4afdrukken|4kopiëren",
-"shop-photo|@shop": "4Foto|lijsten",
-"shop-camera|@shop": "3Camera|camera's|4fotografie",
+"shop-photo|@shop": "4Fotowinkel|foto|lijsten",
+"shop-camera|@shop": "Camerawinkel",
 "shop-travel_agency": "Reisbureau|reisagentschap|reizen",
 "shop-outdoor|@shop": "4Outdooruitrusting|buitenwinkel|buitensportwinkel|kampeerwinkel|klimmen|kamperen|kampeer|buiten|wandel|klim",
 "shop-dry_cleaning": "Stomerij|chemisch reinigen|droogkuis|wassen|stomen",
-"shop-tyres|@shop": "4Banden|band|bandenverkoop",
+"shop-tyres|@shop": "Bandenwinkel|Banden",
 "amenity-car_wash": "3Car wash|autowasstraat|wasstraat",
-"amenity-veterinary": "4Dierenarts|3Veterinair|3veearts",
+"amenity-veterinary": "Dierenarts",
 "@charging_station": "Oplaadstation|opladen",
 "amenity-charging_station-bicycle|@charging_station": "Fiets opladen",
 "amenity-childcare": "Crèche|kinderopvang|kinderzorg",
 "amenity-bicycle_parking": "Fietsenstalling",
-"amenity-waste_basket": "7Vuilnisbak|5afvalbak|4prullenmand|mand",
+"amenity-waste_basket": "Vuilnisbak",
 "emergency-phone": "Praatpaal|4noodtelefoon",
-"leisure-fitness_centre": "3Fitnesscentrum|5sportschool|gym|fitness|5workout|fitness club|5health club|fitness studio|workout studio|sport|sporten",
+"leisure-fitness_centre": "3Fitnesscentrum|sportschool|gym|fitness|workout",
 "leisure-sauna": "3Sauna",
 "shop-car_repair-tyres|shop-car_repair": "Bandenreparatie",
 "shop-chemist|@shop": "4Drogisterij",
 "shop-pet|@shop": "Dierenwinkel",
 "tourism-zoo|@category_tourism|@category_children": "Dierentuin|zoo",
 "attraction-animal": "Dierenverblijf",
-"tourism-information-office|amenity-ranger_station|@category_tourism": "4Toeristische informatie|vvv|5Boswachterskantoor",
-"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "5Bezoekerscentrum|5Boswachterij",
-"amenity-community_centre": "4Wijkcentrum|6gemeenschapscentrum",
-"amenity-compressed_air": "4Perslucht|lucht",
+"tourism-information-office|amenity-ranger_station|@category_tourism": "VVV|Toeristische informatie",
+"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "3Bezoekerscentrum",
+"amenity-community_centre": "Wijkcentrum",
+"amenity-compressed_air": "Samengeperste lucht",
 "amenity-courthouse": "Rechtban|gerechtsgebouw",
-"amenity-vending_machine-cigarettes": "4Sigarettenautomaat",
-"amenity-vending_machine-drinks": "4Drankautomaat|4Frisdrank",
+"amenity-vending_machine-cigarettes": "Sigarettenautomaat",
+"amenity-vending_machine-drinks": "Drankautomaat",
 "amenity-vending_machine-parking_tickets|@category_parking": "4Parkeerautomaat|Betaalautomaat parkeergarage",
-"amenity-vending_machine-public_transport_tickets|@category_transport": "6Kaartjesautomaat voor openbaar vervoer|2OV-kaartjes|7Vervoersbewijzen|Kaartjes|5Betaalautomaat|3Buskaartjes|5Treinkaartjes",
+"amenity-vending_machine-public_transport_tickets|@category_transport": "Kaartjesautomaat voor openbaar vervoer",
 "shop-outpost": "Ophaalpunt",
 "building-garage": "Garage",
-"highway-rest_area|highway-services": "Snelweg rustplaats|5Parkeerplaats|4Servicegebied",
+"highway-rest_area|highway-services": "Snelweg rustplaats|Parkeerplaats|4Servicegebied",
 "man_made-tower|man_made-flare": "Toren",
-"shop-bookmaker|@gambling": "4Wedkantoor",
+"shop-bookmaker|@gambling": "Bookmaker|Boekbinder",
 "shop-seafood|@category_food|@shop": "Visboer|vismarkt|vis|zeedier|zeevrucht|schelpdier",
-"shop-second_hand|@category_shopping|@shop|@category_secondhand": "4Tweedehandswinkel|5Kringloopwinkel4|Vlooienmarkt",
-"shop-charity|@shop|@category_secondhand": "4Liefdadigheid|liefdadigheidswinkel",
-"shop-ticket": "5Kaartverkoop|Kaartjesverkoop|kaartjes",
-"shop-wine|@category_food|@shop": "4Wijn|4Wijnhandel",
+"shop-second_hand|@category_shopping|@shop|@category_secondhand": "Tweedehandswinkel",
+"shop-charity|@shop|@category_secondhand": "Kringloopwinkel",
+"shop-ticket": "Kaartverkoop|Kaartjesverkoop|kaartjes",
+"shop-wine|@category_food|@shop": "Slijterij|Wijn",
 "shop-car_parts|@shop": "Auto-onderdelen",
-"tourism-chalet|@category_hotel": "5Vakantiehuis|4Chalet",
+"tourism-chalet|@category_hotel": "Vakantiehuis",
 "tourism-information-board": "Informatiebord",
-"tourism-information-map": "4Toeristische kaart|toeristenkaart|kaart|4Informatie",
-"aerialway-station": "5Gondelbaanstation|5Kabelbaanstation|gondel|kabelbaan",
-"aeroway-helipad": "4Heliplatform|helikopterplatform",
+"tourism-information-map": "Toeristische kaart|toeristenkaart",
+"aerialway-station": "Gondelstation|Kabelwagenstation",
+"aeroway-helipad": "Heliplatform|helikopterplatform",
 "barrier-border_control": "Grenscontrole",
 "leisure-water_park|@category_tourism|@category_children": "5Waterpretpark",
 "man_made-water_tower": "Watertoren",
-"man_made-windmill": "4Windmolen",
+"man_made-windmill": "Windmolen",
 "natural-cave_entrance": "Grot",
 "natural-volcano|@mountain": "4Vulkaan",
 "office-estate_agent": "Makelaar",
 "waterway-lock_gate": "Waterkering",
-"amenity-public_bookcase": "4Boekenkast|Boekuitwisseling|5Buurtbibliotheek|boeken|boekenkast",
-"sport-climbing": "4Klimhal|klimmen",
+"amenity-public_bookcase": "Boekenkast|Boekuitwisseling",
+"sport-climbing": "Klimhal",
 "sport-yoga": "Yogastudio",
 "tourism-apartment|@category_hotel": "5Appartementen|Appartement",
 "leisure-resort|@category_hotel": "Resort|Complex",
 "amenity-biergarten|@category_eat|@category_nightlife": "5Biergarten|Biertuin",
-"amenity-driving_school": "3Rijschool",
-"amenity-music_school": "4Muziekschool",
-"amenity-language_school": "4Taalschool",
-"amenity-ice_cream": "4IJskraam|IJswinkel|IJs",
-"amenity-internet_cafe": "5Internetcafé|5Cybercafé",
+"amenity-driving_school": "Autorijschool",
+"amenity-music_school": "Muziekschool",
+"amenity-language_school": "Taalschool",
+"amenity-ice_cream": "4Ijskraam|IJswinkel",
+"amenity-internet_cafe": "3Internetcafé",
 "amenity-motorcycle_parking": "4Motorfiets Parkeerplaats|Parking Motorfietsen",
-"amenity-parking_space-disabled|@category_parking": "6Mindervalidenparkeerplaats|parkeerplaats voor mindervaliden",
+"amenity-parking_space-disabled|@category_parking": "Invalide parkeerplaats",
 "amenity-nursing_home": "Bejaardentehuis|Pleeghuis",
-"amenity-payment_terminal": "5Betaalautomaat",
-"amenity-public_bath": "6Openbaar bad|Bad",
+"amenity-payment_terminal": "Betaalautomaat",
+"amenity-public_bath": "Publiek bad",
 "amenity-shower": "Douche",
-"emergency-assembly_point": "5Noodverzamelplaats",
+"emergency-assembly_point": "Verzamelpunt voor noodgevallen",
 "emergency-defibrillator": "4Defibrillator|AED",
 "emergency-fire_hydrant": "4Brandkraan",
 "emergency-lifeguard": "Noodstrandwacht|Strandwacht",
-"emergency-mountain_rescue": "4Nood-bergredding|4Bergredding|Redding|SAR",
-"leisure-fitness_station": "3Fitnesscentrum|straatworkout|fitness|4workout|3Fitnessstation|Fitnessbank|buitenfitness|5Calisthenicspark|4trimparcours",
+"emergency-mountain_rescue": "4Nood-bergredding",
+"leisure-fitness_station": "3Fitness-Station",
 "office-insurance": "Verzekeringskantoor",
 "office-ngo": "3NGO-kantoor",
 "shop-erotic|@shop": "4Erotiekwinkel",
@@ -394,42 +394,42 @@
 "shop-pawnbroker": "Pandjesbaas",
 "shop-stationery|@shop": "Kantoorboekhandel",
 "shop-tattoo": "4Tatoeagezaak|Tattoosalon|Tattoo Studio|Tattoo Shop|tatoeage",
-"shop-variety_store|@category_shopping|@shop": "4Bazaar",
-"shop-video|@shop": "4Video|3DVD|4videoshop|videoverhuur",
-"shop-video_games|@shop": "4Videospellen|4videogames|videospellen|3gaming|games",
+"shop-variety_store|@category_shopping|@shop": "Bazaar|Variety Store",
+"shop-video|@shop": "4Videowinkel",
+"shop-video_games|@shop": "Winkel voor videogames",
 "tourism-wilderness_hut|@category_hotel": "Wildernishut",
 "tourism-gallery|@category_tourism": "3Galerij|museum",
-"tourism-theme_park|@category_tourism|@category_children": "5Attractiepark|4Pretpart",
-"boundary-national_park|@category_tourism": "5Nationaal park",
-"leisure-nature_reserve|@category_tourism": "4Natuurgebied|5reservaat",
+"tourism-theme_park|@category_tourism|@category_children": "Pretpark|Attractiepark",
+"boundary-national_park|@category_tourism": "Nationaal park",
+"leisure-nature_reserve|@category_tourism": "Natuurgebied|reservaat",
 "natural-cape": "Kaap",
 "natural-geyser": "3Geiser",
 "natural-glacier|@category_tourism": "Gletsjer",
 "highway-ford": "Voorde",
 "piste:type-downhill|piste:type-nordic": "Skiën|Skipiste",
 "amenity-events_venue": "Evenementenlocatie",
-"shop-chocolate|@category_food|@shop": "5Chocolaterie",
-"shop-coffee|@category_food|@shop": "4Koffieverkoop|koffie",
+"shop-chocolate|@category_food|@shop": "Chocolaterie",
+"shop-coffee|@category_food|@shop": "Koffiewinkel",
 "shop-fabric|@shop": "Stoffenwinkel",
-"shop-music|@shop": "Platen|LP|4vinyl|Muziek|Platenzaak",
-"shop-musical_instrument|@shop": "7Muziekinstrumenten|6instrumenten|gitaar|gitaren",
+"shop-music|@shop": "Muziekwinkel",
+"shop-musical_instrument|@shop": "Muziekinstrumentenwinkel",
 "shop-tea|@shop": "Theewinkel",
-"shop-antiques|@category_shopping|@shop|@category_secondhand": "5Antiek",
+"shop-antiques|@category_shopping|@shop|@category_secondhand": "Antiekhandel",
 "shop-art|@category_shopping|@shop": "Kunstwinkel",
-"shop-baby_goods|@category_children|@shop": "4Babyspullen",
+"shop-baby_goods|@category_children|@shop": "Babyspullenwinkel",
 "shop-bag|@category_shopping|@shop": "Tassenwinkel",
 "shop-cheese|@category_food|@shop": "Kaaswinkel",
 "shop-dairy|@category_food|@shop": "Zuivelproducten",
 "shop-electrical|@shop": "Witgoed winkel",
 "shop-fishing|@shop": "Viswinkel",
-"shop-interior_decoration|@shop": "6Interieurdecoratie|interieurontwerp",
+"shop-interior_decoration|@shop": "Interieurdecoraties",
 "shop-lottery|@gambling": "Loten",
-"shop-medical_supply|@shop": "7Medische benodigdheden",
-"shop-nutrition_supplements|@shop": "9Voedingssupplementen",
+"shop-medical_supply|@shop": "Medische benodigdheden",
+"shop-nutrition_supplements|@shop": "Voedingssupplementen",
 "shop-paint|@shop": "Verfwinkel",
-"shop-perfumery|@category_shopping|@shop": "5Parfumerie|parfum",
-"shop-sewing|@shop": "4Naaibenodigdheden",
-"shop-storage_rental": "5Opslagverhuur|opslagruimte|4Verhuur van opslagruimte",
+"shop-perfumery|@category_shopping|@shop": "Parfumerie",
+"shop-sewing|@shop": "Naaibenodigdheden",
+"shop-storage_rental": "Opslag verhuur",
 "shop-tobacco|@shop": "Tabakszaak",
 "shop-trade|@shop": "Handelsbenodigdheden",
 "shop-watches|@category_shopping|@shop": "Horlogezaak",
@@ -439,28 +439,28 @@
 "shop-auction|@category_secondhand": "Veiling",
 "shop-collector|@category_shopping|@category_secondhand": "Verzamelaar|Verzamelobjecten",
 "man_made-cairn": "Steengroeve",
-"wheelchair-yes": "4Rolstoel|toegankelijk|5Toegankelijk voor gehandicapten",
-"amenity-social_facility": "5Sociale voorziening|sociaal|6groepshuis|6ondersteund wonen|6ontwenningshuis|sociale werkplaats|huis voor daklozen",
+"wheelchair-yes": "Rolstoel|Uitgerust voor gehandicapten",
+"amenity-social_facility": "Sociale voorziening",
 "leisure-sports_hall": "Sporthal",
 "amenity-arts_centre|@category_tourism": "Kunstcentrum",
-"amenity-prison": "5gevangenis|5penitentiaire inrichting|5detentiecentrum",
-"amenity-exhibition_centre": "5Expositiecentrum",
-"shop-bathroom_furnishing|@shop": "8Badkamerinrichting",
-"shop-bed|@shop": "3Beddenwinkel",
-"shop-boutique|@shop": "4Boetiek",
-"shop-curtain|@shop": "5Gordijnenzaak",
-"shop-gas|@shop": "3Gaswinkel|4propaan|3butaan|kookgas|LNG|CNG|gasflessen",
-"shop-pet_grooming": "5Huisdierverzorging|trimmer|4hondentrimmer",
-"shop-hifi|@shop": "4HiFi-audio",
-"amenity-conference_centre": "5Conferentiecentrum",
-"shop-herbalist|@shop": "4Kruidkundige|Kruidenwinkel|kruiden",
-"shop-appliance|@shop": "4Winkel voor huishoudelijke apparaten|4apparaten|Keukenapparaten|Keukengalerij",
-"shop-agrarian|@shop": "3Agrarische artikelen|4Voerwinkel|Voer en zaden|4Boerderijbenodigdheden",
-"shop-fashion_accessories|@shop": "4Modeaccessoires",
+"amenity-prison": "gevangenis",
+"amenity-exhibition_centre": "Expositiecentrum",
+"shop-bathroom_furnishing|@shop": "Badkamerinrichting",
+"shop-bed|@shop": "Bedden winkel",
+"shop-boutique|@shop": "Boetiek",
+"shop-curtain|@shop": "Gordijnen",
+"shop-gas|@shop": "Gas winkel",
+"shop-pet_grooming": "Huisdierverzorging",
+"shop-hifi|@shop": "HiFi-audio",
+"amenity-conference_centre": "Conferentiecentrum",
+"shop-herbalist|@shop": "Kruiden winkel",
+"shop-appliance|@shop": "Apparaten winkel",
+"shop-agrarian|@shop": "Agrarische winkel",
+"shop-fashion_accessories|@shop": "Mode accessoires",
 "amenity-waste_transfer_station": "Overslagstation voor afval",
-"shop-carpet|@shop": "4Tapijten",
+"shop-carpet|@shop": "Tapijten",
 "shop-pasta|@shop": "Pasta",
-"amenity-luggage_locker": "5Bagagekluis|Bagage|Kluis|4Kluisjes|opslag|5Muntenkluisjes",
+"amenity-luggage_locker": "Bagagekluis",
 "recycling-green_waste|@category_recycling": "4GTE-recycling|5Organischafvalrecycling|5Groenafvalrecycling|Groenafval|Tuinafval",
 "leisure-dance|@category_entertainment": "4Dansen|Dansschool",
 "leisure-firepit": "5Vuurplaats",
@@ -470,61 +470,21 @@
 "recycling-shoes|@category_recycling": "4Recycling van schoenen|Schoenenrecycling|Schoendonatie|schoenen",
 "highway-elevator": "Lift|Elevator",
 "natural-saddle|mountain_pass": "4Doorgang|Pas",
-"amenity-animal_shelter": "6Dierenopvang|dierenasiel",
-"amenity-vending_machine-condoms": "4Condoomautomaat|Condooms",
-"amenity-vending_machine-food|@category_food": "5Snoepautomaat|Snoep|5Snacks",
+"amenity-animal_shelter": "Dierenopvang|dierenasiel",
+"amenity-vending_machine-condoms": "4Condoomsmachine|Condooms",
+"amenity-vending_machine-food|@category_food": "4Snoepmachine|Snoep|Snacks",
 "amenity-vending_machine-newspapers": "4Krantenmachine|Kranten",
 "amenity-vending_machine-sweets": "4Snoepmachine|Snoep",
 "amenity-vending_machine-excrement_bags": "5Uitwerpselenzakjes|4Poepzakjes|3Hondenpoepzakjes|Dierenafval",
 "amenity-vending_machine-fuel|@category_fuel": "Brandstofpomp",
 "man_made-chimney": "Schoorsteen",
-"man_made-crane": "Kraan",
+"man_made-crane": "Hijskraan",
 "leisure-marina": "5Jachthaven",
 "amenity-vending_machine-coffee": "4Koffieautomaat|Koffie",
-"attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "4Attractie|4Doolhof|4Amusement",
-"shop-money_lender": "5Geldlener|Geldschieter",
+"attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "Attractie|Doolhof",
+"shop-money_lender": "Pandjeswinkel",
 "shop-lighting|@shop": "4Verlichting|Verlichtingsarmaturen|4Lampen",
-"amenity-food_court": "Foodcourt",
+"amenity-food_court": "Voedselplein",
 "office-security": "4Beveiligingskantoor",
-"building-guardhouse": "4Wachtpost",
-"amenity-studio": "5Mediastudio|studio",
-"shop-grocery|@category_food|@shop": "5Kruidenier|4winkel",
-"shop-health_food|@category_food|@shop": "6Gezondheidsvoeding|6Gezonde voeding|6healthfood|3organisch|3ecologisch|3vegan|veganistisch|vegetarisch",
-"shop-beauty-nails": "5Nagelsalon|nagelverzorging|vingernagels|teennagels|nagels",
-"amenity-mobile_money_agent": "6Mobiel geldkantoor|mobiel geld",
-"shop-caravan|@category_rv|@shop": "6Camperdealer|campers|5Caravandealer|caravans",
-"amenity-boat_rental": "4Bootverhuur|boot|3verhuur",
-"healthcare-sample_collection": "4Monsterinzamelpunt|monsters|inzamelpunt",
-"recycling-cartons|@category_recycling": "4Kartonrecycling|karton",
-"amenity-sanitary_dump_station|@category_rv": "4Camper-dumpstation|5Afvalwater-dumpsation|4dumpstation|afvalwaterstation|5toiletafvoer|Camperafval",
-"natural-peak|@mountain": "Piek|top",
-"leisure-sports_centre-sport-swimming": "4Zwemcentrum",
-"sport-9pin": "4Bowlen|Bowling",
-"sport-10pin": "4Bowling|bowlen",
-"amenity-police|@category_police": "5Politiebureau|Politie",
-"man_made-survey_point": "4Meetpunt|meetmarkering|3referentiepunt|4geodetisch merkteken|geodetisch punt|4triangulatiepunt|meetpunt|meetpilaar|4meetstation|metingsbaken|4driehoeksmeetkunde",
-"man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "6Telescoop",
-"man_made-observatory": "4Observatorium",
-"amenity-parcel_locker|@category_post": "4Pakketautomaat|4Pakketpunt",
-"leisure-fitness_centre-sport-yoga": "4Yogastudio",
-"amenity-sailing_school": "4Zeilschool|4Vaarschool",
-"amenity-flight_school": "5Vliegschool",
-"amenity-prep_school": "6Bijlesinstituut|bijles|4examentraining",
-"amenity-car_pooling|@category_parking": "5Carpooling",
-"amenity-payment_centre": "5Betaalkantoor",
-"emergency-access_point": "4Evacuatiepunt|5Verzamelpunt",
-"emergency-life_ring": "5Reddingsboei|5drijflichaam",
-"amenity-hydrant": "Watertappunt|waterkraan",
-"shop-beauty-day_spa": "4Dagspa|spa|4wellness",
-"leisure-indoor_play": "Binnenspeeltuin|5speelparadijs",
-"shop-telecommunication|@shop": "6Telecommunicatiezaak|Telecommunicatie|telecom",
-"leisure-bandstand": "3Podium",
-"social_facility-soup_kitchen": "4Gaarkeuken|Voedsel",
-"social_facility-food_bank": "4Voedselbank|voedsel|voeding|doneren|voorraadkast|koelkast",
-"amenity-food_sharing": "4Voedsel delen|Voedsel|doneren",
-"amenity-give_box": "4Giftenkist|doneren",
-"shop-craft|@shop": "3Ambacht",
-"shop-farm|@category_food|@shop": "Boerderijvoedsel",
-"man_made-cross": "Kruis",
-"leisure-hackerspace": "Hackerspace"
+"building-guardhouse": "4Wacht"
 }

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

@@ -199,7 +199,7 @@
 "place-state": "Штат|провинция",
 "place-region": "Район",
 "place-island|place-islet": "Остров",
-"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|квартал|Жилая зона|Жилой комплекс|ЖК",
+"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|микрорайон|квартал|Жилая зона|Жилой комплекс|ж.к.|ЖК",
 "place-hamlet": "Посёлок|деревня",
 "place-village": "Деревня|поселок",
 "place-locality": "Местность|регион",

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

@@ -196,7 +196,7 @@
 "place-state": "Штат|провінція|регіон",
 "place-region": "Район|область",
 "place-island|place-islet": "Острів",
-"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|мікрорайон|квартал|округа|Сусідство|Житловий комплекс|ЖК",
+"place-suburb|place-quarter|place-neighbourhood|landuse-residential": "Район|мікрорайон|квартал|округа|Сусідство|Житловий комплекс|ж.к.|ЖК",
 "place-hamlet": "Поселення|селище|село",
 "place-village": "Село|хутір|поселення",
 "place-locality": "Місцевість|регіон|Місце",

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

@@ -1 +0,0 @@
-{}

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

@@ -1244,8 +1244,8 @@
 "Mexico_Chihuahua":"Chihuahua",
 "Mexico_Sonora":"Sonora",
 "Nepal_Kathmandu":"Kathmandu",
-"Nepal_Madhyamanchal":"Madhyamanchal",
-"Nepal_Purwanchal":"Purwanchal",
+"Nepal_Madhyamanchal":"Daerah Pusat",
+"Nepal_Purwanchal":"Daerah Timur",
 "Nigeria_North":"Nigeria — Utara",
 "Nigeria_South":"Nigeria — Selatan",
 "Norway_Hordaland":"Hordaland",
@@ -1350,7 +1350,7 @@
 "Andorra Description":"Andorra la Vella, La Massana, Ordino",
 "Angola Description":"Luanda, Lobito, Namibe",
 "Anguilla Description":"The Valley, George Hill, Stoney Ground",
-"Antarctica Description":"McMurdo Station, Chilean research station “Villa Las Estrellas”, Rocky Cove",
+"Antarctica Description":"McMurdo Station, Chilean research station „Villa Las Estrellas”, Rocky Cove",
 "Antigua and Barbuda Description":"St. John's, Antigua dan Barbuda",
 "Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires, José C. Paz, González Catán",
 "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell",

data/mapcss-mapping.csv

@@ -472,7 +472,7 @@ amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_n
 # TODO: its being replaced by landuse-recreation_ground, merge in there.
 leisure|recreation_ground;360;
 deprecated:highway|footway|mountain_hiking:04.2024;[highway=footway][sac_scale=mountain_hiking];x;name;int_name;361;highway|path
-emergency|access_point|address;[emergency=access_point][operator=helpbidea];;name;;362;
+deprecated:highway|service|driveway|bridge:01.2020;[highway=service][service=driveway][bridge?];x;name;int_name;362;highway|service|driveway
 amenity|parking|multi-storey|fee;[amenity=parking][parking=multi-storey][fee];;name;int_name;363;
 sport|9pin;364;
 sport|10pin;365;
@@ -541,7 +541,7 @@ healthcare|psychotherapist;426;
 # TODO: deprecated, migrate to ford=*
 highway|ford;427;
 area:highway|path;428;
-emergency|disaster_help_point;429;
+deprecated:railway|siding:06.2023;429;x
 highway|track|area;[highway=track][area?];;name;int_name;430;
 amenity|sanitary_dump_station;431;
 railway|funicular;432;

data/opening_hours_how_to_edit.html

@@ -2,38 +2,12 @@
 <html>
 
 <head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
   <style>
     /* All langs are invisible by default. */
     [lang] {
       display: none;
     }
-	
-    /* Dark mode support. */
-    :root {
-      color-scheme: light dark;
-      --primary-color: black;
-      --secondary-color: #555555;
-      --link-color: #37653F;
-      --background-color: white;
-      --separator-color: #0e0e0e;
-    }
 
-    @media screen and (prefers-color-scheme: dark) {
-      :root {
-        --primary-color: #b5b5b5;
-        --secondary-color: #959595;
-        --link-color: #659464;
-        --background-color: black;
-        --separator-color: #0a0a0a;
-      }
-    }
-
-    html { 
-        color: var(--secondary-color);
-        background-color: var(--background-color);
-	}
     .example {
     font-weight: bold;
     font-family: monospace;

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

@@ -1 +0,0 @@
-{}

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

@@ -88,7 +88,7 @@
 "in_300_feet":"Za tristo stopa",
 "in_400_feet":"Za četiristo stopa",
 "in_500_feet":"Za petsto stopa",
-"in_600_feet":"Za šesto stopa",
+"in_600_feet":"Za šeststo stopa",
 "in_700_feet":"Za sedamsto stopa",
 "in_800_feet":"Za osamsto stopa",
 "in_900_feet":"Za devetsto stopa",

data/styles/default/dark/symbols/defibrillator-m.svg

@@ -1 +1,11 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m10.910745 4.4239125c.81765 0 1.58628.318405 2.164425.89655 1.19355 1.193475 1.19355 3.135525 0 4.329075l-3.8214 3.8214c-.070095.070095-.1618725.1051425-.2537475.1051425s-.18374625-.0350475-.2537475-.1051425l-3.821475-3.8214c-1.193475-1.193475-1.193475-3.135525 0-4.329075.578175-.57813 1.346925-.89655 2.1645-.89655.703125 0 1.3700325.235425 1.9107.6690825.4806-.38547333 1.0609511-.61431852 1.677796-.66041407zm0 .71778c-.62595 0-1.2143475.2437425-1.656975.68637-.0672975.0672915-.1586025.1051425-.2537475.1051425s-.186456-.037851-.2537475-.1051425c-.442575-.44253-1.03098-.68637-1.656975-.68637-.62595 0-1.2143475.2437425-1.656975.68637-.91365.91365-.91365 2.400225 0 3.313875l3.567675 3.567675 3.56772-3.567675c.91365-.91365.91365-2.4003 0-3.313875-.44265-.44253-1.03107-.68637-1.656975-.68637zm-.7272766 1.3583075c.1142317 0 .2203497.05883637.2809163.15564151.0605665.09680515.0669508.21802274.0169966.32069214l-.53974647 1.10846113.65050647.00000256c.123897 0 .2374364.06919401.2942926.17919544.0569414.11009145.0476223.2426983-.0240711.34372681l-1.95175011 2.75259771c-.06367593.089901-.16556297.1396827-.27039251.1396827-.0440892 0-.08869489-.0088005-.13122906-.0270912-.14364853-.0621181-.22431764-.2161257-.19343027-.3695239l.31421861-1.56077701-.79613957.00552174c-.10870992 0-.20861612-.05107506-.27090804-.13734948-.0628098-.08696677-.07963334-.19886526-.04512288-.30041304l.80901738-2.38544158c.04564007-.13451083.17178032-.22492553.31378935-.22492553z" fill="#983E44" opacity=".6"/></svg>
+<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
+ <title>defibrillator-m</title>
+ <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
+  <g id="defibrillator-m" fill-rule="nonzero">
+   <g id="defibrillator" transform="translate(5 5)" fill="#983E44">
+    <path id="Shape" d="m9.5476 0.89855c-0.93747 0-1.8267 0.3139-2.5476 0.89211-0.72089-0.57821-1.6101-0.89211-2.5476-0.89211-1.0901 0-2.1151 0.42456-2.886 1.1954-1.5913 1.5914-1.5913 4.1808 0 5.7721l5.0953 5.0952c0.093335 0.09346 0.21583 0.14019 0.33833 0.14019s0.24487-0.04673 0.33833-0.14019l5.0952-5.0952c1.5914-1.5914 1.5914-4.1808 0-5.7721-0.77086-0.77086-1.7957-1.1954-2.8859-1.1954zm2.2093 6.2907-4.7569 4.7569-4.7569-4.7569c-1.2182-1.2182-1.2182-3.2003 0-4.4185 0.59017-0.59017 1.3747-0.91516 2.2093-0.91516 0.83466 0 1.6192 0.32512 2.2093 0.91516 0.089722 0.089722 0.21147 0.14019 0.33833 0.14019s0.2486-0.050468 0.33833-0.14019c0.59017-0.59017 1.3747-0.91516 2.2093-0.91516 0.83454 0 1.6191 0.32512 2.2093 0.91516 1.2182 1.2181 1.2182 3.2003 0 4.4185z"/>
+    <path id="Shape" d="m9.3128 5.6781h-0.93959l0.77958-1.601c0.072151-0.14829 0.06293-0.32337-0.024549-0.46319-0.087479-0.13982-0.24075-0.2248-0.40574-0.2248h-2.2287c-0.20511 0-0.3873 0.13059-0.45322 0.32487l-1.1685 3.4454c-0.049845 0.14667-0.025546 0.30829 0.065173 0.4339 0.089971 0.12461 0.23427 0.19838 0.38792 0.19838h0.0033646l1.1499-0.0079753-0.45384 2.2543c-0.044612 0.22156 0.071902 0.444 0.27938 0.53372 0.061434 0.026418 0.12586 0.039129 0.18954 0.039129 0.15141 0 0.29857-0.071902 0.39054-0.20175l2.819-3.9757c0.10355-0.14592 0.11701-0.33745 0.034767-0.49646-0.08212-0.15888-0.24611-0.25882-0.42506-0.25882zm-1.9048 2.3377 0.12486-0.6202c0.028412-0.14119-0.0083491-0.28773-0.09994-0.39889-0.090968-0.11028-0.22642-0.17409-0.36923-0.17409h-0.00324l-1.0661 0.0073522 0.84239-2.4838h1.1206l-0.77958 1.601c-0.072151 0.14829-0.06293 0.32337 0.024549 0.46319 0.087479 0.13982 0.24075 0.2248 0.40574 0.2248h0.77883l-0.97896 1.3806z"/>
+   </g>
+  </g>
+ </g>
+</svg>

data/styles/default/include/Icons.mapcss

@@ -1101,8 +1101,7 @@ node|z17-[amenity=fire_station],
 node|z18-[amenity=internet_cafe],
 node|z18-[emergency=defibrillator],
 node|z18-[emergency=access_point],
-node|z19-[emergency=assembly_point],
-node|z18-[emergency=disaster_help_point],
+node|z18-[emergency=assembly_point],
 node|z19-[emergency=life_ring],
 node|z18-[emergency=lifeguard],
 node|z18-[amenity=toilets],
@@ -1710,17 +1709,10 @@ node|z18-[emergency=defibrillator],
 
 node|z18-[emergency=access_point],
 {icon-image: access_point-m.svg;font-size: 11;}
-node|z18-20[emergency=access_point][operator=helpbidea],
-{icon-image: none;}
-node|z18-19[emergency=access_point][operator=helpbidea],
-{text: none;}
 
-node|z19-[emergency=assembly_point],
+node|z18-[emergency=assembly_point],
 {icon-image: assembly_point-m.svg;font-size: 11;}
 
-node|z18-[emergency=disaster_help_point],
-{icon-image: disaster_help_point-m.svg;font-size: 11;}
-
 node|z19-[emergency=life_ring],
 {icon-image: lifebuoy-m.svg; font-size: 11;}
 

data/styles/default/include/Subways.mapcss

@@ -44,14 +44,6 @@ node|z14-[railway=station][station=light_rail]::int_name,
 node|z14-[railway=station][station=monorail]::int_name,
 {text: int_name;text-offset: 1;font-size: 9;text-color: @label_dark;text-halo-radius: 1;text-halo-color: @label_halo_light;text-halo-opacity: 0.8;}
 
-node[railway=station][station=light_rail][!city],
-node[railway=station][station=light_rail][!city]::int_name,
-node[railway=station][station=monorail],
-node[railway=station][station=monorail]::int_name,
-node[railway=station][transport=subway][!city],
-node[railway=station][transport=subway][!city]::int_name,
-{text-color: @public_transport_label;}
-
 node|z15-[railway=station][transport=subway],
 node|z15-[railway=station][station=light_rail],
 node|z15-[railway=station][station=monorail],

data/styles/default/include/priorities_4_overlays.prio.txt

@@ -2443,16 +2443,12 @@ amenity-bench-backless                              # icon z18- (also has captio
 amenity-lounger                                     # icon z18- (also has caption(optional) z19-)
 amenity-waste_disposal                              # icon z18- (also has caption(optional) z18-)
 emergency-access_point                              # icon z18- (also has caption(optional) z18-)
-emergency-assembly_point                            # icon z19- (also has caption(optional) z19-)
+emergency-assembly_point                            # icon z18- (also has caption(optional) z18-)
 emergency-defibrillator                             # icon z18- (also has caption(optional) z18-)
-emergency-disaster_help_point                       # icon z18- (also has caption(optional) z18-)
 emergency-phone                                     # icon z17- (also has caption(optional) z19-)
 man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980
 
-emergency-access_point-address                      # caption z20-
-=== -9981
-
 amenity-hydrant                                     # icon z19- (also has caption(optional) z19-)
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
 emergency-fire_hydrant                              # icon z19- (also has caption(optional) z19-)
@@ -2485,9 +2481,8 @@ amenity-loading_dock                                # icon z19- (also has captio
 # amenity-waste_basket                              # caption(optional) z19- (also has icon z18-)
 # amenity-waste_disposal                            # caption(optional) z18- (also has icon z18-)
 # emergency-access_point                            # caption(optional) z18- (also has icon z18-)
-# emergency-assembly_point                          # caption(optional) z19- (also has icon z19-)
+# emergency-assembly_point                          # caption(optional) z18- (also has icon z18-)
 # emergency-defibrillator                           # caption(optional) z18- (also has icon z18-)
-# emergency-disaster_help_point                     # caption(optional) z18- (also has icon z18-)
 # emergency-fire_hydrant                            # caption(optional) z19- (also has icon z19-)
 # emergency-life_ring                               # caption(optional) z19- (also has icon z19-)
 # emergency-phone                                   # caption(optional) z19- (also has icon z17-)

data/styles/default/light/symbols/defibrillator-m.svg

@@ -1 +1,11 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m10.910745 4.4239125c.81765 0 1.58628.318405 2.164425.89655 1.19355 1.193475 1.19355 3.135525 0 4.329075l-3.8214 3.8214c-.070095.070095-.1618725.1051425-.2537475.1051425s-.18374625-.0350475-.2537475-.1051425l-3.821475-3.8214c-1.193475-1.193475-1.193475-3.135525 0-4.329075.578175-.57813 1.346925-.89655 2.1645-.89655.703125 0 1.3700325.235425 1.9107.6690825.4806-.38547333 1.0609511-.61431852 1.677796-.66041407zm0 .71778c-.62595 0-1.2143475.2437425-1.656975.68637-.0672975.0672915-.1586025.1051425-.2537475.1051425s-.186456-.037851-.2537475-.1051425c-.442575-.44253-1.03098-.68637-1.656975-.68637-.62595 0-1.2143475.2437425-1.656975.68637-.91365.91365-.91365 2.400225 0 3.313875l3.567675 3.567675 3.56772-3.567675c.91365-.91365.91365-2.4003 0-3.313875-.44265-.44253-1.03107-.68637-1.656975-.68637zm-.7272766 1.3583075c.1142317 0 .2203497.05883637.2809163.15564151.0605665.09680515.0669508.21802274.0169966.32069214l-.53974647 1.10846113.65050647.00000256c.123897 0 .2374364.06919401.2942926.17919544.0569414.11009145.0476223.2426983-.0240711.34372681l-1.95175011 2.75259771c-.06367593.089901-.16556297.1396827-.27039251.1396827-.0440892 0-.08869489-.0088005-.13122906-.0270912-.14364853-.0621181-.22431764-.2161257-.19343027-.3695239l.31421861-1.56077701-.79613957.00552174c-.10870992 0-.20861612-.05107506-.27090804-.13734948-.0628098-.08696677-.07963334-.19886526-.04512288-.30041304l.80901738-2.38544158c.04564007-.13451083.17178032-.22492553.31378935-.22492553z" fill="#d85961"/></svg>
+<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
+ <title>defibrillator-m</title>
+ <g fill="none" fill-rule="evenodd">
+  <g id="defibrillator-m" fill-rule="nonzero">
+   <g id="defibrillator" transform="translate(5 5)" fill="#D85961">
+    <path id="Shape" d="m9.5476 0.89855c-0.93747 0-1.8267 0.3139-2.5476 0.89211-0.72089-0.57821-1.6101-0.89211-2.5476-0.89211-1.0901 0-2.1151 0.42456-2.886 1.1954-1.5913 1.5914-1.5913 4.1808 0 5.7721l5.0953 5.0952c0.093335 0.09346 0.21583 0.14019 0.33833 0.14019s0.24487-0.04673 0.33833-0.14019l5.0952-5.0952c1.5914-1.5914 1.5914-4.1808 0-5.7721-0.77086-0.77086-1.7957-1.1954-2.8859-1.1954zm2.2093 6.2907-4.7569 4.7569-4.7569-4.7569c-1.2182-1.2182-1.2182-3.2003 0-4.4185 0.59017-0.59017 1.3747-0.91516 2.2093-0.91516 0.83466 0 1.6192 0.32512 2.2093 0.91516 0.089722 0.089722 0.21147 0.14019 0.33833 0.14019s0.2486-0.050468 0.33833-0.14019c0.59017-0.59017 1.3747-0.91516 2.2093-0.91516 0.83454 0 1.6191 0.32512 2.2093 0.91516 1.2182 1.2181 1.2182 3.2003 0 4.4185z"/>
+    <path id="Shape" d="m9.3128 5.6781h-0.93959l0.77958-1.601c0.072151-0.14829 0.06293-0.32337-0.024549-0.46319-0.087479-0.13982-0.24075-0.2248-0.40574-0.2248h-2.2287c-0.20511 0-0.3873 0.13059-0.45322 0.32487l-1.1685 3.4454c-0.049845 0.14667-0.025546 0.30829 0.065173 0.4339 0.089971 0.12461 0.23427 0.19838 0.38792 0.19838h0.0033646l1.1499-0.0079753-0.45384 2.2543c-0.044612 0.22156 0.071902 0.444 0.27938 0.53372 0.061434 0.026418 0.12586 0.039129 0.18954 0.039129 0.15141 0 0.29857-0.071902 0.39054-0.20175l2.819-3.9757c0.10355-0.14592 0.11701-0.33745 0.034767-0.49646-0.08212-0.15888-0.24611-0.25882-0.42506-0.25882zm-1.9048 2.3377 0.12486-0.6202c0.028412-0.14119-0.0083491-0.28773-0.09994-0.39889-0.090968-0.11028-0.22642-0.17409-0.36923-0.17409h-0.00324l-1.0661 0.0073522 0.84239-2.4838h1.1206l-0.77958 1.601c-0.072151 0.14829-0.06293 0.32337 0.024549 0.46319 0.087479 0.13982 0.24075 0.2248 0.40574 0.2248h0.77883l-0.97896 1.3806z"/>
+   </g>
+  </g>
+ </g>
+</svg>

data/styles/outdoors/include/priorities_4_overlays.prio.txt

@@ -2449,16 +2449,12 @@ amenity-bench-backless                              # icon z18- (also has captio
 amenity-lounger                                     # icon z18- (also has caption(optional) z19-)
 amenity-waste_disposal                              # icon z18- (also has caption(optional) z18-)
 emergency-access_point                              # icon z18- (also has caption(optional) z18-)
-emergency-assembly_point                            # icon z19- (also has caption(optional) z19-)
+emergency-assembly_point                            # icon z18- (also has caption(optional) z18-)
 emergency-defibrillator                             # icon z18- (also has caption(optional) z18-)
-emergency-disaster_help_point                       # icon z18- (also has caption(optional) z18-)
 emergency-phone                                     # icon z17- (also has caption(optional) z19-)
 man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980
 
-emergency-access_point-address                      # caption z20-
-=== -9981
-
 amenity-hydrant                                     # icon z19- (also has caption(optional) z19-)
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
 emergency-fire_hydrant                              # icon z19- (also has caption(optional) z19-)
@@ -2491,9 +2487,8 @@ amenity-loading_dock                                # icon z19- (also has captio
 # amenity-waste_basket                              # caption(optional) z19- (also has icon z18-)
 # amenity-waste_disposal                            # caption(optional) z18- (also has icon z18-)
 # emergency-access_point                            # caption(optional) z18- (also has icon z18-)
-# emergency-assembly_point                          # caption(optional) z19- (also has icon z19-)
+# emergency-assembly_point                          # caption(optional) z18- (also has icon z18-)
 # emergency-defibrillator                           # caption(optional) z18- (also has icon z18-)
-# emergency-disaster_help_point                     # caption(optional) z18- (also has icon z18-)
 # emergency-fire_hydrant                            # caption(optional) z19- (also has icon z19-)
 # emergency-life_ring                               # caption(optional) z19- (also has icon z19-)
 # emergency-phone                                   # caption(optional) z19- (also has icon z17-)

data/subtypes.csv

@@ -1,2 +0,0 @@
-Types;Related Subtypes
-amenity|charging_station;amenity|charging_station|motorcar,amenity|charging_station|motorcycle,amenity|charging_station|bicycle,amenity|charging_station|small,amenity|charging_station|carless

docs/INSTALL_DESKTOP.md

@@ -175,11 +175,6 @@ To build a desktop app:
 tools/unix/build_omim.sh -r desktop
 ```
 
-To build the "Designer" version of the desktop app, add the parameter `-t`:
-```bash
-tools/unix/build_omim.sh -r -t desktop
-```
-
 The output binary will go into `../omim-build-release`.
 
 Check `tools/unix/build_omim.sh -h` for more build options, e.g. to build a debug version.
@@ -210,15 +205,6 @@ _Linux:_
 ../omim-build-release/CoMaps
 ```
 
-For running the "Designer" version instead, use the following command and
-optionally add the path to the style file to be loaded. If no path is provided,
-the application will ask for it by opening a file dialog on startup.
-
-
-```bash
-../omim-build-release/CoMaps.Designer optional/path/to/style.mapcss
-```
-
 _macOS:_
 
 ```bash

docs/STYLES.md

@@ -77,10 +77,9 @@ e strings
 
 ## Testing your changes
 
-The most convenient way is using [the desktop app](INSTALL_DESKTOP.md#desktop-app).
-There is a "Designer" version of it also, which facilitates development
-by rebuilding styles and symbols quickly. See the guide referenced above to find
-details on how to build and execute it.
+The most convenient way is using [the desktop app](INSTALL.md#desktop-app).
+(there is a "Designer" version of it also, which facilitates development
+by rebuilding styles and symbols quickly, but it's broken as of now, please help fix it!)
 
 To test on Android or iOS device either re-build the app or put
 the compiled style files (e.g. `drules_proto_default_light.bin`) into

generator/osm2type.cpp

@@ -11,7 +11,6 @@
 #include "indexer/classificator.hpp"
 #include "indexer/feature_impl.hpp"
 #include "indexer/ftypes_matcher.hpp"
-#include "indexer/ftypes_subtypes.hpp"
 
 #include "platform/platform.hpp"
 
@@ -352,11 +351,9 @@ private:
 // - both amenity-charging_station-motorcar and amenity-charging_station-bicycle are left;
 void LeaveLongestTypes(std::vector<generator::TypeStrings> & matchedTypes)
 {
-  // Prevents types, that either have subtypes or are subtypes, from being removed
-  auto subtypes = ftypes::Subtypes::Instance();
-  auto const hasSubtypeRelatedTypes = [subtypes](auto const & lhs, auto const & rhs)
+  auto const isChargingStation = [](auto const & lhs, auto const & rhs)
   {
-    return subtypes.IsPathOfTypeWithSubtypesOrSubtype(lhs) || subtypes.IsPathOfTypeWithSubtypesOrSubtype(rhs);
+    return lhs.size() > 1 && rhs.size() > 1 && lhs.at(1) == "charging_station" && rhs.at(1) == "charging_station" && lhs.at(0) == "amenity" && rhs.at(0) == "amenity";
   };
 
   auto const equalPrefix = [](auto const & lhs, auto const & rhs)
@@ -377,10 +374,9 @@ void LeaveLongestTypes(std::vector<generator::TypeStrings> & matchedTypes)
     return lhs < rhs;
   };
 
-  // `true` means it will be deleted, because being equal means it isn't unique
-  auto const isEqual = [&equalPrefix, &hasSubtypeRelatedTypes](auto const & lhs, auto const & rhs)
+  auto const isEqual = [&equalPrefix, &isChargingStation](auto const & lhs, auto const & rhs)
   {
-    if (hasSubtypeRelatedTypes(lhs, rhs))
+    if (isChargingStation(lhs, rhs))
       return false;
     
     if (equalPrefix(lhs, rhs))

iphone/Maps/LocalizedStrings/bg.lproj/InfoPlist.strings

@@ -3,7 +3,7 @@
 "search" = "Търсене";
 
 /* Used in home screen quick actions. */
-"bookmarks_and_tracks" = "Любими";
+"bookmarks_and_tracks" = "Отметки и пътеки";
 
 /* Used in home screen quick actions. */
 "route" = "Маршрут";

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

@@ -1486,4 +1486,3 @@
 "type.office.security" = "Security Guards Office";
 "type.power.portal" = "Power Portal";
 "type.building.guardhouse" = "Security Booth";
-"type.man_made.telescope" = "Телескоп";

iphone/Maps/LocalizedStrings/ca.lproj/InfoPlist.strings

@@ -3,7 +3,7 @@
 "search" = "Cerca";
 
 /* Used in home screen quick actions. */
-"bookmarks_and_tracks" = "Preferits";
+"bookmarks_and_tracks" = "Marcadors i recorreguts";
 
 /* Used in home screen quick actions. */
 "route" = "Ruta";

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

@@ -1090,7 +1090,7 @@
 "pref_mapappearance_title" = "Map Appearance";
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
-"pref_maplanguage_local" = "Idioma Local";
+"pref_maplanguage_local" = "Local Language";
 "existence_confirmed_time_ago" = "Existence confirmed %@";
 "hours_confirmed_time_ago" = "Confirmed %@";
 "offline_explanation_title" = "Mapes sense Connexió";

iphone/Maps/LocalizedStrings/cs.lproj/InfoPlist.strings

@@ -3,7 +3,7 @@
 "search" = "Hledat";
 
 /* Used in home screen quick actions. */
-"bookmarks_and_tracks" = "Oblíbené";
+"bookmarks_and_tracks" = "Záložky a stopy";
 
 /* Used in home screen quick actions. */
 "route" = "Trasa";

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

@@ -3,7 +3,7 @@
 "search" = "Suche";
 
 /* Used in home screen quick actions. */
-"bookmarks_and_tracks" = "Favoriten";
+"bookmarks_and_tracks" = "Lesezeichen und Tracks";
 
 /* Used in home screen quick actions. */
 "route" = "Route";

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

@@ -688,7 +688,7 @@
 "editor_reset_edits_button" = "Änderungen verwerfen";
 "editor_remove_place_message" = "Hinzugefügtes Objekt löschen?";
 "editor_remove_place_button" = "Löschen";
-"editor_place_doesnt_exist" = "Ort existiert nicht";
+"editor_place_doesnt_exist" = "Dieser Ort existiert nicht";
 "text_more_button" = "…Mehr";
 
 /* Phone number error message */

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

@@ -361,9 +361,7 @@
 "type.cuisine.vietnamese" = "Vietnamesisch";
 "type.emergency" = "Notfall";
 "type.emergency.access_point" = "Rettungspunkt";
-"type.emergency.access_point.address" = "Rettungsadresse";
 "type.emergency.assembly_point" = "Notfall-Sammelpunkt";
-"type.emergency.disaster_help_point" = "Notfall-Treffpunkt";
 "type.emergency.life_ring" = "Rettungsring";
 "type.emergency.defibrillator" = "Defibrillator";
 "type.emergency.fire_hydrant" = "Hydrant";
@@ -469,13 +467,13 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Fußgängertunnel";
 "type.highway.ford" = "Furt";
-"type.highway.living_street" = "Verkehrsberuhigter Bereich";
+"type.highway.living_street" = "Spielstraße";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.living_street.bridge" = "Brücke";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.living_street.tunnel" = "Tunnel";
+"type.highway.living_street.tunnel" = "Spielstraßentunnel";
 "type.highway.motorway" = "Autobahn";
 
 /* These translations are used for all type.highway.*.bridge. */
@@ -540,7 +538,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.residential.tunnel" = "Wohnstraßentunnel";
 "type.highway.rest_area" = "Rastplatz";
-"type.highway.road" = "Landstraße";
+"type.highway.road" = "Straße";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.road.bridge" = "Brücke";
@@ -550,20 +548,20 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.road.tunnel" = "Tunnel";
-"type.highway.secondary" = "Überregionale Verbindungsstraße";
+"type.highway.secondary" = "Straße";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary.bridge" = "Brücke";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.secondary.tunnel" = "Tunnel";
-"type.highway.secondary_link" = "Überregionale Verbindungsstraßenauffahrt";
+"type.highway.secondary.tunnel" = "Straßentunnel";
+"type.highway.secondary_link" = "Straße";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary_link.bridge" = "Brücke";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.secondary_link.tunnel" = "Tunnel";
+"type.highway.secondary_link.tunnel" = "Straßentunnel";
 "type.highway.service" = "Zufahrtsweg";
 "type.highway.service.area" = "Zufahrtsweg";
 
@@ -583,14 +581,14 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.steps.tunnel" = "Tunnel";
-"type.highway.tertiary" = "Verbindungsstraße";
+"type.highway.tertiary" = "Straße";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.tertiary.bridge" = "Brücke";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary.tunnel" = "Straßentunnel";
-"type.highway.tertiary_link" = "Verbindungsstraßenauffahrt";
+"type.highway.tertiary_link" = "Straße";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.tertiary_link.bridge" = "Brücke";
@@ -632,15 +630,15 @@
 "type.highway.unclassified.tunnel" = "Straßentunnel";
 "type.area_highway.cycleway" = "Radweg";
 "type.area_highway.footway" = "Fußweg";
-"type.area_highway.living_street" = "Verkehrsberuhigter Bereich";
+"type.area_highway.living_street" = "Spielstraße";
 "type.area_highway.motorway" = "Autobahn";
 "type.area_highway.path" = "Pfad";
 "type.area_highway.pedestrian" = "Fußgängerzone";
 "type.area_highway.primary" = "Hauptstraße";
 "type.area_highway.residential" = "Wohnstraße";
-"type.area_highway.secondary" = "Landstraße";
+"type.area_highway.secondary" = "Straße";
 "type.area_highway.service" = "Zufahrtsweg";
-"type.area_highway.tertiary" = "Verbindungsstraße";
+"type.area_highway.tertiary" = "Straße";
 "type.area_highway.steps" = "Treppe";
 "type.area_highway.track" = "Forst-/Feldweg";
 "type.area_highway.trunk" = "Schnellstraße";

iphone/Maps/LocalizedStrings/en-CA.lproj/InfoPlist.strings

@@ -1 +0,0 @@
-

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

@@ -1 +0,0 @@
-

iphone/Maps/LocalizedStrings/en-CA.lproj/LocalizableTypes.strings

@@ -1 +0,0 @@
-

iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings

@@ -372,9 +372,7 @@
 "type.cuisine.vietnamese" = "Vietnamese";
 "type.emergency" = "Emergency";
 "type.emergency.access_point" = "Emergency Rescue Point";
-"type.emergency.access_point.address" = "Emergency Rescue Address";
 "type.emergency.assembly_point" = "Emergency Assembly Point";
-"type.emergency.disaster_help_point" = "Emergency Disaster Help Point";
 "type.emergency.life_ring" = "Lifebuoy";
 "type.emergency.defibrillator" = "Defibrillator";
 "type.emergency.fire_hydrant" = "Fire Hydrant";

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

@@ -391,9 +391,7 @@
 "type.cuisine.vietnamese" = "Vietnamese";
 "type.emergency" = "Emergency";
 "type.emergency.access_point" = "Emergency Rescue Point";
-"type.emergency.access_point.address" = "Emergency Rescue Address";
 "type.emergency.assembly_point" = "Emergency Assembly Point";
-"type.emergency.disaster_help_point" = "Emergency Disaster Help Point";
 "type.emergency.life_ring" = "Lifebuoy";
 "type.emergency.defibrillator" = "Defibrillator";
 "type.emergency.fire_hydrant" = "Fire Hydrant";

iphone/Maps/LocalizedStrings/en_CA.lproj/Localizable.stringsdict

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-    </dict>
-</plist>

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

@@ -96,7 +96,7 @@
 "category_transport" = "Transporte";
 
 /* Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! */
-"category_fuel" = "Estación de servicio";
+"category_fuel" = "Estación de Servicio";
 
 /* Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! */
 "category_parking" = "Aparcamiento";
@@ -700,7 +700,7 @@
 "editor_share_to_all_dialog_title" = "¿Quieres enviarlo a todos los usuarios?";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Asegúrate de que no has introducido ningún dato privado o personal.";
+"editor_share_to_all_dialog_message_1" = "Asegúrate de que no has introducido ningún dato privado o personal";
 "editor_share_to_all_dialog_message_2" = "Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta.";
 "navigation_stop_button" = "Detener";
 

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

@@ -17,7 +17,7 @@
 "type.aeroway.runway" = "Pista de despegue";
 "type.aeroway.taxiway" = "Pista de rodaje";
 "type.aeroway.terminal" = "Terminal";
-"type.amenity" = "Establecimiento";
+"type.amenity" = "Instalación";
 "type.amenity.arts_centre" = "Centro de arte";
 "type.amenity.atm" = "Cajero automático";
 "type.amenity.bank" = "Banco";
@@ -34,7 +34,7 @@
 "type.amenity.cafe" = "Café";
 "type.amenity.car_rental" = "Alquiler de coches";
 "type.amenity.motorcycle_rental" = "Alquiler de motocicletas";
-"type.amenity.car_sharing" = "Estación de uso temporal de vehículos";
+"type.amenity.car_sharing" = "Car Sharing";
 "type.amenity.car_wash" = "Lavado de coches";
 "type.amenity.casino" = "Casino";
 "type.amenity.gambling" = "Apuestas";
@@ -165,8 +165,8 @@
 "type.amenity.taxi" = "Parada de taxis";
 "type.amenity.telephone" = "Teléfono";
 "type.amenity.theatre" = "Teatro";
-"type.amenity.toilets" = "Baño";
-"type.toilets.yes" = "Baños";
+"type.amenity.toilets" = "WC";
+"type.toilets.yes" = "WC";
 "type.amenity.townhall" = "Ayuntamiento";
 "type.amenity.university" = "Universidad";
 "type.amenity.vending_machine" = "Máquina expendedora";
@@ -202,9 +202,9 @@
 "type.natural.water.wastewater" = "Aguas residuales";
 "type.barrier.entrance" = "Entrada";
 "type.barrier.fence" = "Valla";
-"type.barrier.gate" = "Portón";
+"type.barrier.gate" = "Verja";
 "type.barrier.hedge" = "Seto";
-"type.barrier.kissing_gate" = "Tranquera";
+"type.barrier.kissing_gate" = "Puerta peatonal";
 "type.barrier.lift_gate" = "Barrera levadiza";
 "type.barrier.retaining_wall" = "Muro de contención";
 "type.barrier.stile" = "Escalón";
@@ -616,8 +616,8 @@
 "type.historic.castle.manor" = "Casa solariega";
 "type.historic.castle.palace" = "Palacio";
 "type.historic.castle.shiro" = "Castillo japonés";
-"type.historic.castle.stately" = "Castillo señorial";
-"type.historic.city_gate" = "Puerta de ciudad";
+"type.historic.castle.stately" = "Castillo";
+"type.historic.city_gate" = "Portón de la ciudad";
 "type.historic.citywalls" = "Muralla";
 "type.historic.fort" = "Fuerte";
 "type.historic.gallows" = "Horca";
@@ -661,7 +661,7 @@
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Cementerio cristiano";
 "type.landuse.religious" = "Terrenos religiosos";
-"type.landuse.commercial" = "Área de servicios comerciales";
+"type.landuse.commercial" = "Zona comercial";
 "type.landuse.construction" = "Construcción";
 "type.landuse.education" = "Instalaciones educativas";
 "type.landuse.farmland" = "Tierras agrícolas";
@@ -686,15 +686,15 @@
 "type.landuse.recreation_ground" = "Área recreativa";
 "type.landuse.reservoir" = "Embalse";
 "type.landuse.residential" = "Zona residencial";
-"type.landuse.retail" = "Área de tiendas comerciales";
+"type.landuse.retail" = "Zona comercial";
 "type.landuse.salt_pond" = "Salina";
-"type.landuse.village_green" = "Espacio verde común";
+"type.landuse.village_green" = "Espacio verde";
 "type.landuse.vineyard" = "Viñedo";
 "type.leisure" = "Ocio";
-"type.leisure.common" = "Terreno comunal";
+"type.leisure.common" = "Zona pública";
 "type.leisure.dog_park" = "Parque canino";
 "type.leisure.fitness_centre" = "Centro de fitnes";
-"type.leisure.fitness_station" = "Parque de gimnasia";
+"type.leisure.fitness_station" = "Parque de fitnes";
 "type.leisure.dance" = "Salón de baile";
 "type.leisure.garden" = "Jardín";
 "type.leisure.garden.residential" = "Jardín residencial";
@@ -702,7 +702,7 @@
 "type.leisure.miniature_golf" = "Minigolf";
 "type.leisure.hackerspace" = "Espacio para hackers";
 "type.leisure.ice_rink" = "Pisa de patinaje";
-"type.leisure.marina" = "Marina";
+"type.leisure.marina" = "Puerto o amarradero";
 "type.leisure.nature_reserve" = "Reserva natural";
 "type.leisure.outdoor_seating" = "Asientos al aire libre";
 "type.leisure.park" = "Parque";
@@ -711,7 +711,7 @@
 "type.leisure.park.private" = "Parque privado";
 "type.leisure.picnic_table" = "Mesa de picnic";
 "type.leisure.pitch" = "Cancha";
-"type.leisure.playground" = "Parque infantil";
+"type.leisure.playground" = "Patio de recreo";
 "type.leisure.recreation_ground" = "Zona recreativa";
 "type.leisure.sauna" = "Sauna";
 "type.leisure.slipway" = "Rampa de barcos";
@@ -736,7 +736,7 @@
 "type.man_made.mast" = "Mástil";
 "type.man_made.pier" = "Muelle";
 "type.man_made.pipeline" = "Ducto";
-"type.man_made.pipeline.overground" = "Ducto exterior";
+"type.man_made.pipeline.overground" = "Ducto a cielo abierto";
 "type.man_made.silo" = "Silo";
 "type.man_made.storage_tank" = "Cisterna";
 "type.man_made.surveillance" = "Cámara de vigilancia";
@@ -763,11 +763,11 @@
 "type.man_made.works" = "Fábrica";
 "type.military" = "Militar";
 "type.military.bunker" = "Búnker";
-"type.mountain_pass" = "Paso de montaña";
+"type.mountain_pass" = "Puerto de montaña";
 "type.natural" = "Naturaleza";
 
 /* A rocky land cover. */
-"type.natural.bare_rock" = "Lecho rocoso";
+"type.natural.bare_rock" = "Roca desnuda";
 
 /* A land cover consisting of rounded rock fragments (pebbles) on a beach or riverbed. */
 "type.natural.shingle" = "Guijarros";
@@ -781,7 +781,7 @@
 "type.natural.cape" = "Cabo";
 "type.natural.cave_entrance" = "Entrada de cueva";
 "type.natural.cliff" = "Acantilado";
-"type.natural.earth_bank" = "Talud de tierra escarpado";
+"type.natural.earth_bank" = "Talud de tierra";
 "type.man_made.embankment" = "Terraplén";
 "type.natural.coastline" = "Costa";
 "type.natural.desert" = "Desierto";
@@ -866,7 +866,7 @@
 "type.power.generator" = "Generador";
 "type.power.generator.solar" = "Generador solar";
 "type.power.generator.wind" = "Aerogenerador";
-"type.power.generator.gas" = "Planta termoeléctrica a gas";
+"type.power.generator.gas" = "Planta termoeléctrica de gas";
 "type.power.generator.hydro" = "Planta hidroeléctrica";
 "type.power.line" = "Línea eléctrica";
 "type.power.line.underground" = "Línea eléctrica subterránea";
@@ -1225,7 +1225,7 @@
 "type.shop.florist" = "Floristería";
 "type.shop.funeral_directors" = "Funeraria";
 "type.shop.furniture" = "Tienda de muebles";
-"type.shop.garden_centre" = "Centro de jardinería";
+"type.shop.garden_centre" = "Vivero";
 "type.shop.gas" = "Tienda de gas";
 "type.shop.gift" = "Tienda de regalos";
 "type.shop.greengrocer" = "Frutería";
@@ -1283,15 +1283,15 @@
 
 /* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Tienda de arte";
-"type.shop.baby_goods" = "Tienda de artículos para bebés";
+"type.shop.baby_goods" = "Tienda de niños";
 "type.shop.bag" = "Tienda de bolsos";
 "type.shop.bed" = "Tienda de camas";
 "type.shop.boutique" = "Boutique";
 "type.shop.charity" = "Tienda de caridad";
 "type.shop.cheese" = "Tienda de quesos";
-"type.shop.craft" = "Tienda de materiales para manualidades";
+"type.shop.craft" = "Artes y manualidades";
 "type.shop.dairy" = "Productos lácteos";
-"type.shop.electrical" = "Tienda de suministros eléctricos";
+"type.shop.electrical" = "Tienda de electricidad";
 "type.shop.fishing" = "Tienda de pesca";
 "type.shop.interior_decoration" = "Decoración de interiores";
 "type.shop.lottery" = "Boletos de lotería";
@@ -1363,18 +1363,18 @@
 "type.attraction.roller_coaster" = "Montaña rusa";
 "type.attraction.water_slide" = "Tobogán acuático";
 "type.tourism.attraction.specified" = "Atracción turística";
-"type.tourism.camp_site" = "Paraje de acampada";
+"type.tourism.camp_site" = "Paraje de campamento";
 "type.tourism.caravan_site" = "Zona de autocaravanas";
 
 /* A rentable countryside vacation house. */
-"type.tourism.chalet" = "Cabaña vacacional";
+"type.tourism.chalet" = "Casa de vacaciones";
 "type.tourism.gallery" = "Galería";
 "type.tourism.guest_house" = "Casa de huéspedes";
 "type.tourism.hostel" = "Albergue juvenil";
 "type.tourism.hotel" = "Hotel";
 "type.tourism.information" = "Información turística";
 "type.tourism.information.board" = "Tablón de información";
-"type.tourism.information.guidepost" = "Poste guía";
+"type.tourism.information.guidepost" = "Poste indicador";
 "type.tourism.information.map" = "Mapa turístico";
 "type.tourism.information.office" = "Oficina de turismo";
 "type.tourism.information.visitor_centre" = "Centro de visitantes";
@@ -1386,7 +1386,7 @@
 "type.tourism.viewpoint" = "Mirador";
 
 /* Typically more basic, not staffed and free (compared to alpine_hut). */
-"type.tourism.wilderness_hut" = "Refugio de paraje natural";
+"type.tourism.wilderness_hut" = "Cabaña";
 "type.tourism.zoo" = "Zoológico";
 "type.tourism.zoo.petting" = "Zoológico interactivo";
 "type.traffic_calming" = "Pacificación del tráfico";
@@ -1397,13 +1397,13 @@
 "type.waterway.canal.tunnel" = "Túnel de canal";
 "type.waterway.fish_pass" = "Escalera de peces";
 "type.waterway.dam" = "Presa";
-"type.barrier.ditch" = "Acequia";
+"type.barrier.ditch" = "Zanja";
 "type.natural.water.ditch" = "Zanja de drenaje";
-"type.waterway.ditch.tunnel" = "Alcantarilla";
-"type.waterway.dock" = "Dique seco";
+"type.waterway.ditch.tunnel" = "Obra de drenaje";
+"type.waterway.dock" = "Muelle";
 "type.waterway.drain" = "Desagüe";
 "type.natural.water.drain" = "Desagüe";
-"type.waterway.drain.tunnel" = "Alcantarilla";
+"type.waterway.drain.tunnel" = "Obra de drenaje";
 "type.waterway.lock_gate" = "Compuerta";
 "type.waterway.river" = "Río";
 "type.waterway.river.tunnel" = "Río";
@@ -1420,21 +1420,21 @@
 "type.aerialway.j.bar" = "Telesilla barra en J";
 "type.aerialway.magic_carpet" = "Alfombra mágica";
 "type.aerialway.platter" = "Telesilla de disco";
-"type.aerialway.rope_tow" = "Remolque de cuerda";
-"type.aerialway.t.bar" = "Ascensor de barra en T";
+"type.aerialway.rope_tow" = "Telesilla de cuerda";
+"type.aerialway.t.bar" = "Telesilla barra en T";
 "type.piste_type.downhill" = "Pista de esquí alpino";
 "type.piste_type.downhill.area" = "Pista de esquí alpino";
-"type.piste_type.downhill.advanced" = "Pista de esquí alpino nivel avanzado";
-"type.piste_type.downhill.advanced.area" = "Pista de esquí alpino nivel avanzado";
-"type.piste_type.downhill.easy" = "Pista de esquí alpino nivel fácil";
-"type.piste_type.downhill.easy.area" = "Pista de esquí alpino nivel fácil";
-"type.piste_type.downhill.expert" = "Pista de esquí alpino nivel experto";
-"type.piste_type.downhill.expert.area" = "Pista de esquí alpino nivel experto";
-"type.piste_type.downhill.freeride" = "Zona de esquí alpino fuera de pista";
-"type.piste_type.downhill.intermediate" = "Pista de esquí alpino nivel intermedio";
-"type.piste_type.downhill.intermediate.area" = "Pista de esquí alpino nivel intermedio";
-"type.piste_type.downhill.novice" = "Pista de esquí alpino nivel principiante";
-"type.piste_type.downhill.novice.area" = "Pista de esquí alpino nivel principiante";
+"type.piste_type.downhill.advanced" = "Pista de esquí alpino";
+"type.piste_type.downhill.advanced.area" = "Pista de esquí alpino";
+"type.piste_type.downhill.easy" = "Pista de esquí alpino";
+"type.piste_type.downhill.easy.area" = "Pista de esquí alpino";
+"type.piste_type.downhill.expert" = "Pista de esquí alpino";
+"type.piste_type.downhill.expert.area" = "Pista de esquí alpino";
+"type.piste_type.downhill.freeride" = "Pista de esquí alpino";
+"type.piste_type.downhill.intermediate" = "Pista de esquí alpino";
+"type.piste_type.downhill.intermediate.area" = "Pista de esquí alpino";
+"type.piste_type.downhill.novice" = "Pista de esquí alpino";
+"type.piste_type.downhill.novice.area" = "Pista de esquí alpino";
 "type.piste_type.nordic" = "Pista de esquí nórdico";
 "type.piste_type.sled" = "Pista para trineos";
 "type.piste_type.sled.area" = "Pista para trineos";
@@ -1470,9 +1470,9 @@
 "type.sport.diving" = "Salto de trampolín";
 "type.man_made.crane" = "Grúa";
 "type.natural.wetland.fen" = "Tollo";
-"type.natural.wetland.saltmarsh.tidal" = "Marisma salina mareal";
+"type.natural.wetland.saltmarsh.tidal" = "Marisma Salina de Marea";
 "type.natural.wetland.reedbed" = "Juncal";
-"type.natural.wetland.tidalflat" = "Llanura mareal";
+"type.natural.wetland.tidalflat" = "Llanura de marea";
 "type.natural.wetland.swamp" = "Pantano";
 "type.natural.wetland.saltmarsh" = "Marisma salina";
 "type.natural.wetland.mangrove" = "Manglares";
@@ -1540,7 +1540,7 @@
 "type.emergency.access_point" = "Punto de rescate de emergencia";
 "type.amenity.food_sharing" = "Alimentos compartidos";
 "type.social_facility.soup_kitchen" = "Comedor social";
-"type.amenity.give_box" = "Caja libre";
+"type.amenity.give_box" = "Give Box";
 "type.leisure.indoor_play" = "Centro de actividades en interior";
 "type.natural.sand" = "Arena";
 "type.amenity.sailing_school" = "Escuela de vela";

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

@@ -104,7 +104,7 @@
 "mobile_data_description" = "Mobile internet is required for map update notifications and uploading edits.";
 "mobile_data_option_today" = "Samo danas";
 "sharing_call_action_look" = "Check out";
-"accept" = "Prihvati";
+"accept" = "Accept";
 "ok" = "OK";
 "parkings" = "Parkiralište";
 "bookmark_lists" = "Liste";
@@ -120,7 +120,7 @@
 "osm_profile_promt" = "Create an OpenStreetMap account or log in to publish your map edits to the world.";
 "osm_profile" = "OpenStreetMap profile";
 "add_opening_hours" = "Add opening hours";
-"closed" = "Zatvoreno";
+"closed" = "Closed";
 "osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap";
 "osm_mapdata_explanation %@" = "Community-created map data as of *%@*. Learn more about how to edit and update the map at [OpenStreetMap.org](https://openstreetmap.org).";
 "speedcams_alert_title_carplay_1" = "Speedсams";
@@ -130,7 +130,7 @@
 "recover" = "Recover";
 "recover_all" = "Recover All";
 "dialog_routing_location_turn_on" = "Omogući usluge lokacije";
-"day_off" = "Zatvoreno";
+"day_off" = "Closed";
 "editor_reset_edits_button" = "Odbacite promjene";
 "export_file" = "Izvezi kao KMZ";
 "money" = "Novac";
@@ -164,7 +164,7 @@
 "dialog_routing_disclaimer_priority" = "— Uvjeti na cestama, prometni propisi i prometni znakovi uvijek imaju prednost pred navigacijskim savjetima;";
 "pref_tts_speedcams_always" = "Uvijek upozori";
 "hide_from_map" = "Hide from map";
-"core_entrance" = "Glavni Ulaz";
+"core_entrance" = "Ulaz";
 "operator" = "Operator: %@";
 "opens_in" = "Opens in %@";
 "dialog_routing_check_gps" = "Provjerite GPS signal";
@@ -177,7 +177,7 @@
 "downloader_status_maps" = "Maps";
 "avoid_tolls" = "Izbjegni cestarine";
 "enable_logging" = "Omogući zapisivanje";
-"category_post" = "Poštanski ured";
+"category_post" = "Post";
 "downloader_retry" = "Retry";
 "editor_time_title" = "Radno vrijeme";
 "editor_other_info" = "Napomena za volontere OpenStreetMapa (nije obavezno)";
@@ -205,10 +205,10 @@
 "food_places" = "Hrana";
 "editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Please describe any additional details that cannot be edited in CoMaps.";
 "bookmarks_convert_error_title" = "Error";
-"select_cuisine" = "Odaberite kuhinju";
+"select_cuisine" = "Select cuisine";
 "editor_share_to_all_dialog_message_2" = "Urednici OpenStreetMapa će provjeriti promjene i kontaktirati vas ako imaju bilo kakvih pitanja.";
 "terms_of_use" = "Uvjeti korištenja";
-"about_headline" = "Otvoreni projekt kojeg pokreće zajednica";
+"about_headline" = "Open project powered by the community";
 "downloader_delete_map_dialog" = "All of your map edits will be deleted with the map.";
 "app_tip_03" = "Ako poznajete programera softvera, možete ga zamoliti da implementira značajku koja vam je potrebna.";
 "downloader_search_results" = "Found";
@@ -225,7 +225,7 @@
 "core_exit" = "Izlaz";
 "dialog_routing_error_location_not_found" = "Nije moguće izraditi rutu. Trenutne GPS koordinate nije moguće odrediti.";
 "location_services_disabled_2" = "2. Tap Location";
-"clear" = "Očisti";
+"clear" = "Clear";
 "bookmarks_import" = "Uvoz Oznaka i Ruta";
 "opens_tomorrow_at" = "Opens tomorrow at %@";
 "closes_in" = "Closes in %@";
@@ -235,7 +235,7 @@
 "pink" = "Pink";
 "app_tip_09" = "Naš glavni cilj je izrada brzih, na privatnost usmjerenih i jednostavnih karata koje ćete obožavati.";
 "app_tip_08" = "Podatke karte možete jednostavno popraviti i poboljšati.";
-"stop_without_saving" = "Zaustavi bez spremanja";
+"stop_without_saving" = "Stop Without Saving";
 "dialog_routing_change_intermediate" = "Unable to locate the intermediate point.";
 "downloader_status_outdated" = "Update";
 "button_layer_subway" = "Subway";
@@ -252,7 +252,7 @@
 "routing_download_maps_along" = "Preuzmite sve karte duž svoje rute";
 "dialog_routing_check_gps_carplay" = "No GPS signal. Please move to an open area";
 "routing_planning_error" = "Route Planning Failed";
-"drive_through" = "Prolaz za automobile";
+"drive_through" = "Drive-through";
 "restore" = "Vratiti";
 "moremonth_ago_sorttype" = "Prije više od mjesec dana";
 "downloader_applying" = "Applying %@…";
@@ -276,7 +276,7 @@
 "download_over_mobile_message" = "This could be considerably expensive with some plans or if roaming.";
 "ferry_crossing" = "Trajektna linija";
 "email_error_title" = "Error sending email";
-"add_language" = "Dodaj jezik";
+"add_language" = "Add a language";
 "others_sorttype" = "Ostali";
 "common_check_internet_connection_dialog" = "Please make sure your device is connected to the Internet.";
 "car_used_on_the_car_screen" = "Sada koristite CoMaps na zaslonu automobila";
@@ -285,7 +285,7 @@
 "current_location_unknown_error_title" = "Current location is unknown.";
 "app_tip_07" = "Našu aplikaciju razvili su nekoliko entuzijasta i zajednica.";
 "editor_time_advanced" = "Napredni način rada";
-"add_street" = "Dodaj ulicu";
+"add_street" = "Add a street";
 "share_with_friends" = "Share with friends";
 "dialog_routing_download_files_carplay" = "To create a route, download missing maps on your device";
 "last_upload" = "Last upload";
@@ -321,7 +321,7 @@
 "please_note" = "Please note";
 "bookmarks_detect_title" = "New files detected";
 "migration_download_error_dialog" = "Download error";
-"choose_street" = "Odaberite ulicu";
+"choose_street" = "Choose a street";
 "category_food" = "Namirnice";
 "p2p_to_here" = "Ruta do";
 "bookmark_share_email_subject" = "Hej, pogledaj moju oznaku u CoMapsu!";
@@ -355,11 +355,11 @@
 "network" = "Network: %@";
 "elevation_profile_diff_level_easy" = "Easy";
 "editor_share_to_all_dialog_title" = "Želite li to poslati svim korisnicima?";
-"daily" = "Dnevno";
+"daily" = "Daily";
 "elevation_profile_diff_level" = "Difficulty level";
 "downloader_update_maps" = "Ažurirajte karte";
 "dialog_routing_end_not_determined" = "Ruta nije izrađena. Odredište nije moguće pronaći.";
-"closed_now" = "Zatvoreno sada";
+"closed_now" = "Closed now";
 "dialog_routing_download_and_update_all" = "Download or update all maps along the projected path to calculate a route.";
 "miles" = "Miles";
 "deep_purple" = "Tamno ljubičasta";
@@ -369,14 +369,14 @@
 "orange" = "Orange";
 "error_enter_correct_web" = "Unesite valjanu web-adresu";
 "bookmark" = "bookmark";
-"editor_edit_place_title" = "Uređivanje";
+"editor_edit_place_title" = "Editing";
 "category_wifi" = "WiFi";
 "editor_place_doesnt_exist" = "Mjesto ne postoji";
 "subway_data_unavailable" = "Karta podzemne željeznice nije dostupna";
 "near_me_sorttype" = "U mojoj blizini";
 "green" = "Green";
 "pref_tts_speedcams_auto" = "Upozori na prekoračenje brzine";
-"details" = "Detalji";
+"details" = "Details";
 "yellow" = "Yellow";
 "privacy_policy" = "Privacy policy";
 "editor_default_language_hint" = "Kao što je napisano na lokalnom jeziku";
@@ -407,12 +407,12 @@
 "cancel" = "Odustani";
 "switch_to_phone_bookmarks_carplay" = "Switch to the phone to see all bookmarks";
 "lime" = "Limeta";
-"website_menu" = "Poveznica na Jelovnik";
+"website_menu" = "Menu Link";
 "app_tip_02" = "Sviđa li vam se naša aplikacija? Donirajte kako biste podržali razvoj! Još vam se ne sviđa? Javite nam zašto i mi ćemo to popraviti!";
 "pick_destination" = "Destination";
 "cyan" = "Cijan";
 "teal" = "Tirkizna";
-"level" = "Kat";
+"level" = "Floor";
 "refresh" = "Update";
 "use_cellular_data" = "Yes";
 "capacity" = "Capacity: %@";
@@ -426,7 +426,7 @@
 "whats_new_auto_update_message" = "Updating maps keeps the information about objects up to date";
 "editor_time_close" = "Zatvoreno";
 "editor_time_add" = "Dodaj Raspored";
-"editor_edit_place_category_title" = "Kategorija";
+"editor_edit_place_category_title" = "Category";
 "bookmarks_error_title_list_name_already_taken" = "Taj naziv je već zauzet";
 "category_entertainment" = "Zabava";
 "placepage_add_stop" = "Dodaj zaustavljanje";
@@ -467,11 +467,11 @@
 "dialog_routing_unable_locate_route" = "Nije moguće pronaći rutu";
 "bookmarks_error_title_list_name_too_long" = "This name is too long";
 "sort_type" = "Sort by type";
-"cuisine" = "Kuhinja";
+"cuisine" = "Cuisine";
 "country_status_download_without_size" = "Download Map";
 "pref_tts_speedcams_never" = "Nikad ne upozoravaj";
 "twentyfour_seven" = "24/7";
-"outdoor_seating" = "Vanjski prostor za sjedenje";
+"outdoor_seating" = "Outdoor seating";
 "place_description_title" = "Opis mjesta";
 "editor_add_select_category_popular_subtitle" = "Popular";
 "editor_time_add_closed" = "Dodajte izvan radno vrijeme";
@@ -488,7 +488,7 @@
 "editor_comment_hint" = "Comment…";
 "editor_share_to_all_dialog_message_1" = "Provjerite da niste unijeli privatne ili osobne podatke.";
 "location_services_disabled_message" = "Enable access to geolocation in the device settings";
-"edit_place" = "Uredi mjesto";
+"edit_place" = "Edit Place";
 "dialog_pedestrian_route_is_long_message" = "Molimo odaberite početnu ili završnu točku bliže stanici podzemne željeznice";
 "settings" = "Settings";
 "editor_category_unsuitable_title" = "Ne možete pronaći odgovarajuću kategoriju?";
@@ -503,7 +503,7 @@
 "km" = "km";
 "search_history_title" = "Povijest pretraživanja";
 "placepage_delete_track_button" = "Delete Track";
-"house_number" = "Broj zgrade";
+"house_number" = "Building number";
 "show" = "Show";
 "dialog_routing_location_unknown_turn_on" = "Nije moguće pronaći trenutne GPS koordinate. Omogućite usluge lokacije za izračun rute.";
 "dialog_routing_disclaimer_title" = "Prilikom praćenja rute, imajte na umu:";
@@ -523,7 +523,7 @@
 "book_button" = "Book";
 "error_enter_correct_house_number" = "Unesite važeći broj zgrade";
 "toll_road" = "Cesta s naplatom cestarine";
-"choose_language" = "Odaberite jezik";
+"choose_language" = "Choose a language";
 "editor_edit_place_name_hint" = "Naziv mjesta";
 "not_all_shown_bookmarks_carplay" = "Not all bookmarks are shown";
 "icloud_synchronization_error_connection_error" = "Error: Failed to synchronize due to connection error";
@@ -534,7 +534,7 @@
 "editor_reset_edits_message" = "Odbaciti sve lokalne promjene?";
 "sort_distance" = "Sort by distance";
 "traffic_update_app_message" = "To display traffic data, the application must be updated.";
-"category_fuel" = "Benzin";
+"category_fuel" = "Benzinske stanice";
 "editor_add_place_title" = "Dodavanje";
 "bookmark_set_name" = "Označi naziv Liste";
 "moreyear_ago_sorttype" = "Prije više od godinu dana";
@@ -551,7 +551,7 @@
 "button_plan" = "Plan";
 "purple" = "Purple";
 "change_color" = "Change Color";
-"continue_recording" = "Nastavi snimanje";
+"continue_recording" = "Continue Recording";
 "bookmarks_error_message_share_general" = "Nije moguće podijeliti zbog greške u aplikaciji";
 "map" = "Map";
 "bookmarks" = "Oznake";
@@ -581,7 +581,7 @@
 "bookmark_sets" = "Bookmark Lists";
 "leave_a_review" = "Leave a Review";
 "dialog_routing_intermediate_not_determined" = "Please adjust your intermediate point.";
-"open_in_app" = "Otvori u drugoj aplikaciji";
+"open_in_app" = "Open in Another App";
 "pref_mapappearance_title" = "Map Appearance";
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
@@ -592,5 +592,3 @@
 "avoid_steps" = "Izbjegavaj stepenice";
 "avoid_paved" = "Izbjegavaj asfaltirane ceste";
 "pref_map_3d_buildings_disabled_summary" = "3D zgrade su onemogućene u načinu rada za uštedu energije";
-"offline_explanation_title" = "Izvanmrežne karte";
-"offline_explanation_text" = "Za prikaz i navigaciju područjem potrebno je preuzeti kartu.\nPreuzmite karte za područja u koja želite putovati.";

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

@@ -691,11 +691,11 @@
 "placepage_add_place_button" = "Pievienot vietu „OpenStreetMap“";
 
 /* Displayed when saving some edits to the map to warn against publishing personal data */
-"editor_share_to_all_dialog_title" = "Vai nosūtīt to visiem lietotājiem?";
+"editor_share_to_all_dialog_title" = "Vai vēlaties to nosūtīt visiem lietotājiem?";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Jāpārliecinās, ka nav ievadīti nekādi privāti vai personīgi dati.";
-"editor_share_to_all_dialog_message_2" = "OpenStreetMap redaktori pārbaudīs veiktās izmaiņas un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.";
+"editor_share_to_all_dialog_message_1" = "Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus.";
+"editor_share_to_all_dialog_message_2" = "OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.";
 "navigation_stop_button" = "Apturēt";
 
 /* iOS dialog for the case when recent track recording is on and the app comes back from background */

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

@@ -1543,4 +1543,3 @@
 "type.entrance.entry" = "Inngang (bare)";
 "type.man_made.mast.communication" = "Kommunikasjonsmast";
 "type.shop.beauty.nails" = "Neglesalong";
-"type.man_made.telescope.optical" = "Teleskop (Optisk)";

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

@@ -34,7 +34,7 @@
 "use_cellular_data" = "Ja";
 
 /* View and button titles for accessibility */
-"zoom_to_country" = "Weergeven op kaart";
+"zoom_to_country" = "Weergeven op de kaart";
 
 /* Button text for the button at the center of the screen when the country is not downloaded and the size should not be shown */
 "country_status_download_without_size" = "Download kaart";
@@ -43,7 +43,7 @@
 "country_status_download_failed" = "Downloaden is mislukt";
 
 /* Text in About screen */
-"about_headline" = "Open project gedreven door de community";
+"about_headline" = "Open project, gemaakt door de community";
 
 /* Text in About screen */
 "about_proposition_1" = "Offline, snel en gebruiksvriendelijk";
@@ -60,7 +60,7 @@
 "continue_button" = "Doorgaan";
 
 /* "Add new bookmark list" dialog title */
-"add_new_set" = "Nieuwe lijst toevoegen";
+"add_new_set" = "Nieuwe groep toevoegen";
 
 /* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Naam van bladwijzergroep";
@@ -84,7 +84,7 @@
 "settings" = "Instellingen";
 
 /* Measurement units title in settings activity */
-"measurement_units" = "Eenheid van afstand";
+"measurement_units" = "Afstandseenheid";
 
 /* Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! */
 "category_eat" = "Waar iets gaan eten";
@@ -153,7 +153,7 @@
 "category_water" = "Water";
 
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
-"category_rv" = "Camperfaciliteiten";
+"category_rv" = "Caravanfaciliteiten";
 "share_bookmarks_email_body" = "Hallo!\n\nBijgesloten zijn mijn bladwijzers uit de CoMaps app. Open ze als je CoMaps geïnstalleerd hebt. Of, als je dat niet hebt, download de app voor je iOS- of Android-apparaat door deze link te volgen: https://www.comaps.app/download/\n\nGeniet van het reizen met CoMaps!";
 
 /* message title of loading file */

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

@@ -32,7 +32,7 @@
 "unknown_current_position" = "Vaša lokacija še ni znana";
 "edit" = "Uredi";
 "category_bank" = "Banka";
-"category_transport" = "Prevoz";
+"category_transport" = "Javni prevoz";
 "category_nightlife" = "Nočno življenje";
 "load_kmz_successful" = "Zaznamki so uspešno naloženi! Najdete jih lahko na zemljevidu ali v upravitelju zaznamkov.";
 "category_food" = "Špecerija";
@@ -175,7 +175,7 @@
 "search_not_found_query" = "Prenesite območje, po katerem iščete, ali poskusite dodati ime bližnjega mesta/naselja.";
 "editor_time_open" = "Odprto";
 "editor_time_simple" = "Preprosti način";
-"downloader_no_space_message" = "Izbrišite vse nepotrebne podatke";
+"downloader_no_space_message" = "Prosimo, izbrišite vse nepotrebne podatke";
 "downloader_search_field_hint" = "Najdi zemljevid";
 "downloader_no_space_title" = "Ni dovolj prostora";
 "downloader_update_maps" = "Posodobi zemljevide";
@@ -279,7 +279,7 @@
 "parks" = "Parki";
 "no" = "Ne";
 "moremonth_ago_sorttype" = "Pred več kot mesecem";
-"unable_to_calc_alert_subtitle" = "Ni bilo mogoče najti povezave. Mogoče so krive vaše zahteve za pot ali pa nepopolni podatki OpenStreetMapa. Spremenite možnosti iskanja povezave in poskusite ponovno.";
+"unable_to_calc_alert_subtitle" = "Ni bilo mogoče najti relacije. Mogoče so krive vaše zahteve za pot ali pa nepopolni podatki OpenStreetMap. Prosimo, spremenite možnosti relacije in poskusite ponovno.";
 "medicine" = "Zdravstvo";
 "ferry_crossing" = "Plovba s trajektom";
 "others_sorttype" = "Drugo";
@@ -327,7 +327,7 @@
 "app_tip_07" = "Našo aplikacijo razvija nekaj zanesenjakov in skupnost.";
 "app_tip_06" = "Lahko nam pomagate prevesti našo aplikacijo v svoj jezik.";
 "car_used_on_the_phone_screen" = "CoMaps zdaj uporabljate na zaslonu telefona";
-"app_tip_02" = "Ali vam je naša aplikacija všeč? Vabimo vas, da finančno podprete njen razvoj! Ali niste zadovoljni z njo? Prosimo, da nam sporočite zakaj, in jo bomo popravili!";
+"app_tip_02" = "Ali vam je naša aplikacija všeč? Vabimo vas, da finančno podprete njen razvoj! Ali niste zadovoljni z njo? Prosimo, da nam sporočite, zakaj, in jo bomo popravili!";
 "app_tip_04" = "S kratkim pritiskom na zemljevid lahko izberete kateri koli element. Z dolgim pritiskom lahko skrijete ali pokažete vmesnik.";
 "app_tip_01" = "Z vašo podporo lahko ustvarimo najboljše zemljevide na svetu!";
 "app_tip_00" = "Hvala, ker uporabljate naše javno narejene zemljevide!";
@@ -417,7 +417,7 @@
 "downloader_search_results" = "Najdeni";
 "downloader_status_outdated" = "Posodobi";
 "downloader_status_failed" = "Neuspelo";
-"downloader_delete_map_while_routing_dialog" = "Za izbris zemljevida najprej ustavite potno usmerjanje.";
+"downloader_delete_map_while_routing_dialog" = "Za izbris zemljevida, prosimo, ustavite potno usmerjanje";
 "bookmark" = "zaznamek";
 "dialog_routing_download_files" = "Prenesi zahtevane datoteke";
 "dialog_routing_download_and_update_maps" = "Prenesi in posodobi vse zemljevide vzdolž predvidene poti za izračun točne poti.";
@@ -450,9 +450,9 @@
 "panoramax" = "Panoramax";
 "email_error_body" = "Odjemalec el. pošte ni bil nastavljen. Nastavite ga ali pa stopite v stik z nami na %@";
 "dialog_routing_download_and_update_all" = "Prenesite ali posodobite vse zemljevide vzdolž približne poti za izračun točne poti.";
-"dialog_routing_select_closer_end" = "Izberite ciljni položaj bližje cesti.";
+"dialog_routing_select_closer_end" = "Prosimo, izberite ciljni položaj bližje ceste.";
 "dialog_routing_change_intermediate" = "Ni bilo mogoče določiti položaja vmesne točke.";
-"dialog_routing_intermediate_not_determined" = "Prilagodite svojo vmesno točko.";
+"dialog_routing_intermediate_not_determined" = "Prosimo, prilagodite svojo vmesno točko.";
 "routing_planning_error" = "Načrtovanje poti je spodletelo";
 "dialog_routing_application_error" = "Zaradi napake v orodju ni bilo mogoče načrtovati poti.";
 "routing_arrive" = "Prihod ob %@";
@@ -473,7 +473,7 @@
 "last_upload" = "Zadnje nalaganje";
 "thank_you" = "Hvala vam";
 "place_name" = "Ime kraja";
-"common_check_internet_connection_dialog" = "Prepričajte se, da je vaša naprava povezana z omrežjem.";
+"common_check_internet_connection_dialog" = "Prosimo, prepričajte se, da je vaša naprava povezana z omrežjem.";
 "editor_share_to_all_dialog_message_1" = "Poskrbite, da niste vnesli nobenih zasebnih ali osebnih podatkov";
 "editor_share_to_all_dialog_message_2" = "Uredniki na OpenStreetMap bodo preverili spremembe in stopili v stik z vami, če kaj ne bo jasno.";
 "avoid_paved" = "Izogni se neasfaltiranim cestam";
@@ -537,18 +537,18 @@
 "network" = "Omrežje: %@";
 "keyboard_availability_alert" = "Tipkovnica med vožnjo ni na voljo";
 "dialog_routing_change_start_carplay" = "Z vašega trenutnega položaja ni bilo mogoče načrtovati poti";
-"dialog_routing_change_end_carplay" = "Poti do vašega cilja ni bilo mogoče najti. Izberite drugo končno točko";
-"dialog_routing_check_gps_carplay" = "Ni signala GPS. Premaknite se na odprto";
-"dialog_routing_unable_locate_route_carplay" = "Poti ni bilo mogoče načrtovati. Določite druge točke poti";
+"dialog_routing_change_end_carplay" = "Poti do vašega cilja ni bilo mogoče najti. Prosimo, izberite drugo končno točko";
+"dialog_routing_check_gps_carplay" = "Ni signala GPS. Prosimo, premaknite se na odprto";
+"dialog_routing_unable_locate_route_carplay" = "Poti ni bilo mogoče načrtovati. Prosimo, določite druge točke poti";
 "dialog_routing_download_files_carplay" = "Za ustvarjanje poti prenesite na vašo napravo manjkajoče zemljevide";
-"dialog_routing_system_error_carplay" = "Prišlo je do napake. Ponovno zaženite orodje";
+"dialog_routing_system_error_carplay" = "Prišlo je do napake. Prosimo, ponovno zaženite orodje";
 "dialog_routing_rebuild_from_current_location_carplay" = "Pot bo ponovno načrtovana z vašega trenutnega položaja";
 "dialog_routing_rebuild_for_vehicle_carplay" = "Pot bo pretvorjena za avtomobil";
 "not_all_shown_bookmarks_carplay" = "Niso prikazani vsi zaznamki";
 "switch_to_phone_bookmarks_carplay" = "Za ogled vseh zaznamkov preklopite na telefon";
 "speedcams_alert_title_carplay_1" = "Hitrostne kamere";
 "speedcams_alert_title_carplay_2" = "Hitrostna opozorila";
-"download_map_carplay" = "Prenesite zemljevide v orodju na vaši prenosni napravi";
+"download_map_carplay" = "Prosimo, prenesite zemljevide v orodju na vaši prenosni napravi";
 "carplay_roundabout_exit" = "%@ izvoz";
 "sort_default" = "Razvrsti privzeto";
 "sort_type" = "Razvrsti po vrsti";
@@ -561,23 +561,10 @@
 "elevation_profile_diff_level_hard" = "Težko";
 "downloader_updating_ios" = "Posodabljam";
 "whats_new_auto_update_title" = "Posodobi prenešene zemljevide";
-"migration_no_space_message" = "Za prenos potrebujete več prostora. Izbrišite kakršnekoli nepotrebne podatke.";
+"migration_no_space_message" = "Za prenos potrebujetr več prostora. Prosimo, izbrišite kakršnekoli nepotrebne podatke.";
 "editor_sharing_title" = "Izboljšal sem zemljevide CoMaps";
 "editor_storey_number" = "Število nadstropij (največ do %d)";
 "editor_detailed_description_hint" = "Podrobni komentar";
-"editor_detailed_description" = "Spremembe zemljevida, ki ste jih predlagali, bodo poslane skupnosti OpenStreetMap. Opišite kakršnekoli podrobnosti, ki jih ne morete urediti v CoMapsu.";
+"editor_detailed_description" = "Spremembe zemljevida, ki ste jih predlagali, bodo poslane skupnosti OpenStreetMap. Prosimo, opišite kakršnekoli podrobnosti, ki jih ne morete urediti v CoMapsu.";
 "downloader_no_downloaded_maps_message" = "Prenesite zemljevide za iskanje in usmerjanje brez povezave.";
 "current_location_unknown_error_title" = "Trenutni položaj je neznan.";
-"operator" = "Upravitelj: %@";
-"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap";
-"download_over_mobile_message" = "To je lahko z nekaterimi naročniškimi paketi ali gostovanju precej drago.";
-"whats_new_auto_update_message" = "Posodabljanje zemljevidov ohranja podatke predmetov posodobljene";
-"whats_new_auto_update_button_size" = "Posodobi (%@)";
-"whats_new_auto_update_button_later" = "Ročno posodobi kasneje";
-"placepage_delete_track_button" = "Izbriši sled";
-"placepage_delete_track_confirmation_alert_message" = "Ste prepričani, da želite izbrisati to sled?";
-"placepage_track_name_hint" = "Ime sledi";
-"move" = "Premakni";
-"track_title" = "Sled";
-"change_color" = "Spremeni barvo";
-"map" = "Zemljevid";

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

@@ -667,7 +667,7 @@
 "type.landuse.greenhouse_horticulture" = "Rastlinjak";
 "type.landuse.industrial" = "Industrijsko območje";
 "type.landuse.landfill" = "Odlagališče odpadkov";
-"type.landuse.meadow" = "Kmetijski travnik";
+"type.landuse.meadow" = "Travnik";
 "type.landuse.military" = "Vojaško območje";
 "type.landuse.orchard" = "Sadovnjak";
 "type.landuse.quarry" = "Kamnolom";
@@ -758,7 +758,7 @@
 "type.man_made.water_well.drinking_water_no" = "Vodnjak";
 "type.man_made.windmill" = "Mlin na veter";
 "type.man_made.works" = "Industrijski obrat";
-"type.military" = "Vojska";
+"type.military" = "Vojaško";
 "type.military.bunker" = "Vojaško zaklonišče";
 "type.mountain_pass" = "Gorski prelaz";
 "type.natural" = "Narava";
@@ -788,17 +788,17 @@
 "type.place.square" = "Trg";
 "type.place.state" = "Zvezna država";
 "type.place.state.USA" = "Zvezna država ZDA";
-"type.place.suburb" = "Predmestje";
+"type.place.suburb" = "Mestna četrt";
 "type.place.town" = "Manjše mesto";
 "type.place.village" = "Vas";
 "type.power" = "Energetika";
 "type.power.generator" = "Generator";
 "type.power.generator.solar" = "Sončni generator";
 "type.power.generator.wind" = "Vetrni generator";
-"type.power.plant.hydro" = "Vodna elektrarna";
+"type.power.plant.hydro" = "Hidroelektrarna";
 "type.power.plant.wind" = "Vetrna elektrarna";
 "type.power.generator.gas" = "Plinska turbinska elektrarna";
-"type.power.generator.hydro" = "Vodna elektrarna";
+"type.power.generator.hydro" = "Hidroelektrarna";
 "type.power.line" = "Daljnovod";
 "type.power.line.underground" = "Podzemni vod";
 "type.power.minor_line" = "Manjši daljnovod";
@@ -806,271 +806,3 @@
 "type.power.plant.coal" = "Elektrarna na premog";
 "type.power.plant.gas" = "Plinska turbinska elektrarna";
 "type.power.plant.solar" = "Sončna elektrarna";
-"type.landuse.greenfield" = "Nezazidano zemljišče";
-"type.leisure.sports_centre.sport.multi" = "Športno središče";
-"type.leisure.sports_centre.sport.american_football" = "Športno središče";
-"type.leisure.sports_centre.sport.archery" = "Športno središče";
-"type.leisure.sports_centre.sport.athletics" = "Športno središče";
-"type.leisure.sports_centre.sport.australian_football" = "Športno središče";
-"type.natural.earth_bank" = "Breg";
-"type.man_made.embankment" = "Nasip";
-"type.natural.coastline" = "Meja kopnega";
-"type.natural.desert" = "Puščava";
-"type.natural.sand" = "Pesek";
-"type.natural.geyser" = "Vroči vrelec";
-"type.natural.glacier" = "Ledenik";
-"type.natural.grassland" = "Travnik";
-"type.natural.heath" = "Ruševje";
-"type.natural.hot_spring" = "Vroči izvir";
-"type.natural.water.lake" = "Jezero";
-"type.natural.water.pond" = "Ribnik";
-"type.natural.water.reservoir" = "Vodni zbiralnik";
-"type.natural.water.basin" = "Vodni zadrževalnik";
-"type.natural.water.river" = "Reka";
-"type.natural.land" = "Kopno";
-"type.natural.meadow" = "Travnik";
-"type.natural.orchard" = "Sadovnjak";
-"type.natural.peak" = "Vrh";
-"type.natural.saddle" = "Gorsko sedlo";
-"type.natural.rock" = "Skala";
-"type.natural.scrub" = "Grmičevje";
-"type.natural.spring" = "Naravni izvir";
-"type.natural.spring.drinking_water_no" = "Naravni izvir";
-"type.natural.strait" = "Ožina";
-"type.natural.tree" = "Drevo";
-"type.natural.tree_row" = "Vrsta dreves";
-"type.natural.vineyard" = "Vinograd";
-"type.natural.volcano" = "Ognjenik";
-"type.natural.water" = "Voda";
-"type.natural.wetland" = "Mokrišče";
-"type.natural.wetland.bog" = "Barje";
-"type.natural.wetland.marsh" = "Močvirje";
-"type.natural.wetland.saltmarsh" = "Slano močvirje";
-"type.natural.wetland.saltmarsh.tidal" = "Plimno slano močvirje";
-"type.natural.wetland.fen" = "Travno barje";
-"type.natural.wetland.reedbed" = "Trstišče";
-"type.natural.wetland.swamp" = "Močvirni gozd";
-"type.natural.wetland.tidalflat" = "Plimno blato";
-"type.noexit" = "Brez izhoda";
-"type.office" = "Pisarna";
-"type.office.company" = "Pisarna podjetja";
-"type.office.estate_agent" = "Nepremičninsko posredništvo";
-"type.office.government" = "Vladna pisarna";
-"type.office.insurance" = "Zavarovalnica";
-"type.office.lawyer" = "Odvetniška pisarna";
-"type.office.ngo" = "Nevladna organizacija";
-"type.office.telecommunication" = "Telekomunikacijsko podjetje";
-"type.organic.only" = "Organsko";
-"type.organic.yes" = "Organsko";
-"type.place.city" = "Mesto";
-"type.place.city.capital" = "Glavno mesto";
-"type.place.city.capital.10" = "Mesto";
-"type.place.city.capital.2" = "Glavno mesto";
-"type.place.city.capital.3" = "Mesto";
-"type.place.locality" = "Kraj";
-"type.place.quarter" = "Mestna četrt";
-"type.place.neighbourhood" = "Soseska";
-"type.leisure.sports_centre.sport.badminton" = "Športno središče";
-"type.leisure.sports_centre.sport.baseball" = "Športno središče";
-"type.leisure.sports_centre.sport.basketball" = "Športno središče";
-"type.leisure.sports_centre.sport.beachvolleyball" = "Športno središče";
-"type.leisure.sports_centre.sport.bowls" = "Športno središče";
-"type.leisure.sports_centre.sport.climbing" = "Športno središče";
-"type.leisure.sports_centre.sport.cricket" = "Športno središče";
-"type.leisure.sports_centre.sport.curling" = "Športno središče";
-"type.leisure.sports_centre.sport.equestrian" = "Športno središče";
-"type.leisure.sports_centre.sport.field_hockey" = "Športno središče";
-"type.leisure.sports_centre.sport.futsal" = "Športno središče";
-"type.leisure.sports_centre.sport.golf" = "Športno središče";
-"type.leisure.sports_centre.sport.gymnastics" = "Športno središče";
-"type.leisure.sports_centre.sport.handball" = "Športno središče";
-"type.leisure.sports_centre.sport.ice_hockey" = "Športno središče";
-"type.place.city.capital.11" = "Mesto";
-"type.place.city.capital.4" = "Mesto";
-"type.place.city.capital.5" = "Mesto";
-"type.place.city.capital.6" = "Mesto";
-"type.place.city.capital.7" = "Mesto";
-"type.power.substation" = "Transformatorska postaja";
-"type.power.tower" = "Daljnovodni stolp";
-"type.power.pole" = "Daljnovodni steber";
-"type.man_made.utility_pole" = "Steber javne napeljave";
-"type.public_transport" = "Javni prevoz";
-"type.public_transport.platform" = "Postajališče";
-"type.railway" = "Železnica";
-"type.railway.abandoned" = "Opuščena železnica";
-"type.railway.construction" = "Železnica v gradnji";
-"type.railway.crossing" = "Železniški prehod za pešce";
-"type.railway.disused" = "Neuporabljana železnica";
-"type.railway.funicular" = "Vzpenjača";
-"type.railway.funicular.bridge" = "Most vzpenjače";
-"type.railway.funicular.tunnel" = "Predor vzpenjače";
-"type.railway.halt" = "Železniško postajališče";
-"type.railway.level_crossing" = "Železniški prehod";
-"type.railway.light_rail" = "Lahka železnica";
-"type.railway.light_rail.bridge" = "Most lahke železnice";
-"type.railway.light_rail.tunnel" = "Predor lahke železnice";
-"type.railway.monorail" = "Enotirna železnica";
-"type.railway.monorail.bridge" = "Most enotirne železnice";
-"type.railway.monorail.tunnel" = "Predor enotirne železnice";
-"type.railway.narrow_gauge" = "Ozkotirna železnica";
-"type.railway.narrow_gauge.tunnel" = "Ozkotirni železniški predor";
-"type.railway.platform" = "Ploščad železniškega postajališča";
-"type.railway.preserved" = "Muzejska železnica";
-"type.railway.preserved.bridge" = "Muzejski železniški most";
-"type.railway.preserved.tunnel" = "Muzejski železniški predor";
-"type.railway.rail" = "Železniški tir";
-"type.railway.rail.highspeed" = "Visokohitrostna železnica";
-"type.railway.rail.tourism" = "Turistična železnica";
-"type.railway.rail.main" = "Železnica";
-"type.railway.rail.branch" = "Stranska veja železnice";
-"type.railway.rail.utility" = "Industrijska železnica";
-"type.railway.rail.spur" = "Industrijska veja železnice";
-"type.railway.rail.service" = "Pomožna železnica";
-"type.railway.rail.bridge" = "Železniški most";
-"type.railway.rail.highspeed.bridge" = "Železniški most";
-"type.railway.rail.tourism.bridge" = "Železniški most";
-"type.railway.rail.main.bridge" = "Železniški most";
-"type.railway.rail.branch.bridge" = "Železniški most";
-"type.railway.rail.utility.bridge" = "Železniški most";
-"type.railway.rail.spur.bridge" = "Železniški most";
-"type.railway.rail.service.bridge" = "Železniški most";
-"type.railway.rail.tunnel" = "Železniški predor";
-"type.railway.rail.highspeed.tunnel" = "Železniški predor";
-"type.railway.rail.tourism.tunnel" = "Železniški predor";
-"type.railway.rail.main.tunnel" = "Železniški predor";
-"type.railway.rail.branch.tunnel" = "Železniški predor";
-"type.railway.rail.utility.tunnel" = "Železniški predor";
-"type.railway.rail.spur.tunnel" = "Železniški predor";
-"type.railway.rail.service.tunnel" = "Železniški predor";
-"type.railway.station" = "Železniška postaja";
-"type.railway.station.funicular" = "Postaja vzpenjače";
-"type.railway.station.light_rail" = "Postaja lahke železnice";
-"type.railway.station.light_rail.berlin" = "Postaja mestne železnice";
-"type.railway.station.light_rail.london" = "Postaja DLR";
-"type.railway.station.light_rail.porto" = "Postaja podzemne železnice v Portoju";
-"type.railway.station.monorail" = "Postaja enotirne železnice";
-"type.railway.station.subway" = "Postaja podzemne železnice";
-"type.railway.station.subway.adana" = "Postaja podzemne železnice";
-"type.railway.station.subway.algiers" = "Postaja podzemne železnice";
-"type.railway.station.subway.almaty" = "Postaja podzemne železnice";
-"type.railway.station.subway.amsterdam" = "Postaja podzemne železnice";
-"type.railway.station.subway.ankara" = "Postaja podzemne železnice";
-"type.railway.station.subway.athens" = "Postaja podzemne železnice";
-"type.railway.station.subway.baku" = "Postaja podzemne železnice";
-"type.railway.station.subway.bangkok" = "Postaja podzemne železnice";
-"type.railway.station.subway.barcelona" = "Postaja podzemne železnice";
-"type.railway.station.subway.beijing" = "Postaja podzemne železnice";
-"type.railway.station.subway.bengalore" = "Postaja podzemne železnice";
-"type.railway.station.subway.berlin" = "Postaja podzemne železnice";
-"type.railway.station.subway.bilbao" = "Postaja podzemne železnice";
-"type.railway.station.subway.brasilia" = "Postaja podzemne železnice";
-"type.railway.station.subway.brescia" = "Postaja podzemne železnice";
-"type.railway.station.subway.brussels" = "Postaja podzemne železnice";
-"type.railway.station.subway.bucharest" = "Postaja podzemne železnice";
-"type.railway.station.subway.budapest" = "Postaja podzemne železnice";
-"type.railway.station.subway.buenos_aires" = "Postaja podzemne železnice";
-"type.railway.station.subway.bursa" = "Postaja podzemne železnice";
-"type.railway.station.subway.cairo" = "Postaja podzemne železnice";
-"type.railway.station.subway.caracas" = "Postaja podzemne železnice";
-"type.railway.station.subway.catania" = "Postaja podzemne železnice";
-"type.railway.station.subway.changchun" = "Postaja podzemne železnice";
-"type.railway.station.subway.chengdu" = "Postaja podzemne železnice";
-"type.railway.station.subway.chicago" = "Postaja podzemne železnice";
-"type.railway.station.subway.chongqing" = "Postaja podzemne železnice";
-"type.railway.station.subway.dalian" = "Postaja podzemne železnice";
-"type.railway.station.subway.delhi" = "Postaja podzemne železnice";
-"type.railway.station.subway.dnepro" = "Postaja podzemne železnice";
-"type.railway.station.subway.dubai" = "Postaja podzemne železnice";
-"type.railway.station.subway.ekb" = "Postaja podzemne železnice";
-"type.railway.station.subway.fukuoka" = "Postaja podzemne železnice";
-"type.railway.station.subway.glasgow" = "Postaja podzemne železnice";
-"type.railway.station.subway.guangzhou" = "Postaja podzemne železnice";
-"type.railway.station.subway.hamburg" = "Postaja podzemne železnice";
-"type.railway.station.subway.helsinki" = "Postaja podzemne železnice";
-"type.railway.station.subway.hiroshima" = "Postaja podzemne železnice";
-"type.railway.station.subway.hongkong" = "Postaja podzemne železnice";
-"type.railway.station.subway.isfahan" = "Postaja podzemne železnice";
-"type.railway.station.subway.istanbul" = "Postaja podzemne železnice";
-"type.railway.station.subway.izmir" = "Postaja podzemne železnice";
-"type.railway.station.subway.kazan" = "Postaja podzemne železnice";
-"type.railway.station.subway.kharkiv" = "Postaja podzemne železnice";
-"type.railway.station.subway.kiev" = "Postaja podzemne železnice";
-"type.railway.station.subway.kobe" = "Postaja podzemne železnice";
-"type.railway.station.subway.kolkata" = "Postaja podzemne železnice";
-"type.railway.station.subway.kunming" = "Postaja podzemne železnice";
-"type.railway.station.subway.kyoto" = "Postaja podzemne železnice";
-"type.railway.station.subway.la" = "Postaja podzemne železnice";
-"type.railway.station.subway.lausanne" = "Postaja podzemne železnice";
-"type.railway.station.subway.lille" = "Postaja podzemne železnice";
-"type.railway.station.subway.lima" = "Postaja podzemne železnice";
-"type.railway.station.subway.lisboa" = "Postaja podzemne železnice";
-"type.railway.station.subway.london" = "Postaja podzemne železnice";
-"type.railway.station.subway.lyon" = "Postaja podzemne železnice";
-"type.railway.station.subway.madrid" = "Postaja podzemne železnice";
-"type.railway.station.subway.malaga" = "Postaja podzemne železnice";
-"type.railway.station.subway.manila" = "Postaja podzemne železnice";
-"type.railway.station.subway.maracaibo" = "Postaja podzemne železnice";
-"type.railway.station.subway.mashhad" = "Postaja podzemne železnice";
-"type.railway.station.subway.mecca" = "Postaja podzemne železnice";
-"type.railway.station.subway.medellin" = "Postaja podzemne železnice";
-"type.railway.station.subway.mexico" = "Postaja podzemne železnice";
-"type.railway.station.subway.milan" = "Postaja podzemne železnice";
-"type.railway.station.subway.minsk" = "Postaja podzemne železnice";
-"type.railway.station.subway.montreal" = "Postaja podzemne železnice";
-"type.railway.station.subway.moscow" = "Postaja podzemne železnice";
-"type.railway.station.subway.munchen" = "Postaja podzemne železnice";
-"type.railway.station.subway.nagoya" = "Postaja podzemne železnice";
-"type.railway.station.subway.newyork" = "Postaja podzemne železnice";
-"type.railway.station.subway.nnov" = "Postaja podzemne železnice";
-"type.railway.station.subway.novosibirsk" = "Postaja podzemne železnice";
-"type.railway.station.subway.osaka" = "Postaja podzemne železnice";
-"type.railway.station.subway.oslo" = "Postaja podzemne železnice";
-"type.railway.station.subway.palma" = "Postaja podzemne železnice";
-"type.railway.station.subway.panama" = "Postaja podzemne železnice";
-"type.railway.station.subway.paris" = "Postaja podzemne železnice";
-"type.railway.station.subway.philadelphia" = "Postaja podzemne železnice";
-"type.railway.station.subway.pyongyang" = "Postaja podzemne železnice";
-"type.railway.station.subway.qingdao" = "Postaja podzemne železnice";
-"type.railway.station.subway.rennes" = "Postaja podzemne železnice";
-"type.railway.station.subway.rio" = "Postaja podzemne železnice";
-"type.railway.station.subway.roma" = "Postaja podzemne železnice";
-"type.railway.station.subway.rotterdam" = "Postaja podzemne železnice";
-"type.railway.station.subway.samara" = "Postaja podzemne železnice";
-"type.railway.station.subway.santiago" = "Postaja podzemne železnice";
-"type.railway.station.subway.santo_domingo" = "Postaja podzemne železnice";
-"type.railway.station.subway.saopaulo" = "Postaja podzemne železnice";
-"type.railway.station.subway.sapporo" = "Postaja podzemne železnice";
-"type.railway.station.subway.sendai" = "Postaja podzemne železnice";
-"type.railway.station.subway.sf" = "Postaja podzemne železnice";
-"type.railway.station.subway.shanghai" = "Postaja podzemne železnice";
-"type.railway.station.subway.shenzhen" = "Postaja podzemne železnice";
-"type.railway.station.subway.shiraz" = "Postaja podzemne železnice";
-"type.railway.station.subway.singapore" = "Postaja podzemne železnice";
-"type.railway.station.subway.sofia" = "Postaja podzemne železnice";
-"type.railway.station.subway.spb" = "Postaja podzemne železnice";
-"type.railway.station.subway.stockholm" = "Postaja podzemne železnice";
-"type.railway.station.subway.tabriz" = "Postaja podzemne železnice";
-"type.railway.station.subway.taipei" = "Postaja podzemne železnice";
-"type.railway.station.subway.taoyuan" = "Postaja podzemne železnice";
-"type.railway.station.subway.tashkent" = "Postaja podzemne železnice";
-"type.railway.station.subway.tbilisi" = "Postaja podzemne železnice";
-"type.railway.station.subway.tehran" = "Postaja podzemne železnice";
-"type.railway.station.subway.tianjin" = "Postaja podzemne železnice";
-"type.railway.station.subway.tokyo" = "Postaja podzemne železnice";
-"type.railway.station.subway.valencia" = "Postaja podzemne železnice";
-"type.railway.station.subway.vienna" = "Postaja podzemne železnice";
-"type.railway.station.subway.warszawa" = "Postaja podzemne železnice";
-"type.railway.station.subway.washington" = "Postaja podzemne železnice";
-"type.railway.station.subway.wuhan" = "Postaja podzemne železnice";
-"type.railway.station.subway.yerevan" = "Postaja podzemne železnice";
-"type.railway.station.subway.yokohama" = "Postaja podzemne železnice";
-"type.railway.subway" = "Podzemna železnica";
-"type.railway.subway.bridge" = "Most podzemne železnice";
-"type.railway.subway.tunnel" = "Predor podzemne železnice";
-"type.railway.subway_entrance" = "Vhod v podzemno železnico";
-"type.railway.subway_entrance.adana" = "Vhod v podzemno železnico";
-"type.railway.subway_entrance.algiers" = "Vhod v podzemno železnico";
-"type.railway.subway_entrance.almaty" = "Vhod v podzemno železnico";
-"type.railway.subway_entrance.amsterdam" = "Vhod v podzemno železnico";
-"type.railway.subway_entrance.ankara" = "Vhod v podzemno železnico";
-"type.railway.subway_entrance.athens" = "Vhod v podzemno železnico";

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

@@ -317,7 +317,7 @@
 "type.cuisine.italian" = "Italijanska";
 "type.cuisine.italian_pizza" = "Pica";
 "type.cuisine.japanese" = "Japanska";
-"type.cuisine.kebab" = "Кебаб";
+"type.cuisine.kebab" = "Kebab";
 "type.cuisine.korean" = "Korejska";
 "type.cuisine.lao" = "Laoska";
 "type.cuisine.lebanese" = "Libanska";

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

@@ -247,7 +247,7 @@
 "pref_tts_language_title" = "Röstspråk";
 
 /* Settings «Route» category: «Test Voice Directions» title */
-"pref_tts_test_voice_title" = "Testa röstinstruktioner";
+"pref_tts_test_voice_title" = "Testa röstinstruktioner (TTS, Text-To-Speech)";
 
 /* Title for "Other" section in TTS settings. */
 "pref_tts_other_section_title" = "Övrigt";

iphone/Maps/Maps.xcodeproj/project.pbxproj

@@ -14,7 +14,6 @@
 		270C9C282E16AB6F00ABA688 /* Profile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270C9C252E16AB6300ABA688 /* Profile.swift */; };
 		27176A862E65B0150015F25F /* Icon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 27176A852E65B0150015F25F /* Icon.icon */; };
 		27176A8A2E65B01B0015F25F /* Debug Icon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 27176A892E65B01B0015F25F /* Debug Icon.icon */; };
-		272CA4492F127221005A3F5B /* subtypes.csv in Resources */ = {isa = PBXBuildFile; fileRef = 272CA4482F127221005A3F5B /* subtypes.csv */; };
 		272F1F392E0EE09000FA52EF /* ExistingProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F382E0EE08A00FA52EF /* ExistingProfileView.swift */; };
 		272F1F3B2E0EE0A300FA52EF /* NoExistingProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F3A2E0EE09500FA52EF /* NoExistingProfileView.swift */; };
 		272F1F3D2E0EE0C800FA52EF /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F3C2E0EE0C400FA52EF /* ProfileView.swift */; };
@@ -765,7 +764,6 @@
 		270C9C252E16AB6300ABA688 /* Profile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Profile.swift; sourceTree = "<group>"; };
 		27176A852E65B0150015F25F /* Icon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = Icon.icon; sourceTree = "<group>"; };
 		27176A892E65B01B0015F25F /* Debug Icon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = "Debug Icon.icon"; sourceTree = "<group>"; };
-		272CA4482F127221005A3F5B /* subtypes.csv */ = {isa = PBXFileReference; lastKnownFileType = text; name = subtypes.csv; path = ../../data/subtypes.csv; sourceTree = SOURCE_ROOT; };
 		272F1F382E0EE08A00FA52EF /* ExistingProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExistingProfileView.swift; sourceTree = "<group>"; };
 		272F1F3A2E0EE09500FA52EF /* NoExistingProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoExistingProfileView.swift; sourceTree = "<group>"; };
 		272F1F3C2E0EE0C400FA52EF /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = "<group>"; };
@@ -3956,7 +3954,6 @@
 				F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */,
 				FA85F632145DDDC20090E1A0 /* packed_polygons.bin */,
 				451950391B7A3E070085DA05 /* patterns.txt */,
-				272CA4482F127221005A3F5B /* subtypes.csv */,
 				FAAEA7D0161BD26600CCD661 /* synonyms.txt */,
 				BB25B1A51FB32767007276FA /* transit_colors.txt */,
 				FA64D9A813F975AD00350ECF /* types.txt */,
@@ -4284,7 +4281,6 @@
 				34AB66681FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */,
 				F6D67CDE2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib in Resources */,
 				3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */,
-				272CA4492F127221005A3F5B /* subtypes.csv in Resources */,
 				F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */,
 				3463BA691DE81DB90082417F /* MWMTrafficButtonViewController.xib in Resources */,
 				F623DA6C1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */,

libs/drape_frontend/frontend_renderer.cpp

@@ -24,7 +24,6 @@
 
 #include "indexer/drawing_rules.hpp"
 #include "indexer/scales.hpp"
-#include "indexer/classificator_loader.hpp"
 
 #include "geometry/any_rect2d.hpp"
 
@@ -2371,7 +2370,7 @@ void FrontendRenderer::Routine::Do()
 
   m_renderer.CreateContext();
 
-#if defined(BUILD_DESIGNER) || defined(DEBUG) || defined(DEBUG_DRAPE_XCODE) || defined(SCENARIO_ENABLE)
+#if defined(DEBUG) || defined(DEBUG_DRAPE_XCODE) || defined(SCENARIO_ENABLE)
   gui::DrapeGui::Instance().GetScaleFpsHelper().SetVisible(true);
 #endif
 

libs/indexer/CMakeLists.txt

@@ -88,8 +88,6 @@ set(SRC
   ftraits.hpp
   ftypes_matcher.cpp
   ftypes_matcher.hpp
-  ftypes_subtypes.cpp
-  ftypes_subtypes.hpp
   house_to_street_iface.hpp
   index_builder.cpp
   index_builder.hpp