[android] Add setting to hide speed limit during navigation

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
2026-01-17 16:34:50 +00:00 · 2026-01-15 20:31:28 +01:00
112 changed files with 2212 additions and 2895 deletions
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -400,14 +400,8 @@
        android:name="app.organicmaps.settings.SettingsActivity"
        android:configChanges="orientation|screenLayout|screenSize"
        android:screenOrientation="fullUser"
-        android:exported="true"
        android:label="@string/settings"
-        android:parentActivityName="app.organicmaps.MwmActivity" >
-        <intent-filter>
-            <action android:name="android.intent.action.APPLICATION_PREFERENCES"/>
-            <category android:name="android.intent.category.DEFAULT"/>
-        </intent-filter>
-    </activity>
+        android:parentActivityName="app.organicmaps.MwmActivity" />

    <activity
        android:name="app.organicmaps.help.HelpActivity"
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -1196,7 +1196,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
    if (mOnmapDownloader != null)
      mOnmapDownloader.onResume();

-    mNavigationController.refresh();
+    mNavigationController.refresh(getApplicationContext(), Framework.nativeGetRouteFollowingInfo());
    refreshLightStatusBar();

    MwmApplication.from(this).getSensorHelper().addListener(this);
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -1,7 +1,10 @@
 package app.organicmaps.routing;

+import static androidx.core.content.ContextCompat.getString;
 import static app.organicmaps.sdk.util.Utils.dimen;

+import android.content.Context;
+import android.content.SharedPreferences;
 import android.location.Location;
 import android.text.TextUtils;
 import android.view.View;
@@ -13,6 +16,7 @@ import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.preference.PreferenceManager;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.maplayer.MapButtonsViewModel;
@@ -58,6 +62,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav

  private final NavMenu mNavMenu;
  View.OnClickListener mOnSettingsClickListener;
