[android] Update colors used in the editor

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

.forgejo/workflows/android-check.yaml

@@ -34,19 +34,63 @@ on:
       - track_generator/**
       - xcode/**
 
+env:
+  SUBMODULE_CACHE_PATHS: |
+    .git/modules
+    3party/CMake-MetalShaderSupport
+    3party/Vulkan-Headers
+    3party/boost
+    3party/expat
+    3party/fast_double_parser
+    3party/fast_obj
+    3party/freetype/freetype
+    3party/gflags
+    3party/glaze
+    3party/glfw
+    3party/glm
+    3party/googletest
+    3party/harfbuzz/harfbuzz
+    3party/icu/icu
+    3party/imgui/imgui
+    3party/jansson/jansson
+    3party/just_gtfs
+    3party/protobuf/protobuf
+    3party/pugixml/pugixml
+    3party/utfcpp
+    tools/kothic
+    tools/osmctools
+
 jobs:
   lint:
     name: Android Lint
     runs-on: ubuntu-latest
+    container:
+      image: codeberg.org/comaps/docker-android-sdk:ubuntu-standalone-zy-docker
+      options: --user root
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
-      - name: Parallel submodules checkout
+      - name: Cache world map
+        uses: actions/cache@v4
+        with:
+          path: data/world_mwm
+          key: world-mwm
+
+      - uses: actions/cache@v4
+        with:
+          path: ${{ env.SUBMODULE_CACHE_PATHS }}
+          key: submodules-${{ hashFiles('.gitmodules') }}
+          restore-keys: |
+            submodules-
+
+      - name: Sync and update submodules
         shell: bash
-        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
+        run: |
+          git submodule sync --recursive
+          git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
       - name: Lint
         shell: bash
@@ -56,6 +100,9 @@ jobs:
   android-check:
     name: Build Android Debug
     runs-on: ubuntu-latest
+    container:
+      image: codeberg.org/comaps/docker-android-sdk:ubuntu-standalone-zy-docker
+      options: --user root
     strategy:
       fail-fast: false
       matrix:
@@ -71,23 +118,32 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - name: Install build tools and dependencies
-        shell: bash
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y ninja-build
-
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
           fetch-depth: 200 # enough to get all commits for the current day
 
-      - name: Parallel submodules checkout
+      - name: Cache world map
+        uses: actions/cache@v4
+        with:
+          path: data/world_mwm
+          key: world-mwm
+
+      - uses: actions/cache@v4
+        with:
+          path: ${{ env.SUBMODULE_CACHE_PATHS }}
+          key: submodules-${{ hashFiles('.gitmodules') }}
+          restore-keys: |
+            submodules-
+
+      - name: Sync and update submodules
         shell: bash
-        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
+        run: |
+          git submodule sync --recursive
+          git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
       - name: Configure ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: https://github.com/hendrikmuhs/ccache-action@v1.2
         with:
           key: ${{ github.workflow }}-${{ matrix.flavor }}
 
@@ -97,14 +153,11 @@ jobs:
         env:
           CMAKE_C_COMPILER_LAUNCHER: ccache
           CMAKE_CXX_COMPILER_LAUNCHER: ccache
-        run: |
+        run: ./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}
-          cmake --version
-          ninja --version
-          ./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}
 
       - name: Upload ${{ matrix.flavor }} apk
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: android-${{ matrix.flavor }}
-          path: android/app/build/outputs/apk/**/OrganicMaps-*.apk
+          path: android/app/build/outputs/apk/**/*.apk
           if-no-files-found: error

.github/workflows/android-check.yaml

@@ -1,9 +1,6 @@
 name: Android Check
 on:
   workflow_dispatch: # Manual trigger
-  push:
-    branches:
-      - main
 
 env:
   JAVA_HOME: /usr/lib/jvm/temurin-21-jdk-amd64  # Java 21 is required for Android Gradle 8 plugin

README.md

@@ -22,8 +22,8 @@
     <a href="https://codeberg.org/comaps/comaps/src/branch/main/LICENSE">
       <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
     </a>
-    <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
+    <a href="https://codeberg.org/comaps/comaps/actions?workflow=android-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge" alt="Android Build Status"/>
+      <img src="https://codeberg.org/comaps/comaps/badges/workflows/android-check.yaml/badge.svg?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge" alt="Android Build Status"/>
     </a>
     <a href="https://github.com/comaps/comaps/actions/workflows/ios-check.yaml">
       <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge" alt="iOS Build Status"/>

android/app/src/main/AndroidManifest.xml

@@ -400,8 +400,14 @@
         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" />
+        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>
 
     <activity
         android:name="app.organicmaps.help.HelpActivity"

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(getApplicationContext(), Framework.nativeGetRouteFollowingInfo());
+    mNavigationController.refresh();
     refreshLightStatusBar();
 
     MwmApplication.from(this).getSensorHelper().addListener(this);

android/app/src/main/java/app/organicmaps/routing/NavigationController.java

@@ -1,10 +1,7 @@
 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;
@@ -16,7 +13,6 @@ 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;
@@ -62,8 +58,6 @@ 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)
   {
@@ -78,8 +72,6 @@ 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);
@@ -105,16 +97,6 @@ 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) -> {
@@ -154,8 +136,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
 
     mLanesView.setLanes(info.lanes);
 
-    if (speedLimitEnabled)
+    updateSpeedWidgets(info);
-        updateSpeedWidgets(info);
   }
 
   private void updatePedestrian(@NonNull RoutingInfo info)
@@ -163,8 +144,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mNextTurnDistance.setText(Utils.formatDistance(mFrame.getContext(), info.distToTurn));
 
     info.pedestrianTurnDirection.setTurnDrawable(mNextTurnImage);
-    if (speedLimitEnabled)
+    updateSpeedWidgets(info);
-        updateSpeedWidgets(info);
   }
 
   public void updateNorth()
@@ -225,22 +205,9 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mNavMenu.collapseNavBottomSheet();
   }
 