+  private final SharedPreferences sharedPreferences;
+  private final boolean speedLimitEnabled;

  private void addWindowsInsets(@NonNull View topFrame)
  {
@@ -72,6 +78,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
  public NavigationController(AppCompatActivity activity, View.OnClickListener onSettingsClickListener,
                              NavMenu.OnMenuSizeChangedListener onMenuSizeChangedListener)
  {
+    sharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+    speedLimitEnabled = sharedPreferences.getBoolean(getString(activity, R.string.pref_speedlimit),true);
    mMapButtonsViewModel = new ViewModelProvider(activity).get(MapButtonsViewModel.class);

    mFrame = activity.findViewById(R.id.navigation_frame);
@@ -97,6 +105,16 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav

    mSpeedLimit = topFrame.findViewById(R.id.nav_speed_limit);
    mCurrentSpeed = topFrame.findViewById(R.id.nav_current_speed);
+    if (speedLimitEnabled)
+    {
+        UiUtils.show(mSpeedLimit);
+        UiUtils.show(mCurrentSpeed);
+    }
+    else
+    {
+        UiUtils.hide(mSpeedLimit);
+        UiUtils.hide(mCurrentSpeed);
+    }

    View mTopbar = topFrame.findViewById(R.id.statutbar);
    ViewCompat.setOnApplyWindowInsetsListener(mTopbar,(v, windowInsets) -> {
@@ -136,7 +154,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav

    mLanesView.setLanes(info.lanes);

-    updateSpeedWidgets(info);
+    if (speedLimitEnabled)
+        updateSpeedWidgets(info);
  }

  private void updatePedestrian(@NonNull RoutingInfo info)
@@ -144,7 +163,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
    mNextTurnDistance.setText(Utils.formatDistance(mFrame.getContext(), info.distToTurn));

    info.pedestrianTurnDirection.setTurnDrawable(mNextTurnImage);
-    updateSpeedWidgets(info);
+    if (speedLimitEnabled)
+        updateSpeedWidgets(info);
  }

  public void updateNorth()
@@ -205,9 +225,22 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
    mNavMenu.collapseNavBottomSheet();
  }

-  public void refresh()
+  public void refresh(Context context, RoutingInfo info)
  {
-    mNavMenu.refreshTts();
+      mNavMenu.refreshTts();
+      if (speedLimitEnabled != sharedPreferences.getBoolean(getString(context, R.string.pref_speedlimit),true)) {
+          if (speedLimitEnabled)
+          {
+              UiUtils.show(mSpeedLimit);
+              UiUtils.show(mCurrentSpeed);
+              updateSpeedWidgets(info);
+          }
+          else
+          {
+              UiUtils.hide(mSpeedLimit);
+              UiUtils.hide(mCurrentSpeed);
+          }
+      }
  }

  @Override
--- a/android/app/src/main/res/drawable/ic_speed.xml
+++ b/android/app/src/main/res/drawable/ic_speed.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?iconTint">
+  <path
+      android:pathData="M418,620q24,24 62,23.5t56,-27.5l224,-336 -336,224q-27,18 -28.5,55t22.5,61ZM480,160q59,0 113.5,16.5T696,226l-76,48q-33,-17 -68.5,-25.5T480,240q-133,0 -226.5,93.5T160,560q0,42 11.5,83t32.5,77h552q23,-38 33.5,-79t10.5,-85q0,-36 -8.5,-70T766,420l48,-76q30,47 47.5,100T880,554q1,57 -13,109t-41,99q-11,18 -30,28t-40,10L204,800q-21,0 -40,-10t-30,-28q-26,-45 -40,-95.5T80,560q0,-83 31.5,-155.5t86,-127Q252,223 325,191.5T480,160ZM487,473Z"
+      android:fillColor="#FFFFFF"/>
+</vector>
--- a/android/app/src/main/res/drawable/ic_track_recording_off.xml
+++ b/android/app/src/main/res/drawable/ic_track_recording_off.xml
@@ -1,10 +1,49 @@
 <vector
  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="89dp"
-  android:height="80dp"
-  android:viewportWidth="89"
-  android:viewportHeight="80">
+  android:width="74dp"
+  android:height="57dp"
+  android:viewportWidth="74"
+  android:viewportHeight="57">
  <path
-        android:fillColor="#757575"
-        android:pathData="m33.024,19.508c3.955,-3.981 10.402,-4.015 14.399,-0.078 3.999,3.937 4.034,10.355 0.079,14.333l-15.623,15.722c-2.518,2.534 -2.495,6.616 0.049,9.122 2.546,2.504 6.646,2.483 9.164,-0.051l15.309,-15.404c-0.166,-0.342 -0.306,-0.691 -0.422,-1.044l-4.288,0.001c-2.983,0 -3.916,-4.084 -1.118,-5.383l8.362,-3.848c0.941,-0.696 2.001,-1.172 3.104,-1.423l12.775,-5.867c2.238,-0.928 4.663,1.486 3.731,3.713l-11.189,24.132c-1.305,2.783 -5.408,1.854 -5.408,-1.115l-0,-4.717c-0.542,-0.13 -1.077,-0.316 -1.599,-0.561l-15.309,15.404c-4.675,4.704 -12.293,4.745 -17.019,0.092 -4.723,-4.653 -4.765,-12.237 -0.09,-16.941l15.623,-15.722c1.798,-1.808 1.782,-4.725 -0.035,-6.515 -1.819,-1.79 -4.749,-1.774 -6.547,0.035l-10.093,10.16c0.467,1.061 0.727,2.232 0.727,3.464 0,4.766 -3.89,8.638 -8.678,8.638 -4.79,0 -8.678,-3.872 -8.678,-8.638 0,-4.768 3.888,-8.638 8.678,-8.638 1.524,0 2.958,0.392 4.204,1.081z" />
+    android:pathData="m67.3,21.772 l-28.103,11.757 11.772,5.095 5.463,11.606z"
+    android:strokeLineJoin="round"
+    android:strokeWidth="2"
+    android:fillColor="#757575"
+    android:strokeColor="#757575" />
+  <path
+    android:pathData="M45.042,44.7m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M37.942,51.6m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M27.842,52m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="m26.942,43.5c0,2.485 -2.015,4.5 -4.5,4.5 -2.485,0 -4.5,-2.015 -4.5,-4.5 0,-2.485 2.015,-4.5 4.5,-4.5 2.485,0 4.5,2.015 4.5,4.5z"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M26.642,34.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M34.042,27.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M40.842,20.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M41.842,10.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M32.842,4.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M23.842,9.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M16.842,16.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M9.842,23.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
 </vector>
--- a/android/app/src/main/res/drawable/ic_track_recording_on.xml
+++ b/android/app/src/main/res/drawable/ic_track_recording_on.xml
@@ -7,8 +7,47 @@
    <path
      android:pathData="m4.858,10.076c0,-5.523 4.477,-10 10,-10h60c5.523,0 10,4.477 10,10v60c0,5.523 -4.477,10 -10,10h-60c-5.523,0 -10,-4.477 -10,-10z"
      android:fillColor="@color/active_track_recording"
-      android:fillAlpha="0.78"/>
-  <path
-      android:pathData="m33.024,19.508c3.955,-3.981 10.402,-4.015 14.399,-0.078 3.999,3.937 4.034,10.355 0.079,14.333l-15.623,15.722c-2.518,2.534 -2.495,6.616 0.049,9.122 2.546,2.504 6.646,2.483 9.164,-0.051l15.309,-15.404c-0.166,-0.342 -0.306,-0.691 -0.422,-1.044l-4.288,0.001c-2.983,0 -3.916,-4.084 -1.118,-5.383l8.362,-3.848c0.941,-0.696 2.001,-1.172 3.104,-1.423l12.775,-5.867c2.238,-0.928 4.663,1.486 3.731,3.713l-11.189,24.132c-1.305,2.783 -5.408,1.854 -5.408,-1.115l-0,-4.717c-0.542,-0.13 -1.077,-0.316 -1.599,-0.561l-15.309,15.404c-4.675,4.704 -12.293,4.745 -17.019,0.092 -4.723,-4.653 -4.765,-12.237 -0.09,-16.941l15.623,-15.722c1.798,-1.808 1.782,-4.725 -0.035,-6.515 -1.819,-1.79 -4.749,-1.774 -6.547,0.035l-10.093,10.16c0.467,1.061 0.727,2.232 0.727,3.464 0,4.766 -3.89,8.638 -8.678,8.638 -4.79,0 -8.678,-3.872 -8.678,-8.638 0,-4.768 3.888,-8.638 8.678,-8.638 1.524,0 2.958,0.392 4.204,1.081z"
-      android:fillColor="#fff"/>
+      android:fillAlpha="0.78" />
+    <path
+      android:pathData="m78.907,32.87 l-31.833,13.318 13.335,5.772 6.188,13.147z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#ffffff"
+      android:strokeColor="#ffffff" />
+    <path
+      android:pathData="M49.731,57.709a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M41.688,65.525a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M30.247,65.978a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="m34.324,56.35c0,2.815 -2.282,5.097 -5.097,5.097 -2.815,0 -5.097,-2.282 -5.097,-5.097 0,-2.815 2.282,-5.097 5.097,-5.097 2.815,0 5.097,2.282 5.097,5.097z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M28.888,46.155a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M37.27,38.226a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M44.974,30.297a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M46.106,18.969a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M35.911,12.173a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M25.718,17.837a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M17.788,25.766a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M9.858,33.695a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
 </vector>
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -68,11 +68,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Tilføj en ny liste</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Listenavn</string>
+    <string name="bookmark_set_name">Indstil navn for bogmærkeliste</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Steder</string>
+    <string name="bookmarks">Bogmærker</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Favoritter</string>
+    <string name="bookmarks_and_tracks">Bogmærker og spor</string>
    <!-- Add bookmark dialog - bookmark name -->
    <string name="name">Navn</string>
    <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -144,13 +144,13 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Noter</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Mine CoMaps-favoritter</string>
+    <string name="share_bookmarks_email_subject">CoMaps bogmærker er blevet delt med dig</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Indlæser favoritter</string>
+    <string name="load_kmz_title">Indlæser bogmærker</string>
    <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Favoritter er indlæst! Du kan finde dem på kortet eller på skærmen for favorithåndtering.</string>
+    <string name="load_kmz_successful">Bogmærker er indlæst! Du kan finde dem på kortet eller på skærmen for bogmærkehåndtering.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Favoritter kunne ikke indlæses. Filen kan være skadet eller defekt.</string>
+    <string name="load_kmz_failed">Bogmærkerne kunne ikke indlæses. Filen kan være skadet eller defekt.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">Filtypen genkendes ikke af appen: \n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -486,7 +486,7 @@
    <string name="minute">min</string>
    <string name="day">d</string>
    <string name="placepage_more_button">Mere</string>
-    <string name="placepage_edit_bookmark_button">Rediger gemt sted</string>
+    <string name="placepage_edit_bookmark_button">Rediger bogmærke</string>
    <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
    <string name="editor_reset_edits_message">Kassér alle lokale ændringer?</string>
    <string name="editor_reset_edits_button">Kassér ændringer</string>
@@ -543,17 +543,17 @@
    <string name="dialog_error_storage_message">Eksternt lager er ikke tilgængeligt. SD-kortet kan være blevet fjernet eller beskadiget, eller filsystemet er skrivebeskyttet. Kontroller dit SD-kort eller kontakt os på support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Emulér beskadiget lager</string>
    <string name="error_enter_correct_name">Angiv et korrekt navn</string>
-    <string name="bookmark_lists">Favoritlister</string>
+    <string name="bookmark_lists">Lister</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Skjul alle</string>
    <string name="bookmark_lists_show_all">Vis alle</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d gemt sted</item>
-        <item quantity="other">%d gemte steder</item>
+        <item quantity="one">%d bogmærke</item>
+        <item quantity="other">%d bogmærker</item>
    </plurals>
    <string name="bookmarks_create_new_group">Opret ny liste</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importer favoritter</string>
+    <string name="bookmarks_import">Importer bogmærker og spor</string>
    <string name="bookmarks_error_message_share_general">Ikke i stand til at dele på grund af en applikationsfejl</string>
    <string name="bookmarks_error_title_share_empty">Delingsfejl</string>
    <string name="bookmarks_error_message_share_empty">Kan ikke dele en tom liste</string>
@@ -582,7 +582,7 @@
    <string name="subway">Undergrundsbane</string>
    <string name="layers_title">Kortstile og -lag</string>
    <string name="bookmarks_empty_list_title">Listen er tom</string>
-    <string name="bookmarks_empty_list_message">For at gemme et sted, så tryk et sted på kortet og dernæst på stjerneikonet</string>
+    <string name="bookmarks_empty_list_message">For at tilføje et bogmærke, så tryk et sted på kort og så på stjerneikonet</string>
    <string name="category_desc_more">…mere</string>
    <string name="export_file">Eksporter KMZ</string>
    <string name="export_file_gpx">Eksporter GPX</string>
@@ -635,7 +635,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Sorter…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Sorter favoritter</string>
+    <string name="sort_bookmarks">Sorter bogmærker</string>
    <!-- Android -->
    <string name="by_default">Som standard</string>
    <!-- Android -->
@@ -736,7 +736,7 @@
    <string name="browser_not_available">Webbrowser er ikke tilgængelig</string>
    <string name="volume">Lydstyrke</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Eksporter alle steder og spor</string>
+    <string name="bookmarks_export">Eksporter alle bogmærker og spor</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Indstillinger for talesyntese-system</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -768,7 +768,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Fortsæt optagelse</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Gem i favoritter?</string>
+    <string name="track_recording_alert_title">Gem i bogmærker og spor?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">Sporet er tomt - der er ikke noget at gemme</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -787,7 +787,7 @@
    <string name="error_enter_correct_facebook_page">Indtast en gyldig Facebook-webadresse, -konto eller -sidenavn</string>
    <string name="connection_failure">Forbindelsesfejl</string>
    <string name="error_enter_correct_twitter_page">Indtast et gyldigt Twitter-brugernavn eller en webadresse</string>
-    <string name="share_bookmarks_email_body">Hej! \n \nVedhæftet er mine favoritter; åbn dem i CoMaps. Hvis du ikke har den installeret, kan du downloade den her: https://www.comaps.app/download/\n \nGod rejse med CoMaps!</string>
+    <string name="share_bookmarks_email_body">Hej! \n \nVedhæftet er mine bogmærker; åbn dem venligst i CoMaps. Hvis du ikke har den installeret, kan du downloade den her: https://www.comaps.app/download/\n \nGod rejse med CoMaps!</string>
    <string name="delete_place_empty_comment_error">Angiv begrundelsen for at slette stedet</string>
    <string name="disk_error_title">Diskfejl</string>
    <string name="error_enter_correct_instagram_page">Indtast et gyldigt Instagram-brugernavn eller en webadresse</string>
@@ -817,7 +817,7 @@
    <string name="error_enter_correct_bluesky_page">Indtast et gyldigt Bluesky-brugernavn eller en webadresse</string>
    <string name="editor_level">Etage (0 er stueetage)</string>
    <string name="pref_backup_now_summary_ok">Sikkerhedskopiering fuldført</string>
-    <string name="pref_backup_now_summary_empty_lists">Ingen steder og spor at lave sikkerhedskopi af</string>
+    <string name="pref_backup_now_summary_empty_lists">Ingen bogmærker og spor at lave sikkerhedskopi af</string>
    <string name="pref_backup_now_summary_failed">Sikkerhedskopiering mislykkedes</string>
    <string name="pref_backup_now_summary_folder_unavailable">Mappen til sikkerhedskopiering er ikke tilgængelig</string>
    <string name="pref_backup_status_summary_success">Sidste vellykkede sikkerhedskopiering</string>
@@ -832,7 +832,7 @@
    <string name="editor_building_levels">Etager (inkl. stueetage, ekskl. tag)</string>
    <string name="error_enter_correct_level">Indtast et gyldigt etagenummer</string>
    <string name="pref_left_button_title">Indstilling af venstre knap</string>
-    <string name="pref_backup_title">Sikkerhedskopi af favoritter</string>
+    <string name="pref_backup_title">Sikkerhedskopi af bogmærker og spor</string>
    <string name="pref_backup_now_title">Sikkerhedskopiér nu</string>
    <string name="pref_backup_now_summary">Opret en sikkerhedskopi straks</string>
    <string name="clear">Ryd</string>
@@ -841,7 +841,7 @@
    <string name="pedestrian">Fodgænger</string>
    <string name="bicycle">Cykel</string>
    <string name="ruler">Lineal</string>
-    <string name="bookmark_color">Favoritfarve</string>
+    <string name="bookmark_color">Bogmærkefarve</string>
    <string name="pref_backup_summary">Automatisk sikkerhedskopiering til en mappe på din enhed</string>
    <string name="pref_backup_now_summary_progress">Sikkerhedskopiering i gang…</string>
    <string name="pref_backup_location_title">Placering af sikkerhedskopi</string>
@@ -907,5 +907,4 @@
    <string name="download_resources_custom_url_message">Tilsidesæt den som standard anvendte server til download af kort. Lad feltet være tomt for at bruge CoMaps\' standardserver.</string>
    <string name="download_resources_custom_url_summary_none">Ikke indstillet</string>
    <string name="download_resources_custom_url_error_scheme">Indtast en URL, der starter med http:// eller https://</string>
-    <string name="pref_maplanguage_local">Lokalt sprog</string>
 </resources>
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -68,9 +68,9 @@
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
    <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 -->
@@ -146,10 +146,10 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">Σημειώσεις</string>
    <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Τα Αγαπημένα μου στο CoMaps</string>
-    <string name="share_bookmarks_email_body">Γειά σου! \n \nΣου επισυνάπτω τα αγαπημένα μου. Παρακαλώ άνοιξε τα με το CoMaps. Αν δεν το έχεις εγκατεστημένο, μπορείς να το κατεβάσεις από εδώ: https://www.comaps.app/download/ \n \nΚαλή διασκέδαση ταξιδεύοντας με το CoMaps!</string>
+    <string name="share_bookmarks_email_subject">Κοινοποιήθηκαν τα αγαπημένα από το CoMaps σε εσάς</string>
+    <string name="share_bookmarks_email_body">Γειa! \n \nΣου επισυνάπτω τα αγαπημένα μου. Παρακαλώ άνοιξέ τα με το CoMaps. Αν δεν το έχεις εγκαταστήσει, μπορείς να το κατεβάσεις από εδώ: https://www.comaps.app/download/ \n \nΚαλή διασκέδαση ταξιδεύοντας με το CoMaps!</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Φορτώνονται τα Αγαπημένα</string>
+    <string name="load_kmz_title">Φορτώνονται τα αγαπημένα</string>
    <!-- Kmz file successful loading -->
    <string name="load_kmz_successful">Τα αγαπημένα φορτώθηκαν με επιτυχία! Μπορείτε να τα βρείτε στο χάρτη ή στην οθόνη Διαχείρισης αγαπημένων.</string>
    <!-- Kml file loading failed -->
@@ -163,9 +163,9 @@
    <!-- Warning message when doing search around current position -->
    <string name="unknown_current_position">Η τοποθεσία σας δεν έχει προσδιοριστεί ακόμη</string>
    <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Λυπούμαστε, οι ρυθμίσεις αποθήκευσης χαρτών είναι προς το παρόν απενεργοποιημένες</string>
+    <string name="cant_change_this_setting">Λυπούμαστε, οι ρυθμίσεις αποθήκευσης χαρτών είναι προς το παρόν απενεργοποιημένες.</string>
    <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Η λήψη χάρτη βρίσκεται σε εξέλιξη</string>
+    <string name="downloading_is_active">Λήψη χάρτη βρίσκεται σε εξέλιξη.</string>
    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
    <string name="my_position_share_sms">Δες την τρέχουσα τοποθεσία μου στο CoMaps! %1$s ή %2$s Αν δεν έχεις τους χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://www.comaps.app/download/</string>
    <!-- Subject for emailed bookmark -->
@@ -185,7 +185,7 @@
    <!-- Data version in «About» screen, %@ is replaced by a local, human readable date. -->
    <string name="data_version">Δεδομένα OpenStreetMap: %s</string>
    <!-- Title for tracks category in bookmarks manager -->
-    <string name="tracks_title">Ίχνη</string>
+    <string name="tracks_title">Διαδρομές</string>
    <!-- Length of track in cell that describes route -->
    <string name="length">Μήκος</string>
    <string name="share_my_location">Κοινοποίηση της τοποθεσίας μου</string>
@@ -269,7 +269,7 @@
    <string name="downloader_download_all_button">Λήψη όλων</string>
    <string name="downloader_downloading">Γίνεται λήψη:</string>
    <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Για να διαγράψετε το χάρτη, σταματήστε την πλοήγηση</string>
+    <string name="downloader_delete_map_while_routing_dialog">Για να διαγράψετε το χάρτη, σταματήστε την πλοήγηση.</string>
    <!-- PointsInDifferentMWM -->
    <string name="routing_failed_cross_mwm_building">Μπορούν να δημιουργηθούν μόνο διαδρομές που περιέχονται πλήρως μέσα σε ένα χάρτη σε μια ενιαία περιοχή.</string>
    <!-- Context menu item for downloader. -->
@@ -295,7 +295,7 @@
    <!-- location service disabled -->
    <string name="enable_location_services">Ενεργοποιήστε τις υπηρεσίες εντοπισμού τοποθεσίας</string>
    <string name="save">Αποθήκευση</string>
-    <string name="create">Δημιουργία</string>
+    <string name="create">δημιουργήστε</string>
    <!-- red color -->
    <string name="red">Κόκκινο</string>
    <!-- yellow color -->
@@ -341,18 +341,18 @@
    <string name="dialog_routing_location_turn_on">Ενεργοποιήστε τις υπηρεσίες εντοπισμού τοποθεσίας</string>
    <string name="dialog_routing_location_unknown_turn_on">Δεν είναι δυνατός ο εντοπισμός των τρεχουσών συντεταγμένων GPS. Ενεργοποιήστε τις υπηρεσίες εντοπισμού τοποθεσίας για τον υπολογισμό της διαδρομής.</string>
    <string name="dialog_routing_unable_locate_route">Δε μπορεί να εντοπιστεί η διαδρομή</string>
-    <string name="dialog_routing_cant_build_route">Δε μπορεί να δημιουργηθεί η διαδρομή</string>
+    <string name="dialog_routing_cant_build_route">Δε μπορεί να δημιουργηθεί η διαδρομή.</string>
    <string name="dialog_routing_change_start_or_end">Ρυθμίστε το σημείο εκκίνησης ή τον προορισμό σας.</string>
    <string name="dialog_routing_change_start">Ρυθμίστε το σημείο εκκίνησης</string>
    <string name="dialog_routing_start_not_determined">Η διαδρομή δεν δημιουργήθηκε. Δεν είναι δυνατός ο εντοπισμός του σημείου εκκίνησης.</string>
    <string name="dialog_routing_select_closer_start">Επιλέξτε σημείο εκκίνησης πιο κοντά σε κάποιο δρόμο.</string>
    <string name="dialog_routing_change_end">Ρύθμιση προορισμού</string>
    <string name="dialog_routing_end_not_determined">Η διαδρομή δεν δημιουργήθηκε. Δεν είναι δυνατός ο εντοπισμός του προορισμού.</string>
-    <string name="dialog_routing_select_closer_end">Επιλέξτε ένα σημείο προορισμού πιο κοντά σε κάποιο δρόμο</string>
-    <string name="dialog_routing_change_intermediate">Δεν είναι δυνατός ο εντοπισμός ενδιάμεσου σημείου</string>
-    <string name="dialog_routing_intermediate_not_determined">Προσαρμόστε το ενδιάμεσο σημείο</string>
+    <string name="dialog_routing_select_closer_end">Επιλέξτε ένα σημείο προορισμού πιο κοντά σε κάποιο δρόμο.</string>
+    <string name="dialog_routing_change_intermediate">Δεν είναι δυνατός ο εντοπισμός ενδιάμεσου σημείου.</string>
+    <string name="dialog_routing_intermediate_not_determined">Ρυθμίστε το ενδιάμεσο σημείο.</string>
    <string name="dialog_routing_system_error">Σφάλμα συστήματος</string>
-    <string name="dialog_routing_application_error">Δεν είναι δυνατή η δημιουργία διαδρομής λόγω σφάλματος της εφαρμογής</string>
+    <string name="dialog_routing_application_error">Δεν είναι δυνατή η δημιουργία διαδρομής λόγω σφάλματος της εφαρμογής.</string>
    <string name="dialog_routing_try_again">Προσπαθήστε ξανά</string>
    <string name="not_now">Όχι τώρα</string>
    <string name="dialog_routing_download_and_build_cross_route">Θέλετε να κατεβάσετε το χάρτη και να δημιουργήσετε μια πιο βέλτιστη διαδρομή που εκτείνεται σε περισσότερους από έναν χάρτες;</string>
@@ -366,11 +366,11 @@
    <string name="hide">Απόκρυψη</string>
    <string name="categories">Κατηγορίες</string>
    <string name="history">Ιστορικό</string>
-    <string name="search_not_found">Ωχ, δε βρέθηκαν αποτελέσματα</string>
+    <string name="search_not_found">Ωχ, δε βρέθηκαν αποτελέσματα.</string>
    <!-- The message when user did not find anything in the search. -->
    <string name="search_not_found_query">Κατεβάστε την περιοχή στην οποία ψάχνετε ή δοκιμάστε να προσθέσετε το όνομα μιας κοντινής πόλης/χωριού.</string>
    <string name="search_history_title">Ιστορικό αναζητήσεων</string>
-    <string name="search_history_text">Προβολή πρόσφατων αναζητήσεων</string>
+    <string name="search_history_text">Προβολή πρόσφατων αναζητήσεων.</string>
    <string name="clear_search">Εκκαθάριση ιστορικού αναζητήσεων</string>
    <!-- Place Page link to Wikipedia article (if map object has it). -->
    <string name="read_in_wikipedia">Βικιπέδια</string>
@@ -378,7 +378,7 @@
    <string name="p2p_start">Έναρξη</string>
    <string name="p2p_from_here">Διαδρομή από</string>
    <string name="p2p_to_here">Διαδρομή προς</string>
-    <string name="p2p_only_from_current">Η πλοήγηση είναι διαθέσιμη μόνο από την τρέχουσα τοποθεσία σας</string>
+    <string name="p2p_only_from_current">Η πλοήγηση είναι διαθέσιμη μόνο από την τρέχουσα τοποθεσία σας.</string>
    <string name="p2p_reroute_from_current">Θέλετε να σχεδιαστεί μια διαδρομή από την τρέχουσα τοποθεσία σας;</string>
    <!-- Edit open hours/set time and minutes dialog -->
    <string name="next_button">Επόμενο</string>
@@ -443,11 +443,11 @@
    <!-- login text field -->
    <string name="editor_add_phone">Προσθήκη Τηλεφώνου</string>
    <string name="level">Όροφος</string>
-    <string name="downloader_delete_map_dialog">Όλες οι αλλαγές που έχετε κάνει στο χάρτη θα διαγραφούν μαζί με το χάρτη</string>
+    <string name="downloader_delete_map_dialog">Όλες οι αλλαγές που έχετε κάνει στο χάρτη θα διαγραφούν μαζί με το χάρτη.</string>
    <string name="downloader_update_maps">Ενημέρωση χαρτών</string>
    <string name="downloader_mwm_migration_dialog">Για να δημιουργήσετε μια διαδρομή, πρέπει να ενημερώσετε όλους τους χάρτες και στη συνέχεια να σχεδιάσετε τη διαδρομή ξανά.</string>
    <string name="downloader_search_field_hint">Εύρεση χάρτη</string>
-    <string name="common_check_internet_connection_dialog">Βεβαιωθείτε ότι η συσκευή σας είναι συνδεδεμένη στο Διαδίκτυο</string>
+    <string name="common_check_internet_connection_dialog">Βεβαιωθείτε ότι η συσκευή σας είναι συνδεδεμένη στο Internet.</string>
    <string name="downloader_no_space_title">Δεν υπάρχει αρκετός χώρος</string>
    <string name="downloader_no_space_message">Διαγράψτε μη απαραίτητα δεδομένα</string>
    <string name="editor_login_error_dialog">Σφάλμα σύνδεσης</string>
@@ -492,11 +492,11 @@
    <string name="editor_category_unsuitable_text">Οι CoMaps επιτρέπουν την προσθήκη απλών κατηγοριών σημείων μόνο, δηλαδή όχι πόλεων, δρόμων, λιμνών, περιγραμμάτων κτιρίων κ.λπ. Παρακαλούμε προσθέστε τέτοιες κατηγορίες απευθείας στο <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Ελέγξτε τον <a href="https://www.comaps.app/support/advanced-map-editing/">οδηγό μας</a> για λεπτομερείς οδηγίες βήμα προς βήμα.</string>
    <string name="downloader_no_downloaded_maps_title">Δεν έχετε κατεβάσει χάρτες</string>
    <string name="downloader_no_downloaded_maps_message">Κατεβάστε χάρτες για να κάνετε αναζήτηση και να πλοηγηθείτε χωρίς σύνδεση</string>
-    <string name="current_location_unknown_error_title">Η τρέχουσα τοποθεσία είναι άγνωστη</string>
+    <string name="current_location_unknown_error_title">Η τρέχουσα τοποθεσία είναι άγνωστη.</string>
    <!-- abbreviation for kilometers per hour -->
    <string name="kilometers_per_hour">χμ/ω</string>
    <string name="placepage_more_button">Περισσότερα</string>
-    <string name="placepage_edit_bookmark_button">Επεξεργασία αγαπημένων μερών</string>
+    <string name="placepage_edit_bookmark_button">Επεξεργασία αγαπημένου</string>
    <string name="placepage_personal_notes_hint">Προσωπικές σημειώσεις (κείμενο ή html)</string>
    <string name="editor_reset_edits_message">Απόρριψη όλων των τοπικών αλλαγών;</string>
    <string name="editor_reset_edits_button">Απόρριψη αλλαγών</string>
@@ -520,9 +520,9 @@
    <!-- Dialog before publishing the modifications to the public map. -->
    <string name="editor_share_to_all_dialog_message_1">Βεβαιωθείτε ότι δεν έχετε εισάγει προσωπικά δεδομένα.</string>
    <string name="editor_share_to_all_dialog_message_2">Οι συντάκτες του OpenStreetMap θα ελέγξουν τις αλλαγές και θα επικοινωνήσουν μαζί σας εάν έχουν απορίες.</string>
-    <string name="navigation_stop_button">Τέλος</string>
+    <string name="navigation_stop_button">τέλος</string>
    <!-- Shown as toast when starting the recent track recording -->
-    <string name="track_recording">Καταγραφή του ίχνους</string>
+    <string name="track_recording">Καταγραφή της διαδρομής</string>
    <!-- For the first routing -->
    <string name="accept">Συμφωνώ</string>
    <!-- For the first routing -->
@@ -530,13 +530,13 @@
    <string name="mobile_data_dialog">Θέλετε να χρησιμοποιήσετε το δίκτυο κινητής τηλεφωνίας για να εμφανίσετε αναλυτικές πληροφορίες;</string>
    <string name="mobile_data_option_always">Να χρησιμοποιείται πάντα</string>
    <string name="mobile_data_option_today">Μόνο σήμερα</string>
-    <string name="mobile_data_option_not_today">Να μην χρησιμοποιηθεί σήμερα</string>
+    <string name="mobile_data_option_not_today">Να Μην χρησιμοποιηθεί σήμερα</string>
    <string name="mobile_data">Ίντερνετ μέσω δικτύου κινητής</string>
    <!-- NOTE to translators: please synchronize your translation with the English one. -->
    <string name="mobile_data_description">Απαιτείται πρόσβαση στο ίντερνετ μέσω δικτύου κινητής για την εμφάνιση αναλυτικών πληροφοριών για τις τοποθεσίες, όπως φωτογραφίες, τιμές και κριτικές.</string>
    <string name="mobile_data_option_never">Να μην χρησιμοποιείται ποτέ</string>
    <string name="mobile_data_option_ask">Να γίνεται πάντα ερώτηση</string>
-    <string name="traffic_update_maps_text">Για να εμφανιστούν πληροφορίες για την κίνηση, πρέπει να ενημερωθούν οι χάρτες</string>
+    <string name="traffic_update_maps_text">Για να εμφανιστούν πληροφορίες για την κίνηση, πρέπει να ενημερωθούν οι χάρτες.</string>
    <string name="big_font">Αύξηση μεγέθους γραμματοσειράς στο χάρτη</string>
    <string name="traffic_update_app">Κάντε ενημέρωση του CoMaps</string>
    <!-- "traffic" as in "road congestion" -->
@@ -546,7 +546,7 @@
    <string name="feedback_general">Αποστολή γνώμης</string>
    <string name="prefs_languages_information">Χρησιμοποιούμε το σύστημα TTS για τις φωνητικές οδηγίες. Αρκετές συσκευές Android χρησιμοποιούν το Google TTS, μπορείτε να το κατεβάσετε ή να το ενημερώσετε από το Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
    <string name="prefs_languages_information_off">Για μερικές γλώσσες θα χρειαστεί να εγκαταστήσετε συνθεσάιζερ ομιλίας ή κάποιο συμπληρωματικό πακέτο γλώσσας από το app store (Google Play, Galaxy Store, App Gallery, FDroid). \nΑνοίξτε τις Ρυθμίσεις της συσκευής σας → Γλώσσα και εισαγωγή → Ομιλία → Μετατροπή κειμένου σε ομιλία. \nΕδώ μπορείτε να διαχειριστείτε τις ρυθμίσεις της σύνθεσης ομιλίας (για παράδειγμα, μπορείτε να κατεβάσετε πακέτο γλώσσας για χρήση εκτός σύνδεσης) και να επιλέξετε άλλη μηχανή μετατροπής κειμένου σε ομιλία.</string>
-    <string name="prefs_languages_information_off_link">Για περισσότερες πληροφορίες δείτε αυτό τον οδηγό</string>
+    <string name="prefs_languages_information_off_link">Για περισσότερες πληροφορίες δείτε αυτό τον οδηγό.</string>
    <string name="transliteration_title">Μεταγραφή στο λατινικό αλφάβητο</string>
    <string name="learn_more">Μάθετε περισσότερα</string>
    <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
@@ -561,17 +561,17 @@
    <string name="dialog_error_storage_message">Ο εξωτερικός απθηκευτικός χώρος δεν είναι διαθέσιμος, πιθανότατα έχει αφαιρεθεί η κάρτα SD, είναι κατεστραμμένη ή το σύστημα αρχείων είναι μόνο για ανάγνωση. Ελέγξτε το και επικοινωνήστε μαζί μας στη διεύθυνση support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Εξομείωση κακού αποθηκευτικού χώρου</string>
    <string name="error_enter_correct_name">Εισάγετε ένα σωστό όνομα</string>
-    <string name="bookmark_lists">Λίστες αγαπημένων</string>
+    <string name="bookmark_lists">Λίστες</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Απόκρυψη όλων</string>
    <string name="bookmark_lists_show_all">Εμφάνιση όλων</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d αγαπημένο μέρος</item>
-        <item quantity="other">%d αγαπημένα μέρη</item>
+        <item quantity="one">%d αγαπημένο</item>
+        <item quantity="other">%d αγαπημένα</item>
    </plurals>
    <string name="bookmarks_create_new_group">Δημιουργία νέας λίστας</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Εισαγωγή Αγαπημένων</string>
+    <string name="bookmarks_import">Εισαγωγή σελιδοδεικτών και διαδρομών</string>
    <string name="bookmarks_error_message_share_general">Αδυναμία κοινοποίησης λόγω σφάλματος εφαρμογής</string>
    <string name="bookmarks_error_title_share_empty">Σφάλμα κατά την κοινοποίηση</string>
    <string name="bookmarks_error_message_share_empty">Δεν είναι δυνατή η κοινή χρήση μιας κενής λίστας</string>
@@ -589,8 +589,8 @@
    </plurals>
    <string name="restore">Επαναφορά</string>
    <plurals name="tracks">
-        <item quantity="one">%d ίχνος</item>
-        <item quantity="other">%d ίχνη</item>
+        <item quantity="one">%d διαδρομή</item>
+        <item quantity="other">%d διαδρομές</item>
    </plurals>
    <!-- Settings privacy group in settings screen -->
    <string name="privacy">Απόρρητο</string>
@@ -600,12 +600,12 @@
    <string name="subway">Μετρό</string>
    <string name="layers_title">Στυλ χάρτη και επίπεδα</string>
    <string name="bookmarks_empty_list_title">Η λίστα είναι άδεια</string>
-    <string name="bookmarks_empty_list_message">Για να αποθηκεύσετε ένα μέρος, πατήστε μια τοποθεσία στο χάρτη και μετά πατήστε το αστεράκι</string>
+    <string name="bookmarks_empty_list_message">Για να προσθέσετε σελιδοδείκτη, πατήστε ένα μέρος στο χάρτη και μετά πατήστε το αστεράκι</string>
    <string name="category_desc_more">…περισσότερα</string>
    <string name="export_file">Εξαγωγή KMZ</string>
    <string name="export_file_gpx">Εξαγωγή GPX</string>
    <string name="delete_list">Διαγραφή λίστας</string>
-    <string name="speedcams_alert_title">Κάμερες ταχύτητας</string>
+    <string name="speedcams_alert_title">Κάμερες Ταχύτητας</string>
    <string name="place_description_title">Περιγραφή μέρους</string>
    <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
    <string name="notification_channel_downloader">Κατέβασμα χαρτών</string>
@@ -616,9 +616,9 @@
    <!-- Speed camera settings menu option - Never warn (about speedcams) -->
    <string name="pref_tts_speedcams_never">Να μην ειδοποιούμαι ποτέ</string>
    <string name="power_managment_title">Λειτουργία εξοικονόμησης ενέργειας</string>
-    <string name="power_managment_description">Θα γίνεται προσπάθεια εξοικονόμησης ενέργειας εις βάρος κάποιων λειτουργιών</string>
+    <string name="power_managment_description">Θα γίνεται προσπάθεια εξοικονόμησης ενέργειας εις βάρος κάποιον λειτουργιών.</string>
    <string name="power_managment_setting_never">Ποτέ</string>
-    <string name="power_managment_setting_auto">Όταν η μπαταρία είναι χαμηλή</string>
+    <string name="power_managment_setting_auto">Αυτόματα</string>
    <string name="power_managment_setting_manual_max">Πάντα</string>
    <string name="enable_logging_warning_message">Αυτή η λειτουργία είναι ενεργοποιημένη για την καταγραφή ενεργειών για διαγνωστικούς σκοπούς. Αυτό βοηθά την ομάδα να εντοπίζει προβλήματα με την εφαρμογή. Να ενεργοποιείτε τη λειτουργία μόνο κατόπιν αιτήματος της υποστήριξης του CoMaps.</string>
    <string name="driving_options_title">Ρυθμίσεις δρομολόγησης</string>
@@ -641,9 +641,9 @@
    <!-- A generic "No" button in dialogs -->
    <string name="no">Όχι</string>
    <!-- E.g. "WiFi:Yes" -->
-    <string name="yes_available">Ναι</string>
+    <string name="yes_available">Ενεργ.</string>
    <!-- E.g. "WiFi:No" -->
-    <string name="no_available">Όχι</string>
+    <string name="no_available">Απενεργ.</string>
    <!-- To indicate the capacity of car parkings, bicycle parkings, electric vehicle charging stations... -->
    <string name="capacity">Χωρητικότητα: %s</string>
    <!-- To indicate the network of ATMs, bicycle rentals, electric vehicle charging stations... -->
@@ -653,7 +653,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Ταξινόμηση…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Ταξινόμηση αγαπημένων</string>
+    <string name="sort_bookmarks">Ταξινόμηση σελιδ/κτών</string>
    <!-- Android -->
    <string name="by_default">Προεπιλογή</string>
    <!-- Android -->
@@ -769,7 +769,7 @@
    <string name="browser_not_available">Δεν είναι διαθέσιμος ο περιηγητής</string>
    <string name="volume">Ένταση ήχου</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Εξαγωγή όλων των Μερών και Ιχνών</string>
+    <string name="bookmarks_export">Εξαγωγή όλων των σελιδοδεικτών και των διαδρομών</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Ρυθμίσεις συστήματος σύνθεσης ομιλίας</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -793,21 +793,21 @@
    <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
    <string name="power_save_dialog_summary">Για την πιο ακριβή πλοήγηση, συνιστούμε να απενεργοποιήσετε τη λειτουργία εξοικονόμησης ενέργειας στις ρυθμίσεις μπαταρίας του τηλεφώνου.</string>
    <!-- Prompt to start recording a track. -->
-    <string name="start_track_recording">Εγγραφή ίχνους</string>
+    <string name="start_track_recording">Εγγραφή διαδρομής</string>
    <!-- Prompt for stopping a track recording. -->
-    <string name="stop_track_recording">Σταματήστε την εγγραφή ίχνους</string>
+    <string name="stop_track_recording">Σταματήστε την εγγραφή διαδρομής</string>
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="stop_without_saving">Σταματήστε χωρίς αποθήκευση</string>
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Συνέχεια εγγραφής</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Αποθήκευση στα Αγαπημένα;</string>
+    <string name="track_recording_alert_title">Αποθήκευση στα Αγαπημένα και Διαδρομές;</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
-    <string name="track_recording_toast_nothing_to_save">Το ίχνος είναι άδειο - δεν υπάρχει τίποτα να αποθηκεύσετε</string>
+    <string name="track_recording_toast_nothing_to_save">Η διαδρομή είναι άδεια - δεν υπάρχει τίποτα να αποθηκεύσετε</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
    <string name="error_no_file_manager_app">Δεν είναι δυνατή η εμφάνιση του διαλόγου επιλογής φακέλου επειδή δεν είναι εγκατεστημένη η κατάλληλη εφαρμογή στη συσκευή σας. Εγκαταστήστε μια εφαρμογή διαχείρισης αρχείων και δοκιμάστε ξανά.</string>
    <string name="choose_color">Επιλέξτε χρώμα</string>
-    <string name="edit_track">Επεξεργασία ίχνους</string>
+    <string name="edit_track">Επεξεργασία διαδρομής</string>
    <string name="uri_open_location_failed">Δεν υπάρχει εγκατεστημένη εφαρμογή που να μπορεί να ανοίξει την τοποθεσία</string>
    <!-- preference string for using auto theme only in navigation mode -->
    <string name="nav_auto">Αυτόματη πλοήγηση</string>
@@ -816,10 +816,10 @@
    <string name="translated_om_site_url">https://comaps.app/</string>
    <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
    <string name="level_value_generic">Όροφος: %s</string>
-    <string name="miles_per_hour">μλ/ώ</string>
-    <string name="minute">λεπ</string>
-    <string name="day">μέρ</string>
-    <string name="hour">ώ</string>
+    <string name="miles_per_hour">mph</string>
+    <string name="minute">λπτ</string>
+    <string name="day">Μέρα</string>
+    <string name="hour">Ωρα</string>
    <string name="telegram_url">https://t.me/CoMapsApp/</string>
    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
    <string name="panoramax">εικόνα Panoramax</string>
@@ -836,38 +836,4 @@
    <string name="hours_confirmed_time_ago">Επιβεβαιώθηκε %s</string>
    <string name="existence_confirmed_time_ago">Ύπαρξη επιβεβαιώθηκε %s</string>
    <string name="editor_building_levels">Όροφοι (με το ισόγειο, χωρίς την ταράτσα)</string>
-    <string name="about_headline">Ανοιχτό έργο με την υποστήριξη της κοινότητας</string>
-    <string name="offline_explanation_text">Χρειάζεται να ληφθεί ένας χάρτης για να δείτε και να πλοηγηθείτε την περιοχή.\nΚατεβάστε χάρτες για τις περιοχές που θέλετε να ταξιδέψετε.</string>
-    <string name="pref_left_button_disable">Απενεργοποίηση</string>
-    <string name="avoid_steps">Αποφυγή σκαλοπατιών</string>
-    <string name="avoid_paved">Αποφυγή στρωμένων δρόμων</string>
-    <string name="unknown_power_output">άγνωστο</string>
-    <string name="unknown_count">άγνωστο</string>
-    <string name="advanced">Προχωρημένο</string>
-    <string name="charge_socket_count">Πλήθος</string>
-    <string name="ruler">Χάρακας</string>
-    <string name="clear">Εκκαθάριση</string>
-    <string name="route_type">Είδος διαδρομής</string>
-    <string name="vehicle">Όχημα</string>
-    <string name="pedestrian">Πεζός</string>
-    <string name="bicycle">Ποδήλατο</string>
-    <string name="bookmark_color">Χρώμα για Αγαπημένο</string>
-    <string name="about_help">Σχετικά &amp; Βοήθεια</string>
-    <string name="open_now">Ανοιχτό τώρα</string>
-    <string name="closed_now">Κλειστό τώρα</string>
-    <string name="at">στις %s</string>
-    <string name="share_track">Κοινοποίηση Ίχνους</string>
-    <string name="delete_track_dialog_title">Διαγραφή %s;</string>
-    <string name="place_page_app_too_old_description">Τα τρέχοντα δεδομένα χάρτη σας είναι πολύ παλιά, παρακαλούμε ενημερώστε την εφαρμογή CoMaps.</string>
-    <string name="editor_level">Όροφος (το 0 είναι το ισόγειο)</string>
-    <string name="error_enter_correct_level">Εισάγετε έναν έγκυρο αριθμό ορόφου</string>
-    <string name="editor_business_vacant_button">Η επιχείρηση είναι κενή</string>
-    <string name="editor_mark_business_vacant_title">Σήμανση επιχείρησης ως κενή</string>
-    <string name="place_page_update_too_old_map">Ενημέρωση χάρτη περιοχής</string>
-    <string name="place_page_too_old_to_edit">Η επεξεργασία του OpenStreetMap είναι απενεργοποιημένη επειδή τα δεδομένα χάρτη είναι πολύ παλιά.</string>
-    <string name="osm_note_hint">Ή, εναλλακτικά, αφήστε μια σημείωση στην κοινότητα του OpenStreetMap ώστε κάποιος άλλος να προσθέσει ή να διορθώσει την τοποθεσία εδώ.</string>
-    <string name="osm_note_toast">Η σημείωση θα αποσταλεί στο OpenStreetMap</string>
-    <string name="error_enter_correct_fediverse_page">Εισάγετε ένα έγκυρο όνομα χρήστη ή διεύθυνση Mastodon</string>
-    <string name="error_enter_correct_bluesky_page">Εισάγετε ένα έγκυρο όνομα χρήστη ή διεύθυνση Bluesky</string>
-    <string name="power_management">Διαχείριση ενέργειας</string>
 </resources>
--- a/android/app/src/main/res/values-en-rCA/strings.xml
+++ b/android/app/src/main/res/values-en-rCA/strings.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="search">Search</string>
-    <string name="bookmarks_and_tracks">Favourites</string>
-</resources>
+</resources>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -103,7 +103,7 @@
    <!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! -->
    <string name="category_eat">Dónde comer</string>
    <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
-    <string name="category_food">Provisiones</string>
+    <string name="category_food">Tienda de comestibles</string>
    <!-- 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! -->
@@ -848,7 +848,7 @@
    <string name="bookmark_color">Color del favorito</string>
    <string name="pref_backup_title">Respaldar favoritos</string>
    <string name="pref_backup_summary">Copia de seguridad automática a una carpeta de tu dispositivo</string>
-    <string name="pref_backup_now_title">Crear respaldo ahora</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>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -68,11 +68,11 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Créer une nouvelle liste</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nom de la liste</string>
+    <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>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Favoris</string>
+    <string name="bookmarks_and_tracks">Signets et traces</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 -->
@@ -503,7 +503,7 @@
    <string name="minute">min</string>
    <string name="day">j</string>
    <string name="placepage_more_button">Plus</string>
-    <string name="placepage_edit_bookmark_button">Modifier l\'emplacement enregistré</string>
+    <string name="placepage_edit_bookmark_button">Modifier le signet</string>
    <string name="placepage_personal_notes_hint">Notes personnelles (texte ou html)</string>
    <string name="editor_reset_edits_message">Abandonner toutes les modifications locales ?</string>
    <string name="editor_reset_edits_button">Annuler les modifications</string>
@@ -572,13 +572,13 @@
    <string name="bookmark_lists_hide_all">Tout masquer</string>
    <string name="bookmark_lists_show_all">Tout afficher</string>
    <plurals name="bookmarks_places">
-        <item quantity="one">%d emplacement enregistré</item>
-        <item quantity="many">%d emplacements enregistrés</item>
-        <item quantity="other">%d emplacements enregistrés</item>
+        <item quantity="one">%d signet</item>
+        <item quantity="many">%d signets</item>
+        <item quantity="other">%d signets</item>
    </plurals>
    <string name="bookmarks_create_new_group">Créer une nouvelle liste</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importer des favoris</string>
+    <string name="bookmarks_import">Importer des signets et des parcours</string>
    <string name="bookmarks_error_message_share_general">Impossible de partager en raison d’une erreur d’application</string>
    <string name="bookmarks_error_title_share_empty">Erreur de partage</string>
    <string name="bookmarks_error_message_share_empty">Impossible de partager une liste vide</string>
@@ -609,7 +609,7 @@
    <string name="subway">Métro</string>
    <string name="layers_title">Styles et couches de cartes</string>
    <string name="bookmarks_empty_list_title">Cette liste est vide</string>
-    <string name="bookmarks_empty_list_message">Pour enregistrer un lieu, appuyez sur un lieu sur la carte, puis sur l\'icône en forme d\'étoile</string>
+    <string name="bookmarks_empty_list_message">Pour ajouter un signet, appuyez sur un lieu sur la carte, puis appuyez sur l’icône étoile</string>
    <string name="category_desc_more">…plus</string>
    <string name="export_file">Exporter en KMZ</string>
    <string name="export_file_gpx">Exporter en GPX</string>
@@ -662,7 +662,7 @@
    <!-- max. 10 symbols, both iOS and Android -->
    <string name="sort">Trier…</string>
    <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Trier les favoris</string>
+    <string name="sort_bookmarks">Trier les signets</string>
    <!-- Android -->
    <string name="by_default">Par défaut</string>
    <!-- Android -->
@@ -780,7 +780,7 @@
    <string name="browser_not_available">Le navigateur Web n’est pas disponible</string>
    <string name="volume">Volume</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exporter tous les lieux et toutes les traces</string>
+    <string name="bookmarks_export">Exporter tous les signets et toutes les traces</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Paramètres du système de synthèse vocale</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -812,7 +812,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Continuer l’enregistrement</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Enregistrer dans les favoris ?</string>
+    <string name="track_recording_alert_title">Enregistrer dans les signets et traces ?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">L’itinéraire est vide - il n’y a rien à enregistrer</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -854,13 +854,13 @@
    <string name="backup_interval_every_week">Hebdomadaire</string>
    <string name="pref_backup_location_title">Emplacement des enregistrements</string>
    <string name="pref_backup_location_summary_initial">Veuillez d’abord sélectionner un dossier puis accorder l’autorisation</string>
-    <string name="pref_backup_now_summary_empty_lists">Aucun lieu ni piste à sauvegarder</string>
+    <string name="pref_backup_now_summary_empty_lists">Ni signet ni trace à enregistrer</string>
    <string name="pref_backup_interval_title">Enregistrement automatique</string>
    <string name="pref_backup_status_summary_success">Dernier enregistrement réussi</string>
    <string name="pref_backup_now_summary_ok">L’enregistrement s’est déroulé avec succès</string>
    <string name="pref_backup_history_title">Nombre d’enregistrements à conserver</string>
    <string name="pref_backup_now_summary_folder_unavailable">L’emplacement pour enregistrer n’est pas disponible</string>
-    <string name="pref_backup_title">Sauvegarder les favoris</string>
+    <string name="pref_backup_title">Enregistrement des signets et des traces</string>
    <string name="backup_interval_manual_only">Désactivé (manuel uniquement)</string>
    <string name="pref_backup_summary">Enregistrement automatique dans un dossier de votre appareil</string>
    <string name="about_help">À propos &amp; aide</string>
@@ -927,4 +927,6 @@
    <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>
+    <string name="pref_speedlimit_title">Compteur de vitesse</string>
+    <string name="pref_speedlimit_summary">Affichage de la vitesse durant la navigation</string>
 </resources>
--- a/android/app/src/main/res/values-ga/strings.xml
+++ b/android/app/src/main/res/values-ga/strings.xml
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -144,7 +144,7 @@
    <!-- Email Subject when sharing bookmark list -->
    <string name="share_bookmarks_email_subject">Bagikan penanda CoMaps</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">Memuat Tempat Favorit</string>
+    <string name="load_kmz_title">Memuat Penanda</string>
    <!-- Kmz file successful loading -->
    <string name="load_kmz_successful">Penanda berhasil dimuat! Anda dapat menemukannya pada peta atau pada layar Pengelola Penanda Lokasi.</string>
    <!-- Kml file loading failed -->
@@ -525,7 +525,7 @@
    <string name="feedback_general">Umpan Balik Umum</string>
    <string name="prefs_languages_information">Kami menggunakan TTS sistem untuk petunjuk suara. Banyak perangkat Android menggunakan Google TTS, Anda dapat mengunduhnya dari Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
    <string name="prefs_languages_information_off">Untuk beberapa bahasa, Anda perlu menginstal synthesizer suara atau paket bahasa tambahan dari toko aplikasi (Google Play, Galaxy Store, App Gallery, FDroid). \nBuka pengaturan perangkat Anda → Language and input (Bahasa dan input) → Speech (Suara) → Text to speech (Teks ke suara). \nDi sini, Anda dapat mengelola pengaturan untuk sintesis suara (contohnya, mengunduh paket bahasa untuk penggunaan tanpa internet) dan memilih mesin tekske suara lain.</string>
-    <string name="prefs_languages_information_off_link">Untuk informasi selengkapnya, bacalah panduan ini</string>
+    <string name="prefs_languages_information_off_link">Untuk informasi selengkapnya, bacalah panduan ini.</string>
    <string name="transliteration_title">Transliterasi ke dalam bahasa Latin</string>
    <string name="learn_more">Pelajari selengkapnya</string>
    <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
--- a/android/app/src/main/res/values-kw/strings.xml
+++ b/android/app/src/main/res/values-kw/strings.xml
@@ -332,7 +332,7 @@
    <string name="zoom_in">Moghhe</string>
    <string name="zoom_out">Lehe</string>
    <string name="website_menu">Kevren Rol Voos</string>
-    <string name="view_menu">Gweles Rol Voos</string>
+    <string name="view_menu">Vu Rol Voos</string>
    <string name="open_in_app">Ygeri yn Aral App</string>
    <string name="select_option">Dewis dewis</string>
    <string name="outdoor_seating">Esedhow yn-mes</string>
--- a/android/app/src/main/res/values/donottranslate.xml
+++ b/android/app/src/main/res/values/donottranslate.xml
@@ -45,6 +45,7 @@
  <string name="pref_power" translatable="false">pref_power</string>
  <string name="pref_custom_map_download_url" translatable="false">CustomMapDownloadUrl</string>
  <string name="pref_advanced" translatable="false">pref_advanced</string>
+  <string name="pref_speedlimit" translatable="false">pref_speedlimit</string>

  <string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
  <string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -975,4 +975,6 @@
    <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
    <string name="download_resources_custom_url_summary_none">Not set</string>
    <string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
+    <string name="pref_speedlimit_title">Speed limit</string>
+    <string name="pref_speedlimit_summary">Show speed limit during navigation</string>
 </resources>
--- a/android/app/src/main/res/xml/prefs_main.xml
+++ b/android/app/src/main/res/xml/prefs_main.xml
@@ -143,6 +143,14 @@
        <extra android:name="from" android:value="settings" />
      </intent>
    </PreferenceScreen>
+    <SwitchPreferenceCompat
+        android:key="@string/pref_speedlimit"
+        android:title="@string/pref_speedlimit_title"
+        android:summary="@string/pref_speedlimit_summary"
+        android:defaultValue="true"
+        android:widgetLayout="@layout/preference_switch"
+        app:singleLineTitle="true"
+        app:icon="@drawable/ic_speed"/>
  </androidx.preference.PreferenceCategory>

  <PreferenceCategory
--- a/android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml
+++ b/android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml
@@ -52,8 +52,8 @@
    <string name="type.leisure.adult_gaming_centre">Centar za igru odraslih</string>
    <string name="type.leisure.amusement_arcade">Igraonica za odrasle</string>
    <string name="type.amenity.charging_station">Stanica za punjenje EV</string>
-    <string name="type.amenity.charging_station.bicycle">Bicikli</string>
-    <string name="type.amenity.charging_station.motorcar">Auta</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">Vrtić</string>
    <string name="type.amenity.cinema">Bioskop</string>
    <string name="type.amenity.studio">Medijski studio</string>
@@ -1411,8 +1411,4 @@
    <string name="type.xmas.tree">Božićna jelka</string>
    <string name="type.railway.disused.bridge">Napušteni železnički most</string>
    <string name="type.railway.disused.tunnel">Napušteni železnički tunel</string>
-    <string name="type.amenity.charging_station.motorcycle">Motocikli</string>
-    <string name="type.amenity.charging_station.small">Ograničen kapacitet</string>
-    <string name="type.emergency.disaster_help_point">Tačka za pomoć u hitnim slučajevima</string>
-    <string name="type.emergency.access_point.address">Adresa za hitno spašavanje</string>
 </resources>
--- a/android/sdk/src/main/res/values-bn/strings.xml
+++ b/android/sdk/src/main/res/values-bn/strings.xml
@@ -9,7 +9,7 @@
    <string name="maps_storage_external">বহিরাগত শেয়ার্ড স্টোরেজ</string>
    <string name="category_wifi">ওয়াইফাই</string>
    <string name="maps_storage_shared">অভ্যন্তরীণ শেয়ার্ড স্টোরেজ</string>
-    <string name="postal_code">ডাক কোড|পিন কোড</string>
+    <string name="postal_code">ডাক কোড</string>
    <string name="today">আজকে</string>
    <string name="km">কিমি</string>
    <string name="yesterday">গতকাল</string>
--- a/android/sdk/src/main/res/values-bn/types_strings.xml
+++ b/android/sdk/src/main/res/values-bn/types_strings.xml
@@ -6,34 +6,34 @@
    <string name="type.building.guardhouse">সিকিউরিটি বুথ</string>
    <string name="type.power.portal">পাওয়ার পোর্টাল</string>
    <string name="type.amenity.ferry_terminal">ফেরি</string>
-    <string name="type.amenity.fire_station">4দমকল স্টেশন</string>
+    <string name="type.amenity.fire_station">দমকল স্টেশন</string>
    <string name="type.amenity.food_court">ফুড কোর্ট</string>
-    <string name="type.amenity.fountain">ফাউন্টেন|ফোয়ারা</string>
-    <string name="type.amenity.fuel">গ্যাস স্টেশন|5পেট্রোল পাম্প</string>
+    <string name="type.amenity.fountain">ফাউন্টেন</string>
+    <string name="type.amenity.fuel">গ্যাস স্টেশন</string>
    <string name="type.amenity.grave_yard">কবরস্থান</string>
    <string name="type.amenity.grave_yard.christian">খ্রিস্টান কবরস্থান</string>
    <string name="type.amenity.hospital">হাসপাতাল</string>
    <string name="type.amenity.ice_cream">আইসক্রিম</string>
    <string name="type.amenity.internet_cafe">ইন্টারনেট ক্যাফে</string>
    <string name="type.amenity.kindergarten">কিন্ডারগার্টেন</string>
-    <string name="type.amenity.library">গ্রন্থাগার|লাইব্রেরি</string>
-    <string name="type.amenity.marketplace">বাজার|মার্কেট</string>
-    <string name="type.amenity.motorcycle_parking">বাইক পার্কিং|9মোটরসাইকেল পার্কিং</string>
+    <string name="type.amenity.library">গ্রন্থাগার</string>
+    <string name="type.amenity.marketplace">বাজার</string>
+    <string name="type.amenity.motorcycle_parking">বাইক পার্কিং</string>
    <string name="type.amenity.nightclub">নাইটক্লাব</string>
    <string name="type.amenity.nursing_home">নার্সিংহোম</string>
    <string name="type.amenity.parking">পার্কিং</string>
    <string name="type.amenity.parking.fee">পার্কিং</string>
    <string name="type.amenity.parking.multi.storey">বহুতল পার্কিং</string>
    <string name="type.amenity.parking.multi.storey.fee">বহুতল পার্কিং</string>
-    <string name="type.amenity.parking.no.access">ব্যক্তিগত পার্কিং|প্রাইভেট পার্কিং</string>
-    <string name="type.amenity.parking.permissive">ব্যক্তিগত পার্কিং|প্রাইভেট পার্কিং</string>
-    <string name="type.amenity.parking.private">ব্যক্তিগত পার্কিং|প্রাইভেট পার্কিং</string>
-    <string name="type.amenity.parking.underground">আন্ডারগ্রাউন্ড পার্কিং|ভূগর্ভস্থ পার্কিং</string>
-    <string name="type.amenity.parking.underground.fee">আন্ডারগ্রাউন্ড পার্কিং|ভূগর্ভস্থ পার্কিং</string>
+    <string name="type.amenity.parking.no.access">ব্যক্তিগত পার্কিং</string>
+    <string name="type.amenity.parking.permissive">প্রাইভেট পার্কিং</string>
+    <string name="type.amenity.parking.private">প্রাইভেট পার্কিং</string>
+    <string name="type.amenity.parking.underground">আন্ডারগ্রাউন্ড পার্কিং</string>
+    <string name="type.amenity.parking.underground.fee">আন্ডারগ্রাউন্ড পার্কিং</string>
    <string name="type.amenity.parking.street_side">রোড-পার্শ্ববর্তী পার্কিং</string>
    <string name="type.amenity.parking.street_side.private">ব্যক্তিগত সড়ক-পার্শ্ববর্তী পার্কিং</string>
    <string name="type.amenity.parking.lane">লেন পার্কিং</string>
-    <string name="type.amenity.parking.underground.private">ব্যক্তিগত আন্ডারগ্রাউন্ড পার্কিং|প্রাইভেট আন্ডারগ্রাউন্ড পার্কিং|ব্যক্তিগত ভূগর্ভস্থ পার্কিং|প্রাইভেট ভূগর্ভস্থ পার্কিং</string>
+    <string name="type.amenity.parking.underground.private">ব্যক্তিগত আন্ডারগ্রাউন্ড পার্কিং</string>
    <string name="type.aeroway.aerodrome">বিমানবন্দর</string>
    <string name="type.aeroway.aerodrome.international">আন্তর্জাতিক বিমানবন্দর</string>
    <string name="type.amenity.drinking_water">পানীয় জল</string>
@@ -44,10 +44,10 @@
    <string name="type.natural.volcano">আগ্নেয়গিরি</string>
    <string name="type.natural.desert">মরুভূমি</string>
    <string name="type.natural.coastline">উপকূলরেখা</string>
-    <string name="type.amenity.college">কলেজ|মহাবিদ্যালয়</string>
+    <string name="type.amenity.college">কলেজ</string>
    <string name="type.amenity.music_school">গানের স্কুল</string>
    <string name="type.amenity.place_of_worship.muslim">মসজিদ</string>
-    <string name="type.amenity.place_of_worship.hindu">হিন্দু মন্দির|মন্দির</string>
+    <string name="type.amenity.place_of_worship.hindu">হিন্দু মন্দির</string>
    <string name="type.amenity.prison">কারাগার</string>
    <string name="type.barrier.fence">বেড়া</string>
    <string name="type.waterway.waterfall">ঝর্ণা</string>
@@ -75,7 +75,7 @@
    <string name="type.sport.chess">দাবা</string>
    <string name="type.sport.basketball">বাস্কেটবল</string>
    <string name="type.sport.badminton">ব্যাডমিন্টন</string>
-    <string name="type.sport">ক্রীড়া|স্পোর্টস</string>
+    <string name="type.sport">ক্রীড়া</string>
    <string name="type.sport.multi">বিভিন্ন ক্রীড়া</string>
    <string name="type.amenity.toilets">শৌচালয়</string>
    <string name="type.shop.watches">ঘড়ির দোকান</string>
@@ -86,13 +86,13 @@
    <string name="type.man_made.water_tower">জলের ট্যাঙ্ক</string>
    <string name="type.amenity.bench">বেঞ্চ</string>
    <string name="type.amenity.bus_station">বাস স্টেশন</string>
-    <string name="type.amenity.courthouse">আদালত|কোর্ট</string>
+    <string name="type.amenity.courthouse">আদালত</string>
    <string name="type.amenity.dentist">দাঁতের ডাক্তার</string>
-    <string name="type.amenity.doctors">ডাক্তার|4চিকিৎসক</string>
-    <string name="type.amenity.pharmacy">4ওষুধ দোকান|ফার্মেসি</string>
-    <string name="type.amenity.place_of_worship.christian">গির্জা|চার্চ</string>
+    <string name="type.amenity.doctors">ডাক্তার</string>
+    <string name="type.amenity.pharmacy">ওষুধ দোকান</string>
+    <string name="type.amenity.place_of_worship.christian">গির্জা</string>
    <string name="type.amenity.school">স্কুল</string>
-    <string name="type.amenity.telephone">টেলিফোন|ফোন</string>
+    <string name="type.amenity.telephone">টেলিফোন</string>
    <string name="type.amenity.university">বিশ্ববিদ্যালয়</string>
    <string name="type.amenity.vending_machine.fuel">পেট্রোল পাম্প</string>
    <string name="type.barrier">বাঁধা</string>
@@ -111,7 +111,7 @@
    <string name="type.natural">প্রকৃতি</string>
    <string name="type.amenity.atm">এটিএম</string>
    <string name="type.amenity.bank">ব্যাঙ্ক</string>
-    <string name="type.amenity.police">পুলিশ|থানা</string>
+    <string name="type.amenity.police">পুলিশ</string>
    <string name="type.building">বিল্ডিং</string>
    <string name="type.building.address">ঠিকানা</string>
    <string name="type.cuisine.croatian">ক্রোয়েসীয়</string>
@@ -148,7 +148,7 @@
    <string name="type.amenity.bicycle_parking.covered">আচ্ছাদিত সাইকেল পার্কিং</string>
    <string name="type.amenity.boat_rental">নৌকা ভাড়া</string>
    <string name="type.amenity.bicycle_rental">সাইকেল ভাড়া</string>
-    <string name="type.man_made.telescope">দূরবিক্ষণ|দূরবীণ</string>
+    <string name="type.man_made.telescope">দূরবিক্ষণ</string>
    <string name="type.man_made.telescope.optical">দূরবিক্ষণ (আলোক রশ্মি)</string>
    <string name="type.man_made.telescope.radio">দূরবিক্ষণ (রেডিও রশ্মি)</string>
    <string name="type.man_made.telescope.gamma">দূরবিক্ষণ (গামা রশ্মি)</string>
@@ -157,7 +157,7 @@
    <string name="type.amenity.motorcycle_rental">মোটরসাইকেল ভাড়া</string>
    <string name="type.amenity.cinema">সিনেমা</string>
    <string name="type.amenity.shelter.public_transport">আশ্রয়</string>
-    <string name="type.amenity.post_office">পোস্ট অফিস|ডাক ঘর</string>
+    <string name="type.amenity.post_office">পোস্ট অফিস</string>
    <string name="type.amenity.restaurant">রেস্টুরেন্ট</string>
    <string name="type.amenity.taxi">ট্যাক্সি স্ট্যান্ড</string>
    <string name="type.shop.mobile_phone">মোবাইল ফোনের দোকান</string>
@@ -174,64 +174,4 @@
    <string name="type.waterway.drain">ড্রেন</string>
    <string name="type.amenity.bar">বার</string>
    <string name="type.amenity.bicycle_parking">সাইকেল পার্কিং</string>
-    <string name="type.amenity.post_box">মেল বাক্স|ডাক বাক্স</string>
-    <string name="type.recycling.batteries">ব্যাটারি</string>
-    <string name="type.recycling.clothes">4জামাকাপড়</string>
-    <string name="type.recycling.glass_bottles">কাঁচের বোতল</string>
-    <string name="type.recycling.paper">কাগজ</string>
-    <string name="type.recycling.plastic">প্লাস্টিক</string>
-    <string name="type.recycling.plastic_bottles">প্লাস্টিক বোতল</string>
-    <string name="type.recycling.small_appliances">ইলেকট্রনিক বর্জ্য</string>
-    <string name="type.recycling.cardboard">কার্ডবোর্ড</string>
-    <string name="type.recycling.cans">ক্যান</string>
-    <string name="type.recycling.shoes">জুতো</string>
-    <string name="type.recycling.green_waste">5আনাজ খোলা</string>
-    <string name="type.recycling.cartons">কার্টন|কার্ডবোর্ডের বাক্স</string>
-    <string name="type.toilets.yes">শৌচালয়</string>
-    <string name="type.amenity.vehicle_inspection">ধোঁয়া পরীক্ষা</string>
-    <string name="type.amenity.veterinary">গরুর ডাক্তার|পশুচিকিৎসক</string>
-    <string name="type.barrier.chain">চেন</string>
-    <string name="type.barrier.toll_booth">টোল বুথ</string>
-    <string name="type.barrier.wall">দেয়াল</string>
-    <string name="type.boundary">4সীমান্ত</string>
-    <string name="type.boundary.administrative">প্রশাসনিক সীমান্ত</string>
-    <string name="type.boundary.administrative.2">জাতীয় সীমান্ত</string>
-    <string name="type.boundary.administrative.3">আঞ্চলিক সীমান্ত</string>
-    <string name="type.boundary.administrative.4">আঞ্চলিক সীমান্ত</string>
-    <string name="type.boundary.national_park">জাতীয় উদ্যান</string>
-    <string name="type.boundary.aboriginal_lands">আদিবাসী ভূমি</string>
-    <string name="type.boundary.protected_area">সংরক্ষিত এলাকা</string>
-    <string name="type.boundary.protected_area.1">সংরক্ষিত এলাকা</string>
-    <string name="type.boundary.protected_area.2">সংরক্ষিত এলাকা</string>
-    <string name="type.boundary.protected_area.3">সংরক্ষিত এলাকা</string>
-    <string name="type.boundary.protected_area.4">সংরক্ষিত এলাকা</string>
-    <string name="type.boundary.protected_area.5">সংরক্ষিত এলাকা</string>
-    <string name="type.boundary.protected_area.6">সংরক্ষিত এলাকা</string>
-    <string name="type.cemetery.grave">কবর</string>
-    <string name="type.craft.blacksmith">কামার</string>
-    <string name="type.craft.carpenter">কাঠমিস্ত্রি</string>
-    <string name="type.craft.confectionery">ময়ড়া</string>
-    <string name="type.craft.electrician">ইলেকট্রিক মিস্ত্রি</string>
-    <string name="type.craft.gardener">মালী</string>
-    <string name="type.craft.painter">রংমিস্ত্রি</string>
-    <string name="type.craft.photographer">ফটোগ্রাফার</string>
-    <string name="type.shop.camera">ক্যামেরার দোকান</string>
-    <string name="type.craft.plumber">কলের মিস্ত্রি</string>
-    <string name="type.cuisine.american">মার্কিন|আমেরিকান</string>
-    <string name="type.cuisine.cake">কেক</string>
-    <string name="type.cuisine.chicken">চিকেন|মুরগি</string>
-    <string name="type.cuisine.burger">বার্গার</string>
-    <string name="type.cuisine.fish">মাছ</string>
-    <string name="type.cuisine.coffee_shop">কফি</string>
-    <string name="type.cuisine.chinese">চীনা|চাইনিজ</string>
-    <string name="type.cuisine.indian">ভারতীয়</string>
-    <string name="type.cuisine.international">আন্তর্জাতিক</string>
-    <string name="type.cuisine.local">স্থানীয়|লোকাল</string>
-    <string name="type.cuisine.pizza">পিজ্জা</string>
-    <string name="type.cuisine.regional">আঞ্চলিক</string>
-    <string name="type.amenity.parking.lane.private">প্রাইভেট লেন পার্কিং</string>
-    <string name="type.building.has_parts">বিল্ডিং</string>
-    <string name="type.building_part">বিল্ডিং</string>
-    <string name="type.cuisine.spanish">স্পেনীয়</string>
-    <string name="type.cuisine.vietnamese">ভিয়েতনামীয়</string>
 </resources>
--- a/android/sdk/src/main/res/values-cs/types_strings.xml
+++ b/android/sdk/src/main/res/values-cs/types_strings.xml
@@ -29,8 +29,8 @@
    <string name="type.leisure.adult_gaming_centre">Herní centrum pro dospělé</string>
    <string name="type.leisure.amusement_arcade">Pasáž</string>
    <string name="type.amenity.charging_station">Nabíjecí stanice</string>
-    <string name="type.amenity.charging_station.bicycle">Jízdní kola</string>
-    <string name="type.amenity.charging_station.motorcar">Auta</string>
+    <string name="type.amenity.charging_station.bicycle">Nabíjecí stanice pro jízdní kola</string>
+    <string name="type.amenity.charging_station.motorcar">Nabíjecí stanice pro automobily</string>
    <string name="type.amenity.childcare">Jesle</string>
    <string name="type.amenity.cinema">Kino</string>
    <string name="type.leisure.bowling_alley">Bowlingová dráha</string>
@@ -1393,7 +1393,7 @@
    <string name="type.office.security">Strážnice</string>
    <string name="type.building.guardhouse">Vrátnice</string>
    <string name="type.shop.lighting">Obchod s osvětlením</string>
-    <string name="type.amenity.bench.backless">Bez opěradla</string>
+    <string name="type.amenity.bench.backless">Lavička bez opěradla</string>
    <string name="type.leisure.bandstand">Otevřený altán</string>
    <string name="type.leisure.sports_centre.sport.multi">Sportovní centrum</string>
    <string name="type.leisure.sports_centre.sport.american_football">Sportovní centrum</string>
@@ -1502,8 +1502,4 @@
    <string name="type.railway.turntable">Železniční točna</string>
    <string name="type.railway.disused.bridge">Nepoužívaný železniční most</string>
    <string name="type.railway.disused.tunnel">Nepoužívaný železniční tunel</string>
-    <string name="type.amenity.charging_station.motorcycle">Motocykly</string>
-    <string name="type.amenity.charging_station.small">Omezená kapacita</string>
-    <string name="type.emergency.disaster_help_point">Nouzové centrum pomoci při katastrofách</string>
-    <string name="type.emergency.access_point.address">Nouzová adresa záchrany</string>
 </resources>
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -25,7 +25,7 @@
    <string name="type.amenity.bank">Bankfiliale</string>
    <string name="type.amenity.bbq">Grillstelle</string>
    <string name="type.amenity.bench">Sitzbank</string>
-    <string name="type.amenity.bench.backless">Ohne Rückenlehne</string>
+    <string name="type.amenity.bench.backless">Sitzbank ohne Rückenlehne</string>
    <string name="type.amenity.bicycle_parking">Fahrradständer</string>
    <string name="type.amenity.boat_rental">Bootsverleih</string>
    <string name="type.amenity.bicycle_rental">Fahrradverleih</string>
--- a/android/sdk/src/main/res/values-el/types_strings.xml
+++ b/android/sdk/src/main/res/values-el/types_strings.xml
@@ -12,16 +12,16 @@
    <string name="type.aerialway.mixed_lift">Τελεφερίκ</string>
    <string name="type.aerialway.station">Σταθμός τελεφερίκ</string>
    <string name="type.aeroway.aerodrome">Αεροδρόμιο</string>
-    <string name="type.aeroway.aerodrome.international">Διεθνές αεροδρόμιο</string>
+    <string name="type.aeroway.aerodrome.international">Αεροδρόμιο</string>
    <string name="type.aeroway.helipad">Ελικοδρόμιο</string>
-    <string name="type.amenity">Υποδομές</string>
+    <string name="type.amenity">Εγκαταστάσεις υποδομής</string>
    <string name="type.amenity.arts_centre">Κέντρο καλών τεχνών</string>
    <string name="type.amenity.bank">Τράπεζα</string>
    <string name="type.amenity.bar">Μπαρ</string>
    <string name="type.amenity.bbq">Ψησταριά μπάρμπεκιου</string>
    <string name="type.amenity.bench">Παγκάκι</string>
    <string name="type.amenity.bicycle_parking">Χώρος στάθμευσης ποδηλάτων</string>
-    <string name="type.amenity.bicycle_rental">Ενοικίαση ποδηλάτων</string>
+    <string name="type.amenity.bicycle_rental">Ενοικιάσεις ποδηλάτων</string>
    <string name="type.amenity.biergarten">Μπυραρία</string>
    <string name="type.amenity.brothel">Πορνείο</string>
    <string name="type.amenity.bureau_de_change">Συνάλλαγμα</string>
@@ -30,14 +30,14 @@
    <string name="type.amenity.car_rental">Ενοικίαση αυτοκινήτου</string>
    <string name="type.amenity.motorcycle_rental">Ενοικίαση μοτοσικλέτας</string>
    <string name="type.amenity.car_sharing">Παραχώρηση αυτοκινήτου</string>
-    <string name="type.amenity.car_wash">Πλύσιμο αυτοκινήτου</string>
+    <string name="type.amenity.car_wash">Καθαρισμός αυτοκινήτων</string>
    <string name="type.amenity.casino">Καζίνο</string>
-    <string name="type.amenity.gambling">Τυχερά παιχνίδια</string>
+    <string name="type.amenity.gambling">ΤΥΧΕΡΑ ΠΑΙΧΝΙΔΙΑ</string>
    <string name="type.leisure.adult_gaming_centre">Κέντρο παιχνιδιών ενηλίκων</string>
-    <string name="type.leisure.amusement_arcade">Ηλεκτρονικά παιχνίδια</string>
+    <string name="type.leisure.amusement_arcade">Στοά</string>
    <string name="type.amenity.charging_station">Σταθμός φόρτισης</string>
-    <string name="type.amenity.charging_station.bicycle">Ποδήλατα</string>
-    <string name="type.amenity.charging_station.motorcar">Αυτοκίνητα</string>
+    <string name="type.amenity.charging_station.bicycle">Σταθμός φόρτισης ποδηλάτων</string>
+    <string name="type.amenity.charging_station.motorcar">Σταθμός φόρτισης αυτοκινήτων</string>
    <string name="type.amenity.childcare">Βρεφικός σταθμός</string>
    <string name="type.amenity.cinema">Κινηματογράφος</string>
    <string name="type.leisure.bowling_alley">Αίθουσα σφαιρίσεως</string>
@@ -65,11 +65,11 @@
    <!-- 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.amenity.grave_yard">Νεκροταφείο</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.amenity.grave_yard.christian">Χριστιανικό νεκροταφείο</string>
+    <string name="type.amenity.grave_yard.christian">Νεκροταφείο</string>
    <string name="type.amenity.hospital">Νοσοκομείο</string>
    <string name="type.amenity.hunting_stand">Βάση σκόπευσης</string>
    <string name="type.amenity.ice_cream">Παγωτατζίδικο</string>
-    <string name="type.amenity.internet_cafe">Ίντερνετ καφέ</string>
+    <string name="type.amenity.internet_cafe">Καφετέρια με Ίντερνετ</string>
    <string name="type.amenity.kindergarten">Νηπιαγωγείο</string>
    <string name="type.amenity.library">Βιβλιοθήκη</string>
    <string name="type.amenity.loading_dock">Αποβάθρα φόρτωσης</string>
@@ -117,7 +117,7 @@
    <string name="type.amenity.police">Αστυνομία</string>
    <string name="type.amenity.post_box">Ταχυδρομική θυρίδα</string>
    <string name="type.amenity.post_office">Ταχυδρομείο</string>
-    <string name="type.amenity.prison">Φυλακή</string>
+    <string name="type.amenity.prison">φυλακή</string>
    <string name="type.amenity.pub">Παμπ</string>
    <string name="type.amenity.public_bookcase">Ανταλλαγή βιβλίων</string>
    <!-- SECTION: Types: Recycling -->
@@ -125,10 +125,10 @@
    <string name="type.amenity.recycling">Κάδος ανακύκλωσης</string>
    <string name="type.amenity.recycling.container">Κάδος ανακύκλωσης</string>
    <string name="type.recycling.batteries">Μπαταρίες</string>
-    <string name="type.recycling.clothes">Ρούχα</string>
+    <string name="type.recycling.clothes">Παλιά ρούχα</string>
    <string name="type.recycling.glass_bottles">Γυάλινα μπουκάλια</string>
-    <string name="type.recycling.paper">Χαρτί</string>
-    <string name="type.recycling.plastic">Πλαστικό</string>
+    <string name="type.recycling.paper">Απορρίμματα χαρτιού</string>
+    <string name="type.recycling.plastic">Πλαστικά απορρίμματα</string>
    <string name="type.recycling.plastic_bottles">Πλαστικά μπουκάλια</string>
    <string name="type.recycling.scrap_metal">Παλιοσίδερα</string>
    <string name="type.recycling.small_appliances">Ηλεκτρονικά απορρίμματα</string>
@@ -153,7 +153,7 @@
    <string name="type.amenity.vending_machine.cigarettes">Αυτόματος πωλητής τσιγάρων</string>
    <string name="type.amenity.vending_machine.drinks">Αυτόματος πωλητής ποτών</string>
    <string name="type.amenity.vending_machine.parking_tickets">Εισιτήρια στάθμευσης</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Μηχάνημα αυτόματης πώλησης εισιτηρίων για δημόσια συγκοινωνία</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Μηχάνημα αυτόματης πώλησης εισιτηρίων για τα μέσα μαζικής μεταφοράς</string>
    <string name="type.amenity.vehicle_inspection">Έλεγχος οχήματος</string>
    <string name="type.amenity.veterinary">Κτηνίατρος</string>
    <string name="type.amenity.waste_basket">Κάδος απορριμμάτων</string>
@@ -314,7 +314,7 @@
    <string name="type.entrance">Είσοδος</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">Κύρια είσοδος</string>
-    <string name="type.entrance.exit">Έξοδος (μόνο)</string>
+    <string name="type.entrance.exit">Έξοδος</string>
    <string name="type.fee.no">Δωρεάν</string>
    <string name="type.healthcare.laboratory">Ιατρικό Εργαστήριο</string>
    <string name="type.healthcare.physiotherapist">Φυσικοθεραπευτής</string>
@@ -367,7 +367,7 @@
    <string name="type.highway.motorway_link.bridge">Γέφυρα</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.motorway_link.tunnel">Σήραγγα</string>
-    <string name="type.highway.path">Μονοπάτι</string>
+    <string name="type.highway.path">Διαδρομή</string>
    <!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
    <string name="type.highway.path.difficult">Δύσκολη ή ελάχιστα ορατή διαδρομή</string>
    <!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
@@ -379,19 +379,20 @@
    <string name="type.highway.path.horse">Διαδρομή</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.path.tunnel">Σήραγγα</string>
-    <string name="type.highway.pedestrian">Πεζόδρομος</string>
+    <string name="type.highway.pedestrian">Οδός</string>
    <string name="type.highway.pedestrian.area">Οδός</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Γέφυρα</string>
+
    <string name="type.highway.pedestrian.square">Πλατεία</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Σήραγγα</string>
-    <string name="type.highway.primary">Πρωτεύων δρόμος</string>
+    <string name="type.highway.primary">Οδός</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.primary.bridge">Γέφυρα</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.primary.tunnel">Σήραγγα</string>
-    <string name="type.highway.primary_link">Ράμπα πρωτεύοντος δρόμου</string>
+    <string name="type.highway.primary_link">Οδός</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.primary_link.bridge">Γέφυρα</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
@@ -411,36 +412,36 @@
    <string name="type.man_made.bridge">Γέφυρα</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.road.tunnel">Σήραγγα</string>
-    <string name="type.highway.secondary">Δευτερεύων δρόμος</string>
+    <string name="type.highway.secondary">Οδός</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.secondary.bridge">Γέφυρα</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.secondary.tunnel">Σήραγγα</string>
-    <string name="type.highway.secondary_link">Ράμπα δευτερεύοντος δρόμου</string>
+    <string name="type.highway.secondary_link">Οδός</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.secondary_link.bridge">Γέφυρα</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.secondary_link.tunnel">Σήραγγα</string>
-    <string name="type.highway.service">Δρόμος υπηρεσίας</string>
-    <string name="type.highway.service.area">Δρόμος υπηρεσίας</string>
+    <string name="type.highway.service">Οδός</string>
+    <string name="type.highway.service.area">Οδός</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.service.bridge">Γέφυρα</string>
    <string name="type.highway.service.driveway">Οδός</string>
-    <string name="type.highway.service.parking_aisle">Διάδρομος πάρκινγκ</string>
+    <string name="type.highway.service.parking_aisle">Οδός</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.service.tunnel">Σήραγγα</string>
    <string name="type.highway.speed_camera">Κάμερα ταχύτητας</string>
-    <string name="type.highway.steps">Σκαλοπάτια</string>
+    <string name="type.highway.steps">Διαδρομή</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.steps.bridge">Γέφυρα</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.steps.tunnel">Σήραγγα</string>
-    <string name="type.highway.tertiary">Τριτεύων δρόμος</string>
+    <string name="type.highway.tertiary">Οδός</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.tertiary.bridge">Γέφυρα</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.tertiary.tunnel">Σήραγγα</string>
-    <string name="type.highway.tertiary_link">Ράμπα τριτεύοντος δρόμου</string>
+    <string name="type.highway.tertiary_link">Οδός</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.tertiary_link.bridge">Γέφυρα</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
@@ -470,26 +471,26 @@
    <string name="type.highway.unclassified.bridge">Γέφυρα</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.unclassified.tunnel">Σήραγγα</string>
-    <string name="type.area_highway.footway">Μονοπάτι πεζών</string>
+    <string name="type.area_highway.footway">Διαδρομή</string>
    <string name="type.area_highway.living_street">Οδός</string>
    <string name="type.area_highway.motorway">Οδός</string>
-    <string name="type.area_highway.path">Μονοπάτι</string>
-    <string name="type.area_highway.pedestrian">Πεζόδρομος</string>
-    <string name="type.area_highway.primary">Πρωτεύων δρόμος</string>
+    <string name="type.area_highway.path">Διαδρομή</string>
+    <string name="type.area_highway.pedestrian">Οδός</string>
+    <string name="type.area_highway.primary">Οδός</string>
    <string name="type.area_highway.residential">Οδός</string>
-    <string name="type.area_highway.secondary">Δευτερεύων δρόμος</string>
-    <string name="type.area_highway.service">Δρόμος υπηρεσίας</string>
-    <string name="type.area_highway.tertiary">Τριτεύων δρόμος</string>
-    <string name="type.area_highway.steps">Σκαλοπάτια</string>
+    <string name="type.area_highway.secondary">Οδός</string>
+    <string name="type.area_highway.service">Οδός</string>
+    <string name="type.area_highway.tertiary">Οδός</string>
+    <string name="type.area_highway.steps">Διαδρομή</string>
    <string name="type.area_highway.track">Οδός</string>
    <string name="type.area_highway.trunk">Οδός</string>
    <string name="type.area_highway.unclassified">Οδός</string>
    <!-- SECTION: Types: Historic -->
    <string name="type.historic">Ιστορικό αντικείμενο</string>
    <string name="type.historic.aircraft">Ιστορικό αεροσκάφος</string>
-    <string name="type.historic.anchor">Ιστορική άγκυρα</string>
+    <string name="type.historic.anchor">Ιστορική Άγκυρα</string>
    <string name="type.historic.archaeological_site">Αρχαιολογικός χώρος</string>
-    <string name="type.historic.battlefield">Ιστορικό πεδίο μάχης</string>
+    <string name="type.historic.battlefield">Πεδίο μάχης</string>
    <string name="type.historic.boundary_stone">Οριακή πέτρα</string>
    <string name="type.historic.cannon">Κανόνι</string>
    <string name="type.historic.castle">Κάστρο</string>
@@ -556,17 +557,17 @@
    <string name="type.leisure.nature_reserve">Φυσικό απόθεμα</string>
    <string name="type.leisure.outdoor_seating">Καθίσματα εξωτερικού χώρου</string>
    <string name="type.leisure.park">Πάρκο</string>
-    <string name="type.leisure.park.no.access">Ιδιωτικό πάρκο</string>
+    <string name="type.leisure.park.no.access">Πάρκο</string>
    <string name="type.leisure.park.permissive">Πάρκο</string>
-    <string name="type.leisure.park.private">Ιδιωτικό πάρκο</string>
+    <string name="type.leisure.park.private">Πάρκο</string>
    <string name="type.leisure.picnic_table">Τραπέζι πικ-νικ</string>
-    <string name="type.leisure.pitch">Γήπεδο άθλησης</string>
+    <string name="type.leisure.pitch">Γήπεδο αθλοπαιδιών</string>
    <string name="type.leisure.playground">Παιδική χαρά</string>
    <string name="type.leisure.sauna">Σάουνα</string>
    <string name="type.leisure.sports_centre">Αθλητικό κέντρο</string>
-    <string name="type.sport.climbing">Αναρρίχηση</string>
-    <string name="type.sport.yoga">Γιόγκα</string>
-    <string name="type.leisure.stadium">Στάδιο</string>
+    <string name="type.sport.climbing">Κέντρο αναρρίχησης</string>
+    <string name="type.sport.yoga">Στούντιο γιόγκα</string>
+    <string name="type.leisure.stadium">Γήπεδο</string>
    <string name="type.leisure.swimming_pool">Πισίνα</string>
    <string name="type.leisure.swimming_pool.private">Πισίνα</string>
    <string name="type.leisure.water_park">Υδάτινο πάρκο</string>
@@ -1103,7 +1104,7 @@
    <string name="type.sport.volleyball">Πετοσφαίριση</string>
    <string name="type.sport.10pin">Μπόουλινγκ</string>
    <string name="type.sport.9pin">Μπόουλινγκ</string>
-    <string name="type.sport.padel">Πάντελ</string>
+    <string name="type.sport.padel">Padel</string>
    <string name="type.sport.futsal">Futsal</string>
    <string name="type.sport.ice_hockey">Χόκεϊ στον παγο</string>
    <string name="type.sport.field_hockey">Χόκεϊ επί χόρτου</string>
@@ -1180,7 +1181,7 @@
    <string name="type.self_service.partially">Μερική αυτοεξυπηρέτηση</string>
    <string name="type.self_service.no">Δεν υπάρχει αυτοεξυπηρέτηση</string>
    <!-- https://wiki.openstreetmap.org/wiki/Key:social_facility -->
-    <string name="type.amenity.social_facility">Κοινωνική δομή</string>
+    <string name="type.amenity.social_facility">Κοινωνική διευκόλυνση</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
    <string name="type.emergency.emergency_ward_entrance">Είσοδος θαλάμου έκτακτης ανάγκης</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->
@@ -1200,7 +1201,7 @@
    <string name="type.man_made.utility_pole">Πόλος κοινής ωφέλειας</string>
    <string name="type.railway.narrow_gauge.bridge">Σιδηροδρομική γέφυρα στενού εύρους</string>
    <string name="type.aeroway">Υποδομή εναέριου χώρου</string>
-    <string name="type.aeroway.apron">Χώρος στάθμευσης αεροσκαφών</string>
+    <string name="type.aeroway.apron">Ποδιά</string>
    <string name="type.aeroway.runway">Αεροδιάδρομος</string>
    <string name="type.aeroway.taxiway">Τροχόδρομος</string>
    <string name="type.aeroway.terminal">Τερματικός σταθμός</string>
@@ -1245,7 +1246,7 @@
    <string name="type.boundary.administrative.3">Περιφερειακά όρια</string>
    <string name="type.boundary.administrative.4">Περιφερειακά όρια</string>
    <string name="type.building.warehouse">Αποθήκη</string>
-    <string name="type.area_highway.cycleway">Μονοπάτι ποδηλάτων</string>
+    <string name="type.area_highway.cycleway">Ποδηλατόδρομος</string>
    <string name="type.aeroway.gate">Πύλη</string>
    <string name="type.amenity.atm">ATM</string>
    <string name="type.railway.platform">Σιδηροδρομική πλατφόρμα</string>
@@ -1262,61 +1263,4 @@
    <string name="type.attraction.bumper_car">Συγκρουόμενα</string>
    <string name="type.landuse">Χρήσης γης</string>
    <string name="type.junction.roundabout">Κυκλικός κόμβος</string>
-    <string name="type.amenity.animal_shelter">Καταφύγιο ζώων</string>
-    <string name="type.cardinal.east">Ανατολή</string>
-    <string name="type.cardinal.north">Βορράς</string>
-    <string name="type.cardinal.south">Νότος</string>
-    <string name="type.cardinal.west">Δύση</string>
-    <string name="type.entrance.entry">Είσοδος (μόνο)</string>
-    <string name="type.entrance.emergency">Έξοδος κινδύνου</string>
-    <string name="type.fee.yes">€</string>
-    <string name="type.entrance.house">Είσοδος σπιτιού</string>
-    <string name="type.entrance.garage">Είσοδος γκαράζ</string>
-    <string name="type.entrance.service">Είσοδος υπηρεσίας</string>
-    <string name="type.disusedbusiness">Κενή επιχείρηση</string>
-    <string name="type.shop.lighting">Κατάστημα φωτιστικών</string>
-    <string name="type.xmas.tree">Χριστουγεννιάτικο δέντρο</string>
-    <string name="type.leisure.track">Πίστα</string>
-    <string name="type.leisure.track.area">Πίστα</string>
-    <string name="type.leisure.sports_centre.sport.multi">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.american_football">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.archery">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.athletics">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.australian_football">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.badminton">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.baseball">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.basketball">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.beachvolleyball">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.bowls">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.climbing">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.cricket">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.curling">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.equestrian">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.field_hockey">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.futsal">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.golf">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.gymnastics">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.handball">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.ice_hockey">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.padel">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.pelota">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.scuba_diving">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.shooting">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.skateboard">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.skiing">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.soccer">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.swimming">Κέντρο κολύμβησης</string>
-    <string name="type.leisure.sports_centre.sport.table_tennis">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.tennis">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.volleyball">Αθλητικό κέντρο</string>
-    <string name="type.leisure.sports_centre.sport.yoga">Αθλητικό κέντρο</string>
-    <string name="type.leisure.fitness_centre.sport.yoga">Στούντιο γιόγκα</string>
-    <string name="type.leisure.hackerspace">Hackerspace</string>
-    <string name="type.leisure">Αναψυχή</string>
-    <string name="type.leisure.common">Δημόσια γη</string>
-    <string name="type.landuse.military">Στρατιωτική περιοχή</string>
-    <string name="type.landuse.industrial">Βιομηχανική περιοχή</string>
-    <string name="type.amenity.bench.backless">Παγκάκι χωρίς πλάτη</string>
-    <string name="type.amenity.boat_rental">Ενοικίαση σκαφών</string>
-    <string name="type.amenity.flight_school">Σχολή πιλότων</string>
 </resources>
--- a/android/sdk/src/main/res/values-en-rAU/types_strings.xml
+++ b/android/sdk/src/main/res/values-en-rAU/types_strings.xml
@@ -49,5 +49,4 @@
    <string name="type.shop.lottery">Lotto</string>
    <string name="type.sport.australian_football">AFL</string>
    <string name="type.sport.table_tennis">Ping Pong</string>
-    <string name="type.amenity.ice_cream">Ice Cream Shop</string>
 </resources>
--- a/android/sdk/src/main/res/values-en-rCA/types_strings.xml
+++ b/android/sdk/src/main/res/values-en-rCA/types_strings.xml
@@ -1,17 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="type.amenity.arts_centre">Arts Centre</string>
-    <string name="type.amenity.conference_centre">Conference Centre</string>
-    <string name="type.amenity.exhibition_centre">Exhibition Centre</string>
-    <string name="type.amenity.recycling.centre">Recycling Centre</string>
-    <string name="type.amenity.toilets">Washroom</string>
-    <string name="type.barrier.guard_rail">Guardrail</string>
-    <string name="type.highway.motorway">Freeway</string>
-    <string name="type.highway.motorway.bridge">Freeway Bridge</string>
-    <string name="type.highway.motorway.tunnel">Freeway Tunnel</string>
-    <string name="type.highway.motorway_link">Freeway Ramp</string>
-    <string name="type.leisure.sports_centre">Sports Centre</string>
-    <string name="type.shop.tyres">Tire Shop</string>
-    <string name="type.traffic_calming.bump">Road Bump</string>
-    <string name="type.traffic_calming.hump">Road Bump</string>
-</resources>
+</resources>
--- a/android/sdk/src/main/res/values-en-rUS/types_strings.xml
+++ b/android/sdk/src/main/res/values-en-rUS/types_strings.xml
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -68,9 +68,9 @@
    <string name="type.amenity.fast_food">Comida rápida</string>
    <string name="type.amenity.ferry_terminal">Transbordador de ferry</string>
    <string name="type.amenity.fire_station">Estación de bomberos</string>
-    <string name="type.amenity.food_court">Plaza de comidas</string>
+    <string name="type.amenity.food_court">Zona de comidas</string>
    <string name="type.amenity.fountain">Fuente</string>
-    <string name="type.amenity.fuel">Estación de servicio</string>
+    <string name="type.amenity.fuel">Gasolinera</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.amenity.grave_yard">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. -->
@@ -79,7 +79,7 @@
    <string name="type.amenity.hunting_stand">Puesto de caza</string>
    <string name="type.amenity.ice_cream">Heladería</string>
    <string name="type.amenity.internet_cafe">Cibercafé</string>
-    <string name="type.amenity.kindergarten">Jardín de infantes</string>
+    <string name="type.amenity.kindergarten">Guardería</string>
    <string name="type.amenity.library">Biblioteca</string>
    <string name="type.amenity.loading_dock">Muelle de carga</string>
    <string name="type.amenity.marketplace">Mercado</string>
@@ -88,7 +88,7 @@
    <string name="type.amenity.nursing_home">Residencia de ancianos</string>
    <string name="type.amenity.parking">Aparcamiento</string>
    <string name="type.amenity.parking.fee">Aparcamiento</string>
-    <string name="type.amenity.parking.multi.storey">Aparcamiento multinivel</string>
+    <string name="type.amenity.parking.multi.storey">Edificio de aparcamiento</string>
    <string name="type.amenity.parking.multi.storey.fee">Edificio de aparcamiento</string>
    <string name="type.amenity.parking.no.access">Aparcamiento privado</string>
    <string name="type.amenity.parking.permissive">Aparcamiento privado</string>
@@ -168,16 +168,16 @@
    <string name="type.amenity.townhall">Ayuntamiento</string>
    <string name="type.amenity.university">Universidad</string>
    <string name="type.amenity.vending_machine">Máquina expendedora</string>
-    <string name="type.amenity.vending_machine.cigarettes">Expendedora de tabaco</string>
-    <string name="type.amenity.vending_machine.coffee">Expendedora de café</string>
-    <string name="type.amenity.vending_machine.condoms">Expendedora de condones</string>
-    <string name="type.amenity.vending_machine.drinks">Expendedora de bebidas</string>
-    <string name="type.amenity.vending_machine.food">Expendedora de comida</string>
-    <string name="type.amenity.vending_machine.newspapers">Expendedora de periódicos</string>
+    <string name="type.amenity.vending_machine.cigarettes">Máquina expendedora de tabaco</string>
+    <string name="type.amenity.vending_machine.coffee">Máquina expendedora de café</string>
+    <string name="type.amenity.vending_machine.condoms">Máquina expendedora de condones</string>
+    <string name="type.amenity.vending_machine.drinks">Máquina expendedora de bebidas</string>
+    <string name="type.amenity.vending_machine.food">Máquina expendedora de comida</string>
+    <string name="type.amenity.vending_machine.newspapers">Máquina expendedora de periódicos</string>
    <string name="type.amenity.vending_machine.parking_tickets">Parquímetro</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Expendedora de billetes de transporte público</string>
-    <string name="type.amenity.vending_machine.sweets">Expendedora de dulces</string>
-    <string name="type.amenity.vending_machine.excrement_bags">Dispensador de bolsas para excrementos</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Máquina expendedora de billetes de transporte público</string>
+    <string name="type.amenity.vending_machine.sweets">Máquina expendedora de dulces</string>
+    <string name="type.amenity.vending_machine.excrement_bags">Maquina expendedora de bolsas para excrementos</string>
    <string name="type.amenity.parcel_locker">Taquilla de paquetes</string>
    <string name="type.amenity.vehicle_inspection">Inspección de vehículos</string>
    <string name="type.amenity.vending_machine.fuel">Surtidor de combustible</string>
@@ -257,7 +257,7 @@
    <string name="type.craft.photographer">Fotógrafo</string>
    <string name="type.shop.camera">Tienda de fotografía</string>
    <string name="type.craft.plumber">Fontanero</string>
-    <string name="type.craft.sawmill">Aserradero</string>
+    <string name="type.craft.sawmill">Serrería</string>
    <string name="type.craft.shoemaker">Zapatero</string>
    <string name="type.craft.winery">Bodega vinícola</string>
    <string name="type.craft.tailor">Sastre</string>
@@ -335,7 +335,7 @@
    <string name="type.cuisine.sandwich">Sándwiches</string>
    <string name="type.cuisine.sausage">Salchichas</string>
    <string name="type.cuisine.savory_pancakes">Tortitas saladas</string>
-    <string name="type.cuisine.seafood">Marina</string>
+    <string name="type.cuisine.seafood">del mar</string>
    <string name="type.cuisine.soba">Soba</string>
    <string name="type.cuisine.spanish">Española</string>
    <string name="type.cuisine.steak_house">Asador</string>
@@ -350,7 +350,7 @@
    <string name="type.emergency">Emergencia</string>
    <string name="type.emergency.assembly_point">Punto de reunión de emergencia</string>
    <string name="type.emergency.defibrillator">Desfibrilador</string>
-    <string name="type.emergency.fire_hydrant">Hidrante de incendio</string>
+    <string name="type.emergency.fire_hydrant">Boca de incendio</string>
    <string name="type.amenity.hydrant">Boca de riego</string>
    <string name="type.emergency.phone">Teléfono de emergencias</string>
    <!-- A place where a lifeguard is on duty. -->
@@ -499,12 +499,12 @@
    <string name="type.highway.tertiary_link.bridge">Puente</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.tertiary_link.tunnel">Túnel</string>
-    <string name="type.highway.track">Camino</string>
-    <string name="type.highway.track.area">Camino</string>
+    <string name="type.highway.track">Pista</string>
+    <string name="type.highway.track.area">Pista</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.track.bridge">Puente</string>
-    <string name="type.highway.track.grade1">Camino</string>
-    <string name="type.highway.track.no.access">Camino</string>
+    <string name="type.highway.track.grade1">Pista</string>
+    <string name="type.highway.track.no.access">Pista</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.track.tunnel">Túnel</string>
    <string name="type.highway.traffic_signals">Semáforo</string>
@@ -536,7 +536,7 @@
    <string name="type.area_highway.service">Vía de servicio</string>
    <string name="type.area_highway.tertiary">Carretera terciaria</string>
    <string name="type.area_highway.steps">Escaleras</string>
-    <string name="type.area_highway.track">Camino</string>
+    <string name="type.area_highway.track">Pista</string>
    <string name="type.area_highway.trunk">Vía troncal</string>
    <string name="type.area_highway.unclassified">Carretera menor</string>
    <!-- SECTION: Types: Historic -->
@@ -737,7 +737,7 @@
    <string name="type.natural.tree_row">Fila de árboles</string>
    <string name="type.natural.vineyard">Viña</string>
    <string name="type.natural.volcano">Volcán</string>
-    <string name="type.natural.water">Agua</string>
+    <string name="type.natural.water">Cuerpo de agua</string>
    <string name="type.natural.wetland">Terreno pantanoso</string>
    <string name="type.natural.wetland.bog">Turbera</string>
    <string name="type.natural.wetland.marsh">Ciénaga</string>
@@ -1107,7 +1107,7 @@
    <string name="type.shop.car_repair.tyres">Reparación de neumáticos</string>
    <string name="type.shop.caravan">Concesionario de caravanas</string>
    <string name="type.shop.carpet">Tienda de alfombras</string>
-    <string name="type.shop.chemist">Parafarmacia</string>
+    <string name="type.shop.chemist">Droguería</string>
    <string name="type.shop.chocolate">Chocolatería</string>
    <string name="type.shop.clothes">Tienda de ropa</string>
    <string name="type.shop.coffee">Tienda de café</string>
@@ -1370,7 +1370,7 @@
    <string name="type.fee.yes">$</string>
    <string name="type.railway.narrow_gauge.tunnel">Túnel de vía férrea estrecha</string>
    <string name="type.railway.light_rail.bridge">Puente de tren ligero</string>
-    <string name="type.highway.ladder">Escalerilla</string>
+    <string name="type.highway.ladder">Escalera</string>
    <string name="type.amenity.studio">Estudio multimedia</string>
    <string name="type.landuse.plant_nursery">Vivero de plantas</string>
    <string name="type.barrier.guard_rail">Guardarraíl</string>
@@ -1383,7 +1383,7 @@
    <string name="type.natural.wetland.tidalflat">Llanura mareal</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">Consigna de equipaje</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>
@@ -1410,7 +1410,7 @@
    <string name="type.leisure.sports_centre.sport.basketball">Centro deportivo</string>
    <string name="type.leisure.sports_centre.sport.beachvolleyball">Centro deportivo</string>
    <string name="type.leisure.sports_centre.sport.bowls">Centro deportivo</string>
-    <string name="type.leisure.sports_centre.sport.climbing">Rocódromo</string>
+    <string name="type.leisure.sports_centre.sport.climbing">Centro deportivo</string>
    <string name="type.leisure.sports_centre.sport.cricket">Centro deportivo</string>
    <string name="type.leisure.sports_centre.sport.curling">Centro deportivo</string>
    <string name="type.leisure.sports_centre.sport.equestrian">Centro deportivo</string>
@@ -1508,5 +1508,4 @@
    <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>
-    <string name="type.emergency.disaster_help_point">Punto de ayuda para emergencias y desastres</string>
 </resources>
--- a/android/sdk/src/main/res/values-et/types_strings.xml
+++ b/android/sdk/src/main/res/values-et/types_strings.xml
@@ -44,8 +44,8 @@
    <string name="type.leisure.adult_gaming_centre">Hasartmängusaal</string>
    <string name="type.leisure.amusement_arcade">Videomängusaal</string>
    <string name="type.amenity.charging_station">Laadimisjaam</string>
-    <string name="type.amenity.charging_station.bicycle">Jalgrattad</string>
-    <string name="type.amenity.charging_station.motorcar">Autod</string>
+    <string name="type.amenity.charging_station.bicycle">Jalgratta laadimisjaam</string>
+    <string name="type.amenity.charging_station.motorcar">Autode laadimisjaam</string>
    <string name="type.amenity.childcare">Lastehoid</string>
    <string name="type.amenity.cinema">Kino</string>
    <string name="type.leisure.bowling_alley">Bowlingusaal</string>
@@ -1505,7 +1505,4 @@
    <string name="type.tourism.information.tactile_map">Kombatav kaart</string>
    <string name="type.railway.disused.bridge">Kasutuselt eemaldatud raudteesild</string>
    <string name="type.railway.disused.tunnel">Kasutuselt eemaldatud raudteetunnel</string>
-    <string name="type.amenity.charging_station.motorcycle">Mootorrattad</string>
-    <string name="type.amenity.charging_station.small">Väike laadimisjaam</string>
-    <string name="type.emergency.disaster_help_point">Katastroofiabi teenused</string>
 </resources>
--- a/android/sdk/src/main/res/values-fr/types_strings.xml
+++ b/android/sdk/src/main/res/values-fr/types_strings.xml
@@ -1191,7 +1191,7 @@
    <string name="type.sport.handball">Handball</string>
    <string name="type.sport.multi">Sports multiples</string>
    <!-- Used to tag a scuba diving site. -->
-    <string name="type.sport.scuba_diving">Plongée sous-marine</string>
+    <string name="type.sport.scuba_diving">Site de plongée sous-marine</string>
    <string name="type.sport.shooting">Tir sportif</string>
    <string name="type.sport.skateboard">Skateboard</string>
    <string name="type.sport.skiing">Ski</string>
@@ -1484,8 +1484,8 @@
    <string name="type.spherical_buoy.special_purpose">Bouée sphérique, marque spéciale</string>
    <string name="type.lateral.port">Bâbord</string>
    <string name="type.lateral.starboard">Tribord</string>
-    <string name="type.cardinal.east">Est :</string>
-    <string name="type.cardinal.north">Nord :</string>
+    <string name="type.cardinal.east">Est</string>
+    <string name="type.cardinal.north">Nord</string>
    <string name="type.cardinal.south">Sud</string>
    <string name="type.cardinal.west">Ouest</string>
    <string name="type.entrance.house">Entrée de la maison</string>
@@ -1507,6 +1507,4 @@
    <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>
-    <string name="type.emergency.access_point.address">Adresse de secours en cas d\'urgence</string>
-    <string name="type.emergency.disaster_help_point">Point d\'assistance d\'urgence en cas de catastrophe</string>
 </resources>
--- a/android/sdk/src/main/res/values-ga/strings.xml
+++ b/android/sdk/src/main/res/values-ga/strings.xml
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
--- a/android/sdk/src/main/res/values-ga/types_strings.xml
+++ b/android/sdk/src/main/res/values-ga/types_strings.xml
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
--- a/android/sdk/src/main/res/values-ia/strings.xml
+++ b/android/sdk/src/main/res/values-ia/strings.xml
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
--- a/android/sdk/src/main/res/values-in/types_strings.xml
+++ b/android/sdk/src/main/res/values-in/types_strings.xml
@@ -1181,6 +1181,4 @@
    <string name="type.man_made.observatory">Observatorium</string>
    <string name="type.aeroway.runway">Landasan Pacu</string>
    <string name="type.emergency">Darurat</string>
-    <string name="type.office.security">Kantor Satpam</string>
-    <string name="type.building.guardhouse">Pos Satpam</string>
 </resources>
--- a/android/sdk/src/main/res/values-lv/types_strings.xml
+++ b/android/sdk/src/main/res/values-lv/types_strings.xml
@@ -2,7 +2,7 @@
 <resources>
    <!-- SECTION: Types -->
    <string name="type.amenity.motorcycle_rental">Motociklu noma</string>
-    <string name="type.amenity.charging_station.bicycle">Divriteņi</string>
+    <string name="type.amenity.charging_station.bicycle">Velosipēdu uzlāde</string>
    <!-- SECTION: Types: Recycling -->
    <!-- A place where a lifeguard is on duty. -->
    <string name="type.emergency.lifeguard">Glābējs</string>
@@ -42,7 +42,7 @@
    <string name="type.amenity.car_wash">Automazgātuve</string>
    <string name="type.amenity.casino">Kazino</string>
    <string name="type.amenity.charging_station">Uzlādes stacija</string>
-    <string name="type.amenity.charging_station.motorcar">Mašīnas</string>
+    <string name="type.amenity.charging_station.motorcar">Auto uzlādes stacija</string>
    <string name="type.amenity.cinema">Kinoteātris</string>
    <string name="type.amenity.clinic">Poliklīnika</string>
    <string name="type.amenity.college">Koledža</string>
@@ -184,6 +184,4 @@
    <string name="type.railway.disused.tunnel">Neizmantots dzelzceļa tunelis</string>
    <string name="type.railway.funicular">Funikulieris</string>
    <string name="type.railway.disused.bridge">Neizmantots dzelzceļa tilts</string>
-    <string name="type.amenity.charging_station.small">Ierobežots vietu skaits</string>
-    <string name="type.amenity.charging_station.motorcycle">Motocikli</string>
 </resources>
--- a/android/sdk/src/main/res/values-nb/types_strings.xml
+++ b/android/sdk/src/main/res/values-nb/types_strings.xml
@@ -1011,7 +1011,7 @@
    <string name="type.shop.health_food">Helsekostbutikk</string>
    <string name="type.shop.hearing_aids">Høreapparatbutikk</string>
    <string name="type.shop.herbalist">Urtebutikk</string>
-    <string name="type.shop.hifi">HiFi-butikk</string>
+    <string name="type.shop.hifi">HiFi lyd</string>
    <string name="type.shop.houseware">Husholdningsbutikk</string>
    <string name="type.shop.jewelry">Gullsmed</string>
    <string name="type.shop.kiosk">Kiosk</string>
--- a/android/sdk/src/main/res/values-nl/types_strings.xml
+++ b/android/sdk/src/main/res/values-nl/types_strings.xml
@@ -44,8 +44,8 @@
    <string name="type.leisure.adult_gaming_centre">Gamingcentrum voor volwassenen</string>
    <string name="type.leisure.amusement_arcade">Speelhal</string>
    <string name="type.amenity.charging_station">Oplaadstation</string>
-    <string name="type.amenity.charging_station.bicycle">Fietsen</string>
-    <string name="type.amenity.charging_station.motorcar">Auto\'s</string>
+    <string name="type.amenity.charging_station.bicycle">Oplaadstation voor fietsen</string>
+    <string name="type.amenity.charging_station.motorcar">Oplaadstation voor auto\'s</string>
    <string name="type.amenity.childcare">Crèche</string>
    <string name="type.amenity.cinema">Bioscoop</string>
    <string name="type.leisure.bowling_alley">Bowlingbaan</string>
@@ -1505,8 +1505,4 @@
    <string name="type.tourism.information.tactile_map">Reliëfkaart</string>
    <string name="type.railway.disused.bridge">Niet meer gebruikte spoorbrug</string>
    <string name="type.railway.disused.tunnel">Niet meer gebruikte spoortunnel</string>
-    <string name="type.amenity.charging_station.motorcycle">Motorfietsen</string>
-    <string name="type.amenity.charging_station.small">Beperkte capaciteit</string>
-    <string name="type.emergency.disaster_help_point">Hulppunt voor noodrampen</string>
-    <string name="type.emergency.access_point.address">Noodreddingsadres</string>
 </resources>
--- a/android/sdk/src/main/res/values-sl/types_strings.xml
+++ b/android/sdk/src/main/res/values-sl/types_strings.xml
@@ -1084,253 +1084,4 @@
    <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>
-    <string name="type.railway.subway_entrance.baku">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.bangkok">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.barcelona">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.beijing">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.bengalore">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.berlin">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.bilbao">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.brasilia">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.brescia">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.brussels">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.bucharest">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.budapest">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.buenos_aires">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.bursa">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.cairo">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.caracas">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.catania">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.changchun">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.chengdu">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.chicago">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.chongqing">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.dalian">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.delhi">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.dnepro">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.dubai">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.ekb">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.fukuoka">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.glasgow">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.guangzhou">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.hamburg">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.helsinki">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.hiroshima">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.hongkong">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.isfahan">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.istanbul">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.izmir">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.kazan">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.kharkiv">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.kiev">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.kobe">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.kolkata">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.kunming">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.kyoto">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.la">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.lausanne">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.lille">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.lima">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.lisboa">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.london">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.lyon">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.madrid">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.malaga">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.manila">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.maracaibo">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.mashhad">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.mecca">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.medellin">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.mexico">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.milan">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.minsk">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.montreal">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.moscow">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.munchen">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.nagoya">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.newyork">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.nnov">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.novosibirsk">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.osaka">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.oslo">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.palma">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.panama">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.paris">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.philadelphia">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.pyongyang">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.rennes">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.rio">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.roma">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.rotterdam">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.samara">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.santiago">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.santo_domingo">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.saopaulo">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.sapporo">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.sendai">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.sf">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.shanghai">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.shenzhen">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.shiraz">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.singapore">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.sofia">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.spb">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.stockholm">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.tabriz">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.taipei">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.taoyuan">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.tashkent">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.tbilisi">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.tehran">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.tianjin">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.tokyo">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.valencia">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.vienna">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.warszawa">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.washington">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.wuhan">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.yerevan">Vhod v podzemno železnico</string>
-    <string name="type.railway.subway_entrance.yokohama">Vhod v podzemno železnico</string>
-    <string name="type.railway.tram">Tramvaj</string>
-    <string name="type.railway.tram.bridge">Most tramvaja</string>
-    <string name="type.railway.tram.tunnel">Predor tramvaja</string>
-    <string name="type.railway.tram_stop">Postaja tramvaja</string>
-    <string name="type.route">Trasa</string>
-    <string name="type.route.ferry">Trajektna povezava</string>
-    <string name="type.shop">Trgovina</string>
-    <string name="type.shop.alcohol">Trgovina z alkoholom</string>
-    <string name="type.shop.bakery">Pekarna</string>
-    <string name="type.shop.bathroom_furnishing">Trgovina s kopalniško opremo</string>
-    <string name="type.shop.beauty">Lepotni salon</string>
-    <string name="type.shop.beauty.nails">Salon za nohte</string>
-    <string name="type.shop.beverages">Pivnica</string>
-    <string name="type.shop.bicycle">Kolesarska trgovina</string>
-    <string name="type.shop.bookmaker">Kgnjigoveznica</string>
-    <string name="type.shop.books">Knjigarna</string>
-    <string name="type.shop.butcher">Mesarija</string>
-    <string name="type.shop.cannabis">Trgovina s konopljo</string>
-    <string name="type.shop.car">Trgovina z rabljenimi avtomobili</string>
-    <string name="type.shop.car_parts">Trgovina z avtomobilskimi deli</string>
-    <string name="type.shop.car_repair">Avtomehanična delavnica</string>
-    <string name="type.shop.car_repair.tyres">Vulkanizer</string>
-    <string name="type.shop.caravan">Prodaja avtodomov</string>
-    <string name="type.shop.carpet">Trgovina s preprogami</string>
-    <string name="type.shop.chemist">Drogerija</string>
-    <string name="type.shop.chocolate">Čokoladnica</string>
-    <string name="type.shop.clothes">Trgovina z oblačili</string>
-    <string name="type.shop.coffee">Trgovina s kavo</string>
-    <string name="type.shop.computer">Računalniška trgovina</string>
-    <string name="type.shop.confectionery">Slaščičarna</string>
-    <string name="type.shop.convenience">Trgovina z mešanim blagom</string>
-    <string name="type.shop.copyshop">Kopirnica</string>
-    <string name="type.shop.cosmetics">Kozmetična trgovina</string>
-    <string name="type.shop.curtain">Trgovina z zavesami</string>
-    <string name="type.shop.deli">Delikatesa</string>
-    <string name="type.shop.department_store">Veleblagovnica</string>
-    <string name="type.shop.dry_cleaning">Kemična čistilnica</string>
-    <string name="type.shop.electronics">Trgovina z električno opremo</string>
-    <string name="type.shop.erotic">Erotična trgovina</string>
-    <string name="type.shop.fabric">Trgovina z blagom</string>
-    <string name="type.shop.fashion_accessories">Trgovina z modnimi dodatki</string>
-    <string name="type.shop.florist">Cvetličarstvo</string>
-    <string name="type.shop.funeral_directors">Pogrebna služba</string>
-    <string name="type.shop.furniture">Trgovina s pohištvom</string>
-    <string name="type.shop.garden_centre">Vrtni center</string>
-    <string name="type.shop.gas">Trgovina s plinom</string>
-    <string name="type.shop.gift">Trgovina z darili</string>
-    <string name="type.shop.greengrocer">Trgovina s sadjem in zelenjavo</string>
-    <string name="type.shop.grocery">Špecarija</string>
-    <string name="type.shop.hairdresser">Frizer</string>
-    <string name="type.shop.hardware">Trgovina z računalniško opemo</string>
-    <string name="type.shop.health_food">Trgovina z zdravo hrano</string>
-    <string name="type.shop.hearing_aids">Trgovina s slušnimi pripomočki</string>
-    <string name="type.shop.herbalist">Zeliščarstvo</string>
-    <string name="type.shop.hifi">HiFi Audio</string>
-    <string name="type.shop.jewelry">Trgovina z nakitom</string>
-    <string name="type.shop.kiosk">Trafika</string>
-    <string name="type.shop.kitchen">Trgovina kuhinj</string>
-    <string name="type.shop.laundry">Pralnica</string>
-    <string name="type.shop.massage">Masažni salon</string>
-    <string name="type.shop.mobile_phone">Trgovina s pametnimi telefoni</string>
-    <string name="type.shop.motorcycle">Trgovina z motorji</string>
-    <string name="type.shop.motorcycle_repair">Servis motorjev</string>
-    <string name="type.shop.toys">Trgovina z igračami</string>
-    <string name="type.shop.travel_agency">Potovalno posredništvo</string>
-    <string name="type.shop.tyres">Trgovina s pnevmatikami</string>
-    <string name="type.shop.video_games">Trgovina z videoigricami</string>
-    <string name="type.shop.wine">Trgovina vina</string>
-    <string name="type.shop.agrarian">Kmetijska trgovina</string>
-    <string name="type.shop.antiques">Starinarnica</string>
-    <string name="type.shop.art">Trgovina z umetninami</string>
-    <string name="type.shop.baby_goods">Otroška trgovina</string>
-    <string name="type.shop.bag">Trgovina s torbami</string>
-    <string name="type.shop.bed">Trgovina s posteljami</string>
-    <string name="type.shop.boutique">Butik</string>
-    <string name="type.shop.cheese">Trgovina s sirom</string>
-    <string name="type.shop.watches">Trgovina z urami</string>
-    <string name="type.shop.lighting">Trgovina s svetili</string>
-    <string name="type.disusedbusiness">Opuščeno podjetje</string>
-    <string name="type.sport">Šport</string>
-    <string name="type.sport.badminton">Badminton</string>
-    <string name="type.sport.bowls">Balinišče</string>
-    <string name="type.sport.diving">Višinski skoki v vodo</string>
-    <string name="type.sport.equestrian">Jahalni športi</string>
-    <string name="type.sport.shooting">Streljanje</string>
-    <string name="type.sport.tennis">Igrišče za tenis</string>
-    <string name="type.tourism.aquarium">Akvarij</string>
-    <string name="type.tourism.alpine_hut">Gorska koča</string>
-    <string name="type.tourism.apartment">Počitniški apartma</string>
-    <string name="type.tourism.artwork">Umetnina</string>
-    <string name="type.tourism.artwork.architecture">Arhitekturna umetnina</string>
-    <string name="type.tourism.artwork.painting">Slika</string>
-    <string name="type.tourism.artwork.sculpture">Skulptura</string>
-    <string name="type.attraction.animal">Ograda z živalmi</string>
-    <string name="type.leisure.resort">Letovišče</string>
-    <string name="type.tourism.wilderness_hut">Koča v divjini</string>
-    <string name="type.waterway.dock">Pristaniški dok</string>
-    <string name="type.waterway.drain">Odvodni jarek</string>
-    <string name="type.natural.water.drain">Odtočni jarek</string>
-    <string name="type.emergency.disaster_help_point">Točka za pomoč ob nesrečah</string>
-    <string name="type.leisure.hackerspace">Hackerspace</string>
-    <string name="type.natural.wetland.mangrove">Mangrove</string>
-    <string name="type.shop.farm">Prodajalna domačih pridelkov</string>
-    <string name="type.shop.mall">Nakupovalno središče</string>
-    <string name="type.shop.money_lender">Posojilnica</string>
-    <string name="type.shop.music">Glasbena trgovina</string>
-    <string name="type.shop.musical_instrument">Trgovina z glasbili</string>
-    <string name="type.shop.newsagent">Prodajalna časopisov</string>
-    <string name="type.shop.optician">Optika</string>
-    <string name="type.shop.seafood">Ribarnica</string>
-    <string name="type.shop.second_hand">Trgovina z rabljenimi oblačili</string>
-    <string name="type.shop.shoes">Trgovina s čevlji</string>
-    <string name="type.shop.sports">Športna trgovina</string>
-    <string name="type.shop.stationery">Papirnica</string>
-    <string name="type.shop.supermarket">Supermarket</string>
-    <string name="type.shop.tattoo">Tetovatorski salon</string>
-    <string name="type.shop.tea">Trgovina s čajem</string>
-    <string name="type.shop.telecommunication">Trgovina za telekomunikacije</string>
-    <string name="type.shop.ticket">Prodajalna vstopnic</string>
-    <string name="type.shop.dairy">Trgovina z mlečnimi izdelki</string>
-    <string name="type.shop.electrical">Trgovina z elektroniko</string>
-    <string name="type.shop.fishing">Ribarska trgovina</string>
-    <string name="type.shop.interior_decoration">Trgovina z notranjo opremo</string>
-    <string name="type.shop.lottery">Loterijski listki</string>
-    <string name="type.shop.medical_supply">Trgovina z zdravstveno opremo</string>
-    <string name="type.shop.nutrition_supplements">Trgovina s prehranskimi dopolnili</string>
-    <string name="type.shop.paint">Trgovina z barvami</string>
-    <string name="type.shop.perfumery">Trgovina z dišavami</string>
-    <string name="type.shop.sewing">Šiviljska trgovina</string>
-    <string name="type.shop.storage_rental">Najem skladiščnih prostorov</string>
-    <string name="type.tourism.hostel">Gostišče</string>
-    <string name="type.tourism.hotel">Hotel</string>
-    <string name="type.tourism.information">Turistične informacije</string>
-    <string name="type.tourism.information.board">Informacijska tabla</string>
-    <string name="type.tourism.information.guidepost">Kažipot</string>
-    <string name="type.tourism.information.office">Turistična pisarna</string>
-    <string name="type.wheelchair.limited">Omejen dostop za invalidske vozičke</string>
-    <string name="type.wheelchair.no">Nedostopno za invalidske vozičke</string>
-    <string name="type.wheelchair.yes">Polna dostopnost za invalidske vozičke</string>
-    <string name="type.aerialway.j.bar">Sidra</string>
-    <string name="type.aerialway.magic_carpet">Preproge</string>
-    <string name="type.aerialway.platter">Krožniki</string>
 </resources>
--- a/android/sdk/src/main/res/values-sr/types_strings.xml
+++ b/android/sdk/src/main/res/values-sr/types_strings.xml
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -27,7 +27,7 @@
    <string name="type.amenity.bar">Bar</string>
    <string name="type.amenity.bbq">Barbecue Grill</string>
    <string name="type.amenity.bench">Bench</string>
-    <string name="type.amenity.bench.backless">Without Backrest</string>
+    <string name="type.amenity.bench.backless">Backless Bench</string>
    <string name="type.amenity.bicycle_parking">Bicycle Parking</string>
    <string name="type.amenity.bicycle_parking.covered">Covered Bicycle Parking</string>
    <string name="type.amenity.boat_rental">Boat Rental</string>
--- a/data/categories-strings/ar.json/localize.json
+++ b/data/categories-strings/ar.json/localize.json
@@ -116,7 +116,7 @@
 "historic-wayside_cross": "صليب مسيحي",
 "historic-wayside_shrine": "ضريح",
 "leisure-garden": "بستان|مناظر|سياحة|حديقة",
-"amenity-bench": "مقعد طويل|مصطبة",
+"amenity-bench|amenity-bench-backless": "مقعد طويل|مصطبة",
 "amenity-bicycle_rental": "تأجير دراجات",
 "amenity-bicycle_repair_station": "تصليح الدراجات|اصلاح الدراجات|صيانة الدراجات|تصليح عجل|اصلاح عجل",
 "amenity-car_sharing": "مشاركة السيارة|تقاسم السيارة",
--- a/data/categories-strings/bg.json/localize.json
+++ b/data/categories-strings/bg.json/localize.json
@@ -116,7 +116,7 @@
 "historic-wayside_shrine": "Крайпътно светилище",
 "leisure-dog_park": "Кучешка зона|домашни любимци",
 "leisure-garden": "3Градина",
-"amenity-bench": "Пейка|скамейка",
+"amenity-bench|amenity-bench-backless": "Пейка|скамейка",
 "amenity-bicycle_rental": "велосипеди|колелета|под наем",
 "amenity-car_sharing": "Споделяне|автомобил|кола|превоз",
 "amenity-car_rental": "Кола|под наем|рент а кар|автопаркинг",
--- a/data/categories-strings/cs.json/localize.json
+++ b/data/categories-strings/cs.json/localize.json
@@ -117,7 +117,7 @@
 "historic-wayside_shrine": "Drobná sakrální památka",
 "leisure-dog_park": "3Psí hřiště",
 "leisure-garden": "2Zahrada|zajímavost",
-"amenity-bench": "Lavička",
+"amenity-bench|amenity-bench-backless": "Lavička",
 "amenity-bicycle_rental": "2Půjčovna kol|4jízdní kolo|3kolo|3pronájem|3nájemné",
 "amenity-bicycle_repair_station": "Oprava jízdních kol|4jízdní kolo|3kolo|Oprava",
 "amenity-car_sharing": "Sdílení aut",
--- a/data/categories-strings/da.json/localize.json
+++ b/data/categories-strings/da.json/localize.json
@@ -115,7 +115,7 @@
 "historic-wayside_cross": "Kors ved vejsiden",
 "historic-wayside_shrine": "Skrin ved vejsiden",
 "leisure-garden": "2Have",
-"amenity-bench": "Bænk",
+"amenity-bench|amenity-bench-backless": "Bænk",
 "amenity-bicycle_rental": "4Cykeludlejning|udlejning|cykel",
 "amenity-bicycle_repair_station": "4Cykel reparation",
 "amenity-car_sharing": "Delebiler",
--- a/data/categories-strings/de.json/localize.json
+++ b/data/categories-strings/de.json/localize.json
@@ -125,7 +125,7 @@
 "historic-wayside_shrine": "4Bildstock|4Marterl|4Wegstock|4Helgenstöckli",
 "leisure-dog_park": "4Hundezone|4Hundeauslaufzone|4Hundeauslauffläche|5Hunde|5Hundepark|U+1F436|U+1F415|U+1F9AE|U+1F429",
 "leisure-garden": "2Garten",
-"amenity-bench": "4Sitzbank|4Parkbank",
+"amenity-bench|amenity-bench-backless": "4Sitzbank|4Parkbank",
 "amenity-bicycle_rental": "4Fahrradverleih|4Fahrrad|4Fahrradvermietung|4Radfahren|4Radverleih|3Velo|3Veloverleih|3Velovermietung|5Verleih|5Vermietung|U+1F6B2|U+1F510|U+1F6B4|U+1F6B5",
 "amenity-bicycle_repair_station": "4Fahrradreparatur|4Radservicestation|4Radreparatur|Velomechaniker|Veloreparatur|U+1F6B2|U+1F527|U+1F529|U+26D3|U+1FA9B|U+1F6DE",
 "amenity-car_sharing": "4Carsharing|4Car-Sharing|4Carsharing-Dienste|5Auto teilen|4Auto|5Fahrgemeinschaft|4Mitfahrzentrale|U+1F690|U+1F697|U+1F698|U+1F699|U+1F6FB|U+1F46B|U+1F465",
--- a/data/categories-strings/el.json/localize.json
+++ b/data/categories-strings/el.json/localize.json
@@ -116,7 +116,7 @@
 "historic-wayside_cross": "Σταυρός στην άκρη του δρόμου",
 "historic-wayside_shrine": "Εικονοστάσιο στην άκρη του δρόμου",
 "leisure-garden": "Κήπος αναψυχής|αξιοθέατα",
-"amenity-bench": "Παγκάκι",
+"amenity-bench|amenity-bench-backless": "Παγκάκι",
 "amenity-bicycle_rental": "Ενοικιάσεις ποδηλάτων|δίκυκλο|ποδήλατο|ενοικιάσεις",
 "amenity-car_sharing": "Παραχώρηση αυτοκινήτου",
 "amenity-car_rental": "Ενοικίαση αυτοκινήτου|αυτοκίνητο|ενοικιάσεις|κοινή χρήση",
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -132,7 +132,7 @@
 "leisure-dance|@category_entertainment": "4Dance|Dancing school",
 "leisure-garden": "3Garden",
 "leisure-firepit": "5Firepit",
-"amenity-bench": "Bench",
+"amenity-bench|amenity-bench-backless": "Bench",
 "amenity-boat_rental": "4Boat rental|boat|boats|3Rental",
 "amenity-bicycle_rental": "4Bicycle rental|cycling|cycle|bike|3Rental|U+1F6B2|U+1F6B4|U+1F6B5|bicycle hire|bike rental",
 "amenity-bicycle_repair_station": "4Bicycle repair station|cycle|bike|4repair of bicycles",
--- a/data/categories-strings/es.json/localize.json
+++ b/data/categories-strings/es.json/localize.json
@@ -2,7 +2,7 @@
 "@category_eat": "Dónde comer|Comer|Comida",
 "@category_food": "Provisiones|Víveres|4Alimentos|4Alimentación|Abasto|Despensa|Abarrotes|Comestibles",
 "@category_transport": "5Transporte",
-"@category_fuel": "3Gasolinera|Gasolinería|3Estación de servicio|3Bencinera|grifo|servicentro|gasolinería|gasetería|gasoil|diésel|nafta|combustible|carburante|bencina|gasolina|gasóleo|surtidor|4bomba de gasolina",
+"@category_fuel": "3Gasolinera|Gasolinería|3Estación de servicio|gasoil|diésel|nafta|combustible|bencina|gasolina|gasóleo|surtidor|4bomba de gasolina",
 "@category_parking": "5Aparcamiento|5Estacionamiento|Aparcar|Estacionar|Parquear|4Parking|Aparcadero|Parqueadero|Parqueo",
 "@category_shopping": "4Compras",
 "@category_hotel": "Hotel|Hoteles|alojamiento",
@@ -124,7 +124,7 @@
 "leisure-dance|@category_entertainment": "4Baile|Escuela de baile|4Danza|Escuela de danza",
 "leisure-garden": "2Jardín",
 "leisure-firepit": "3Fogón|Fogata",
-"amenity-bench": "Asiento|3Banco de sentarse",
+"amenity-bench|amenity-bench-backless": "Asiento|3Banco de sentarse",
 "amenity-bicycle_rental": "3Alquiler de bicicletas|4bicicleta|alquiler|Alquiler de bicis|Bicicletas|Bicis|Ciclismo",
 "amenity-bicycle_repair_station": "4Reparación de bicicletas|Reparación de bicis|Bicicletas|Bicis",
 "amenity-car_sharing": "Coche compartido|4carsharing",
@@ -513,7 +513,7 @@
 "amenity-fuel|@category_fuel": "3Gasolinera|4Estación de servicio|combustible|gasolina|nafta|diesel|gasóleo|U+26FD",
 "shop-beauty-nails": "4Salón de manicura|salón de belleza|manicure|manicur|maniquiur|pedicure|uñas",
 "amenity-college": "colegio universtitario|universidad|College|U+1F3EB",
-"amenity-hospital|@category_hospital": "4Hospital|emergencia|emergencias|primeros auxilios|servicios médicos|servicio médico|primeros auxilios|centro médico",
+"amenity-hospital|@category_hospital": "4Hospital|emergencia|emergencias|primeros auxilios",
 "amenity-parking|amenity-parking_entrance|@category_parking": "Entrada de parking|Parking|Estacionamiento|Aparcadero|aparcamiento",
 "amenity-toilets|toilets-yes|@category_toilet": "wc",
 "leisure-sports_centre-sport-swimming": "4Centro de natación",
--- a/data/categories-strings/et.json/localize.json
+++ b/data/categories-strings/et.json/localize.json
@@ -121,7 +121,7 @@
 "historic-wayside_shrine": "Teeäärne pühakoht",
 "leisure-dog_park": "3Koerte ala|koerte park",
 "leisure-garden": "3Aed",
-"amenity-bench": "Pink",
+"amenity-bench|amenity-bench-backless": "Pink",
 "amenity-bicycle_rental": "Jalgrataste laenutus",
 "amenity-bicycle_repair_station": "Jalgrataste remondipunkt",
 "amenity-car_sharing": "Auto jagamine",
--- a/data/categories-strings/eu.json/localize.json
+++ b/data/categories-strings/eu.json/localize.json
@@ -115,7 +115,7 @@
 "historic-wayside_cross": "Bideko gurutze",
 "historic-wayside_shrine": "Bide bazterreko baseliza",
 "leisure-garden": "2Lorategia|Lorategi",
-"amenity-bench": "Bankua",
+"amenity-bench|amenity-bench-backless": "Bankua",
 "amenity-bicycle_rental": "Bizikleta alokairua|4bizikleta|3alokairua",
 "amenity-car_sharing": "Partekatu autoa",
 "amenity-car_rental": "3Autoa alokairua|alokairua",
--- a/data/categories-strings/fa.json/localize.json
+++ b/data/categories-strings/fa.json/localize.json
@@ -115,7 +115,7 @@
 "historic-wayside_cross": "صلیب کنار راه",
 "historic-wayside_shrine": "حرم کنار راه",
 "leisure-garden": "باغ تفریحی|گردشگری",
-"amenity-bench": "سَکو|نیمکت",
+"amenity-bench|amenity-bench-backless": "سَکو|نیمکت",
 "amenity-bicycle_rental": "مکان اجاره دوچرخه",
 "amenity-bicycle_repair_station": "تعمیر دوچرخه",
 "amenity-car_rental": "مکان اجاره ماشین",
--- a/data/categories-strings/fi.json/localize.json
+++ b/data/categories-strings/fi.json/localize.json
@@ -115,7 +115,7 @@
 "historic-wayside_shrine": "Tienvarren pyhäkkö",
 "leisure-dog_park": "Koirapuisto",
 "leisure-garden": "Puutarha",
-"amenity-bench": "Penkki",
+"amenity-bench|amenity-bench-backless": "Penkki",
 "amenity-bicycle_rental": "Polkupyöränvuokraus",
 "amenity-bicycle_repair_station": "Polkupyörän korjaus",
 "amenity-car_sharing": "Autojen yhteiskäyttö",
--- a/data/categories-strings/fr.json/localize.json
+++ b/data/categories-strings/fr.json/localize.json
@@ -121,7 +121,7 @@
 "historic-wayside_shrine": "Oratoire",
 "leisure-dog_park": "Parc canin|Espace sans laisse",
 "leisure-garden": "2Jardin",
-"amenity-bench": "Banc",
+"amenity-bench|amenity-bench-backless": "Banc",
 "amenity-bicycle_rental": "Location de vélos|vélo|bicyclette|3location",
 "amenity-bicycle_repair_station": "Réparation de vélos|vélo|bicyclette|réparation",
 "amenity-car_sharing": "Station d'autopartage|auto-partage",
--- a/data/categories-strings/hi.json/localize.json
+++ b/data/categories-strings/hi.json/localize.json
@@ -96,7 +96,7 @@
 "historic-wayside_shrine": "5रास्ते का तीर्थ",
 "leisure-dog_park": "श्वान पार्क",
 "leisure-garden": "बाग",
-"amenity-bench": "बेंच",
+"amenity-bench|amenity-bench-backless": "बेंच",
 "amenity-bicycle_rental": "4साइकिल किराए के लिए",
 "amenity-bicycle_repair_station": "4साइकिल मरम्मत स्टेशन",
 "amenity-car_sharing": "3गाड़ी साँझा",
--- a/data/categories-strings/hu.json/localize.json
+++ b/data/categories-strings/hu.json/localize.json
@@ -116,7 +116,7 @@
 "historic-wayside_cross": "Útszéli kereszt",
 "historic-wayside_shrine": "Útmenti szentély|Szentély",
 "leisure-garden": "2Kert",
-"amenity-bench": "Pad",
+"amenity-bench|amenity-bench-backless": "Pad",
 "amenity-bicycle_rental": "4Kerékpárkölcsönző|kerékpár|3bérlés|U+1F6B2|U+1F6B4|U+1F6B5|Kölcsönző",
 "amenity-bicycle_repair_station": "4Kerékpár javítás|kerékpár",
 "amenity-car_sharing": "Gépjárműmegosztás|U+1F697|U+1F698|U+1F699|telekocsi",
--- a/data/categories-strings/id.json/localize.json
+++ b/data/categories-strings/id.json/localize.json
@@ -114,7 +114,7 @@
 "historic-wayside_cross": "Salib di pinggir jalan",
 "historic-wayside_shrine": "Kuil di pinggir jalan",
 "leisure-garden": "Situs arkeologi",
-"amenity-bench": "Bangku panjang",
+"amenity-bench|amenity-bench-backless": "Bangku panjang",
 "amenity-bicycle_rental": "Penyewaan Sepeda",
 "amenity-car_sharing": "Berbagi mobil",
 "amenity-car_rental": "4Rental mobil",
--- a/data/categories-strings/it.json/localize.json
+++ b/data/categories-strings/it.json/localize.json
@@ -116,7 +116,7 @@
 "historic-wayside_cross": "Crocifisso",
 "historic-wayside_shrine": "Edicola votiva",
 "leisure-garden": "2Giardino",
-"amenity-bench": "Panchina|panca",
+"amenity-bench|amenity-bench-backless": "Panchina|panca",
 "amenity-bicycle_rental": "Noleggio biciclette|4bicicletta|bici|3noleggio",
 "amenity-bicycle_repair_station": "Riparazione di biciclette|4bicicletta|bici",
 "amenity-car_sharing": "3Car Sharing",
--- a/data/categories-strings/ja.json/localize.json
+++ b/data/categories-strings/ja.json/localize.json
@@ -117,7 +117,7 @@
 "historic-wayside_shrine": "歴史的な祠",
 "leisure-dog_park": "ドッグラン",
 "leisure-garden": "1庭園|庭|園",
-"amenity-bench": "ベンチ|縁台|椅子",
+"amenity-bench|amenity-bench-backless": "ベンチ|縁台|椅子",
 "amenity-bicycle_rental": "レンタサイクル|自転車|自転車レンタル|貸し自転車|貸自転車|1レンタル",
 "amenity-bicycle_repair_station": "自転車修理",
 "amenity-car_sharing": "カーシェアリング",
--- a/data/categories-strings/ko.json/localize.json
+++ b/data/categories-strings/ko.json/localize.json
@@ -116,7 +116,7 @@
 "historic-wayside_shrine": "길가의 신사",
 "leisure-dog_park": "개 놀이 공원|도그 파크",
 "leisure-garden": "가든|정원",
-"amenity-bench": "벤치",
+"amenity-bench|amenity-bench-backless": "벤치",
 "amenity-bicycle_rental": "자전거 대여소|자전거 대여",
 "amenity-bicycle_repair_station": "자전거 수리",
 "amenity-car_sharing": "카 셰어링|카 쉐어링|자동차 공유|차 공유|카셰어링",
--- a/data/categories-strings/lv.json/localize.json
+++ b/data/categories-strings/lv.json/localize.json
@@ -113,7 +113,7 @@
 "historic-wayside_shrine": "Ceļmalas svētnīca",
 "leisure-dog_park": "Suņu laukums|suņu parks",
 "leisure-garden": "dārzs",
-"amenity-bench": "Sols|soliņš",
+"amenity-bench|amenity-bench-backless": "Sols|soliņš",
 "amenity-bicycle_rental": "4Velonoma|velosipēdu noma|divriteņu noma|4noma|U+1F6B2|U+1F6B4|U+1F6B5",
 "amenity-bicycle_repair_station": "Veloremonta stacija|Veloremonta punkts|divriteņu remonts|velosipēdu remonts|veloremonts",
 "amenity-car_sharing": "Automobiļu koplietošana|auto koplietošana|automašīnu koplietošana|koplietošana|automobilis|U+1F697|U+1F698|U+1F699|",
--- a/data/categories-strings/mr.json/localize.json
+++ b/data/categories-strings/mr.json/localize.json
@@ -111,7 +111,7 @@
 "historic-wayside_cross": "ख्रिश्चन क्रॉस",
 "historic-wayside_shrine": "देवस्थान",
 "leisure-garden": "बाग",
-"amenity-bench": "बाक",
+"amenity-bench|amenity-bench-backless": "बाक",
 "amenity-bicycle_rental": "भाड्याची सायकल",
 "amenity-car_sharing": "कार पूल|कार शेअर",
 "amenity-car_rental": "भाड्याने गाडी",
--- a/data/categories-strings/nb.json/localize.json
+++ b/data/categories-strings/nb.json/localize.json
@@ -115,7 +115,7 @@
 "historic-wayside_cross": "Veikantkors",
 "historic-wayside_shrine": "Helligdom ved veikanten",
 "leisure-garden": "Hage",
-"amenity-bench": "Benk",
+"amenity-bench|amenity-bench-backless": "Benk",
 "amenity-bicycle_rental": "Sykkelutleie",
 "amenity-car_sharing": "3Bildeling",
 "amenity-car_rental": "Bilutleie",
--- a/data/categories-strings/nl.json/localize.json
+++ b/data/categories-strings/nl.json/localize.json
@@ -118,7 +118,7 @@
 "historic-wayside_shrine": "Kruisbeeld",
 "leisure-dog_park": "4Hondenpark|Hondengebied",
 "leisure-garden": "2Tuin",
-"amenity-bench": "Zitbank|bankje",
+"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",
--- a/data/categories-strings/pl.json/localize.json
+++ b/data/categories-strings/pl.json/localize.json
@@ -120,7 +120,7 @@
 "leisure-dance|@category_entertainment": "Taniec|Szkoła tańca",
 "leisure-garden": "2Ogród",
 "leisure-firepit": "Palenisko|miejsce na ognisko",
-"amenity-bench": "Ławka",
+"amenity-bench|amenity-bench-backless": "Ławka",
 "amenity-bicycle_rental": "4Wynajem rowerów|4rower|3Wynajem",
 "amenity-bicycle_repair_station": "Stacja naprawy rowerów",
 "amenity-car_sharing": "Współdzielenie samochodów|Wypożyczanie samochodów|samochód",
--- a/data/categories-strings/pt-BR.json/localize.json
+++ b/data/categories-strings/pt-BR.json/localize.json
@@ -95,7 +95,7 @@
 "historic-aircraft|@category_tourism": "Aeronave histórica|Avião histórico",
 "leisure-dog_park": "Parque canino|Parque para cães|Parque para cachorros",
 "leisure-garden": "2Jardim|lazer",
-"amenity-bench": "Assento|Banco de praça",
+"amenity-bench|amenity-bench-backless": "Assento|Banco de praça",
 "amenity-bicycle_rental": "Aluguel de bicicletas|4bicicleta|3aluguel",
 "amenity-bicycle_repair_station": "Oficina de bicicletas|4bicicleta",
 "amenity-car_sharing": "Compartilhamento de carro",
--- a/data/categories-strings/pt.json/localize.json
+++ b/data/categories-strings/pt.json/localize.json
@@ -117,7 +117,7 @@
 "historic-wayside_shrine": "Alminhas",
 "leisure-dog_park": "Parque canino|Parque para cães",
 "leisure-garden": "2Jardim",
-"amenity-bench": "2Assento|3Banco",
+"amenity-bench|amenity-bench-backless": "2Assento|3Banco",
 "amenity-bicycle_rental": "Aluguer de bicicletas|4bicicleta|3aluguar",
 "amenity-bicycle_repair_station": "Conserto de bicicleta|4bicicleta",
 "amenity-car_sharing": "Partilha de carro",
--- a/data/categories-strings/ro.json/localize.json
+++ b/data/categories-strings/ro.json/localize.json
@@ -113,7 +113,7 @@
 "historic-tomb|@category_tourism": "Mormânt",
 "historic-wayside_cross": "Troiță",
 "historic-wayside_shrine": "Altarul de la marginea drumului",
-"amenity-bench": "Banchetă|Bancă|Bancă parc",
+"amenity-bench|amenity-bench-backless": "Banchetă|Bancă|Bancă parc",
 "amenity-bicycle_rental": "4Închiriere biciclete|4Biciclete",
 "amenity-car_sharing": "3Car Sharing",
 "amenity-car_rental": "Închiriere mașini",
--- a/data/categories-strings/ru.json/localize.json
+++ b/data/categories-strings/ru.json/localize.json
@@ -121,7 +121,7 @@
 "historic-wayside_shrine": "Святыня",
 "leisure-dog_park": "Место для выгула собак|3выгул собак|Площадка для собак|4Собачья площадка",
 "leisure-garden": "Сад",
-"amenity-bench": "Скамейка|лавка",
+"amenity-bench|amenity-bench-backless": "Скамейка|лавка",
 "amenity-bicycle_rental": "4Велопрокат|велосипед|прокат|4прокат велосипедов|велосипед аренда|велосипед напрокат",
 "amenity-bicycle_repair_station": "4Велоремонт|велосипед|ремонт|ремонт велосипедов",
 "amenity-car_sharing": "3Каршеринг|аренда машин|аренда",
--- a/data/categories-strings/sk.json/localize.json
+++ b/data/categories-strings/sk.json/localize.json
@@ -116,7 +116,7 @@
 "historic-wayside_cross": "Prícestný kríž",
 "historic-wayside_shrine": "Svätyňa pri ceste",
 "leisure-garden": "2Záhrada",
-"amenity-bench": "Lavička",
+"amenity-bench|amenity-bench-backless": "Lavička",
 "amenity-bicycle_rental": "2Požičovňa bicyklov|bicykle|požičovňa",
 "amenity-car_sharing": "Zdieľanie automobilov",
 "amenity-car_rental": "3Autopožičovňa|požičovňa áut",
--- a/data/categories-strings/sr.json/localize.json
+++ b/data/categories-strings/sr.json/localize.json
@@ -86,7 +86,7 @@
 "historic-cannon": "Топ|Top",
 "leisure-dog_park": "Парк за псе|Park za pse",
 "leisure-garden": "Башта|Bašta",
-"amenity-bench": "Клупа|Klupa",
+"amenity-bench|amenity-bench-backless": "Клупа|Klupa",
 "amenity-bicycle_rental": "Изнајмљивање бицикала|Iznajmljivanje bicikala",
 "amenity-bicycle_repair_station": "7Станица за поправку бицикала",
 "amenity-car_rental": "Рентакар|Изнајмљивање аутомобила|Rentakar|Iznajmljivanje automobila",
--- a/data/categories-strings/sv.json/localize.json
+++ b/data/categories-strings/sv.json/localize.json
@@ -116,7 +116,7 @@
 "historic-wayside_cross": "Korset vid vägkanten",
 "historic-wayside_shrine": "Helgedom vid vägkanten",
 "leisure-garden": "2Trädgård",
-"amenity-bench": "Bänk",
+"amenity-bench|amenity-bench-backless": "Bänk",
 "amenity-bicycle_rental": "4Cykeluthyrning|cykel|cykel|3uthyrning",
 "amenity-car_sharing": "Samåkning",
 "amenity-car_rental": "3Biluthyrning|bilpool|bil|uthyrning|delning",
--- a/data/categories-strings/sw.json/localize.json
+++ b/data/categories-strings/sw.json/localize.json
@@ -77,7 +77,7 @@
 "historic-wayside_cross": "Msalaba wa njiani",
 "historic-wayside_shrine": "Kaburi la njia",
 "leisure-garden": "Bustani",
-"amenity-bench": "Benchi",
+"amenity-bench|amenity-bench-backless": "Benchi",
 "amenity-bicycle_rental": "Kodi ya baiskeli|baiskeli|kodi",
 "amenity-car_sharing": "Kushiriki Gari",
 "amenity-car_rental": "Kodi ya gari|gari|kodi",
--- a/data/categories-strings/th.json/localize.json
+++ b/data/categories-strings/th.json/localize.json
@@ -115,7 +115,7 @@
 "historic-wayside_cross": "ทางข้าม",
 "historic-wayside_shrine": "ศาลเจ้าข้างทาง",
 "leisure-garden": "2สวน",
-"amenity-bench": "ม้านั่ง",
+"amenity-bench|amenity-bench-backless": "ม้านั่ง",
 "amenity-bicycle_rental": "4จักรยานให้เช่า|4จักรยาน|บริการรถเช่า",
 "amenity-car_sharing": "การใช้รถร่วมกัน",
 "amenity-car_rental": "3รถยนต์|บริการรถเช่า",
--- a/data/categories-strings/tr.json/localize.json
+++ b/data/categories-strings/tr.json/localize.json
@@ -122,7 +122,7 @@
 "historic-wayside_shrine": "Yol üstünde türbe|yol üstü türbe|yol kenarı türbe|yol kenarında türbe",
 "leisure-dog_park": "3Köpek parkı",
 "leisure-garden": "2Bahçe",
-"amenity-bench": "Bank",
+"amenity-bench|amenity-bench-backless": "Bank",
 "amenity-bicycle_rental": "Bisiklet kiralama|4Bisiklet",
 "amenity-bicycle_repair_station": "4Bisiklet tamiri|4Bisiklet|Bisiklet tamircisi",
 "amenity-car_sharing": "Araç Paylaşımı|ortak araç",
--- a/data/categories-strings/uk.json/localize.json
+++ b/data/categories-strings/uk.json/localize.json
@@ -117,7 +117,7 @@
 "historic-wayside_cross": "Християнський хрест",
 "historic-wayside_shrine": "Святиня",
 "leisure-garden": "3Садок",
-"amenity-bench": "Лавка",
+"amenity-bench|amenity-bench-backless": "Лавка",
 "amenity-bicycle_rental": "4Велопрокат|велосипед|3прокат",
 "amenity-bicycle_repair_station": "4Велоремонт|велосипед|ремонт|ремонт велосипедів",
 "amenity-car_sharing": "3Каршерінг",
--- a/data/categories-strings/vi.json/localize.json
+++ b/data/categories-strings/vi.json/localize.json
@@ -114,7 +114,7 @@
 "historic-wayside_cross": "Đường chéo",
 "historic-wayside_shrine": "Đền thờ",
 "leisure-garden": "Điểm khảo cổ",
-"amenity-bench": "Xe đạp",
+"amenity-bench|amenity-bench-backless": "Xe đạp",
 "amenity-bicycle_rental": "Cho thuê xe đạp",
 "amenity-car_sharing": "Chia sẻ Xe",
 "amenity-car_rental": "Ô tô",
--- a/data/categories-strings/zh-Hans.json/localize.json
+++ b/data/categories-strings/zh-Hans.json/localize.json
@@ -116,7 +116,7 @@
 "historic-wayside_cross": "路旁十字架",
 "historic-wayside_shrine": "路旁神龛",
 "leisure-garden": "2花园|景点",
-"amenity-bench": "长凳",
+"amenity-bench|amenity-bench-backless": "长凳",
 "amenity-bicycle_rental": "1自行车租赁",
 "amenity-bicycle_repair_station": "1自行车修理",
 "amenity-car_sharing": "拼车点",
--- a/data/categories-strings/zh-Hant.json/localize.json
+++ b/data/categories-strings/zh-Hant.json/localize.json
@@ -116,7 +116,7 @@
 "historic-wayside_cross": "路旁十字架",
 "historic-wayside_shrine": "路旁神龕",
 "leisure-garden": "1花園|旅遊景點",
-"amenity-bench": "1長板凳|板凳|長椅|長椅子|條凳",
+"amenity-bench|amenity-bench-backless": "1長板凳|板凳|長椅|長椅子|條凳",
 "amenity-bicycle_rental": "1自行車出租|腳踏車|單車|租金|租錢",
 "amenity-bicycle_repair_station": "1自行車修理",
 "amenity-car_sharing": "汽車共用",
--- a/data/countries-strings/de.json/localize.json
+++ b/data/countries-strings/de.json/localize.json
@@ -227,21 +227,21 @@
 "Cuba":"Kuba",
 "Cyprus":"Zypern",
 "Czech Republic":"Tschechische Republik",
-"Czech_Jihovychod_Jihomoravsky kraj":"Südmährische Region (Jihomoravský kraj)",
-"Czech_Jihovychod_Kraj Vysocina":"Region Hochland (Kraj Vysočina)",
-"Czech_Jihozapad_Jihocesky kraj":"Südböhmische Region (Jihočeský kraj)",
-"Czech_Jihozapad_Plzensky kraj":"Pilsner Region (Plzeňský kraj)",
-"Czech_Karlovasky kraj":"Karlsbader Region (Karlovarský kraj)",
-"Czech_Moravskoslezsko":"Mährisch-Schlesische Region (Moravskoslezský kraj)",
-"Czech_Olomoucky kraj":"Olmützer Region (Olomoucký kraj)",
+"Czech_Jihovychod_Jihomoravsky kraj":"Region Südmähren",
+"Czech_Jihovychod_Kraj Vysocina":"Region Hochland",
+"Czech_Jihozapad_Jihocesky kraj":"Region Südböhmen",
+"Czech_Jihozapad_Plzensky kraj":"Region Pilsen",
+"Czech_Karlovasky kraj":"Region Karlsbad",
+"Czech_Moravskoslezsko":"Region Mährisch-Schlesien",
+"Czech_Olomoucky kraj":"Region Olmütz",
 "Czech_Praha":"Prag",
-"Czech_Severovychod_Kralovehradecky kraj":"Königgrätzer Region (Královéhradecký kraj)",
-"Czech_Severovychod_Liberecky kraj":"Reichenberger Region (Liberecký kraj)",
-"Czech_Severovychod_Pardubicky kraj":"Pardubitzer Region (Pardubický kraj)",
-"Czech_Stredni Cechy_East":"Mittelböhmische Region (Středočeský kraj) – Osten",
-"Czech_Stredni Cechy_West":"Mittelböhmische Region (Středočeský kraj) – Westen",
-"Czech_Ustecky kraj":"Aussiger Region (Ústecký kraj)",
-"Czech_Zlinsky Kraj":"Zliner Region (Zlínský kraj)",
+"Czech_Severovychod_Kralovehradecky kraj":"Region Königgrätz",
+"Czech_Severovychod_Liberecky kraj":"Region Reichenberg",
+"Czech_Severovychod_Pardubicky kraj":"Region Pardubitz",
+"Czech_Stredni Cechy_East":"Mittelböhmen — Osten",
+"Czech_Stredni Cechy_West":"Mittelböhmen — Westen",
+"Czech_Ustecky kraj":"Region Aussig",
+"Czech_Zlinsky Kraj":"Region Zlin",
 "Denmark":"Dänemark",
 "Denmark_Capital Region of Denmark":"Hauptstadtregion",
 "Denmark_Central Denmark Region":"Region Mitteljütland",
@@ -410,7 +410,7 @@
 "Germany_Hesse_Regierungsbezirk Darmstadt":"Darmstadt",
 "Germany_Hesse_Regierungsbezirk Giessen":"Gießen",
 "Germany_Hesse_Regierungsbezirk Kassel":"Kassel",
-"Germany_Lower Saxony":"Niedersachsen und Bremen",
+"Germany_Lower Saxony":"Niedersachsen",
 "Germany_Lower Saxony_Bremen_Bremen":"Bremen",
 "Germany_Lower Saxony_Bremen_Munster":"Lüneburg",
 "Germany_Lower Saxony_Hannover":"Hannover",
@@ -1342,14 +1342,14 @@
 "US_Florida_Gainesville":"Gainesville",
 "US_Texas_Victoria":"Victoria",
 "US_Virginia_Norfolk":"Norfolk",
-"Abkhazia Description":"Aqwa, Gudouta, Pizunda",
+"Abkhazia Description":"Pizunda, Suchum",
 "Afghanistan Description":"Kabul, Kandahar, Tokzar",
 "Albania Description":"Tirana, Kavaje, Shkoder",
 "Algeria_Central Description":"Batna, Djelfa, Biskra",
 "Algeria_Coast Description":"Algier, Oran, Constantine",
 "Andorra Description":"Andorra la Vella, La Massana, Ordino",
 "Angola Description":"Luanda, Lobito, Namibe",
-"Anguilla Description":"George Hill, Stoney Ground, The Valley",
+"Anguilla Description":"The Valley, George Hill, Stoney Ground",
 "Antarctica Description":"Chilenische Forschungsstation „Villa Las Estrellas“, McMurdo-Station, Rocky Cove",
 "Antigua and Barbuda Description":"St. John's, English Harbour, Freetown",
 "Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires, José C. Paz, González Catán",
@@ -1405,7 +1405,7 @@
 "Belgium_West Flanders Description":"Brügge, Koksijde, Nieuwpoort",
 "Belize Description":"Belize-Stadt, Belmopan, Benque Viejo del Carmen",
 "Benin Description":"Abomey, Djougou, Natitingou",
-"Bermuda Description":"Hamilton, St. George's, Somerset",
+"Bermuda Description":"St. George's, Hamilton, Somerset",
 "Bhutan Description":"Ha, Mongar, Thimphu",
 "Bolivia_North Description":"El Alto, La Paz, Santa Cruz de la Sierra",
 "Bolivia_South Description":"Cochabamba, Sucre, Tupiza",
@@ -1437,7 +1437,7 @@
 "Brazil_Southeast Region_Sao Paulo_City Description":"Guarulhos, São Bernardo do Campo, São Paulo",
 "Brazil_Southeast Region_Sao Paulo_West Description":"Franca, Ribeirão Preto, São José do Rio Preto",
 "British Indian Ocean Territory Description":"Seabreeze Village, Camp Justice",
-"British Virgin Islands Description":"East End, Road Town, Spanish Town",
+"British Virgin Islands Description":"Spanish Town, Road Town, East End",
 "Brunei Description":"Bandar Seri Begawan, Muara, Seria",
 "Bulgaria_East Description":"Burgas, Dobritsch, Warna",
 "Bulgaria_West Description":"Sofia, Plewen, Plowdiw",
@@ -1503,8 +1503,8 @@
 "Canada_Yukon_North Description":"Dawson City, Mayo, Ross River",
 "Canada_Yukon_Whitehorse Description":"Haines Junction, Watson Lake, Whitehorse",
 "Cape Verde Description":"Cidade de Espargos, Praia, Ribeira Grande",
-"Caribisch Nederland Description":"Oranjestad, San Nicolaas, Willemstad",
-"Cayman Islands Description":"George Town, West Bay, West End",
+"Caribisch Nederland Description":"San Nicolaas, Willemstad, Oranjestad",
+"Cayman Islands Description":"George Town",
 "Central African Republic Description":"Bangui, Baoro, Bouar",
 "Chad Description":"Bol, Mao, N’Djamena",
 "Chile_Central Description":"Pichilemu, San Antonio, Santiago",
@@ -1538,58 +1538,58 @@
 "China_Xinjiang Description":"Hotan, Kaschgar, Tumxuk",
 "China_Yunnan Description":"Kunming, Yongbei, Zhedao",
 "China_Zhejiang Description":"Hangzhou, Jiande, Lin'an",
-"Colombia_East Description":"Florencia, Mocoa, Villavicencio",
-"Colombia_North Description":"Cartagena, Cúcuta, Medellín",
-"Colombia_West Description":"Bogotá, Cali, Soacha",
-"Comoros Description":"Bazimini, Moroni, Mutsamudu",
+"Colombia_East Description":"Mocoa, Villavicencio, Florencia",
+"Colombia_North Description":"Cúcuta, Medellín, Cartagena",
+"Colombia_West Description":"Bogotá",
+"Comoros Description":"Moroni",
 "Congo-Brazzaville Description":"Brazzaville, Impfondo, Pointe-Noire",
 "Congo-Kinshasa_Kivu Description":"Beni, Bukavu, Goma",
 "Congo-Kinshasa_West Description":"Kinshasa, Lubumbashi, Mbuji-Mayi",
-"Cook Islands Description":"Avarua, Kimiangatau, Rarotonga Muri",
-"Costa Rica Description":"Alajuela, Palmira, San José",
-"Cote dIvoire Description":"Abobo, Abidjan, Yopougon",
-"Crimea Description":"Kertsch, Sewastopol, Simferopol",
-"Croatia_Central Description":"Osijek, Ozalji, Zagreb",
-"Croatia_West Description":"Opatija, Rijeka, Split",
-"Cuba Description":"Cienfuegos, Havanna, Santiago de Cuba",
+"Cook Islands Description":"Rarotonga Muri, Avarua, Kimiangatau",
+"Costa Rica Description":"San José",
+"Cote dIvoire Description":"Abidjan",
+"Crimea Description":"Sewastopol, Simferopol, Kertsch",
+"Croatia_Central Description":"Essegg",
+"Croatia_West Description":"Sankt Jakobi",
+"Cuba Description":"Havanna",
 "Cyprus Description":"Nikosia, Limassol, Larnaca, Paphos",
-"Czech_Jihovychod_Jihomoravsky kraj Description":"Břeclav, Brno (ehem. Brünn), Znojmo",
-"Czech_Jihovychod_Kraj Vysocina Description":"Havlíčkův Brod, Jihlava, Třebíč",
-"Czech_Jihozapad_Jihocesky kraj Description":"České Budějovice (ehem. Budweis), Písek, Tábor",
-"Czech_Jihozapad_Plzensky kraj Description":"Plzeň (ehem. Pilsen), Klatovy, Rokycany",
-"Czech_Karlovasky kraj Description":"Cheb, Karlovy Vary (ehem. Karlsbad), Sokolov",
-"Czech_Moravskoslezsko Description":"Havířov, Opava, Ostrava (ehem. Ostrau)",
-"Czech_Olomoucky kraj Description":"Olomouc (ehem. Olmütz), Přerov, Prostějov",
+"Czech_Jihovychod_Jihomoravsky kraj Description":"Brünn, Znaim, Lundenburg",
+"Czech_Jihovychod_Kraj Vysocina Description":"Iglau, Trebitsch, Deutschbrod",
+"Czech_Jihozapad_Jihocesky kraj Description":"Budweis, Tabor, Pisek",
+"Czech_Jihozapad_Plzensky kraj Description":"Pilsen, Klattau, Rokitzan",
+"Czech_Karlovasky kraj Description":"Karlsbad, Eger, Falkenau",
+"Czech_Moravskoslezsko Description":"Ostrau, Havířov, Troppau",
+"Czech_Olomoucky kraj Description":"Olmütz, Proßnitz in Mähren, Prerau",
 "Czech_Praha Description":"Prag",
-"Czech_Severovychod_Kralovehradecky kraj Description":"Náchod, Hradec Králové (ehem. Königgrätz), Trutnov",
-"Czech_Severovychod_Liberecky kraj Description":"Česká Lípa, Jablonec nad Nisou, Liberec",
-"Czech_Severovychod_Pardubicky kraj Description":"Chrudim, Pardubice, Svitavy",
-"Czech_Stredni Cechy_East Description":"Kolín, Kutná Hora, Příbram",
-"Czech_Stredni Cechy_West Description":"Beroun, Kladno, Mladá Boleslav",
-"Czech_Ustecky kraj Description":"Most, Teplice, Ústí nad Labem",
-"Czech_Zlinsky Kraj Description":"Kroměříž, Vsetín, Zlín",
+"Czech_Severovychod_Kralovehradecky kraj Description":"Königgrätz, Trautenau, Nachod",
+"Czech_Severovychod_Liberecky kraj Description":"Reichenberg, Gablonz an der Neiße, Böhmisch Leipa",
+"Czech_Severovychod_Pardubicky kraj Description":"Pardubitz, Chrudim, Zwittau",
+"Czech_Stredni Cechy_East Description":"Kolin, Pribram, Kuttenberg",
+"Czech_Stredni Cechy_West Description":"Kladen, Jungbunzlau, Beraun",
+"Czech_Ustecky kraj Description":"Aussig, Brüx, Teplitz",
+"Czech_Zlinsky Kraj Description":"Kremsier, Wsetin, Zlin",
 "Denmark_Capital Region of Denmark Description":"Kopenhagen, Skovlunde, Virum",
 "Denmark_Central Denmark Region Description":"Aarhus, Brabrand, Juelsminde",
 "Denmark_North Denmark Region Description":"Aalborg, Hjörring, Frederikshavn",
 "Denmark_Region Zealand Description":"Roskilde, Nästved, Greve",
 "Denmark_Region of Southern Denmark Description":"Korup, Morud, Odense",
 "Djibouti Description":"Dschibuti, Randa, Yoboki",
-"Dominica Description":"Grand Bay, Roseau, Salisbury",
-"Dominican Republic Description":"Azua, Barahona, Santo Domingo",
+"Dominica Description":"Roseau, Salisbury, Grand Bay",
+"Dominican Republic Description":"Santo Domingo, Barahona, Azua",
 "East Timor Description":"Dili, Pante Macassar, Viqueque",
-"Ecuador_East Description":"Cuenca, Quito, Tena",
-"Ecuador_West Description":"Guayaquil, Machala, Manta",
+"Ecuador_East Description":"Quito",
+"Ecuador_West Description":"Guayaquil, Manta, Machala",
 "Egypt Description":"Kairo, Alexandria, Giseh",
-"El Salvador Description":"Ahuachapan, San Salvador, Sonsonate",
-"Equatorial Guinea Description":"Bata, Malabo, Mongomo",
+"El Salvador Description":"San Salvador",
+"Equatorial Guinea Description":"Malabo",
 "Eritrea Description":"Asmara, Keren, Omhajer",
-"Estonia_East Description":"Põltsamaa linn, Tartu, Võru",
-"Estonia_West Description":"Maardu, Pärnu, Tallinn",
-"Ethiopia Description":"Addis Abeba, Asella, Bahir Dar",
+"Estonia_East Description":"Stadtgemeinde Oberpahlen, Dorpat",
+"Estonia_West Description":"Reval, Pernau",
+"Ethiopia Description":"Addis Abeba",
 "Falkland Islands Description":"Stanley, Falklandinseln, Dunnose Head, Port Edgar",
-"Faroe Islands Description":"Klaksvík, Norðdepil, Tórshavn",
-"Federated States of Micronesia Description":"Palikir, Weno, Kolonia (Pohnpei)",
-"Fiji Description":"Nadi, Nasinu, Suva",
+"Faroe Islands Description":"Thorshaven",
+"Federated States of Micronesia Description":"Palikir, Colonia, Tamworohi",
+"Fiji Description":"Suva",
 "Finland_Eastern Finland_North Description":"Alapitkä, Koli, Kajaani",
 "Finland_Eastern Finland_South Description":"Kuopio, Joensuu, Mikkeli",
 "Finland_Northern Finland Description":"Oulu, Rovaniemi, Kokkola",
@@ -1716,7 +1716,7 @@
 "Germany_Hesse_Regierungsbezirk Giessen Description":"Lauterbach, Gießen, Marburg",
 "Germany_Hesse_Regierungsbezirk Kassel Description":"Kassel, Fulda, Vöhl",
 "Germany_Lower Saxony_Braunschweig Description":"Braunschweig, Göttingen, Wolfsburg",
-"Germany_Lower Saxony_Bremen_Bremen Description":"Bremen und Bremerhaven, Delmenhorst, Cuxhaven",
+"Germany_Lower Saxony_Bremen_Bremen Description":"Bremen, Bremerhaven, Uchte",
 "Germany_Lower Saxony_Bremen_Munster Description":"Rotenburg (Wümme), Winsen (Luhe), Buxtehude",
 "Germany_Lower Saxony_Hannover Description":"Hannover, Hildesheim, Bad Nenndorf",
 "Germany_Lower Saxony_Oldenburg Description":"Osnabrück, Oldenburg, Nordhorn",
@@ -2497,8 +2497,8 @@
 "Austria_Lower Austria_West Short":"Niederösterreich",
 "Brazil_Southeast Region_Minas Gerais_North Short":"Minas Gerais",
 "Brazil_Southeast Region_Sao Paulo_West Short":"São Paulo",
-"Czech_Stredni Cechy_East Short":"Mittelböhmen (Stredni Cechy)",
-"Czech_Stredni Cechy_West Short":"Mittelböhmische Region (Středočeský kraj)",
+"Czech_Stredni Cechy_East Short":"Středočeský kraj",
+"Czech_Stredni Cechy_West Short":"Středočeský kraj",
 "Finland_Southern Finland_West Short":"Varsinais-Suomi",
 "Germany_Brandenburg_North Short":"Brandenburg",
 "Germany_Brandenburg_South Short":"Brandenburg",
--- a/data/countries-strings/el.json/localize.json
+++ b/data/countries-strings/el.json/localize.json
@@ -799,8 +799,8 @@
 "Romania_North_West":"Βορειοαδυτικά",
 "Romania_South":"Νότια",
 "Romania_South_East":"Νοτιοδυτικά",
-"Romania_South_West":"Νοτιοδυτική περιφέρεια",
-"Romania_West":"Δυτική περιφέρεια",
+"Romania_South_West":"Νοτιοδυτική περιφέρεια Ρουμανίας",
+"Romania_West":"Δύση",
 "Russia_Altai Krai":"Αλτάι Κράι",
 "Russia_Altai Republic":"Δημοκρατία του Αλτάι",
 "Russia_Amur Oblast":"Περιφέρεια Αμούρ",
@@ -2514,7 +2514,7 @@
 "Romania_South Short":"Νότια",
 "Romania_South_East Short":"Νοτιοδυτικά",
 "Romania_South_West Short":"Νοτιοδυτική",
-"Romania_West Short":"Δυτική",
+"Romania_West Short":"Δύση",
 "Russia_Arkhangelsk Oblast_Central Short":"Περιφέρεια Αρχάγγελσκ",
 "Russia_Arkhangelsk Oblast_North Short":"Περιφέρεια Αρχάγγελσκ",
 "Switzerland_Central Short":"Κεντρική Ελβετία",
--- a/data/countries-strings/ga.json/localize.json
+++ b/data/countries-strings/ga.json/localize.json
@@ -1 +0,0 @@
-{}
--- a/data/sound-strings/cs.json/localize.json
+++ b/data/sound-strings/cs.json/localize.json
@@ -49,7 +49,7 @@
 "in_3_kilometers":"Za tři kilometry",
 "then":"Poté",
 "dist_direction_onto_street":"%1$s %2$s %3$s %4$s",
-"take_the_1_exit":"Odbočte první výjezd",
+"take_the_1_exit":"Vyjeďte prvním výjezdem.",
 "take_the_1_exit_street":"NULL",
 "take_the_1_exit_street_verb":"NULL",
 "take_the_2_exit":"Vyjeďte druhým výjezdem.",
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -2438,10 +2438,8 @@ building-address                                    # caption z16-
 man_made-telescope-optical                          # icon z17- (also has caption(optional) z17-)
 === -9970

-amenity-bench-backless                              # icon z18- (also has caption(optional) z19-)
-=== -9979
-
 amenity-bench                                       # icon z18- (also has caption(optional) z19-)
+amenity-bench-backless                              # icon z18- (also has caption(optional) z19-)
 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-)
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -2444,10 +2444,8 @@ building-address                                    # caption z16-
 man_made-telescope-optical                          # icon z17- (also has caption(optional) z17-)
 === -9970

-amenity-bench-backless                              # icon z18- (also has caption(optional) z19-)
-=== -9979
-
 amenity-bench                                       # icon z18- (also has caption(optional) z19-)
+amenity-bench-backless                              # icon z18- (also has caption(optional) z19-)
 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-)
--- a/data/subtypes.csv
+++ b/data/subtypes.csv
@@ -1,3 +1,2 @@
 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
-amenity|bench;amenity|bench|backless
+amenity|charging_station;amenity|charging_station|motorcar,amenity|charging_station|motorcycle,amenity|charging_station|bicycle,amenity|charging_station|small,amenity|charging_station|carless
--- a/generator/maxspeeds_builder.cpp
+++ b/generator/maxspeeds_builder.cpp
@@ -139,7 +139,7 @@ public:
    };
    auto const GetHighwayType = [&](uint32_t fid) { return GetRoad(fid).GetHighwayType(); };

-    //auto const & converter = GetMaxspeedConverter();
+    auto const & converter = GetMaxspeedConverter();
    using HwTypeT = std::optional<routing::HighwayType>;
    auto const CalculateSpeed = [&](uint32_t parentFID, Maxspeed const & s,
                                    HwTypeT hwType) -> std::optional<SpeedInUnits>
--- a/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings
@@ -502,7 +502,7 @@
 "avoid_ferry" = "Avoid ferries";
 "elevation_profile_min_elevation" = "Min. elevation";
 "category_hotel" = "হোটেল";