-  public void refresh(Context context, RoutingInfo info)
+  public void refresh()
   {
-      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

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

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

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

@@ -5,45 +5,6 @@
   android:viewportWidth="74"
   android:viewportHeight="57">
   <path
-    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" />
+    android:pathData="m26.278,8.137c3.695,-3.729 9.719,-3.761 13.453,-0.073 3.736,3.687 3.769,9.699 0.074,13.425l-14.597,14.726c-2.353,2.373 -2.331,6.197 0.046,8.544 2.379,2.345 6.209,2.326 8.562,-0.048l14.303,-14.428c-0.155,-0.32 -0.286,-0.647 -0.394,-0.978l-4.006,0.001c-2.787,0 -3.659,-3.825 -1.045,-5.042l7.813,-3.604c0.879,-0.652 1.87,-1.098 2.9,-1.333l11.936,-5.495c2.091,-0.869 4.357,1.392 3.486,3.478l-10.454,22.603c-1.219,2.607 -5.053,1.736 -5.053,-1.044v-4.418c-0.506,-0.122 -1.006,-0.296 -1.494,-0.525l-14.303,14.428c-4.368,4.406 -11.485,4.444 -15.901,0.086 -4.413,-4.358 -4.452,-11.461 -0.084,-15.867l14.597,-14.726c1.68,-1.693 1.665,-4.426 -0.033,-6.102 -1.7,-1.677 -4.437,-1.662 -6.117,0.033l-9.43,9.516c0.436,0.994 0.679,2.091 0.679,3.244 0,4.464 -3.634,8.091 -8.108,8.091 -4.475,0 -8.108,-3.627 -8.108,-8.091 0,-4.466 3.633,-8.091 8.108,-8.091 1.424,0 2.764,0.367 3.928,1.012z" />
-  <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>

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

@@ -9,45 +9,6 @@
       android:fillColor="@color/active_track_recording"
       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: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:strokeLineJoin="round"
+      android:fillColor="#ffffff"/>
-      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>

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

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:background="@color/bg_editor"
+    android:background="?colorSurfaceContainerLow"
     tools:context=".editor.EditorActivity">
   <LinearLayout
       android:layout_width="match_parent"

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

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/frameLayout"
-        android:background="@color/bg_editor"
+        android:background="?colorSurfaceContainerLow"
         android:layout_marginBottom="@dimen/margin_quarter">
 
         <androidx.recyclerview.widget.RecyclerView

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

@@ -9,7 +9,7 @@
     style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_editor"
+    android:background="?colorSurfaceContainerLow"
     android:layout_above="@+id/tv__mode_switch"
     android:layout_below="@id/toolbar"/>
 
@@ -19,7 +19,7 @@
     android:layout_height="wrap_content"
     android:layout_alignTop="@+id/tv__mode_switch"
     android:layout_alignParentBottom="true"
-    android:background="@color/bg_editor"/>
+    android:background="?colorSurfaceContainerLow"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__mode_switch"

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

@@ -5,7 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/bg_editor">
+  android:background="?colorSurfaceContainerLow">
 
   <LinearLayout
     android:layout_width="match_parent"

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

@@ -4,7 +4,7 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/bg_editor"
+  android:background="?colorSurfaceContainerLow"
   android:paddingStart="@dimen/margin_half"
   android:paddingEnd="@dimen/margin_half"
   android:scrollbars="vertical"/>

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

@@ -7,7 +7,6 @@
   android:orientation="vertical"
   android:paddingEnd="@dimen/margin_base"
   android:paddingStart="@dimen/margin_base"
-  android:background="@color/fg_editor"
   android:animateLayoutChanges="true">
 
   <com.google.android.material.textview.MaterialTextView
@@ -25,7 +24,6 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/fg_editor"
     android:scrollbars="vertical"/>
 
   <com.google.android.material.button.MaterialButton

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">Indstil navn for bogmærkeliste</string>
+    <string name="bookmark_set_name">Listenavn</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Bogmærker</string>
+    <string name="bookmarks">Steder</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bogmærker og spor</string>
+    <string name="bookmarks_and_tracks">Favoritter</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">CoMaps bogmærker er blevet delt med dig</string>
+    <string name="share_bookmarks_email_subject">Mine CoMaps-favoritter</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Indlæser bogmærker</string>
+    <string name="load_kmz_title">Indlæser favoritter</string>
     <!-- Kmz file successful loading -->
-    <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>
+    <string name="load_kmz_successful">Favoritter er indlæst! Du kan finde dem på kortet eller på skærmen for favorithåndtering.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Bogmærkerne kunne ikke indlæses. Filen kan være skadet eller defekt.</string>
+    <string name="load_kmz_failed">Favoritter 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 bogmærke</string>
+    <string name="placepage_edit_bookmark_button">Rediger gemt sted</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">Lister</string>
+    <string name="bookmark_lists">Favoritlister</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 bogmærke</item>
+        <item quantity="one">%d gemt sted</item>
-        <item quantity="other">%d bogmærker</item>
+        <item quantity="other">%d gemte steder</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 bogmærker og spor</string>
+    <string name="bookmarks_import">Importer favoritter</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 tilføje et bogmærke, så tryk et sted på kort og så på stjerneikonet</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="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 bogmærker</string>
+    <string name="sort_bookmarks">Sorter favoritter</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 bogmærker og spor</string>
+    <string name="bookmarks_export">Eksporter alle steder 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 bogmærker og spor?</string>
+    <string name="track_recording_alert_title">Gem i favoritter?</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 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="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="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 bogmærker og spor at lave sikkerhedskopi af</string>
+    <string name="pref_backup_now_summary_empty_lists">Ingen steder 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 bogmærker og spor</string>
+    <string name="pref_backup_title">Sikkerhedskopi af favoritter</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">Bogmærkefarve</string>
+    <string name="bookmark_color">Favoritfarve</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,4 +907,5 @@
     <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>

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_subject">Τα Αγαπημένα μου στο CoMaps</string>
-    <string name="share_bookmarks_email_body">Γειa! \n \nΣου επισυνάπτω τα αγαπημένα μου. Παρακαλώ άνοιξέ τα με το CoMaps. Αν δεν το έχεις εγκαταστήσει, μπορείς να το κατεβάσεις από εδώ: https://www.comaps.app/download/ \n \nΚαλή διασκέδαση ταξιδεύοντας με το CoMaps!</string>
+    <string name="share_bookmarks_email_body">Γειά σου! \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_select_closer_end">Επιλέξτε ένα σημείο προορισμού πιο κοντά σε κάποιο δρόμο</string>
-    <string name="dialog_routing_change_intermediate">Δεν είναι δυνατός ο εντοπισμός ενδιάμεσου σημείου.</string>
+    <string name="dialog_routing_change_intermediate">Δεν είναι δυνατός ο εντοπισμός ενδιάμεσου σημείου</string>
-    <string name="dialog_routing_intermediate_not_determined">Ρυθμίστε το ενδιάμεσο σημείο.</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">Βεβαιωθείτε ότι η συσκευή σας είναι συνδεδεμένη στο Internet.</string>
+    <string name="common_check_internet_connection_dialog">Βεβαιωθείτε ότι η συσκευή σας είναι συνδεδεμένη στο Διαδίκτυο</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="one">%d αγαπημένο μέρος</item>
-        <item quantity="other">%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="one">%d ίχνος</item>
-        <item quantity="other">%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">mph</string>
+    <string name="miles_per_hour">μλ/ώ</string>
-    <string name="minute">λπτ</string>
+    <string name="minute">λεπ</string>
-    <string name="day">Μέρα</string>
+    <string name="day">μέρ</string>
-    <string name="hour">Ωρα</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,4 +836,38 @@
     <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>

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

@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="search">Search</string>
+    <string name="bookmarks_and_tracks">Favourites</string>
 </resources>

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">Tienda de comestibles</string>
+    <string name="category_food">Provisiones</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">Realizar copia de seguridad ahora</string>
+    <string name="pref_backup_now_title">Crear respaldo 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>

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 du groupe de signets</string>
+    <string name="bookmark_set_name">Nom de la liste</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">Signets et traces</string>
+    <string name="bookmarks_and_tracks">Favoris</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 le signet</string>
+    <string name="placepage_edit_bookmark_button">Modifier l\'emplacement enregistré</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 signet</item>
+        <item quantity="one">%d emplacement enregistré</item>
-        <item quantity="many">%d signets</item>
+        <item quantity="many">%d emplacements enregistrés</item>
-        <item quantity="other">%d signets</item>
+        <item quantity="other">%d emplacements enregistrés</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 signets et des parcours</string>
+    <string name="bookmarks_import">Importer des favoris</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 ajouter un signet, appuyez sur un lieu sur la carte, puis appuyez sur l’icône étoile</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="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 signets</string>
+    <string name="sort_bookmarks">Trier les favoris</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 signets et toutes les traces</string>
+    <string name="bookmarks_export">Exporter tous les lieux 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 signets et traces ?</string>
+    <string name="track_recording_alert_title">Enregistrer dans les favoris ?</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">Ni signet ni trace à enregistrer</string>
+    <string name="pref_backup_now_summary_empty_lists">Aucun lieu ni piste à sauvegarder</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">Enregistrement des signets et des traces</string>
+    <string name="pref_backup_title">Sauvegarder les favoris</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,6 +927,4 @@
     <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>

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

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

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 Penanda</string>
+    <string name="load_kmz_title">Memuat Tempat Favorit</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". -->

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

@@ -129,7 +129,7 @@
     <string name="clear_search">Dilea Istori Hwilas</string>
     <string name="read_in_wikipedia">Wikipedya</string>
     <string name="wikimedia_commons">Wikimedia Commons</string>
-    <string name="p2p_your_location">Agas Tyller</string>
+    <string name="p2p_your_location">Dha Tyller</string>
     <string name="p2p_start">Dalleth</string>
     <string name="next_button">Nessa</string>
     <string name="editor_time_add">Addya Rol Vetyansow</string>
@@ -186,8 +186,8 @@
     <string name="error_enter_correct_zip_code">Ynworra unn kod post ewn</string>
     <string name="editor_other_info">Noten dhe bodhogyon OpenStreetMap (dre dhewis)</string>
     <string name="editor_more_about_osm">Moy a-dro OpenStreetMap</string>
-    <string name="editor_osm_history">Agas istori golegyans</string>
+    <string name="editor_osm_history">Dha istori golegyans</string>
-    <string name="editor_osm_notes">Agas notennow mappow</string>
+    <string name="editor_osm_notes">Dha notennow mappow</string>
     <string name="editor_operator">Oberador</string>
     <string name="operator">Oberador: %s</string>
     <string name="kilometers_per_hour">kdo</string>
@@ -266,9 +266,9 @@
     <string name="toll_road">Tollfordh</string>
     <string name="unpaved_road">Fordh dor</string>
     <string name="ferry_crossing">Kowbalhyns</string>
-    <string name="yes">Ya</string>
+    <string name="yes">Ea</string>
     <string name="no">Na</string>
-    <string name="yes_available">Ya</string>
+    <string name="yes_available">Ea</string>
     <string name="no_available">Na</string>
     <string name="capacity">Dalghuster: %s</string>
     <string name="network">Rosweyth: %s</string>
@@ -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">Vu Rol Voos</string>
+    <string name="view_menu">Gweles 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>

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

@@ -16,8 +16,6 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#FF588157</color>
   <color name="bg_app">#10140F</color>
-  <color name="bg_editor">#161b14</color>
-  <color name="fg_editor">#282e25</color>
 
   <color name="bg_menu">#CC2D3237</color>
 

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

@@ -151,7 +151,7 @@
     <!-- Kmz file successful loading -->
     <string name="load_kmz_successful">Os favoritos foram carregados com sucesso! Pode encontrá-los no mapa ou no ecrã de gestão dos favoritos.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Surgiu uma falha ao enviar os favoritos. O ficheiro pode estar corrompido ou com defeito.</string>
+    <string name="load_kmz_failed">Impossível carregar favoritos. O ficheiro pode estar corrompido ou com defeito.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">O tipo de ficheiro não é reconhecido pela aplicação: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -549,7 +549,7 @@
     <string name="dialog_error_storage_message">O armazenamento externo não está disponível. Provavelmente porque o cartão SD foi removido, danificado ou o sistema de ficheiros é apenas para leitura. Verifique e contacte-nos através do email support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular o armazenamento defeituoso</string>
     <string name="error_enter_correct_name">Introduza um nome correto</string>
-    <string name="bookmark_lists">Listas</string>
+    <string name="bookmark_lists">Listas de Favoritos</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Ocultar tudo</string>
     <string name="bookmark_lists_show_all">Mostrar tudo</string>
@@ -560,7 +560,7 @@
     </plurals>
     <string name="bookmarks_create_new_group">Criar nova lista</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importar favoritos e trajetos</string>
+    <string name="bookmarks_import">Importar favoritos</string>
     <string name="bookmarks_error_message_share_general">Não foi possível partilhar devido a um erro da aplicação</string>
     <string name="bookmarks_error_title_share_empty">Erro ao partilhar</string>
     <string name="bookmarks_error_message_share_empty">Não é possível partilhar uma lista vazia</string>
@@ -748,7 +748,7 @@
     <string name="browser_not_available">O navegador de Internet não está disponível</string>
     <string name="volume">Volume</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exportar todos os favoritos e trajetos</string>
+    <string name="bookmarks_export">Exportar todos os Favoritos e Trajetos</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Definições do sistema de síntese de voz</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -780,7 +780,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Continuar gravação</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Guardar em Favoritos e Trajetos?</string>
+    <string name="track_recording_alert_title">Guardar nos Favoritos?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">O trajeto está vazio - não há nada para guardar</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -847,10 +847,10 @@
     <string name="backup_interval_every_day">Diariamente</string>
     <string name="backup_interval_every_week">Semanalmente</string>
     <string name="backup_interval_manual_only">Off (apenas manual)</string>
-    <string name="bookmark_color">Cor do marcador</string>
+    <string name="bookmark_color">Cor do Favorito</string>
     <string name="pref_backup_now_summary_ok">Backup completado com sucesso</string>
     <string name="pref_backup_location_summary_initial">Por favor selecione uma pasta primeiro e garanta permissão</string>
-    <string name="pref_backup_title">Backup dos marcadores e trajetos</string>
+    <string name="pref_backup_title">Backup dos Favoritos</string>
     <string name="dialog_report_error_missing_folder">A localização de backup selecionada não está disponível ou não permite escrita. Selecione outra localização, por favor.</string>
     <string name="dialog_report_error_with_logs">Por favor, envie-nos um reporte de erro:\n - \"Ativar o histórico\" nas definições\n - reproduza o problema\n - no ecrã de \"Acerca &amp; Ajuda\" pressione o botão para \"Reportar um problema\" e envie via email ou chat\n - desative o histórico</string>
     <string name="open_now">Aberto agora</string>
@@ -914,4 +914,5 @@
     <string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string>
     <string name="download_resources_custom_url_summary_none">Indefinido</string>
     <string name="download_resources_custom_url_error_scheme">Por favor, insira um URL começando com http:// ou https://</string>
+    <string name="pref_maplanguage_local">Idioma Local</string>
 </resources>

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

@@ -412,7 +412,7 @@
         <item quantity="few">%d datoteke najdene. Po pretvorbi si jih lahko ogledate.</item>
         <item quantity="other">%d datotek najdenih. Po pretvorbi si jih lahko ogledate.</item>
     </plurals>
-    <string name="restore">Obnovi</string>
+    <string name="restore">Povrni</string>
     <plurals name="tracks">
         <item quantity="one">%d pot</item>
         <item quantity="two">%d poti</item>

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

@@ -493,9 +493,9 @@
     <string name="editor_more_about_osm">关于 OpenStreetMap 的更多信息</string>
     <string name="editor_osm_history">您的编辑历史</string>
     <string name="editor_osm_notes">您的地图数据注记</string>
-    <string name="editor_operator">操作员</string>
+    <string name="editor_operator">运营方</string>
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
-    <string name="operator">操作员: %s</string>
+    <string name="operator">运营方：%s</string>
     <string name="editor_category_unsuitable_title">找不到合适的类别？</string>
     <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>

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

@@ -65,8 +65,6 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
   <color name="bg_app">@android:color/white</color>
-  <color name="bg_editor">#ebefe4</color>
-  <color name="fg_editor">#f9faf2</color>
 
   <color name="bg_dialog_translucent">#BB000000</color>
   <color name="bg_text_translucent">#99FFFFFF</color>

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

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

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

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

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

@@ -89,7 +89,7 @@
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginBottom">@dimen/margin_half</item>
-    <item name="cardBackgroundColor">@color/fg_editor</item>
+    <item name="cardBackgroundColor">?appBackground</item>
     <item name="android:padding">@dimen/margin_base</item>
     <item name="cardPreventCornerOverlap">false</item>
   </style>

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

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

android/sdk/build.gradle

@@ -153,7 +153,7 @@ project.afterEvaluate {
 
   final taskName = gradle.startParameter.taskNames
 
-  if (['assemble', 'bundle', 'compile', 'install', 'run', 'publish'].any{taskName.any{task->task.startsWith(it)}}) {
+  if (['assemble', 'bundle', 'compile', 'install', 'lint', 'publish', 'run'].any{taskName.any{task->task.startsWith(it)}}) {
     exec {
       workingDir '../..'
 

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

@@ -117,7 +117,6 @@
     <string name="type.amenity.public_bookcase">Boekekas</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Herwinningsentrum</string>
-    <string name="type.amenity.recycling">Herwinningshouer</string>
     <string name="type.amenity.recycling.container">Herwinningshouer</string>
     <string name="type.recycling.batteries">Batterye</string>
     <string name="type.recycling.clothes">Klere</string>

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

@@ -130,7 +130,6 @@
     <string name="type.amenity.public_bookcase">مكتبة، تبادل كتب</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">مركز إعادة تدوير</string>
-    <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>

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

@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">Kitab mübadiləsi</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Təkrar Emal Mərkəzi</string>
-    <string name="type.amenity.recycling">Təkrar emal konteyneri</string>
     <string name="type.amenity.recycling.container">Təkrar emal konteyneri</string>
     <string name="type.recycling.batteries">Batareyalar</string>
     <string name="type.recycling.clothes">Geyim</string>

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">Stanica za punjenje bicikala</string>
+    <string name="type.amenity.charging_station.bicycle">Bicikli</string>
-    <string name="type.amenity.charging_station.motorcar">Stanica za punjenje automobila</string>
+    <string name="type.amenity.charging_station.motorcar">Auta</string>
     <string name="type.amenity.childcare">Vrtić</string>
     <string name="type.amenity.cinema">Bioskop</string>
     <string name="type.amenity.studio">Medijski studio</string>
@@ -149,7 +149,6 @@
     <string name="type.amenity.pub">Pab</string>
     <string name="type.amenity.public_bookcase">Razmena knjiga</string>
     <string name="type.amenity.recycling.centre">Centar za reciklažu</string>
-    <string name="type.amenity.recycling">Kontejner za reciklažu</string>
     <string name="type.amenity.recycling.container">Kontejner za reciklažu</string>
     <string name="type.recycling.batteries">Beterije</string>
     <string name="type.recycling.clothes">Stara odeća</string>
@@ -1411,4 +1410,8 @@
     <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>

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

@@ -54,7 +54,6 @@
     <string name="type.amenity.prison">Турма</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Прыём другсыравіны</string>
-    <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>

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

@@ -587,7 +587,6 @@
     <string name="type.amenity.police">Полиция</string>
     <string name="type.amenity.pub">Кръчма</string>
     <string name="type.amenity.public_bookcase">Книжен обмен</string>
-    <string name="type.amenity.recycling">Кофи за преработваем отпадък</string>
     <string name="type.amenity.recycling.container">Кофи за преработваем отпадък</string>
     <string name="type.recycling.clothes">Дрехи</string>
     <string name="type.recycling.glass_bottles">Стъклени бутилки</string>

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>

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">দমকল স্টেশন</string>
+    <string name="type.amenity.fire_station">4দমকল স্টেশন</string>
     <string name="type.amenity.food_court">ফুড কোর্ট</string>
-    <string name="type.amenity.fountain">ফাউন্টেন</string>
+    <string name="type.amenity.fountain">ফাউন্টেন|ফোয়ারা</string>
-    <string name="type.amenity.fuel">গ্যাস স্টেশন</string>
+    <string name="type.amenity.fuel">গ্যাস স্টেশন|5পেট্রোল পাম্প</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.library">গ্রন্থাগার|লাইব্রেরি</string>
-    <string name="type.amenity.marketplace">বাজার</string>
+    <string name="type.amenity.marketplace">বাজার|মার্কেট</string>
-    <string name="type.amenity.motorcycle_parking">বাইক পার্কিং</string>
+    <string name="type.amenity.motorcycle_parking">বাইক পার্কিং|9মোটরসাইকেল পার্কিং</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.no.access">ব্যক্তিগত পার্কিং|প্রাইভেট পার্কিং</string>
-    <string name="type.amenity.parking.permissive">প্রাইভেট পার্কিং</string>
+    <string name="type.amenity.parking.permissive">ব্যক্তিগত পার্কিং|প্রাইভেট পার্কিং</string>
-    <string name="type.amenity.parking.private">প্রাইভেট পার্কিং</string>
+    <string name="type.amenity.parking.private">ব্যক্তিগত পার্কিং|প্রাইভেট পার্কিং</string>
-    <string name="type.amenity.parking.underground">আন্ডারগ্রাউন্ড পার্কিং</string>
+    <string name="type.amenity.parking.underground">আন্ডারগ্রাউন্ড পার্কিং|ভূগর্ভস্থ পার্কিং</string>
-    <string name="type.amenity.parking.underground.fee">আন্ডারগ্রাউন্ড পার্কিং</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">ডাক্তার</string>
+    <string name="type.amenity.doctors">ডাক্তার|4চিকিৎসক</string>
-    <string name="type.amenity.pharmacy">ওষুধ দোকান</string>
+    <string name="type.amenity.pharmacy">4ওষুধ দোকান|ফার্মেসি</string>
-    <string name="type.amenity.place_of_worship.christian">গির্জা</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,4 +174,64 @@
     <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>

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

@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">Intercanvi de llibres</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centre de reciclatge</string>
-    <string name="type.amenity.recycling">Contenidor de reciclatge</string>
     <string name="type.amenity.recycling.container">Contenidor de reciclatge</string>
     <string name="type.recycling.batteries">Bateries</string>
     <string name="type.recycling.clothes">Roba</string>

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">Nabíjecí stanice pro jízdní kola</string>
+    <string name="type.amenity.charging_station.bicycle">Jízdní kola</string>
-    <string name="type.amenity.charging_station.motorcar">Nabíjecí stanice pro automobily</string>
+    <string name="type.amenity.charging_station.motorcar">Auta</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>
@@ -115,7 +115,6 @@
     <string name="type.amenity.public_bookcase">Výměna knih</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Recyklační středisko</string>
-    <string name="type.amenity.recycling">Recyklační nádoba</string>
     <string name="type.amenity.recycling.container">Recyklační nádoba</string>
     <string name="type.recycling.batteries">Baterie</string>
     <string name="type.recycling.clothes">Staré oblečení</string>
@@ -1393,7 +1392,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">Lavička bez opěradla</string>
+    <string name="type.amenity.bench.backless">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,4 +1501,8 @@
     <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>

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

@@ -114,7 +114,6 @@
     <string name="type.amenity.public_bookcase">Bogbytteskab</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Genbrugsplads</string>
-    <string name="type.amenity.recycling">Genbrugscontainer</string>
     <string name="type.amenity.recycling.container">Genbrugscontainer</string>
     <string name="type.recycling.batteries">Batterier</string>
     <string name="type.recycling.clothes">Tekstil</string>
@@ -958,7 +957,7 @@
     <string name="type.shop.coffee">Kaffehandel</string>
     <string name="type.shop.computer">Computerforretning</string>
     <string name="type.shop.confectionery">Slikbutik</string>
-    <string name="type.shop.convenience">Døgnbutik</string>
+    <string name="type.shop.convenience">Nærbutik</string>
     <string name="type.shop.copyshop">Kopieringsbutik</string>
     <string name="type.shop.cosmetics">Kosmetiker</string>
     <string name="type.shop.curtain">Gardinhandel</string>

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">Sitzbank ohne Rückenlehne</string>
+    <string name="type.amenity.bench.backless">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>
@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">Bücherschrank</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Recyclinghof</string>
-    <string name="type.amenity.recycling">Wertstoffcontainer</string>
     <string name="type.amenity.recycling.container">Wertstoffcontainer</string>
     <string name="type.recycling.batteries">Batterien</string>
     <string name="type.recycling.clothes">Altkleider</string>

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.bicycle">Ποδήλατα</string>
-    <string name="type.amenity.charging_station.motorcar">Σταθμός φόρτισης αυτοκινήτων</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,18 +117,17 @@
     <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 -->
     <string name="type.amenity.recycling.centre">Κέντρο ανακύκλωσης</string>
-    <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.paper">Χαρτί</string>
-    <string name="type.recycling.plastic">Πλαστικά απορρίμματα</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 +152,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 +313,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 +366,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,20 +378,19 @@
     <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. -->
@@ -412,36 +410,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">Δρόμος υπηρεσίας</string>
-    <string name="type.highway.service.area">Οδός</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. -->
@@ -471,26 +469,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.path">Μονοπάτι</string>
-    <string name="type.area_highway.pedestrian">Οδός</string>
+    <string name="type.area_highway.pedestrian">Πεζόδρομος</string>
-    <string name="type.area_highway.primary">Οδός</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.secondary">Δευτερεύων δρόμος</string>
-    <string name="type.area_highway.service">Οδός</string>
+    <string name="type.area_highway.service">Δρόμος υπηρεσίας</string>
-    <string name="type.area_highway.tertiary">Οδός</string>
+    <string name="type.area_highway.tertiary">Τριτεύων δρόμος</string>
-    <string name="type.area_highway.steps">Διαδρομή</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>
@@ -557,17 +555,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.climbing">Αναρρίχηση</string>
-    <string name="type.sport.yoga">Στούντιο γιόγκα</string>
+    <string name="type.sport.yoga">Γιόγκα</string>
-    <string name="type.leisure.stadium">Γήπεδο</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>
@@ -1104,7 +1102,7 @@
     <string name="type.sport.volleyball">Πετοσφαίριση</string>
     <string name="type.sport.10pin">Μπόουλινγκ</string>
     <string name="type.sport.9pin">Μπόουλινγκ</string>
-    <string name="type.sport.padel">Padel</string>
+    <string name="type.sport.padel">Πάντελ</string>
     <string name="type.sport.futsal">Futsal</string>
     <string name="type.sport.ice_hockey">Χόκεϊ στον παγο</string>
     <string name="type.sport.field_hockey">Χόκεϊ επί χόρτου</string>
@@ -1181,7 +1179,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 -->
@@ -1201,7 +1199,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>
@@ -1246,7 +1244,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>
@@ -1263,4 +1261,61 @@
     <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>

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

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

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

@@ -1,3 +1,17 @@
 <?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>

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

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

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">Zona de comidas</string>
+    <string name="type.amenity.food_court">Plaza de comidas</string>
     <string name="type.amenity.fountain">Fuente</string>
-    <string name="type.amenity.fuel">Gasolinera</string>
+    <string name="type.amenity.fuel">Estación de servicio</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">Guardería</string>
+    <string name="type.amenity.kindergarten">Jardín de infantes</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">Edificio de aparcamiento</string>
+    <string name="type.amenity.parking.multi.storey">Aparcamiento multinivel</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>
@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">Intercambio de libros</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centro de reciclaje</string>
-    <string name="type.amenity.recycling">Contenedor de reciclaje</string>
     <string name="type.amenity.recycling.container">Contenedor de reciclaje</string>
     <string name="type.recycling.batteries">Baterías</string>
     <string name="type.recycling.clothes">Ropa</string>
@@ -168,16 +167,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">Máquina expendedora de tabaco</string>
+    <string name="type.amenity.vending_machine.cigarettes">Expendedora de tabaco</string>
-    <string name="type.amenity.vending_machine.coffee">Máquina expendedora de café</string>
+    <string name="type.amenity.vending_machine.coffee">Expendedora de café</string>
-    <string name="type.amenity.vending_machine.condoms">Máquina expendedora de condones</string>
+    <string name="type.amenity.vending_machine.condoms">Expendedora de condones</string>
-    <string name="type.amenity.vending_machine.drinks">Máquina expendedora de bebidas</string>
+    <string name="type.amenity.vending_machine.drinks">Expendedora de bebidas</string>
-    <string name="type.amenity.vending_machine.food">Máquina expendedora de comida</string>
+    <string name="type.amenity.vending_machine.food">Expendedora de comida</string>
-    <string name="type.amenity.vending_machine.newspapers">Máquina expendedora de periódicos</string>
+    <string name="type.amenity.vending_machine.newspapers">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">Máquina expendedora de billetes de transporte público</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">Máquina expendedora de dulces</string>
+    <string name="type.amenity.vending_machine.sweets">Expendedora de dulces</string>
-    <string name="type.amenity.vending_machine.excrement_bags">Maquina expendedora de bolsas para excrementos</string>
+    <string name="type.amenity.vending_machine.excrement_bags">Dispensador 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 +256,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">Serrería</string>
+    <string name="type.craft.sawmill">Aserradero</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 +334,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">del mar</string>
+    <string name="type.cuisine.seafood">Marina</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 +349,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">Boca de incendio</string>
+    <string name="type.emergency.fire_hydrant">Hidrante 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 +498,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">Pista</string>
+    <string name="type.highway.track">Camino</string>
-    <string name="type.highway.track.area">Pista</string>
+    <string name="type.highway.track.area">Camino</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.track.bridge">Puente</string>
-    <string name="type.highway.track.grade1">Pista</string>
+    <string name="type.highway.track.grade1">Camino</string>
-    <string name="type.highway.track.no.access">Pista</string>
+    <string name="type.highway.track.no.access">Camino</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 +535,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">Pista</string>
+    <string name="type.area_highway.track">Camino</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 +736,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">Cuerpo de agua</string>
+    <string name="type.natural.water">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 +1106,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">Droguería</string>
+    <string name="type.shop.chemist">Parafarmacia</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 +1369,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">Escalera</string>
+    <string name="type.highway.ladder">Escalerilla</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 +1382,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">Casillero de maletas</string>
+    <string name="type.amenity.luggage_locker">Consigna de equipaje</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>
@@ -1398,7 +1397,7 @@
     <string name="type.building.guardhouse">Garita de seguridad</string>
     <string name="type.power.portal">Torre de alta tensión</string>
     <string name="type.shop.lighting">Tienda de iluminación</string>
-    <string name="type.amenity.bench.backless">Banco sin respaldo</string>
+    <string name="type.amenity.bench.backless">Sin respaldo</string>
     <string name="type.leisure.bandstand">Templete</string>
     <string name="type.leisure.sports_centre.sport.multi">Centro deportivo</string>
     <string name="type.leisure.sports_centre.sport.american_football">Centro deportivo</string>
@@ -1410,7 +1409,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">Centro deportivo</string>
+    <string name="type.leisure.sports_centre.sport.climbing">Rocódromo</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,4 +1507,6 @@
     <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>
+    <string name="type.emergency.access_point.address">Dirección de Punto de Emergencia</string>
 </resources>

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">Jalgratta laadimisjaam</string>
+    <string name="type.amenity.charging_station.bicycle">Jalgrattad</string>
-    <string name="type.amenity.charging_station.motorcar">Autode laadimisjaam</string>
+    <string name="type.amenity.charging_station.motorcar">Autod</string>
     <string name="type.amenity.childcare">Lastehoid</string>
     <string name="type.amenity.cinema">Kino</string>
     <string name="type.leisure.bowling_alley">Bowlingusaal</string>
@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">Avalik raamaturiiul</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Jäätmejaam</string>
-    <string name="type.amenity.recycling">Taaskasutuskonteiner</string>
     <string name="type.amenity.recycling.container">Taaskasutuskonteiner</string>
     <string name="type.recycling.batteries">Patareid</string>
     <string name="type.recycling.clothes">Rõivad</string>
@@ -1396,7 +1395,7 @@
     <string name="type.power.portal">Õhuliini värava-tüüpi mast</string>
     <string name="type.office.security">Turvafirma kontor</string>
     <string name="type.shop.lighting">Lambipood</string>
-    <string name="type.amenity.bench.backless">Ilma seljatoeta pink</string>
+    <string name="type.amenity.bench.backless">Ilma seljatoeta</string>
     <string name="type.leisure.bandstand">Väike vabaõhulava</string>
     <string name="type.leisure.sports_centre.sport.multi">Spordikeskus</string>
     <string name="type.leisure.fitness_centre.sport.yoga">Joogastuudio</string>
@@ -1505,4 +1504,8 @@
     <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>
+    <string name="type.emergency.access_point.address">Hädaolukorras asukohatuvastuspunkti aadress</string>
 </resources>

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

@@ -129,7 +129,6 @@
     <string name="type.amenity.public_bookcase">Liburu trukea</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Birziklapen zentroa</string>
-    <string name="type.amenity.recycling">Birziklatzeko edukiontzia</string>
     <string name="type.amenity.recycling.container">Birziklatzeko edukiontzia</string>
     <string name="type.recycling.batteries">Bateriak</string>
     <string name="type.recycling.clothes">Arropa</string>

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

@@ -115,7 +115,6 @@
     <string name="type.amenity.pub">میکده</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">مرکز بازیافت</string>
-    <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>

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

@@ -128,7 +128,6 @@
     <string name="type.amenity.public_bookcase">Kirjahylly</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Kierrätyskeskus</string>
-    <string name="type.amenity.recycling">Kierrätysjäteastia</string>
     <string name="type.amenity.recycling.container">Kierrätysjäteastia</string>
     <string name="type.recycling.batteries">Paristot</string>
     <string name="type.recycling.clothes">Vaatteet</string>

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

@@ -124,7 +124,6 @@
     <string name="type.amenity.public_bookcase">Microbibliothèque</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centre de recyclage</string>
-    <string name="type.amenity.recycling">Conteneur de recyclage</string>
     <string name="type.amenity.recycling.container">Conteneur de recyclage</string>
     <string name="type.recycling.batteries">Batteries</string>
     <string name="type.recycling.clothes">Vêtements usagés</string>
@@ -1191,7 +1190,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">Site de plongée sous-marine</string>
+    <string name="type.sport.scuba_diving">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>
@@ -1397,7 +1396,7 @@
     <string name="type.building.guardhouse">Guérite de sécurité</string>
     <string name="type.power.portal">Portique haute tension</string>
     <string name="type.shop.lighting">Boutique de luminaires</string>
-    <string name="type.amenity.bench.backless">Banc sans dossier</string>
+    <string name="type.amenity.bench.backless">Sans dossier</string>
     <string name="type.leisure.bandstand">Kiosque à musique</string>
     <string name="type.leisure.sports_centre.sport.multi">Complexe sportif</string>
     <string name="type.leisure.sports_centre.sport.american_football">Complexe sportif</string>
@@ -1484,8 +1483,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.east">Est :</string>
-    <string name="type.cardinal.north">Nord</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,4 +1506,6 @@
     <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>

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

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

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

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

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

@@ -138,7 +138,6 @@
     <string name="type.amenity.pub">Pub</string>
     <string name="type.amenity.public_bookcase">Intercambio de libros</string>
     <string name="type.amenity.recycling.centre">Centro de reciclaxe</string>
-    <string name="type.amenity.recycling">Contedora de reciclaxe</string>
     <string name="type.amenity.recycling.container">Contedora de reciclaxe</string>
     <string name="type.recycling.batteries">Baterías</string>
     <string name="type.recycling.clothes">Roupa</string>

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

@@ -131,7 +131,6 @@
     <string name="type.amenity.pub">Beiz</string>
     <string name="type.amenity.public_bookcase">Büecherschrank</string>
     <string name="type.amenity.recycling.centre">Recyclinghof</string>
-    <string name="type.amenity.recycling">Recyclingcontainer</string>
     <string name="type.amenity.recycling.container">Recyclingcontainer</string>
     <string name="type.recycling.batteries">Batterie</string>
     <string name="type.recycling.clothes">Altchleider</string>

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

@@ -97,7 +97,6 @@
     <string name="type.amenity.public_bookcase">सार्वजनिक किताबों की अलमारी</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">रीसाइक्लिंग सेंटर</string>
-    <string name="type.amenity.recycling">रीसाइक्लिंग कंटेनर</string>
     <string name="type.amenity.recycling.container">रीसाइक्लिंग कंटेनर</string>
     <string name="type.amenity.restaurant">रेस्तरां</string>
     <string name="type.amenity.sanitary_dump_station">सेनेटरी डंप स्टेशन</string>

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

@@ -151,7 +151,6 @@
     <string name="type.amenity.pub">Pub</string>
     <string name="type.amenity.public_bookcase">Razmjena knjiga</string>
     <string name="type.amenity.recycling.centre">Centar za recikliranje</string>
-    <string name="type.amenity.recycling">Kontejner za recikliranje</string>
     <string name="type.amenity.recycling.container">Kontejner za recikliranje</string>
     <string name="type.recycling.batteries">Baterije</string>
     <string name="type.recycling.clothes">Odjeća</string>

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

@@ -117,7 +117,6 @@
     <string name="type.amenity.public_bookcase">Nyilvános könyvespolc</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Hulladékudvar</string>
-    <string name="type.amenity.recycling">Szelektív hulladékgyűjtés</string>
     <string name="type.amenity.recycling.container">Szelektív hulladékgyűjtő konténer</string>
     <string name="type.recycling.batteries">Elem, akkumulátor</string>
     <string name="type.recycling.clothes">Ruha</string>

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

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

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

@@ -112,7 +112,6 @@
     <string name="type.amenity.public_bookcase">Rak Buku</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">TPA</string>
-    <string name="type.amenity.recycling">Wadah daur ulang</string>
     <string name="type.amenity.recycling.container">Wadah daur ulang</string>
     <string name="type.recycling.batteries">Baterai</string>
     <string name="type.recycling.clothes">Pakaian lama</string>
@@ -1181,4 +1180,6 @@
     <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>

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

@@ -35,7 +35,6 @@
     <string name="type.amenity.pub">Krá</string>
     <string name="type.amenity.public_bookcase">Bókaskipti</string>
     <string name="type.amenity.recycling.centre">Endurvinnslustöð</string>
-    <string name="type.amenity.recycling">Endurvinnslugámur</string>
     <string name="type.recycling.plastic_bottles">Plastflöskur</string>
     <string name="type.recycling.scrap_metal">Brotajárn</string>
     <string name="type.amenity.school">Skóli</string>

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

@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">Biblioteca di strada</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centro di riciclaggio</string>
-    <string name="type.amenity.recycling">Contenitore per materiali riciclabili</string>
     <string name="type.amenity.recycling.container">Contenitore per materiali riciclabili</string>
     <string name="type.recycling.batteries">Batterie</string>
     <string name="type.recycling.clothes">Vestiti usati</string>

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

@@ -129,7 +129,6 @@
     <string name="type.amenity.public_bookcase">כוננית ספרים ציבורית</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">מרכז מיחזור</string>
-    <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>

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

@@ -130,7 +130,6 @@
     <string name="type.amenity.public_bookcase">街角文庫</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">リサイクルセンター</string>
-    <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>

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

@@ -117,7 +117,6 @@
     <string name="type.amenity.public_bookcase">도서 교환</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">재활용센터</string>
-    <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>

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

@@ -97,7 +97,6 @@
     <string name="type.amenity.pub">Barr</string>
     <string name="type.amenity.public_bookcase">Keschanj Lyver</string>
     <string name="type.amenity.recycling.centre">Kresen Eylgylghyans</string>
-    <string name="type.amenity.recycling">Kofen Eylgylghyans</string>
     <string name="type.amenity.recycling.container">Kofen Eylgylghyans</string>
     <string name="type.recycling.batteries">Batriow</string>
     <string name="type.recycling.clothes">Dillas</string>

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

@@ -110,7 +110,7 @@
     <string name="type.amenity.bank">Bankas</string>
     <string name="type.amenity.bar">Baras</string>
     <string name="type.amenity.bench">Suolas</string>
-    <string name="type.amenity.bench.backless">Suolas be atramos</string>
+    <string name="type.amenity.bench.backless">Be atramos</string>
     <string name="type.amenity.bicycle_parking">Dviračių stovėjimo aikštelė</string>
     <string name="type.amenity.bicycle_parking.covered">Dengta dviračių stovėjimo aikštelė</string>
     <string name="type.amenity.boat_rental">Valčių nuoma</string>
@@ -136,8 +136,8 @@
     <string name="type.leisure.adult_gaming_centre">Lošimo automatų salonas</string>
     <string name="type.leisure.amusement_arcade">Žaidimo automatų salonas</string>
     <string name="type.amenity.charging_station">Krovimo stotelė</string>
-    <string name="type.amenity.charging_station.bicycle">Elektrinių dviračių krovimo stotelė</string>
+    <string name="type.amenity.charging_station.bicycle">Elektriniams dviračiams</string>
-    <string name="type.amenity.charging_station.motorcar">Elektromobilių krovimo stotelė</string>
+    <string name="type.amenity.charging_station.motorcar">Elektromobiliams</string>
     <string name="type.amenity.childcare">Lopšelis</string>
     <string name="type.amenity.cinema">Kino teatras</string>
     <string name="type.leisure.bowling_alley">Boulingo klubas</string>
@@ -225,7 +225,6 @@
     <string name="type.amenity.pub">Aludė</string>
     <string name="type.amenity.public_bookcase">Knygų namelis</string>
     <string name="type.amenity.recycling.centre">Antrinių žaliavų surinkimo aikštelė</string>
-    <string name="type.amenity.recycling">Antrinių žaliavų konteineris</string>
     <string name="type.amenity.recycling.container">Antrinių žaliavų konteineris</string>
     <string name="type.recycling.batteries">Baterijos</string>
     <string name="type.recycling.clothes">Tekstilė</string>
@@ -1433,4 +1432,8 @@
     <string name="type.tourism.information.tactile_map">Taktilinis žemėlapis</string>
     <string name="type.railway.disused.bridge">Apleistas geležinkelio tiltas</string>
     <string name="type.railway.disused.tunnel">Apleistas geležinkelio tunelis</string>
+    <string name="type.amenity.charging_station.motorcycle">Motociklams</string>
+    <string name="type.amenity.charging_station.small">Ribota galia</string>
+    <string name="type.emergency.access_point.address">Evakuacijos adresas</string>
+    <string name="type.emergency.disaster_help_point">Pagalbos stichinių nelaimių atvejais punktas</string>
 </resources>

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">Velosipēdu uzlāde</string>
+    <string name="type.amenity.charging_station.bicycle">Divriteņi</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">Auto uzlādes stacija</string>
+    <string name="type.amenity.charging_station.motorcar">Mašīnas</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>
@@ -123,7 +123,7 @@
     <string name="type.leisure.common">Valsts zemes īpašums</string>
     <string name="type.leisure.dog_park">Suņu parks</string>
     <string name="type.disusedbusiness">Brīva uzņēmējdarbība</string>
-    <string name="type.amenity.bench.backless">Sols bez atzveltnes</string>
+    <string name="type.amenity.bench.backless">Bez atzveltnes</string>
     <string name="type.shop.coffee">Kafijas mazumtirgotājs</string>
     <string name="type.shop.computer">Datorveikals</string>
     <string name="type.shop.confectionery">Saldumu veikals</string>
@@ -184,4 +184,6 @@
     <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>

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

@@ -112,7 +112,6 @@
     <string name="type.amenity.pub">पब</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">भंगार केंद्र</string>
-    <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>

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

@@ -120,7 +120,6 @@
     <string name="type.amenity.public_bookcase">Bokhylle</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Resirkuleringssenter</string>
-    <string name="type.amenity.recycling">Gjenvinningsbeholder</string>
     <string name="type.amenity.recycling.container">Gjenvinningsbeholder</string>
     <string name="type.recycling.batteries">Batterier</string>
     <string name="type.recycling.clothes">Gamle klær</string>
@@ -1011,7 +1010,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 lyd</string>
+    <string name="type.shop.hifi">HiFi-butikk</string>
     <string name="type.shop.houseware">Husholdningsbutikk</string>
     <string name="type.shop.jewelry">Gullsmed</string>
     <string name="type.shop.kiosk">Kiosk</string>

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">Oplaadstation voor fietsen</string>
+    <string name="type.amenity.charging_station.bicycle">Fietsen</string>
-    <string name="type.amenity.charging_station.motorcar">Oplaadstation voor auto\'s</string>
+    <string name="type.amenity.charging_station.motorcar">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>
@@ -130,7 +130,6 @@
     <string name="type.amenity.public_bookcase">Boekenkast</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Milieustraat</string>
-    <string name="type.amenity.recycling">Recycling container</string>
     <string name="type.amenity.recycling.container">Recycling container</string>
     <string name="type.recycling.batteries">Batterijen</string>
     <string name="type.recycling.clothes">Oude kleding</string>
@@ -1396,7 +1395,7 @@
     <string name="type.building.guardhouse">Beveiligingsloket</string>
     <string name="type.power.portal">Verdeelstation</string>
     <string name="type.shop.lighting">Verlichtingswinkel</string>
-    <string name="type.amenity.bench.backless">Bankje</string>
+    <string name="type.amenity.bench.backless">Zonder bankje</string>
     <string name="type.amenity.boat_rental">Bootverhuur</string>
     <string name="type.man_made.telescope">Telescoop</string>
     <string name="type.man_made.telescope.optical">Telescoop (optisch)</string>
@@ -1505,4 +1504,8 @@
     <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>

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

@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">Wymiana książek</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centrum przetwórstwa odpadów</string>
-    <string name="type.amenity.recycling">Pojemnik do recyklingu</string>
     <string name="type.amenity.recycling.container">Pojemnik do recyklingu</string>
     <string name="type.recycling.batteries">Baterie</string>
     <string name="type.recycling.clothes">Stare ubrania</string>

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

@@ -110,7 +110,6 @@
     <string name="type.amenity.public_bookcase">Biblioteca livre</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centro de reciclagem</string>
-    <string name="type.amenity.recycling">Contêiner de reciclagem</string>
     <string name="type.amenity.recycling.container">Contêiner de reciclagem</string>
     <string name="type.recycling.batteries">Baterias</string>
     <string name="type.recycling.clothes">Roupas velhas</string>

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

@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">Biblioteca livre</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centro de reciclagem</string>
-    <string name="type.amenity.recycling">Contentor de reciclagem</string>
     <string name="type.amenity.recycling.container">Contentor de reciclagem</string>
     <string name="type.recycling.batteries">Baterias</string>
     <string name="type.recycling.clothes">Roupas velhas</string>
@@ -1397,7 +1396,7 @@
     <string name="type.building.guardhouse">Cabine de Segurança</string>
     <string name="type.power.portal">Portal de Energia</string>
     <string name="type.shop.lighting">Loja de Iluminação</string>
-    <string name="type.amenity.bench.backless">Banco sem Encosto</string>
+    <string name="type.amenity.bench.backless">Sem Encosto</string>
     <string name="type.leisure.bandstand">Coreto</string>
     <string name="type.leisure.sports_centre.sport.multi">Centro Desportivo</string>
     <string name="type.leisure.sports_centre.sport.american_football">Centro Desportivo</string>
@@ -1508,4 +1507,6 @@
     <string name="type.railway.miniature.tunnel">Túnel Ferroviário em Miniatura</string>
     <string name="type.railway.turntable">Plataforma Giratória Ferroviária</string>
     <string name="type.tourism.information.tactile_map">Mapa tátil</string>
+    <string name="type.emergency.access_point.address">Endereço de Resgate de Emergência</string>
+    <string name="type.emergency.disaster_help_point">Ponto de Ajuda de Emergências e Desastres</string>
 </resources>

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

@@ -110,7 +110,6 @@
     <string name="type.amenity.public_bookcase">Bibliotecă</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Centru de reciclare</string>
-    <string name="type.amenity.recycling">Containere pentru reciclare</string>
     <string name="type.amenity.recycling.container">Containere pentru reciclare</string>
     <string name="type.recycling.batteries">Baterii</string>
     <string name="type.recycling.clothes">Haine vechi</string>

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

@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">Книгообмен</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Приём вторсырья</string>
-    <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>

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

@@ -125,7 +125,6 @@
     <string name="type.amenity.public_bookcase">Knižná búdka</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Zberné suroviny</string>
-    <string name="type.amenity.recycling">Recyklačný kontajner</string>
     <string name="type.amenity.recycling.container">Recyklačný kontajner</string>
     <string name="type.recycling.batteries">Batérie</string>
     <string name="type.recycling.clothes">Staré oblečenie</string>

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

@@ -28,7 +28,7 @@
     <string name="type.amenity.bar">Lokal</string>
     <string name="type.amenity.bbq">Žar na prostem</string>
     <string name="type.amenity.bench">Klop</string>
-    <string name="type.amenity.bench.backless">Klop brez naslonjala</string>
+    <string name="type.amenity.bench.backless">Brez naslonjala</string>
     <string name="type.amenity.bicycle_parking">Parkirišče za kolesa</string>
     <string name="type.amenity.bicycle_parking.covered">Pokrito parkirišče za kolesa</string>
     <string name="type.amenity.bicycle_rental">Izposoja koles</string>
@@ -309,7 +309,6 @@
     <string name="type.amenity.prep_school">Inštrukcije</string>
     <string name="type.amenity.mobile_money_agent">Posrednik mobilnega denarja</string>
     <string name="type.amenity.recycling.centre">Zbirno mesto za ločene odpadke</string>
-    <string name="type.amenity.recycling">Zabojnik za ločene odpadke</string>
     <string name="type.amenity.recycling.container">Zabojnik za ločene odpadke</string>
     <string name="type.amenity.shelter.public_transport">Zavetje</string>
     <string name="type.amenity.vending_machine.public_transport_tickets">Avtomat za vozovnice javnega prometa</string>
@@ -1084,4 +1083,335 @@
     <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 osnovnimi potrebščinami</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">Hostel</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">Tekoči trak</string>
+    <string name="type.aerialway.platter">Krožniki</string>
+    <string name="type.emergency.access_point.address">Naslov za reševanja v sili</string>
+    <string name="type.natural.water.lock">Zaporna komora</string>
+    <string name="type.shop.doityourself">Trgovina za dom in vrt</string>
+    <string name="type.shop.houseware">Gospodinjska trgovina</string>
+    <string name="type.shop.beauty.day_spa">Lepotni in sprostitveni center</string>
+    <string name="type.shop.outdoor">Trgovina z opremo za aktivnosti na prostem</string>
+    <string name="type.shop.outpost">Prevzemna točka</string>
+    <string name="type.shop.pasta">Trgovina s testeninami</string>
+    <string name="type.shop.pastry">Prodajalna peciva</string>
+    <string name="type.shop.pawnbroker">Zastavljalnica</string>
+    <string name="type.shop.pet">Trgovina s hišnimi ljubljenčki</string>
+    <string name="type.shop.pet_grooming">Negovalni salon za hišne ljubljenčke</string>
+    <string name="type.shop.photo">Fotografska trgovina</string>
+    <string name="type.shop.rental">Izposojevalnica</string>
+    <string name="type.shop.rental.bicycle">Izposojevalnica koles</string>
+    <string name="type.shop.variety_store">Trgovina z mešanim blagom</string>
+    <string name="type.shop.video">Videotrgovina</string>
+    <string name="type.shop.appliance">Trgovina z gospodinjskimi aparati</string>
+    <string name="type.shop.charity">Dobrodelna trgovina</string>
+    <string name="type.shop.tobacco">Trgovina s tobačnimi izdelki</string>
+    <string name="type.shop.trade">Specializirana trgovina</string>
+    <string name="type.shop.wholesale">Trgovina na debelo</string>
+    <string name="type.sport.curling">Curling</string>
+    <string name="type.sport.field_hockey">Hokej na travi</string>
+    <string name="type.sport.futsal">Dvoranski nogomet</string>
+    <string name="type.sport.padel">Padel</string>
+    <string name="type.sport.pelota">Basque Pelota</string>
+    <string name="type.shop.craft">Trgovina z materiali za ustvarjanje</string>
+    <string name="type.attraction.amusement_ride">Zabaviščna vožnja</string>
+    <string name="type.attraction.bumper_car">Vožnja z avtomobilčki</string>
+    <string name="type.attraction.big_wheel">Panoramsko kolo</string>
+    <string name="type.attraction.carousel">Vrtiljak</string>
+    <string name="type.attraction.historic">Zgodovinska znamenitost</string>
+    <string name="type.attraction.maze">Labirint</string>
+    <string name="type.attraction.roller_coaster">Bobkart</string>
+    <string name="type.tourism.attraction.specified">Znamenitost</string>
+    <string name="type.tourism.camp_site">Taborni prostor</string>
+    <string name="type.tourism.caravan_site">Kamp za počitniške prikolice</string>
+    <string name="type.tourism.chalet">Počitniška hišica</string>
+    <string name="type.tourism.gallery">Umetnostna galerija</string>
+    <string name="type.tourism.guest_house">Gostišče</string>
+    <string name="type.tourism.information.tactile_map">Zemljevid za slepe in slabovidne</string>
+    <string name="type.tourism.zoo.petting">Otroški živalski vrt</string>
+    <string name="type.waterway.lock_gate">Plovna zapornica</string>
+    <string name="type.aerialway.rope_tow">Vrvna vlečnica</string>
+    <string name="type.aerialway.t.bar">Vlečnica na T</string>
+    <string name="type.piste_type.downhill">Smučarska proga</string>
+    <string name="type.piste_type.downhill.area">Spustna proga za tek na smučeh</string>
+    <string name="type.piste_type.downhill.advanced">Zahtevna smučarska proga</string>
+    <string name="type.piste_type.downhill.advanced.area">Zahtevna spustna proga za tek na smučeh</string>
+    <string name="type.piste_type.downhill.easy">Enostavna spustna proga za tek na smučeh</string>
+    <string name="type.piste_type.downhill.easy.area">Enostavna smučarska proga</string>
+    <string name="type.piste_type.downhill.expert">Zelo zahtevna spustna proga za tek na smučeh</string>
+    <string name="type.piste_type.downhill.expert.area">Zelo zahtevna smučarska proga</string>
+    <string name="type.piste_type.downhill.freeride">Proga za tek na smučeh – prosti slog</string>
+    <string name="type.piste_type.downhill.intermediate">Srednje zahtevna proga za tek na smučeh</string>
+    <string name="type.piste_type.downhill.intermediate.area">Srednje zahtevna proga za tek na smučeh</string>
+    <string name="type.piste_type.downhill.novice">Začetniška spustna proga za tek na smučeh</string>
+    <string name="type.piste_type.downhill.novice.area">Začetniška smučarska proga</string>
+    <string name="type.piste_type.nordic">Proga za nordijsko smučanje</string>
+    <string name="type.piste_type.sled">Sankaška steza</string>
+    <string name="type.piste_type.sled.area">Sankaška steza</string>
+    <string name="type.piste_type.snow_park">Snežni park</string>
+    <string name="type.piste_type.hike">Zimska pohodniška pot</string>
+    <string name="type.piste_type.connection">Povezovalna proga</string>
+    <string name="type.piste_type.skitour">Proga za turno smučanje</string>
+    <string name="type.amenity.events_venue">Prireditveni prostor</string>
+    <string name="type.shop.auction">Dražba</string>
+    <string name="type.shop.collector">Trgovina s zbirateljskimi predmeti</string>
+    <string name="type.self_service.yes">Na voljo samopostrežba</string>
+    <string name="type.self_service.only">Samo samopostrežno</string>
+    <string name="type.self_service.partially">Delno samopostrežno</string>
+    <string name="type.self_service.no">Ni samopostrežno</string>
+    <string name="type.amenity.social_facility">Socialna ustanova</string>
+    <string name="type.social_facility.soup_kitchen">Kuhinja za brezdomce</string>
+    <string name="type.social_facility.food_bank">Brezplačna delilnica hrane</string>
+    <string name="type.amenity.food_sharing">Razdeljevalnica hrane</string>
+    <string name="type.amenity.give_box">Zaboj za darove</string>
+    <string name="type.emergency.emergency_ward_entrance">Vhod v urgentni oddelek</string>
+    <string name="type.amenity.dojo">Dojo (vadbeni prostor borilnih veščin)</string>
+    <string name="type.leisure.sports_hall">Športna dvorana</string>
+    <string name="type.xmas.tree">Božično drevo</string>
 </resources>

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

@@ -115,7 +115,6 @@
     <string name="type.amenity.public_bookcase">Bokskåp</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Återvinningscentral</string>
-    <string name="type.amenity.recycling">Behållare för återvinningsbart avfall</string>
     <string name="type.amenity.recycling.container">Behållare för återvinningsbart avfall</string>
     <string name="type.recycling.batteries">Batterier</string>
     <string name="type.recycling.clothes">Gamla kläder</string>

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

@@ -146,7 +146,6 @@
     <string name="type.amenity.pub">பப்</string>
     <string name="type.amenity.public_bookcase">புத்தக பரிமாற்றம்</string>
     <string name="type.amenity.recycling.centre">மறுசுழற்சி நடுவண்</string>
-    <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>

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

@@ -118,7 +118,6 @@
     <string name="type.amenity.public_bookcase">ตู้หนังสือ สถานที่แลกเปลี่ยนหนังสือ</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">ศูนย์รีไซเคิล</string>
-    <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>

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

@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">Kitap Değişimi</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Geri Dönüşüm Merkezi</string>
-    <string name="type.amenity.recycling">Atık Toplama Merkezi</string>
     <string name="type.amenity.recycling.container">Atık Toplama Merkezi</string>
     <string name="type.recycling.batteries">Piller</string>
     <string name="type.recycling.clothes">Kıyafet</string>

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

@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">Книгообмін</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Прийом вторсировини</string>
-    <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>

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

@@ -117,7 +117,6 @@
     <string name="type.amenity.public_bookcase">Kệ sách</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">Trung tâm tái sinh</string>
-    <string name="type.amenity.recycling">Thùng rác</string>
     <string name="type.amenity.recycling.container">Thùng rác</string>
     <string name="type.recycling.batteries">Ắc quy</string>
     <string name="type.recycling.clothes">Quần áo cũ</string>

android/sdk/src/main/res/values-zh-rHK/types_strings.xml

@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">書架</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">回收中心</string>
-    <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>

android/sdk/src/main/res/values-zh-rTW/types_strings.xml

@@ -269,7 +269,6 @@
     <string name="type.amenity.pub">酒吧</string>
     <string name="type.amenity.public_bookcase">漂書站</string>
     <string name="type.amenity.recycling.centre">回收中心</string>
-    <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>

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

@@ -131,7 +131,6 @@
     <string name="type.amenity.public_bookcase">公共书架</string>
     <!-- SECTION: Types: Recycling -->
     <string name="type.amenity.recycling.centre">资源回收设施</string>
-    <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>
@@ -355,7 +354,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.yes">¥</string>
     <string name="type.fee.no">免费</string>
     <string name="type.healthcare.laboratory">医学实验室</string>
@@ -1393,8 +1392,36 @@
     <string name="type.post_office.post_partner">邮政合作点</string>
     <string name="type.barrier.wicket_gate">旁门</string>
     <string name="type.amenity.animal_shelter">动物收容所</string>
-    <string name="type.amenity.bench.backless">长凳</string>
+    <string name="type.amenity.bench.backless">无靠背长凳</string>
     <string name="type.office.security">保安室</string>
     <string name="type.building.guardhouse">保安亭</string>
     <string name="type.power.portal">能源站</string>
+    <string name="type.entrance.emergency">应急出口</string>
+    <string name="type.amenity.boat_rental">船只租赁</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>
+    <string name="type.man_made.observatory">观测台</string>
+    <string name="type.amenity.charging_station.motorcycle">摩托车</string>
+    <string name="type.amenity.car_pooling">拼车</string>
+    <string name="type.xmas.tree">圣诞树</string>
+    <string name="type.amenity.food_sharing">食物共享设施</string>
+    <string name="type.amenity.give_box">捐赠箱</string>
+    <string name="type.shop.beauty.nails">美甲店</string>
+    <string name="type.railway.turntable">铁路转车盘</string>
+    <string name="type.railway.disused.tunnel">废弃铁路隧道</string>
+    <string name="type.railway.miniature">小火车轨道</string>
+    <string name="type.railway.disused.bridge">废弃铁路桥</string>
+    <string name="type.natural.tree">树</string>
+    <string name="type.natural.sand">沙子</string>
+    <string name="type.leisure.sports_centre.sport.volleyball">运动中心</string>
+    <string name="type.leisure.sports_centre.sport.swimming">游泳中心</string>
+    <string name="type.cardinal.south">南</string>
+    <string name="type.cardinal.east">东</string>
+    <string name="type.cardinal.west">西</string>
+    <string name="type.cardinal.north">北</string>
+    <string name="type.entrance.garage">车库入口</string>
+    <string name="type.entrance.entry">单向入口</string>
+    <string name="type.emergency.access_point">紧急连络点</string>
 </resources>

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">Backless Bench</string>
+    <string name="type.amenity.bench.backless">Without Backrest</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>
@@ -154,8 +154,7 @@
     <string name="type.amenity.pub">Pub</string>
     <string name="type.amenity.public_bookcase">Book Exchange</string>
     <!-- SECTION: Types: Recycling -->
-    <string name="type.amenity.recycling.centre">Recycling Center</string>
+    <string name="type.amenity.recycling.centre">Recycling Centre</string>
-    <string name="type.amenity.recycling">Recycling Container</string>
     <string name="type.amenity.recycling.container">Recycling Container</string>
     <string name="type.recycling.batteries">Batteries</string>
     <string name="type.recycling.clothes">Clothes</string>

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

@@ -116,7 +116,7 @@
 "historic-wayside_cross": "صليب مسيحي",
 "historic-wayside_shrine": "ضريح",
 "leisure-garden": "بستان|مناظر|سياحة|حديقة",
-"amenity-bench|amenity-bench-backless": "مقعد طويل|مصطبة",
+"amenity-bench": "مقعد طويل|مصطبة",
 "amenity-bicycle_rental": "تأجير دراجات",
 "amenity-bicycle_repair_station": "تصليح الدراجات|اصلاح الدراجات|صيانة الدراجات|تصليح عجل|اصلاح عجل",
 "amenity-car_sharing": "مشاركة السيارة|تقاسم السيارة",
@@ -162,7 +162,7 @@
 "amenity-vehicle_inspection": "فحص المركبة",
 "amenity-waste_disposal": "قمامة|مهملات|سلة مهملات|صندوق قمامة",
 "amenity-recycling-centre|@category_recycling": "مركز إعادة تدوير",
-"amenity-recycling-container|amenity-recycling|@category_recycling": "حاوية لإعادة التدوير",
+"amenity-recycling-container|@category_recycling": "حاوية لإعادة التدوير",
 "recycling-batteries|@category_recycling": "ﺕﺎﻳﺭﺎﻄﺑ|بطاريات",
 "recycling-clothes|@category_recycling": "إعادة تدوير الملابس القديم|ملابس قديمة|ملابس",
 "recycling-glass_bottles|@category_recycling": "زجاجات زجاجية",

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

@@ -109,7 +109,7 @@
 "amenity-post_office|post_office-post_partner|@category_post": "3Паштовае аддзяленне",
 "amenity-vehicle_inspection": "Тэхагляд аўтамабіля",
 "amenity-recycling-centre|@category_recycling": "5Пункт прыёму другаснай сыравіны",
-"amenity-recycling-container|amenity-recycling|@category_recycling": "Кантэйнер для другаснай сыравіны",
+"amenity-recycling-container|@category_recycling": "Кантэйнер для другаснай сыравіны",
 "recycling-batteries|@category_recycling": "5Прыём батарэек|Утылізацыя батарэек|5Перапрацоўка батарэек|5Здаць батарэйкі|4Збор батарэек|5Батарэйкі",
 "recycling-clothes|@category_recycling": "5Прыём адзення|Старае адзенне|Здаць непатрэбныя рэчы|Здаць рэчы|5Здаць адзенне",
 "recycling-glass_bottles|@category_recycling": "5Прыём шклатары|Прыём шкла|5Перапрацоўка шкла|5Здаць шклатару|Здаць бутэлькі|4Збор шклотары|5Шклатара|Шклабало|Шкляныя бутэлькі",

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

@@ -116,7 +116,7 @@
 "historic-wayside_shrine": "Крайпътно светилище",
 "leisure-dog_park": "Кучешка зона|домашни любимци",
 "leisure-garden": "3Градина",
-"amenity-bench|amenity-bench-backless": "Пейка|скамейка",
+"amenity-bench": "Пейка|скамейка",
 "amenity-bicycle_rental": "велосипеди|колелета|под наем",
 "amenity-car_sharing": "Споделяне|автомобил|кола|превоз",
 "amenity-car_rental": "Кола|под наем|рент а кар|автопаркинг",
@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Проверка на автомобила",
 "amenity-waste_disposal": "Боклук|кош|контейнер|отпадък|бунище",
 "amenity-recycling-centre|@category_recycling": "Рециклиране|разделно събиране|Преработвателно средище",
-"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер|разделно|събиране|Кофи за преработваем отпадък",
+"amenity-recycling-container|@category_recycling": "Контейнер|разделно|събиране|Кофи за преработваем отпадък",
 "recycling-batteries|@category_recycling": "Батерии",
 "recycling-clothes|@category_recycling": "Стари дрехи|рециклиране|",
 "recycling-glass_bottles|@category_recycling": "Стъкло|шише|рециклиране",

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|amenity-bench-backless": "Lavička",
+"amenity-bench": "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",
@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Kontrola vozidla",
 "amenity-waste_disposal": "Odpadky|koš|popelnice|uložiště odpadu",
 "amenity-recycling-centre|@category_recycling": "Recyklační středisko",
-"amenity-recycling-container|amenity-recycling|@category_recycling": "Recyklační nádoba",
+"amenity-recycling-container|@category_recycling": "Recyklační nádoba",
 "recycling-batteries|@category_recycling": "Baterie",
 "recycling-clothes|@category_recycling": "Staré oblečení|Recyklujte staré oblečení",
 "recycling-glass_bottles|@category_recycling": "Skleněné lahve",

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|amenity-bench-backless": "Bænk",
+"amenity-bench": "Bænk",
 "amenity-bicycle_rental": "4Cykeludlejning|udlejning|cykel",
 "amenity-bicycle_repair_station": "4Cykel reparation",
 "amenity-car_sharing": "Delebiler",
@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Bilsyn",
 "amenity-waste_disposal": "Bortskaffelse af affald|skraldespand|skrald",
 "amenity-recycling-centre|@category_recycling": "Genbrugsplads",
-"amenity-recycling-container|amenity-recycling|@category_recycling": "Genbrugscontainer",
+"amenity-recycling-container|@category_recycling": "Genbrugscontainer",
 "recycling-batteries|@category_recycling": "Batterier",
 "recycling-clothes|@category_recycling": "Gammelt tøj|Genbrug gammelt tøj|Tekstil",
 "recycling-glass_bottles|@category_recycling": "Glasflasker",

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|amenity-bench-backless": "4Sitzbank|4Parkbank",
+"amenity-bench": "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",
@@ -172,7 +172,7 @@
 "amenity-vehicle_inspection": "Fahrzeuginspektion",
 "amenity-waste_disposal": "4Müllcontainer|Mülltonne|Abfälle|Müll|Müllentsorgung",
 "amenity-recycling-centre|@category_recycling": "3Recyclinghof|3Recyclingzentrum|3Wertstoffhof|U+1F6AE|U+267B",
-"amenity-recycling-container|amenity-recycling|@category_recycling": "3Wertstoffcontainer|3Recyclingbehälter|3Container|U+1F6AE|U+267B",
+"amenity-recycling-container|@category_recycling": "3Wertstoffcontainer|3Recyclingbehälter|3Container|U+1F6AE|U+267B",
 "recycling-batteries|@category_recycling": "Batterien",
 "recycling-clothes|@category_recycling": "3Altkleider|3Alte Kleidung|3Kleiderspende|3Altkleidercontainer",
 "recycling-glass_bottles|@category_recycling": "4Glas-Container|3Glasflaschen|3Altglas",

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

@@ -116,7 +116,7 @@
 "historic-wayside_cross": "Σταυρός στην άκρη του δρόμου",
 "historic-wayside_shrine": "Εικονοστάσιο στην άκρη του δρόμου",
 "leisure-garden": "Κήπος αναψυχής|αξιοθέατα",
-"amenity-bench|amenity-bench-backless": "Παγκάκι",
+"amenity-bench": "Παγκάκι",
 "amenity-bicycle_rental": "Ενοικιάσεις ποδηλάτων|δίκυκλο|ποδήλατο|ενοικιάσεις",
 "amenity-car_sharing": "Παραχώρηση αυτοκινήτου",
 "amenity-car_rental": "Ενοικίαση αυτοκινήτου|αυτοκίνητο|ενοικιάσεις|κοινή χρήση",
@@ -160,7 +160,7 @@
 "amenity-vehicle_inspection": "Έλεγχος οχήματος",
 "amenity-waste_disposal": "Διαχείριση απορριμμάτων|σκουπίδια",
 "amenity-recycling-centre|@category_recycling": "Κέντρο ανακύκλωσης",
-"amenity-recycling-container|amenity-recycling|@category_recycling": "Κάδος ανακύκλωσης",
+"amenity-recycling-container|@category_recycling": "Κάδος ανακύκλωσης",
 "recycling-batteries|@category_recycling": "Μπαταρίες",
 "recycling-clothes|@category_recycling": "Παλιά ρούχα|Ανακύκλωση παλαιών ρούχων",
 "recycling-glass_bottles|@category_recycling": "Γυάλινα μπουκάλια",