-"postal_code" = "ডাক কোড|পিন কোড";
+"postal_code" = "ডাক কোড";
 "location_services_disabled_1" = "1. Open Settings";
 "whats_new_auto_update_title" = "Update downloaded maps";
 "power_managment_setting_auto" = "When battery is low";
--- a/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
@@ -17,39 +17,39 @@
 "type.amenity.cafe" = "Cafe";
 "type.amenity.gambling" = "Gambling";
 "type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
-"type.amenity.courthouse" = "আদালত|কোর্ট";
+"type.amenity.courthouse" = "আদালত";
 "type.amenity.language_school" = "Language School";
 "type.office.diplomatic" = "দূতাবাস";
 "type.amenity.money_transfer" = "Money Transfer";
 "type.drinking_water.yes" = "পানীয় জল";
 "type.amenity.music_school" = "গানের স্কুল";
 "type.amenity.exhibition_centre" = "Exhibition Center";
-"type.amenity.doctors" = "ডাক্তার|4চিকিৎসক";
+"type.amenity.doctors" = "ডাক্তার";
 "type.amenity.grave_yard.christian" = "খ্রিস্টান কবরস্থান";
 "type.amenity.ferry_terminal" = "ফেরি";
 "type.amenity.ice_cream" = "আইসক্রিম";
-"type.amenity.library" = "গ্রন্থাগার|লাইব্রেরি";
+"type.amenity.library" = "গ্রন্থাগার";
 "type.amenity.parking.multi.storey" = "বহুতল পার্কিং";
-"type.amenity.motorcycle_parking" = "বাইক পার্কিং|9মোটরসাইকেল পার্কিং";
+"type.amenity.motorcycle_parking" = "বাইক পার্কিং";
 "type.amenity.parking.street_side.fee" = "Street-Side Parking";
-"type.amenity.parking.underground.fee" = "আন্ডারগ্রাউন্ড পার্কিং|ভূগর্ভস্থ পার্কিং";
+"type.amenity.parking.underground.fee" = "আন্ডারগ্রাউন্ড পার্কিং";
 "type.amenity.parking.street_side" = "রোড-পার্শ্ববর্তী পার্কিং";
-"type.amenity.parking.lane.private" = "প্রাইভেট লেন পার্কিং";
+"type.amenity.parking.lane.private" = "Private Lane Parking";
 "type.amenity.parking_space.disabled" = "Disabled Parking Space";
 "type.amenity.place_of_worship.taoist" = "Taoist Temple";
-"type.amenity.police" = "পুলিশ|থানা";
-"type.amenity.post_box" = "মেল বাক্স|ডাক বাক্স";
-"type.amenity.place_of_worship.hindu" = "হিন্দু মন্দির|মন্দির";
+"type.amenity.police" = "পুলিশ";
+"type.amenity.post_box" = "Mailbox";
+"type.amenity.place_of_worship.hindu" = "হিন্দু মন্দির";
 "type.amenity.place_of_worship.shinto" = "Shinto Shrine";
 "type.amenity.place_of_worship.muslim" = "মসজিদ";
 "type.amenity.place_of_worship.jewish" = "Synagogue";
 "type.amenity.recycling.centre" = "Recycling Center";
 "type.amenity.recycling" = "Recycling Container";
-"type.recycling.plastic_bottles" = "প্লাস্টিক বোতল";
-"type.recycling.cartons" = "কার্টন|কার্ডবোর্ডের বাক্স";
+"type.recycling.plastic_bottles" = "Plastic Bottles";
+"type.recycling.cartons" = "Cartons";
 "type.amenity.restaurant" = "রেস্টুরেন্ট";
-"type.recycling.cans" = "ক্যান";
-"type.recycling.shoes" = "জুতো";
+"type.recycling.cans" = "Cans";
+"type.recycling.shoes" = "Shoes";
 "type.amenity.sanitary_dump_station" = "Holding Tank Dump Station";
 "type.emergency.fire_hydrant" = "Fire Hydrant";
 "type.emergency.phone" = "Emergency Phone";
@@ -240,20 +240,20 @@
 "type.railway.station.subway.baku" = "Subway Station";
 "type.railway.station.subway.algiers" = "Subway Station";
 "type.railway.station.light_rail.porto" = "Porto Metro";
-"type.cuisine.pizza" = "পিজ্জা";
-"type.craft.blacksmith" = "কামার";
+"type.cuisine.pizza" = "Pizza";
+"type.craft.blacksmith" = "Blacksmith";
 "type.sport.bowls" = "Bowls";
 "type.highway.motorway.tunnel" = "Motorway Tunnel";
 "type.railway.subway_entrance.warszawa" = "Subway Entrance";
 "type.tourism.camp_site" = "Campground";
 "type.entrance.exit" = "প্রস্থান (শুধুমাত্র)";
-"type.amenity.vehicle_inspection" = "ধোঁয়া পরীক্ষা";
+"type.amenity.vehicle_inspection" = "Vehicle Inspection";
 "type.railway.subway_entrance.almaty" = "Subway Entrance";
 "type.railway.subway_entrance.brussels" = "Subway Entrance";
 "type.historic.castle.manor" = "Manor House";
 "type.shop.curtain" = "Curtain Shop";
 "type.highway.trunk.bridge" = "Bridge";
-"type.cuisine.american" = "মার্কিন|আমেরিকান";
+"type.cuisine.american" = "American";
 "type.natural.bare_rock" = "Bare Rock";
 "type.piste_type.downhill.intermediate.area" = "Intermediate Downhill Ski Run";
 "type.cuisine.beef_bowl" = "Beef Bowl";
@@ -265,17 +265,17 @@
 "type.tourism" = "পর্যটন";
 "type.highway.residential.area" = "Residential Street";
 "type.wheelchair.yes" = "Full Wheelchair Access";
-"type.boundary.protected_area.2" = "সংরক্ষিত এলাকা";
+"type.boundary.protected_area.2" = "Protected Area";
 "type.amenity.drinking_water" = "পানীয় জল";
 "type.healthcare.podiatrist" = "Podiatrist";
 "type.railway.station.subway.yokohama" = "Subway Station";
 "type.area_highway.primary" = "Primary Road";
 "type.shop.cannabis" = "Cannabis Shop";
-"type.craft.plumber" = "কলের মিস্ত্রি";
+"type.craft.plumber" = "Plumber";
 "type.amenity.vending_machine.parking_tickets" = "Parking Meter";
 "type.historic.wayside_shrine" = "Wayside Shrine";
 "type.highway.secondary_link" = "Secondary Road Ramp";
-"type.amenity.post_office" = "পোস্ট অফিস|ডাক ঘর";
+"type.amenity.post_office" = "পোস্ট অফিস";
 "type.waterway.stream" = "Stream";
 "type.railway.rail.highspeed" = "High-Speed Railway";
 "type.place.city.capital.4" = "City";
@@ -291,8 +291,8 @@
 "type.amenity.vending_machine.food" = "Food Dispenser";
 "type.highway.living_street.tunnel" = "Tunnel";
 "type.natural.water.lock" = "Lock Chamber";
-"type.craft.carpenter" = "কাঠমিস্ত্রি";
-"type.cuisine.indian" = "ভারতীয়";
+"type.craft.carpenter" = "Carpenter";
+"type.cuisine.indian" = "Indian";
 "type.highway.living_street.bridge" = "Bridge";
 "type.railway.subway_entrance.yokohama" = "Subway Entrance";
 "type.shop.art" = "Artwork Shop";
@@ -341,7 +341,7 @@
 "type.railway.subway_entrance.rennes" = "Subway Entrance";
 "type.railway.station.subway.malaga" = "Subway Station";
 "type.shop.stationery" = "Stationery Shop";
-"type.craft.confectionery" = "ময়ড়া";
+"type.craft.confectionery" = "Confectioner";
 "type.shop.medical_supply" = "Medical Supplies Store";
 "type.military.bunker" = "Bunker";
 "type.barrier.guard_rail" = "Guard Rail";
@@ -371,7 +371,7 @@
 "type.railway.subway_entrance.osaka" = "Subway Entrance";
 "type.attraction.carousel" = "Carousel";
 "type.aerialway.cable_car" = "Cable Car";
-"type.amenity.marketplace" = "বাজার|মার্কেট";
+"type.amenity.marketplace" = "বাজার";
 "type.leisure.ice_rink" = "Ice Rink";
 "type.amenity.parking.lane" = "লেন পার্কিং";
 "type.railway.subway_entrance.mashhad" = "Subway Entrance";
@@ -383,7 +383,7 @@
 "type.railway.subway_entrance.pyongyang" = "Subway Entrance";
 "type.amenity.parking.multi.storey.fee" = "বহুতল পার্কিং";
 "type.amenity.fast_food" = "ফাস্ট ফুড";
-"type.recycling.glass_bottles" = "কাঁচের বোতল";
+"type.recycling.glass_bottles" = "Glass Bottles";
 "type.amenity.shelter" = "Shelter";
 "type.landuse.grass" = "Grass";
 "type.amenity.toilets" = "শৌচালয়";
@@ -392,13 +392,13 @@
 "type.power.pole" = "Power Pole";
 "type.leisure.picnic_table" = "Picnic Table";
 "type.shop.outpost" = "Pickup Point";
-"type.recycling.small_appliances" = "ইলেকট্রনিক বর্জ্য";
+"type.recycling.small_appliances" = "Electronic Waste";
 "type.amenity.pub" = "Pub";
-"type.amenity.parking.underground" = "আন্ডারগ্রাউন্ড পার্কিং|ভূগর্ভস্থ পার্কিং";
+"type.amenity.parking.underground" = "আন্ডারগ্রাউন্ড পার্কিং";
 "type.tourism.artwork.painting" = "Painting";
-"type.amenity.pharmacy" = "4ওষুধ দোকান|ফার্মেসি";
+"type.amenity.pharmacy" = "ওষুধ দোকান";
 "type.landuse.military" = "Military Area";
-"type.amenity.college" = "কলেজ|মহাবিদ্যালয়";
+"type.amenity.college" = "কলেজ";
 "type.railway.station.light_rail" = "Light Rail Station";
 "type.railway.subway_entrance.bucharest" = "Subway Entrance";
 "type.cuisine.ethiopian" = "Ethiopian";
@@ -409,7 +409,7 @@
 "type.aeroway" = "Airspace Infrastructure";
 "type.healthcare.alternative" = "Alternative Medicine";
 "type.highway.cycleway.bridge" = "Bridge";
-"type.amenity.fire_station" = "4দমকল স্টেশন";
+"type.amenity.fire_station" = "দমকল স্টেশন";
 "type.sport.table_tennis" = "টেবিল টেনিস";
 "type.railway.station.subway.dnepro" = "Subway Station";
 "type.railway.subway_entrance.valencia" = "Subway Entrance";
@@ -438,7 +438,7 @@
 "type.cuisine.soba" = "Soba";
 "type.railway.subway_entrance.newyork" = "Subway Entrance";
 "type.shop.wholesale" = "Wholesale Store";
-"type.craft.electrician" = "ইলেকট্রিক মিস্ত্রি";
+"type.craft.electrician" = "Electrician";
 "type.amenity.recycling.container" = "Recycling Container";
 "type.natural.beach.sand" = "Sandy Beach";
 "type.amenity.nursing_home" = "নার্সিংহোম";
@@ -503,7 +503,7 @@
 "type.natural.land" = "Land";
 "type.barrier.city_wall" = "City Wall";
 "type.natural.water.reservoir" = "জলাধার";
-"type.amenity.place_of_worship.christian" = "গির্জা|চার্চ";
+"type.amenity.place_of_worship.christian" = "গির্জা";
 "type.leisure.golf_course" = "Golf Course";
 "type.highway.unclassified" = "Minor Road";
 "type.natural.scree" = "Scree";
@@ -514,7 +514,7 @@
 "type.office.telecommunication" = "Telecom Company";
 "type.highway.steps" = "Stairs";
 "type.shop.hairdresser" = "Hairdresser";
-"type.cuisine.international" = "আন্তর্জাতিক";
+"type.cuisine.international" = "International";
 "type.railway.subway_entrance.kharkiv" = "Subway Entrance";
 "type.shop.florist" = "Florist";
 "type.man_made.flagpole" = "Flagpole";
@@ -527,7 +527,7 @@
 "type.cuisine.lebanese" = "Lebanese";
 "type.railway.construction" = "Railway Construction";
 "type.railway.subway_entrance.nnov" = "Subway Entrance";
-"type.barrier.wall" = "দেয়াল";
+"type.barrier.wall" = "Wall";
 "type.tourism.artwork.statue" = "মূর্তি";
 "type.cuisine.hungarian" = "Hungarian";
 "type.natural.cape" = "Cape";
@@ -542,7 +542,7 @@
 "type.railway.monorail.bridge" = "Monorail Bridge";
 "type.cuisine.african" = "African";
 "type.historic.aircraft" = "Historic Aircraft";
-"type.boundary.protected_area" = "সংরক্ষিত এলাকা";
+"type.boundary.protected_area" = "Protected Area";
 "type.highway.traffic_signals" = "Traffic Lights";
 "type.highway.motorway.bridge" = "Motorway Bridge";
 "type.shop.rental.bicycle" = "Bicycle Rental Shop";
@@ -565,20 +565,20 @@
 "type.area_highway.track" = "Track";
 "type.amenity.theatre" = "থিয়েটার";
 "type.sport.baseball" = "Baseball";
-"type.recycling.batteries" = "ব্যাটারি";
+"type.recycling.batteries" = "Batteries";
 "type.fee.yes" = "$";
 "type.highway.secondary.tunnel" = "Tunnel";
 "type.junction" = "Junction";
 "type.historic.castle.stately" = "Stately Castle";
 "type.shop.furniture" = "Furniture Store";
 "type.landuse.education" = "Educational Facility";
-"type.boundary.administrative.4" = "আঞ্চলিক সীমান্ত";
+"type.boundary.administrative.4" = "Regional Boundary";
 "type.tourism.apartment" = "Holiday Apartment";
 "type.railway.station.subway.istanbul" = "Subway Station";
 "type.amenity.grave_yard" = "কবরস্থান";
-"type.recycling.cardboard" = "কার্ডবোর্ড";
+"type.recycling.cardboard" = "Cardboard";
 "type.shop.interior_decoration" = "Interior Decorations Store";
-"type.amenity.parking.underground.private" = "ব্যক্তিগত আন্ডারগ্রাউন্ড পার্কিং|প্রাইভেট আন্ডারগ্রাউন্ড পার্কিং|ব্যক্তিগত ভূগর্ভস্থ পার্কিং|প্রাইভেট ভূগর্ভস্থ পার্কিং";
+"type.amenity.parking.underground.private" = "ব্যক্তিগত আন্ডারগ্রাউন্ড পার্কিং";
 "type.amenity.taxi" = "ট্যাক্সি স্ট্যান্ড";
 "type.cuisine.fish_and_chips" = "Fish and Chips";
 "type.cuisine.greek" = "গ্রিক";
@@ -629,7 +629,7 @@
 "type.leisure.dance" = "Dance Hall";
 "type.emergency.defibrillator" = "Defibrillator";
 "type.amenity.food_court" = "ফুড কোর্ট";
-"type.amenity.parking.no.access" = "ব্যক্তিগত পার্কিং|প্রাইভেট পার্কিং";
+"type.amenity.parking.no.access" = "ব্যক্তিগত পার্কিং";
 "type.railway.level_crossing" = "Level Crossing";
 "type.amenity.vending_machine.fuel" = "পেট্রোল পাম্প";
 "type.railway.station.subway.maracaibo" = "Subway Station";
@@ -656,7 +656,7 @@
 "type.amenity.clinic" = "Clinic";
 "type.railway.station.subway.ekb" = "Subway Station";
 "type.natural.hot_spring" = "Hot Spring";
-"type.recycling.plastic" = "প্লাস্টিক";
+"type.recycling.plastic" = "Plastic";
 "type.amenity.waste_disposal" = "Dumpster";
 "type.area_highway.motorway" = "Motorway";
 "type.amenity.bicycle_repair_station" = "Bicycle Repair Station";
@@ -704,7 +704,7 @@
 "type.aerialway.chair_lift" = "Chair Lift";
 "type.piste_type.snow_park" = "Snow Park";
 "type.building.warehouse" = "Warehouse";
-"type.cuisine.regional" = "আঞ্চলিক";
+"type.cuisine.regional" = "Regional";
 "type.shop.gas" = "Gas Store";
 "type.railway.station.subway.shanghai" = "Subway Station";
 "type.shop.perfumery" = "Perfume Shop";
@@ -712,8 +712,8 @@
 "type.shop.cheese" = "Cheese Shop";
 "type.man_made.pipeline.overground" = "Overground Pipeline";
 "type.sport.multi" = "বিভিন্ন ক্রীড়া";
-"type.boundary.protected_area.1" = "সংরক্ষিত এলাকা";
-"type.boundary.aboriginal_lands" = "আদিবাসী ভূমি";
+"type.boundary.protected_area.1" = "Protected Area";
+"type.boundary.aboriginal_lands" = "Indigenous Lands";
 "type.amenity.driving_school" = "Driving School";
 "type.amenity.payment_terminal" = "Payment Terminal";
 "type.man_made.petroleum_well" = "Oil or Gas Well";
@@ -736,20 +736,20 @@
 "type.barrier.lift_gate" = "লিফ্ট গেট";
 "type.barrier.retaining_wall" = "Retaining Wall";
 "type.barrier.stile" = "Stile";
-"type.barrier.toll_booth" = "টোল বুথ";
-"type.boundary" = "4সীমান্ত";
+"type.barrier.toll_booth" = "Toll Booth";
+"type.boundary" = "Boundary";
 "type.cuisine.barbecue" = "Barbecue";
-"type.cuisine.burger" = "বার্গার";
+"type.cuisine.burger" = "Burger";
 "type.cuisine.caribbean" = "Caribbean";
-"type.cuisine.chinese" = "চীনা|চাইনিজ";
-"type.cuisine.coffee_shop" = "কফি";
+"type.cuisine.chinese" = "Chinese";
+"type.cuisine.coffee_shop" = "Coffee";
 "type.cuisine.crepe" = "Crepe";
 "type.cuisine.croatian" = "ক্রোয়েসীয়";
 "type.cuisine.curry" = "Curry";
 "type.cuisine.deli" = "Deli";
 "type.cuisine.filipino" = "Filipino";
 "type.cuisine.fine_dining" = "Fine Dining";
-"type.cuisine.fish" = "মাছ";
+"type.cuisine.fish" = "Fish";
 "type.cuisine.georgian" = "Georgian";
 "type.cuisine.ice_cream" = "আইসক্রিম";
 "type.cuisine.moroccan" = "Moroccan";
@@ -758,10 +758,10 @@
 "type.cuisine.pasta" = "পাস্তা";
 "type.cuisine.portuguese" = "Portuguese";
 "type.cuisine.savory_pancakes" = "Savory Pancakes";
-"type.cuisine.spanish" = "স্পেনীয়";
+"type.cuisine.spanish" = "Spanish";
 "type.cuisine.tapas" = "Tapas";
 "type.cuisine.vegan" = "Vegan";
-"type.cuisine.vietnamese" = "ভিয়েতনামীয়";
+"type.cuisine.vietnamese" = "Vietnamese";
 "type.emergency" = "Emergency";
 "type.highway.track.no.access" = "Track";
 "type.landuse.quarry" = "Quarry";
@@ -826,7 +826,7 @@
 "type.tourism.viewpoint" = "Viewpoint";
 "type.tourism.information.visitor_centre" = "Visitor Centre";
 "type.shop.chemist" = "Chemist";
-"type.craft.photographer" = "ফটোগ্রাফার";
+"type.craft.photographer" = "Photographer";
 "type.power.plant.gas" = "Gas Turbine Power Plant";
 "type.highway.residential.tunnel" = "Tunnel";
 "type.shop.convenience" = "Convenience Store";
@@ -834,7 +834,7 @@
 "type.shop.gift" = "Gift Shop";
 "type.amenity.waste_transfer_station" = "Waste Transfer Station";
 "type.railway.station.subway.isfahan" = "Subway Station";
-"type.boundary.administrative" = "প্রশাসনিক সীমান্ত";
+"type.boundary.administrative" = "Administrative Boundary";
 "type.amenity.parking_space" = "Parking Space";
 "type.fee.no" = "বিনামূল্যে";
 "type.railway.subway_entrance.tehran" = "Subway Entrance";
@@ -854,7 +854,7 @@
 "type.historic.boundary_stone" = "Boundary Stone";
 "type.cuisine.german" = "জার্মান";
 "type.amenity.townhall" = "Town Hall";
-"type.building.has_parts" = "বিল্ডিং";
+"type.building.has_parts" = "Building";
 "type.piste_type.skitour" = "Skitour Trail";
 "type.place.city.capital.2" = "Capital";
 "type.highway.trunk_link.bridge" = "Bridge";
@@ -863,7 +863,7 @@
 "type.railway.subway_entrance.philadelphia" = "Subway Entrance";
 "type.shop.laundry" = "Laundry";
 "type.railway.subway_entrance.taipei" = "Subway Entrance";
-"type.cemetery.grave" = "কবর";
+"type.cemetery.grave" = "Grave";
 "type.junction.roundabout" = "Roundabout";
 "type.tourism.hostel" = "হোস্টেল";
 "type.highway.tertiary_link.tunnel" = "Tunnel";
@@ -879,7 +879,7 @@
 "type.railway.subway_entrance.buenos_aires" = "Subway Entrance";
 "type.man_made.surveillance" = "Surveillance Camera";
 "type.railway.station.subway.changchun" = "Subway Station";
-"type.boundary.protected_area.4" = "সংরক্ষিত এলাকা";
+"type.boundary.protected_area.4" = "Protected Area";
 "type.railway.narrow_gauge.tunnel" = "Narrow Gauge Rail Tunnel";
 "type.tourism.information.map" = "Tourist Map";
 "type.craft.shoemaker" = "Shoe Repair";
@@ -913,13 +913,13 @@
 "type.cuisine.french" = "ফরাসি";
 "type.route.ferry" = "ফেরি";
 "type.tourism.information" = "Tourist Information";
-"type.shop.camera" = "ক্যামেরার দোকান";
+"type.shop.camera" = "Camera Shop";
 "type.tourism.information.board" = "Information Board";
 "type.amenity.shelter.lean_to" = "Lean-to Shelter";
 "type.shop.electrical" = "Electrical Supplies Store";
 "type.natural.spring" = "Natural Spring";
 "type.natural.peak" = "Peak";
-"type.recycling.paper" = "কাগজ";
+"type.recycling.paper" = "Paper";
 "type.highway.services" = "Service Area";
 "type.highway.path.bicycle" = "Cycle & Foot Path";
 "type.highway.raceway" = "Racetrack";
@@ -945,7 +945,7 @@
 "type.area_highway.trunk" = "Trunk Road";
 "type.railway.subway" = "Subway Line";
 "type.cuisine.buschenschank" = "Buschenschank";
-"type.boundary.protected_area.5" = "সংরক্ষিত এলাকা";
+"type.boundary.protected_area.5" = "Protected Area";
 "type.landuse.industrial" = "Industrial Area";
 "type.attraction.roller_coaster" = "Roller Coaster";
 "type.railway.subway_entrance.maracaibo" = "Subway Entrance";
@@ -962,7 +962,7 @@
 "type.railway.station.subway.santiago" = "Subway Station";
 "type.cuisine.italian" = "Italian";
 "type.man_made.bridge" = "Bridge";
-"type.boundary.protected_area.3" = "সংরক্ষিত এলাকা";
+"type.boundary.protected_area.3" = "Protected Area";
 "type.cuisine.steak_house" = "Steak House";
 "type.sport.diving" = "High Diving";
 "type.place.island" = "Island";
@@ -971,12 +971,12 @@
 "type.cuisine.arab" = "আরবি";
 "type.tourism.hotel" = "হোটেল";
 "type.amenity.shower" = "Shower";
-"type.barrier.chain" = "চেন";
+"type.barrier.chain" = "Chain";
 "type.office" = "Office";
 "type.shop.confectionery" = "Candy Shop";
 "type.railway.station.subway.buenos_aires" = "Subway Station";
 "type.shop.greengrocer" = "Greengrocer";
-"type.cuisine.local" = "স্থানীয়|লোকাল";
+"type.cuisine.local" = "Local";
 "type.highway.pedestrian.bridge" = "Pedestrian Bridge";
 "type.highway.pedestrian.square" = "Square";
 "type.cuisine.turkish" = "তুর্কি";
@@ -1022,10 +1022,10 @@
 "type.amenity.parking_space.permissive" = "Parking Space";
 "type.shop.trade" = "Trade Supplies";
 "type.railway.subway_entrance.stockholm" = "Subway Entrance";
-"type.boundary.administrative.2" = "জাতীয় সীমান্ত";
+"type.boundary.administrative.2" = "National Border";
 "type.place.locality" = "Locality";
 "type.piste_type.hike" = "Snow Hiking Trail";
-"type.amenity.parking.private" = "ব্যক্তিগত পার্কিং|প্রাইভেট পার্কিং";
+"type.amenity.parking.private" = "প্রাইভেট পার্কিং";
 "type.recycling.scrap_metal" = "Scrap Metal";
 "type.highway.secondary" = "Secondary Road";
 "type.piste_type.nordic" = "Nordic Ski Trail";
@@ -1047,7 +1047,7 @@
 "type.highway.primary_link.bridge" = "Bridge";
 "type.railway.station.subway.warszawa" = "Subway Station";
 "type.healthcare.sample_collection" = "Sample Collection Centre";
-"type.toilets.yes" = "শৌচালয়";
+"type.toilets.yes" = "Toilet";
 "type.shop.supermarket" = "Supermarket";
 "type.sport.beachvolleyball" = "Beach Volleyball";
 "type.highway.busway.tunnel" = "Tunnel";
@@ -1072,7 +1072,7 @@
 "type.highway.tertiary" = "Tertiary Road";
 "type.office.government" = "Government Office";
 "type.highway.pedestrian.area" = "Pedestrian Area";
-"type.cuisine.cake" = "কেক";
+"type.cuisine.cake" = "Cake";
 "type.railway.station.subway.tokyo" = "Subway Station";
 "type.highway.motorway_link.tunnel" = "Tunnel";
 "type.historic.mine" = "Historic Mine";
@@ -1081,10 +1081,10 @@
 "type.railway.station.subway.stockholm" = "Subway Station";
 "type.highway.busway.bridge" = "Bridge";
 "type.highway.ladder" = "Ladder";
-"type.boundary.protected_area.6" = "সংরক্ষিত এলাকা";
+"type.boundary.protected_area.6" = "Protected Area";
 "type.shop.dairy" = "Dairy Shop";
 "type.wheelchair" = "Wheelchair";
-"type.boundary.administrative.3" = "আঞ্চলিক সীমান্ত";
+"type.boundary.administrative.3" = "Regional Boundary";
 "type.tourism.theme_park" = "Theme Park";
 "type.railway.station.subway.tianjin" = "Subway Station";
 "type.historic.castle.hillfort" = "Hillfort";
@@ -1102,7 +1102,7 @@
 "type.cuisine.sausage" = "Sausage";
 "type.railway.subway_entrance.shanghai" = "Subway Entrance";
 "type.sport.10pin" = "Bowling";
-"type.amenity.veterinary" = "গরুর ডাক্তার|পশুচিকিৎসক";
+"type.amenity.veterinary" = "Veterinary Doctor";
 "type.amenity.dentist" = "দাঁতের ডাক্তার";
 "type.shop.rental" = "Rental Shop";
 "type.historic.castle" = "Castle";
@@ -1124,12 +1124,12 @@
 "type.highway.bridleway.bridge" = "Bridge";
 "type.waterway.waterfall" = "ঝর্ণা";
 "type.landuse.landfill" = "Landfill";
-"type.sport" = "ক্রীড়া|স্পোর্টস";
+"type.sport" = "ক্রীড়া";
 "type.landuse.meadow" = "Meadow";
 "type.natural.wetland.swamp" = "Swamp";
 "type.landuse.railway" = "Railway Premises";
 "type.railway.subway_entrance.adana" = "Subway Entrance";
-"type.building_part" = "বিল্ডিং";
+"type.building_part" = "Building";
 "type.waterway.stream.intermittent" = "Intermittent Stream";
 "type.railway.tram_stop" = "Tram Stop";
 "type.highway.pedestrian.tunnel" = "Pedestrian Tunnel";
@@ -1144,11 +1144,11 @@
 "type.railway.subway_entrance.kolkata" = "Subway Entrance";
 "type.railway.station.subway.cairo" = "Subway Station";
 "type.railway.station.subway.rennes" = "Subway Station";
-"type.amenity.fuel" = "গ্যাস স্টেশন|5পেট্রোল পাম্প";
+"type.amenity.fuel" = "গ্যাস স্টেশন";
 "type.highway.motorway_junction" = "Road Exit";
 "type.cuisine.kebab" = "Kebab";
 "type.cuisine.sushi" = "Sushi";
-"type.boundary.national_park" = "জাতীয় উদ্যান";
+"type.boundary.national_park" = "National Park";
 "type.cuisine.sandwich" = "Sandwich";
 "type.power.substation" = "Substation";
 "type.place.city.capital" = "Capital";
@@ -1165,12 +1165,12 @@
 "type.natural.water.pond" = "পুকুর";
 "type.waterway.dam" = "বাঁধ";
 "type.amenity.parking.park_and_ride" = "Park And Ride Parking";
-"type.amenity.fountain" = "ফাউন্টেন|ফোয়ারা";
+"type.amenity.fountain" = "ফাউন্টেন";
 "type.amenity.vending_machine.coffee" = "Coffee Dispenser";
 "type.railway.station.subway.hamburg" = "Subway Station";
 "type.railway.station.subway.sf" = "Subway Station";
 "type.highway.service" = "Service Road";
-"type.cuisine.chicken" = "চিকেন|মুরগি";
+"type.cuisine.chicken" = "Chicken";
 "type.highway.residential.bridge" = "Bridge";
 "type.sport.climbing" = "Climbing Centre";
 "type.power.plant.coal" = "Coal Power Plant";
@@ -1188,7 +1188,7 @@
 "type.railway.subway_entrance.chongqing" = "Subway Entrance";
 "type.natural.coastline" = "উপকূলরেখা";
 "type.highway.road.bridge" = "Bridge";
-"type.recycling.green_waste" = "5আনাজ খোলা";
+"type.recycling.green_waste" = "Green/Organic Waste";
 "type.railway.station.subway.valencia" = "Subway Station";
 "type.amenity.cinema" = "সিনেমা";
 "type.cuisine.bubble_tea" = "Bubble Tea";
@@ -1236,20 +1236,20 @@
 "type.place.country" = "Country";
 "type.railway.station.subway.wuhan" = "Subway Station";
 "type.man_made.water_well.drinking_water_no" = "পাতকুয়া";
-"type.amenity.telephone" = "টেলিফোন|ফোন";
+"type.amenity.telephone" = "টেলিফোন";
 "type.sport.handball" = "Handball";
 "type.traffic_calming" = "Traffic Calming";
 "type.amenity.parking_space.private" = "Parking Space";
 "type.historic.memorial.cross" = "Memorial Cross";
 "type.railway.subway_entrance.vienna" = "Subway Entrance";
-"type.amenity.parking.permissive" = "ব্যক্তিগত পার্কিং|প্রাইভেট পার্কিং";
+"type.amenity.parking.permissive" = "প্রাইভেট পার্কিং";
 "type.historic.castle.fortress" = "Fortress";
 "type.railway.subway_entrance.shiraz" = "Subway Entrance";
 "type.aeroway.terminal" = "Terminal";
 "type.shop.car_repair.tyres" = "Tyre Repair";
 "type.office.ngo" = "Non-Governmental Organization";
 "type.amenity.vending_machine.condoms" = "Condoms Dispenser";
-"type.craft.painter" = "রংমিস্ত্রি";
+"type.craft.painter" = "House Painter";
 "type.highway.path.difficult" = "Difficult or Indistinct Trail";
 "type.highway.secondary_link.bridge" = "Bridge";
 "type.amenity.nightclub" = "নাইটক্লাব";
@@ -1281,11 +1281,11 @@
 "type.historic.castle.palace" = "Palace";
 "type.railway.station" = "Train Station";
 "type.railway.subway_entrance.sendai" = "Subway Entrance";
-"type.craft.gardener" = "মালী";
+"type.craft.gardener" = "Gardener";
 "type.historic.locomotive" = "Historic Locomotive";
 "type.landuse.forest.mixed" = "Mixed-Leaf Forest";
 "type.natural.shingle" = "Shingle";
-"type.recycling.clothes" = "4জামাকাপড়";
+"type.recycling.clothes" = "Clothes";
 "type.aerialway" = "Aerialway";
 "type.craft.sawmill" = "Sawmill";
 "type.highway.service.parking_aisle" = "Parking Aisle";
@@ -1303,7 +1303,7 @@
 "type.natural.tree" = "গাছ";
 "type.natural.sand" = "বালুকা";
 "type.amenity.boat_rental" = "নৌকা ভাড়া";
-"type.man_made.telescope" = "দূরবিক্ষণ|দূরবীণ";
+"type.man_made.telescope" = "দূরবিক্ষণ";
 "type.man_made.telescope.optical" = "দূরবিক্ষণ (আলোক রশ্মি)";
 "type.man_made.telescope.radio" = "দূরবিক্ষণ (রেডিও রশ্মি)";
 "type.man_made.telescope.gamma" = "দূরবিক্ষণ (গামা রশ্মি)";
--- a/iphone/Maps/LocalizedStrings/da.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/InfoPlist.strings
@@ -3,7 +3,7 @@
 "search" = "Søg";

 /* Used in home screen quick actions. */
-"bookmarks_and_tracks" = "Favoritter";
+"bookmarks_and_tracks" = "Bogmærker og spor";

 /* Used in home screen quick actions. */
 "route" = "Rute";
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -24,7 +24,7 @@
 "type.amenity.bar" = "Bar";
 "type.amenity.bbq" = "Grillstelle";
 "type.amenity.bench" = "Sitzbank";
-"type.amenity.bench.backless" = "Ohne Rückenlehne";
+"type.amenity.bench.backless" = "Sitzbank ohne Rückenlehne";
 "type.amenity.bicycle_parking" = "Fahrradständer";
 "type.amenity.boat_rental" = "Bootsverleih";
 "type.amenity.bicycle_rental" = "Fahrradverleih";
--- a/iphone/Maps/LocalizedStrings/el.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/el.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" = "Διαδρομή";
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -63,10 +63,10 @@
 "bookmark_sets" = "Λίστα αγαπημένων";

 /* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
-"bookmarks" = "Σελιδοδείκτες";
+"bookmarks" = "Αγαπημένα";

 /* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
-"bookmarks_and_tracks" = "Σελιδοδείκτες και Ίχνη";
+"bookmarks_and_tracks" = "Αγαπημένα και διαδρομές";

 /* Default bookmark list name */
 "core_my_places" = "Οι τοποθεσίες μου";
@@ -148,16 +148,16 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Για RV";
-"share_bookmarks_email_body" = "Γειά σου! \n \nΣου επισυνάπτω τα αγαπημένα μου. Παρακαλώ άνοιξε τα με το CoMaps. Αν δεν το έχεις εγκατεστημένο, μπορείς να το κατεβάσεις από εδώ: https://www.comaps.app/download/ \n \nΚαλή διασκέδαση ταξιδεύοντας με το CoMaps!";
+"share_bookmarks_email_body" = "Γειa!\n\nΣου επισυνάπτω τα αγαπημένα μου. Παρακαλώ άνοιξέ τα με το CoMaps. Αν δεν το έχεις εγκαταστήσει, μπορείς να το κατεβάσεις από εδώ: https://www.comaps.app/download/\n\nΚαλή διασκέδαση ταξιδεύοντας με το CoMaps!";

 /* message title of loading file */
-"load_kmz_title" = "Φορτώνονται οι σελιδοδείκτες";
+"load_kmz_title" = "Φορτώνονται τα αγαπημένα";

 /* Kmz file successful loading */
-"load_kmz_successful" = "Οι σελιδοδείκτες φορτώθηκαν με επιτυχία! Μπορείτε να τους βρείτε στο χάρτη ή στην οθόνη Διαχείρισης σελιδοδεικτών.";
+"load_kmz_successful" = "Τα αγαπημένα φορτώθηκαν με επιτυχία! Μπορείτε να τα βρείτε στο χάρτη ή στην οθόνη Διαχείρισης αγαπημένων.";

 /* Kml file loading failed */
-"load_kmz_failed" = "Η φόρτωση των σελιδοδεικτών απέτυχε. Το αρχείο μπορεί να είναι κατεστραμμένο ή ελαττωματικό.";
+"load_kmz_failed" = "Η φόρτωση των αγαπημένων απέτυχε. Το αρχείο μπορεί να είναι κατεστραμμένο ή ελαττωματικό.";

 /* resource for context menu */
 "edit" = "Επεξεργασία";
@@ -192,7 +192,7 @@
 "version: %@ (%@)\nmap data: %@" = "Έκδοση: %@ (%@)\nΔεδομένα χάρτη: %@";

 /* Title for tracks category in bookmarks manager */
-"tracks_title" = "Ίχνη";
+"tracks_title" = "Διαδρομές";

 /* Length of track in cell that describes route */
 "length" = "Μήκος";
@@ -663,14 +663,14 @@

 /* A unit of measure */
 "ft" = "πόδια";
-"miles_per_hour" = "μλ/ώ";
-"hour" = "ώ";
-"minute" = "λεπ";
-"day" = "μέρ";
+"miles_per_hour" = "mph";
+"hour" = "Ωρα";
+"minute" = "λπτ";
+"day" = "Μέρα";
 "placepage_more_button" = "Περισσότερα";
 "book_button" = "Κράτηση";
 "placepage_call_button" = "Κλήση";
-"placepage_edit_bookmark_button" = "Επεξεργασία σελιδοδείκτη";
+"placepage_edit_bookmark_button" = "Επεξεργασία αγαπημένου";
 "placepage_bookmark_name_hint" = "Όνομα αγαπημένου";
 "placepage_personal_notes_hint" = "Προσωπικές σημειώσεις (κείμενο ή html)";
 "placepage_delete_bookmark_button" = "Διαγραφή αγαπημένου";
@@ -696,7 +696,7 @@
 /* Dialog before publishing the modifications to the public map. */
 "editor_share_to_all_dialog_message_1" = "Βεβαιωθείτε ότι δεν έχετε εισάγει προσωπικά δεδομένα.";
 "editor_share_to_all_dialog_message_2" = "Οι συντάκτες του OpenStreetMap θα ελέγξουν τις αλλαγές και θα επικοινωνήσουν μαζί σας εάν έχουν απορίες.";
-"navigation_stop_button" = "Τέλος";
+"navigation_stop_button" = "τέλος";

 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
 "recent_track_background_dialog_title" = "Θέλετε να απενεργοποιήσετε την καταγραφή της πρόσφατης διαδρομής σας;";
@@ -715,7 +715,7 @@
 "mobile_data_dialog" = "Θέλετε να χρησιμοποιήσετε το δίκτυο κινητής τηλεφωνίας για να εμφανίσετε αναλυτικές πληροφορίες;";
 "mobile_data_option_always" = "Να χρησιμοποιείται πάντα";
 "mobile_data_option_today" = "Μόνο σήμερα";
-"mobile_data_option_not_today" = "Να μην χρησιμοποιηθεί σήμερα";
+"mobile_data_option_not_today" = "Να Μην χρησιμοποιηθεί σήμερα";
 "mobile_data" = "Ίντερνετ μέσω δικτύου κινητής";

 /* NOTE to translators: please synchronize your translation with the English one. */
@@ -761,7 +761,7 @@
 "bookmarks_create_new_group" = "Δημιουργία νέας λίστας";

 /* Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files */
-"bookmarks_import" = "Εισαγωγή Σελιδοδεικτών και Ιχνών";
+"bookmarks_import" = "Εισαγωγή σελιδοδεικτών και διαδρομών";
 "downloader_hide_screen" = "Απόκρυψη οθόνης";
 "downloader_percent" = "%@ (%@ από %@)";
 "downloader_process" = "Λήψη %@…";
@@ -791,7 +791,7 @@
 "hide_from_map" = "Απόκρυψη από τον χάρτη";
 "tags_loading_error_subtitle" = "Ένα σφάλμα συνέβη κατά το φόρτωμα των ετικετών, παρακαλώ ξαναπροσπαθήστε";
 "download_button" = "Λήψη";
-"speedcams_alert_title" = "Κάμερες ταχύτητας";
+"speedcams_alert_title" = "Κάμερες Ταχύτητας";
 "place_description_title" = "Περιγραφή μέρους";

 /* "Speed cameras" settings menu option (should be short! no more than 47-50 chars) to warn a driver if there is a risk of exceeding the speed limit */
@@ -803,9 +803,9 @@
 /* Speed camera settings menu option - Never warn (about speedcams) */
 "pref_tts_speedcams_never" = "Να μην ειδοποιούμαι ποτέ";
 "power_managment_title" = "Λειτουργία εξοικονόμησης ενέργειας";
-"power_managment_description" = "Θα γίνεται προσπάθεια εξοικονόμησης ενέργειας εις βάρος κάποιων λειτουργιών.";
+"power_managment_description" = "Θα γίνεται προσπάθεια εξοικονόμησης ενέργειας εις βάρος κάποιον λειτουργιών.";
 "power_managment_setting_never" = "Ποτέ";
-"power_managment_setting_auto" = "Όταν η μπαταρία είναι χαμηλή";
+"power_managment_setting_auto" = "Αυτόματα";
 "power_managment_setting_manual_max" = "Πάντα";
 "enable_logging_warning_message" = "Αυτή η λειτουργία είναι ενεργοποιημένη για την καταγραφή ενεργειών για διαγνωστικούς σκοπούς. Αυτό βοηθά την ομάδα να εντοπίζει προβλήματα με την εφαρμογή. Να ενεργοποιείτε τη λειτουργία μόνο κατόπιν αιτήματος της υποστήριξης του CoMaps.";
 "driving_options_title" = "Ρυθμίσεις δρομολόγησης";
@@ -840,10 +840,10 @@
 "no" = "Όχι";

 /* E.g. "WiFi:Yes" */
-"yes_available" = "Ναι";
+"yes_available" = "Ενεργ.";

 /* E.g. "WiFi:No" */
-"no_available" = "Όχι";
+"no_available" = "Απενεργ.";

 /* To indicate the capacity of car parkings, bicycle parkings, electric vehicle charging stations... */
 "capacity" = "Χωρητικότητα: %@";
@@ -863,7 +863,7 @@
 "not_all_shown_bookmarks_carplay" = "Δεν εμφανίζονται όλοι οι σελιδοδείκτες";
 "switch_to_phone_bookmarks_carplay" = "Μεταβείτε στο τηλέφωνο για να δείτε όλους τους σελιδοδείκτες";
 "ok" = "Οκ";
-"speedcams_alert_title_carplay_1" = "Κάμερες ταχύτητας";
+"speedcams_alert_title_carplay_1" = "Κάμερες Ταχύτητας";
 "speedcams_alert_title_carplay_2" = "Ειδοποιήσεις ταχύτητας";
 "download_map_carplay" = "Κάντε λήψη χαρτών στην εφαρμογή, στη συσκευή σας";
 "carplay_roundabout_exit" = "%@ έξοδος";
@@ -930,19 +930,19 @@
 "whats_new_auto_update_button_later" = "Χειροκίνητη ενημέρωση αργότερα";

 /* Delete track button on track edit screen */
-"placepage_delete_track_button" = "Διαγραφή ίχνους";
+"placepage_delete_track_button" = "Διαγραφή διαδρομής";

 /* The track deletion confirmaion alert message. */
-"placepage_delete_track_confirmation_alert_message" = "Σίγουρα θέλετε να διαγράψετε αυτό το ίχνος;";
+"placepage_delete_track_confirmation_alert_message" = "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το κομμάτι;";

 /* Placeholder for track name input on track edit screen */
-"placepage_track_name_hint" = "Όνομα ίχνους";
+"placepage_track_name_hint" = "Όνομα διαδρομής";

 /* move track or bookmark from the list button text */
 "move" = "Μετακίνηση";

 /* edit track screen title */
-"track_title" = "Ίχνος";
+"track_title" = "Διαδρομή";

 /* Translated CoMaps site */
 "translated_om_site_url" = "https://www.comaps.app/";
@@ -993,7 +993,7 @@
 "button_layer_outdoor" = "Πεζοπορία";

 /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */
-"bookmarks_export" = "Εξαγωγή όλων των Σελιδοδεικτών και Ιχνών";
+"bookmarks_export" = "Εξαγωγή όλων των σελιδοδεικτών και των διαδρομών";

 /* Text for the editing the Track's color button. */
 "change_color" = "Αλλαγή χρώματος";
@@ -1009,7 +1009,7 @@
 "bugreport_alert_message" = "Θα θέλατε να στείλετε μια αναφορά σφάλματος στους προγραμματιστές;\nΒασιζόμαστε στους χρήστες μας, καθώς οι CoMaps δεν συλλέγουν αυτόματα καμία πληροφορία σφάλματος. Σας ευχαριστούμε εκ των προτέρων για την υποστήριξη των CoMaps!";

 /* Title for the iCloud syncronization setting */
-"icloud_sync" = "Συγχρονισμός iCloud (Beta)";
+"icloud_sync" = "iCloud Syncronization (Beta)";

 /* Title for the "Enable iCloud Syncronization" alert. */
 "enable_icloud_synchronization_title" = "Ενεργοποίηση συγχρονισμού iCloud";
@@ -1021,7 +1021,7 @@
 "icloud_disabled_title" = "Το iCloud είναι απενεργοποιημένο";

 /* Message for the "iCloud is Disabled" alert. */
-"icloud_disabled_message" = "Ενεργοποιήστε το iCloud για το CoMaps στις ρυθμίσεις του Apple λογαριασμού σας για να χρησιμοποιήσετε αυτή τη λειτουργία.";
+"icloud_disabled_message" = "Ενεργοποιήστε το iCloud στις ρυθμίσεις της συσκευής σας για να χρησιμοποιήσετε αυτή τη λειτουργία.";

 /* Title for the "Enable iCloud Syncronization" alert's "Enable" action button. */
 "enable" = "Ενεργοποίηση";
@@ -1066,10 +1066,10 @@
 "recover_all" = "Ανάκτηση όλων";

 /* Prompt to start recording a track. */
-"start_track_recording" = "Εγγραφή ίχνους";
+"start_track_recording" = "Εγγραφή διαδρομής";

 /* Prompt for stopping a track recording. */
-"stop_track_recording" = "Σταματήστε την εγγραφή ίχνους";
+"stop_track_recording" = "Σταματήστε την εγγραφή διαδρομής";

 /* Title for the "Stop Without Saving" action for the alert when saving a track recording. */
 "stop_without_saving" = "Σταματήστε χωρίς αποθήκευση";
@@ -1078,23 +1078,18 @@
 "continue_recording" = "Συνέχεια εγγραφής";

 /* Title for the alert when saving a track recording. */
-"track_recording_alert_title" = "Αποθήκευση στους Σελιδοδείκτες και Ίχνη;";
+"track_recording_alert_title" = "Αποθήκευση στα Αγαπημένα και Διαδρομές;";

 /* Message for the toast when saving the track recording is finished but nothing to save. */
-"track_recording_toast_nothing_to_save" = "Το ίχνος είναι άδειο - δεν υπάρχει τίποτα να αποθηκεύσετε";
-"edit_track" = "Επεξεργασία ίχνους";
+"track_recording_toast_nothing_to_save" = "Η διαδρομή είναι άδεια - δεν υπάρχει τίποτα να αποθηκεύσετε";
+"edit_track" = "Επεξεργασία διαδρομής";
 "osm_profile_view_notes" = "Προβολή σημειώσεων";
 "osm_profile_view_edit_history" = "Προβολή ιστορικού επεξεργασιών";
-"about_proposition_3" = "Διαφανές και μη κερδοσκοπικό";
-"about_headline" = "Ανοιχτό έργο με την υποστήριξη της κοινότητας";
+"about_proposition_3" = "Transparent and not for profit";
+"about_headline" = "Open project powered by the community";
 "pref_mapappearance_title" = "Εμφάνιση χάρτη";
 "pref_maplanguage_title" = "Γλώσσα χάρτη";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Τοπική γλώσσα";
-"existence_confirmed_time_ago" = "Ύπαρξη επιβεβαιώθηκε %@";
-"hours_confirmed_time_ago" = "Επιβεβαιώθηκε %@";
-"offline_explanation_text" = "Χρειάζεται να ληφθεί ένας χάρτης για να δείτε και να πλοηγηθείτε την περιοχή.\nΚατεβάστε χάρτες για τις περιοχές που θέλετε να ταξιδέψετε.";
-"avoid_steps" = "Αποφυγή σκαλοπατιών";
-"avoid_paved" = "Αποφυγή στρωμένων δρόμων";
-"unknown" = "Άγνωστο";
-"voice" = "Φωνή";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
--- a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
@@ -10,14 +10,14 @@
 "type.aerialway.station" = "Σταθμός τελεφερίκ";
 "type.aeroway" = "Υποδομή εναέριου χώρου";
 "type.aeroway.aerodrome" = "Αεροδρόμιο";
-"type.aeroway.aerodrome.international" = "Διεθνές αεροδρόμιο";
-"type.aeroway.apron" = "Χώρος στάθμευσης αεροσκαφών";
+"type.aeroway.aerodrome.international" = "Αεροδρόμιο";
+"type.aeroway.apron" = "Ποδιά";
 "type.aeroway.gate" = "Πύλη";
 "type.aeroway.helipad" = "Ελικοδρόμιο";
 "type.aeroway.runway" = "Αεροδιάδρομος";
 "type.aeroway.taxiway" = "Τροχόδρομος";
 "type.aeroway.terminal" = "Τερματικός σταθμός";
-"type.amenity" = "Υποδομές";
+"type.amenity" = "Εγκαταστάσεις υποδομής";
 "type.amenity.arts_centre" = "Κέντρο καλών τεχνών";
 "type.amenity.atm" = "ATM";
 "type.amenity.bank" = "Τράπεζα";
@@ -25,7 +25,7 @@
 "type.amenity.bbq" = "Ψησταριά μπάρμπεκιου";
 "type.amenity.bench" = "Παγκάκι";
 "type.amenity.bicycle_parking" = "Χώρος στάθμευσης ποδηλάτων";
-"type.amenity.bicycle_rental" = "Ενοικίαση ποδηλάτων";
+"type.amenity.bicycle_rental" = "Ενοικιάσεις ποδηλάτων";
 "type.amenity.bicycle_repair_station" = "Σταθμός επισκευής ποδηλάτων";
 "type.amenity.biergarten" = "Μπυραρία";
 "type.amenity.brothel" = "Πορνείο";
@@ -35,11 +35,11 @@
 "type.amenity.car_rental" = "Ενοικίαση αυτοκινήτου";
 "type.amenity.motorcycle_rental" = "Ενοικίαση μοτοσικλέτας";
 "type.amenity.car_sharing" = "Παραχώρηση αυτοκινήτου";
-"type.amenity.car_wash" = "Πλύσιμο αυτοκινήτου";
+"type.amenity.car_wash" = "Καθαρισμός αυτοκινήτων";
 "type.amenity.casino" = "Καζίνο";
-"type.amenity.gambling" = "Τυχερά παιχνίδια";
+"type.amenity.gambling" = "ΤΥΧΕΡΑ ΠΑΙΧΝΙΔΙΑ";
 "type.leisure.adult_gaming_centre" = "Κέντρο παιχνιδιών ενηλίκων";
-"type.leisure.amusement_arcade" = "Ηλεκτρονικά παιχνίδια";
+"type.leisure.amusement_arcade" = "Στοά";
 "type.amenity.charging_station" = "Σταθμός φόρτισης";
 "type.amenity.charging_station.bicycle" = "Σταθμός φόρτισης ποδηλάτων";
 "type.amenity.charging_station.motorcar" = "Σταθμός φόρτισης αυτοκινήτων";
@@ -73,11 +73,11 @@
 "type.amenity.grave_yard" = "Νεκροταφείο";

 /* 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.amenity.grave_yard.christian" = "Χριστιανικό νεκροταφείο";
+"type.amenity.grave_yard.christian" = "Νεκροταφείο";
 "type.amenity.hospital" = "Νοσοκομείο";
 "type.amenity.hunting_stand" = "Βάση σκόπευσης";
 "type.amenity.ice_cream" = "Παγωτατζίδικο";
-"type.amenity.internet_cafe" = "Ίντερνετ καφέ";
+"type.amenity.internet_cafe" = "Καφετέρια με Ίντερνετ";
 "type.amenity.kindergarten" = "Νηπιαγωγείο";
 "type.amenity.library" = "Βιβλιοθήκη";
 "type.amenity.loading_dock" = "Αποβάθρα φόρτωσης";
@@ -125,17 +125,17 @@
 "type.amenity.police" = "Αστυνομία";
 "type.amenity.post_box" = "Ταχυδρομική θυρίδα";
 "type.amenity.post_office" = "Ταχυδρομείο";
-"type.amenity.prison" = "Φυλακή";
+"type.amenity.prison" = "φυλακή";
 "type.amenity.pub" = "Παμπ";
 "type.amenity.public_bookcase" = "Ανταλλαγή βιβλίων";
 "type.amenity.recycling.centre" = "Κέντρο ανακύκλωσης";
 "type.amenity.recycling" = "Κάδος ανακύκλωσης";
 "type.amenity.recycling.container" = "Κάδος ανακύκλωσης";
 "type.recycling.batteries" = "Μπαταρίες";
-"type.recycling.clothes" = "Ρούχα";
+"type.recycling.clothes" = "Παλιά ρούχα";
 "type.recycling.glass_bottles" = "Γυάλινα μπουκάλια";
-"type.recycling.paper" = "Χαρτί";
-"type.recycling.plastic" = "Πλαστικό";
+"type.recycling.paper" = "Απορρίμματα χαρτιού";
+"type.recycling.plastic" = "Πλαστικά απορρίμματα";
 "type.recycling.plastic_bottles" = "Πλαστικά μπουκάλια";
 "type.recycling.scrap_metal" = "Παλιοσίδερα";
 "type.recycling.small_appliances" = "Ηλεκτρονικά απορρίμματα";
@@ -371,8 +371,8 @@

 /* This is for main/primary entrances, for secondary entrances see type.entrance */
 "type.entrance.main" = "Κύρια είσοδος";
-"type.entrance.exit" = "Έξοδος (μόνο)";
-"type.fee.yes" = "€";
+"type.entrance.exit" = "Έξοδος";
+"type.fee.yes" = "$";
 "type.fee.no" = "Δωρεάν";
 "type.healthcare.laboratory" = "Ιατρικό Εργαστήριο";
 "type.healthcare.physiotherapist" = "Φυσικοθεραπευτής";
@@ -444,7 +444,7 @@

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.motorway_link.tunnel" = "Σήραγγα";
-"type.highway.path" = "Μονοπάτι";
+"type.highway.path" = "Διαδρομή";

 /* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
 "type.highway.path.difficult" = "Δύσκολη ή ελάχιστα ορατή διαδρομή";
@@ -460,7 +460,7 @@

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Σήραγγα";
-"type.highway.pedestrian" = "Πεζόδρομος";
+"type.highway.pedestrian" = "Οδός";
 "type.highway.pedestrian.area" = "Οδός";

 /* These translations are used for all type.highway.*.bridge. */
@@ -469,14 +469,14 @@

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.pedestrian.tunnel" = "Σήραγγα";
-"type.highway.primary" = "Πρωτεύων δρόμος";
+"type.highway.primary" = "Οδός";

 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.primary.bridge" = "Γέφυρα";

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.primary.tunnel" = "Σήραγγα";
-"type.highway.primary_link" = "Ράμπα πρωτεύοντος δρόμου";
+"type.highway.primary_link" = "Οδός";

 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.primary_link.bridge" = "Γέφυρα";
@@ -503,47 +503,47 @@

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.road.tunnel" = "Σήραγγα";
-"type.highway.secondary" = "Δευτερεύων δρόμος";
+"type.highway.secondary" = "Οδός";

 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary.bridge" = "Γέφυρα";

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary.tunnel" = "Σήραγγα";
-"type.highway.secondary_link" = "Ράμπα δευτερεύοντος δρόμου";
+"type.highway.secondary_link" = "Οδός";

 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.secondary_link.bridge" = "Γέφυρα";

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.secondary_link.tunnel" = "Σήραγγα";
-"type.highway.service" = "Δρόμος υπηρεσίας";
-"type.highway.service.area" = "Δρόμος υπηρεσίας";
+"type.highway.service" = "Οδός";
+"type.highway.service.area" = "Οδός";

 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.service.bridge" = "Γέφυρα";
 "type.highway.service.driveway" = "Οδός";
-"type.highway.service.parking_aisle" = "Διάδρομος πάρκινγκ";
+"type.highway.service.parking_aisle" = "Οδός";

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.service.tunnel" = "Σήραγγα";
 "type.highway.services" = "Περιοχή εξυπηρέτησης";
 "type.highway.speed_camera" = "Κάμερα ταχύτητας";
-"type.highway.steps" = "Σκαλοπάτια";
+"type.highway.steps" = "Διαδρομή";

 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.steps.bridge" = "Γέφυρα";

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.steps.tunnel" = "Σήραγγα";
-"type.highway.tertiary" = "Τριτεύων δρόμος";
+"type.highway.tertiary" = "Οδός";

 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.tertiary.bridge" = "Γέφυρα";

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary.tunnel" = "Σήραγγα";
-"type.highway.tertiary_link" = "Ράμπα τριτεύοντος δρόμου";
+"type.highway.tertiary_link" = "Οδός";

 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.tertiary_link.bridge" = "Γέφυρα";
@@ -583,26 +583,26 @@

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.unclassified.tunnel" = "Σήραγγα";
-"type.area_highway.cycleway" = "Μονοπάτι ποδηλάτων";
-"type.area_highway.footway" = "Μονοπάτι πεζών";
+"type.area_highway.cycleway" = "Ποδηλατόδρομος";
+"type.area_highway.footway" = "Διαδρομή";
 "type.area_highway.living_street" = "Οδός";
 "type.area_highway.motorway" = "Οδός";
-"type.area_highway.path" = "Μονοπάτι";
-"type.area_highway.pedestrian" = "Πεζόδρομος";
-"type.area_highway.primary" = "Πρωτεύων δρόμος";
+"type.area_highway.path" = "Διαδρομή";
+"type.area_highway.pedestrian" = "Οδός";
+"type.area_highway.primary" = "Οδός";
 "type.area_highway.residential" = "Οδός";
-"type.area_highway.secondary" = "Δευτερεύων δρόμος";
-"type.area_highway.service" = "Δρόμος υπηρεσίας";
-"type.area_highway.tertiary" = "Τριτεύων δρόμος";
-"type.area_highway.steps" = "Σκαλοπάτια";
+"type.area_highway.secondary" = "Οδός";
+"type.area_highway.service" = "Οδός";
+"type.area_highway.tertiary" = "Οδός";
+"type.area_highway.steps" = "Διαδρομή";
 "type.area_highway.track" = "Οδός";
 "type.area_highway.trunk" = "Οδός";
 "type.area_highway.unclassified" = "Οδός";
 "type.historic" = "Ιστορικό αντικείμενο";
 "type.historic.aircraft" = "Ιστορικό αεροσκάφος";
-"type.historic.anchor" = "Ιστορική άγκυρα";
+"type.historic.anchor" = "Ιστορική Άγκυρα";
 "type.historic.archaeological_site" = "Αρχαιολογικός χώρος";
-"type.historic.battlefield" = "Ιστορικό πεδίο μάχης";
+"type.historic.battlefield" = "Πεδίο μάχης";
 "type.historic.boundary_stone" = "Οριακή πέτρα";
 "type.historic.cannon" = "Κανόνι";
 "type.historic.castle" = "Κάστρο";
@@ -675,10 +675,10 @@
 "type.landuse.grass" = "Γκαζόν";
 "type.landuse.greenfield" = "Greenfield";
 "type.landuse.greenhouse_horticulture" = "Greenhouse";
-"type.landuse.industrial" = "Βιομηχανική περιοχή";
+"type.landuse.industrial" = "Industrial Area";
 "type.landuse.landfill" = "Σκουπιδότοπος";
 "type.landuse.meadow" = "Meadow";
-"type.landuse.military" = "Στρατιωτική περιοχή";
+"type.landuse.military" = "Military Area";
 "type.landuse.orchard" = "Orchard";
 "type.landuse.quarry" = "Quarry";
 "type.landuse.railway" = "Σιδηροδρομικές εγκαταστάσεις";
@@ -689,8 +689,8 @@
 "type.landuse.salt_pond" = "Salt Pond";
 "type.landuse.village_green" = "Land";
 "type.landuse.vineyard" = "Vineyard";
-"type.leisure" = "Αναψυχή";
-"type.leisure.common" = "Δημόσια γη";
+"type.leisure" = "Leisure";
+"type.leisure.common" = "Public Land";
 "type.leisure.dog_park" = "Περιοχή για βόλτα σκύλων";
 "type.leisure.fitness_centre" = "Κέντρο γυμναστικής";
 "type.leisure.fitness_station" = "Γυμναστήριο";
@@ -705,23 +705,23 @@
 "type.leisure.nature_reserve" = "Φυσικό απόθεμα";
 "type.leisure.outdoor_seating" = "Καθίσματα εξωτερικού χώρου";
 "type.leisure.park" = "Πάρκο";
-"type.leisure.park.no.access" = "Ιδιωτικό πάρκο";
+"type.leisure.park.no.access" = "Πάρκο";
 "type.leisure.park.permissive" = "Πάρκο";
-"type.leisure.park.private" = "Ιδιωτικό πάρκο";
+"type.leisure.park.private" = "Πάρκο";
 "type.leisure.picnic_table" = "Τραπέζι πικ-νικ";
-"type.leisure.pitch" = "Γήπεδο άθλησης";
+"type.leisure.pitch" = "Γήπεδο αθλοπαιδιών";
 "type.leisure.playground" = "Παιδική χαρά";
 "type.leisure.recreation_ground" = "Recreation Ground";
 "type.leisure.sauna" = "Σάουνα";
 "type.leisure.slipway" = "Slipway";
 "type.leisure.sports_centre" = "Αθλητικό κέντρο";
-"type.sport.climbing" = "Αναρρίχηση";
-"type.sport.yoga" = "Γιόγκα";
-"type.leisure.stadium" = "Στάδιο";
+"type.sport.climbing" = "Κέντρο αναρρίχησης";
+"type.sport.yoga" = "Στούντιο γιόγκα";
+"type.leisure.stadium" = "Γήπεδο";
 "type.leisure.swimming_pool" = "Πισίνα";
 "type.leisure.swimming_pool.private" = "Πισίνα";
-"type.leisure.track" = "Πίστα";
-"type.leisure.track.area" = "Πίστα";
+"type.leisure.track" = "Track";
+"type.leisure.track.area" = "Track";
 "type.leisure.water_park" = "Υδάτινο πάρκο";
 "type.leisure.beach_resort" = "Beach Resort";
 "type.man_made" = "Man Made";
@@ -1330,11 +1330,11 @@
 "type.sport.soccer" = "Ποδόσφαιρο";
 "type.sport.swimming" = "Κολύμβηση";
 "type.sport.table_tennis" = "Επιτραπέζια αντισφαίριση";
-"type.sport.tennis" = "Τένις";
+"type.sport.tennis" = "Γήπεδο τένις";
 "type.sport.volleyball" = "Πετοσφαίριση";
 "type.sport.10pin" = "Μπόουλινγκ";
 "type.sport.9pin" = "Μπόουλινγκ";
-"type.sport.padel" = "Πάντελ";
+"type.sport.padel" = "Padel";
 "type.sport.futsal" = "Futsal";
 "type.sport.ice_hockey" = "Χόκεϊ στον παγο";
 "type.sport.field_hockey" = "Χόκεϊ επί χόρτου";
@@ -1450,7 +1450,7 @@
 "type.self_service.no" = "Δεν υπάρχει αυτοεξυπηρέτηση";

 /* https://wiki.openstreetmap.org/wiki/Key:social_facility */
-"type.amenity.social_facility" = "Κοινωνική δομή";
+"type.amenity.social_facility" = "Κοινωνική διευκόλυνση";

 /* https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance */
 "type.emergency.emergency_ward_entrance" = "Είσοδος θαλάμου έκτακτης ανάγκης";
@@ -1482,55 +1482,7 @@
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
 "type.barrier.wicket_gate" = "Wicket gate";
-"type.amenity.animal_shelter" = "Καταφύγιο ζώων";
+"type.amenity.animal_shelter" = "Animal Shelter";
 "type.office.security" = "Security Guards Office";
 "type.power.portal" = "Power Portal";
 "type.building.guardhouse" = "Security Booth";
-"type.cardinal.east" = "Ανατολή";
-"type.cardinal.north" = "Βορράς";
-"type.cardinal.south" = "Νότος";
-"type.cardinal.west" = "Δύση";
-"type.entrance.entry" = "Είσοδος (μόνο)";
-"type.entrance.emergency" = "Έξοδος κινδύνου";
-"type.entrance.house" = "Είσοδος σπιτιού";
-"type.entrance.garage" = "Είσοδος γκαράζ";
-"type.entrance.service" = "Είσοδος υπηρεσίας";
-"type.disusedbusiness" = "Κενή επιχείρηση";
-"type.shop.lighting" = "Κατάστημα φωτιστικών";
-"type.xmas.tree" = "Χριστουγεννιάτικο δέντρο";
-"type.leisure.sports_centre.sport.multi" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.american_football" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.archery" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.athletics" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.australian_football" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.badminton" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.baseball" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.basketball" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.beachvolleyball" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.bowls" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.climbing" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.cricket" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.curling" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.equestrian" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.field_hockey" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.futsal" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.golf" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.gymnastics" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.handball" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.ice_hockey" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.padel" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.pelota" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.scuba_diving" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.shooting" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.skateboard" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.skiing" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.soccer" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.swimming" = "Κέντρο κολύμβησης";
-"type.leisure.sports_centre.sport.table_tennis" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.tennis" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.volleyball" = "Αθλητικό κέντρο";
-"type.leisure.sports_centre.sport.yoga" = "Αθλητικό κέντρο";
-"type.leisure.fitness_centre.sport.yoga" = "Στούντιο γιόγκα";
-"type.amenity.bench.backless" = "Παγκάκι χωρίς πλάτη";
-"type.amenity.boat_rental" = "Ενοικίαση σκαφών";
-"type.amenity.flight_school" = "Σχολή πιλότων";
--- a/iphone/Maps/LocalizedStrings/en-CA.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/en-CA.lproj/InfoPlist.strings
@@ -1,2 +1 @@
-"search" = "Search";
-"bookmarks_and_tracks" = "Favourites";
+
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -24,7 +24,7 @@
 "type.amenity.bar" = "Bar";
 "type.amenity.bbq" = "Barbecue Grill";
 "type.amenity.bench" = "Bench";
-"type.amenity.bench.backless" = "Without Backrest";
+"type.amenity.bench.backless" = "Backless Bench";
 "type.amenity.bicycle_parking" = "Bicycle Parking";
 "type.amenity.boat_rental" = "Boat Rental";
 "type.amenity.bicycle_rental" = "Bicycle Rental";
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -28,7 +28,7 @@
 "type.amenity.bar" = "Bar";
 "type.amenity.bbq" = "Barbecue Grill";
 "type.amenity.bench" = "Bench";
-"type.amenity.bench.backless" = "Without Backrest";
+"type.amenity.bench.backless" = "Backless Bench";
 "type.amenity.bicycle_parking" = "Bicycle Parking";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.amenity.boat_rental" = "Boat Rental";
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -90,7 +90,7 @@
 "category_eat" = "Dónde comer";

 /* Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! */
-"category_food" = "Provisiones";
+"category_food" = "Tienda de comestibles";

 /* Search category for public transport; any changes should be duplicated in categories.txt @category_transport! */
 "category_transport" = "Transporte";
@@ -869,7 +869,7 @@
 "not_all_shown_bookmarks_carplay" = "No se muestran todos los marcadores";
 "switch_to_phone_bookmarks_carplay" = "Cambie al teléfono para ver todos los marcadores";
 "ok" = "Aceptar";
-"speedcams_alert_title_carplay_1" = "Radares de velocidad";
+"speedcams_alert_title_carplay_1" = "Cám.velocidad";
 "speedcams_alert_title_carplay_2" = "Alertas de velocidad";
 "download_map_carplay" = "Descargue los mapas en la aplicación del dispositivo";
 "carplay_roundabout_exit" = "%@ salida";
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -65,9 +65,9 @@
 "type.amenity.fast_food" = "Comida rápida";
 "type.amenity.ferry_terminal" = "Transbordador de ferry";
 "type.amenity.fire_station" = "Estación de bomberos";
-"type.amenity.food_court" = "Plaza de comidas";
+"type.amenity.food_court" = "Zona de comidas";
 "type.amenity.fountain" = "Fuente";
-"type.amenity.fuel" = "Estación de servicio";
+"type.amenity.fuel" = "Gasolinera";

 /* 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.amenity.grave_yard" = "Cementerio";
@@ -78,7 +78,7 @@
 "type.amenity.hunting_stand" = "Puesto de caza";
 "type.amenity.ice_cream" = "Heladería";
 "type.amenity.internet_cafe" = "Cibercafé";
-"type.amenity.kindergarten" = "Jardín de infantes";
+"type.amenity.kindergarten" = "Guardería";
 "type.amenity.library" = "Biblioteca";
 "type.amenity.loading_dock" = "Muelle de carga";
 "type.amenity.marketplace" = "Mercado";
@@ -87,7 +87,7 @@
 "type.amenity.nursing_home" = "Residencia de ancianos";
 "type.amenity.parking" = "Aparcamiento";
 "type.amenity.parking.fee" = "Aparcamiento";
-"type.amenity.parking.multi.storey" = "Aparcamiento multinivel";
+"type.amenity.parking.multi.storey" = "Edificio de aparcamiento";
 "type.amenity.parking.multi.storey.fee" = "Edificio de aparcamiento";
 "type.amenity.parking.no.access" = "Aparcamiento privado";
 "type.amenity.parking.permissive" = "Aparcamiento privado";
@@ -170,16 +170,16 @@
 "type.amenity.townhall" = "Ayuntamiento";
 "type.amenity.university" = "Universidad";
 "type.amenity.vending_machine" = "Máquina expendedora";
-"type.amenity.vending_machine.cigarettes" = "Expendedora de tabaco";
-"type.amenity.vending_machine.coffee" = "Expendedora de café";
-"type.amenity.vending_machine.condoms" = "Expendedora de condones";
-"type.amenity.vending_machine.drinks" = "Expendedora de bebidas";
-"type.amenity.vending_machine.food" = "Expendedora de comida";
-"type.amenity.vending_machine.newspapers" = "Expendedora de periódicos";
+"type.amenity.vending_machine.cigarettes" = "Máquina expendedora de tabaco";
+"type.amenity.vending_machine.coffee" = "Máquina expendedora de café";
+"type.amenity.vending_machine.condoms" = "Máquina expendedora de condones";
+"type.amenity.vending_machine.drinks" = "Máquina expendedora de bebidas";
+"type.amenity.vending_machine.food" = "Máquina expendedora de comida";
+"type.amenity.vending_machine.newspapers" = "Máquina expendedora de periódicos";
 "type.amenity.vending_machine.parking_tickets" = "Parquímetro";
 "type.amenity.vending_machine.public_transport_tickets" = "Máquina expendedora de billetes de transporte público";
-"type.amenity.vending_machine.sweets" = "Expendedora de dulces";
-"type.amenity.vending_machine.excrement_bags" = "Dispensador de bolsas para excrementos";
+"type.amenity.vending_machine.sweets" = "Máquina expendedora de dulces";
+"type.amenity.vending_machine.excrement_bags" = "Maquina expendedora de bolsas para excrementos";
 "type.amenity.parcel_locker" = "Taquilla de paquetes";
 "type.amenity.vehicle_inspection" = "Inspección de vehículos";
 "type.amenity.vending_machine.fuel" = "Surtidor de combustible";
@@ -264,7 +264,7 @@
 "type.craft.photographer" = "Fotógrafo";
 "type.shop.camera" = "Tienda de fotografía";
 "type.craft.plumber" = "Fontanero";
-"type.craft.sawmill" = "Aserradero";
+"type.craft.sawmill" = "Serrería";
 "type.craft.shoemaker" = "Zapatero";
 "type.craft.winery" = "Bodega vinícola";
 "type.craft.tailor" = "Sastre";
@@ -342,7 +342,7 @@
 "type.cuisine.sandwich" = "Sándwiches";
 "type.cuisine.sausage" = "Salchichas";
 "type.cuisine.savory_pancakes" = "Tortitas saladas";
-"type.cuisine.seafood" = "Marina";
+"type.cuisine.seafood" = "del mar";
 "type.cuisine.soba" = "Soba";
 "type.cuisine.spanish" = "Española";
 "type.cuisine.steak_house" = "Asador";
@@ -357,7 +357,7 @@
 "type.emergency" = "Emergencia";
 "type.emergency.assembly_point" = "Punto de reunión de emergencia";
 "type.emergency.defibrillator" = "Desfibrilador";
-"type.emergency.fire_hydrant" = "Hidrante de incendio";
+"type.emergency.fire_hydrant" = "Boca de incendio";
 "type.amenity.hydrant" = "Boca de riego";
 "type.emergency.phone" = "Teléfono de emergencias";

@@ -551,13 +551,13 @@

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary_link.tunnel" = "Túnel";
-"type.highway.track" = "Camino";
-"type.highway.track.area" = "Camino";
+"type.highway.track" = "Pista";
+"type.highway.track.area" = "Pista";

 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.track.bridge" = "Puente";
-"type.highway.track.grade1" = "Camino";
-"type.highway.track.no.access" = "Camino";
+"type.highway.track.grade1" = "Pista";
+"type.highway.track.no.access" = "Pista";

 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Túnel";
@@ -596,7 +596,7 @@
 "type.area_highway.service" = "Vía de servicio";
 "type.area_highway.tertiary" = "Carretera terciaria";
 "type.area_highway.steps" = "Escaleras";
-"type.area_highway.track" = "Camino";
+"type.area_highway.track" = "Pista";
 "type.area_highway.trunk" = "Vía troncal";
 "type.area_highway.unclassified" = "Carretera menor";
 "type.historic" = "Objeto histórico";
@@ -715,7 +715,7 @@
 "type.leisure.recreation_ground" = "Zona recreativa";
 "type.leisure.sauna" = "Sauna";
 "type.leisure.slipway" = "Rampa de barcos";
-"type.leisure.sports_centre" = "Centro deportivo";
+"type.leisure.sports_centre" = "Complejo deportivo";
 "type.sport.climbing" = "Escalada";
 "type.sport.yoga" = "Yoga";
 "type.leisure.stadium" = "Estadio";
@@ -809,7 +809,7 @@
 "type.natural.tree_row" = "Fila de árboles";
 "type.natural.vineyard" = "Viña";
 "type.natural.volcano" = "Volcán";
-"type.natural.water" = "Agua";
+"type.natural.water" = "Cuerpo de agua";
 "type.natural.wetland" = "Terreno pantanoso";
 "type.natural.wetland.bog" = "Turbera";
 "type.natural.wetland.marsh" = "Ciénaga";
@@ -1203,7 +1203,7 @@
 "type.shop.car_repair.tyres" = "Reparación de neumáticos";
 "type.shop.caravan" = "Concesionario de caravanas";
 "type.shop.carpet" = "Tienda de alfombras";
-"type.shop.chemist" = "Parafarmacia";
+"type.shop.chemist" = "Droguería";
 "type.shop.chocolate" = "Chocolatería";
 "type.shop.clothes" = "Tienda de ropa";
 "type.shop.coffee" = "Tienda de café";
@@ -1465,7 +1465,7 @@
 "type.leisure.firepit" = "Fogón";
 "type.amenity.love_hotel" = "Hotel del amor";
 "type.barrier.guard_rail" = "Guardarraíl";
-"type.highway.ladder" = "Escalerilla";
+"type.highway.ladder" = "Escalera";
 "type.landuse.plant_nursery" = "Vivero de plantas";
 "type.sport.diving" = "Salto de trampolín";
 "type.man_made.crane" = "Grúa";
@@ -1479,7 +1479,7 @@
 "type.railway.station.subway.qingdao" = "Estación de Metro";
 "type.leisure.escape_game" = "Sala de Escape";
 "type.post_office.post_partner" = "Asociado de Correo";
-"type.amenity.luggage_locker" = "Consigna de equipaje";
+"type.amenity.luggage_locker" = "Casillero de maletas";
 "type.amenity.ranger_station" = "Estación de guardabosques";
 "type.amenity.bicycle_parking.covered" = "Parking de bici cubierto";
 "type.amenity.animal_shelter" = "Refugio de animales";
@@ -1517,7 +1517,7 @@
 "type.leisure.sports_centre.sport.tennis" = "Centro deportivo";
 "type.leisure.sports_centre.sport.beachvolleyball" = "Centro deportivo";
 "type.leisure.sports_centre.sport.skateboard" = "Centro deportivo";
-"type.leisure.sports_centre.sport.climbing" = "Rocódromo";
+"type.leisure.sports_centre.sport.climbing" = "Centro deportivo";
 "type.leisure.sports_centre.sport.scuba_diving" = "Centro deportivo";
 "type.leisure.sports_centre.sport.field_hockey" = "Centro deportivo";
 "type.leisure.sports_centre.sport.bowls" = "Centro deportivo";
--- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
@@ -1324,7 +1324,7 @@
 "type.sport.multi" = "Sports multiples";

 /* Used to tag a scuba diving site. */
-"type.sport.scuba_diving" = "Plongée sous-marine";
+"type.sport.scuba_diving" = "Site de plongée sous-marine";
 "type.sport.shooting" = "Tir sportif";
 "type.sport.skateboard" = "Skateboard";
 "type.sport.skiing" = "Ski";
@@ -1575,8 +1575,8 @@
 "type.spherical_buoy.special_purpose" = "Bouée sphérique, marque spéciale";
 "type.lateral.port" = "Bâbord";
 "type.lateral.starboard" = "Tribord";
-"type.cardinal.east" = "Est :";
-"type.cardinal.north" = "Nord :";
+"type.cardinal.east" = "Est";
+"type.cardinal.north" = "Nord";
 "type.cardinal.south" = "Sud";
 "type.cardinal.west" = "Ouest";
 "type.entrance.house" = "Entrée de la maison";
--- a/iphone/Maps/LocalizedStrings/ga.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/ga.lproj/InfoPlist.strings
@@ -1 +0,0 @@
-
--- a/iphone/Maps/LocalizedStrings/ga.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ga.lproj/Localizable.strings
@@ -1 +0,0 @@
-
--- a/Show More
+++ b/Show More