update pbf

Either move to o5m for subways or remove from here

Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>

.forgejo/workflows/process_subways.yml

@@ -35,6 +35,47 @@ jobs:
           cd ~
           git clone --depth 1 --single-branch https://codeberg.org/comaps/subways.git
 
+  update-planet-pbf:
+    name: Update PBF Planet
+    runs-on: mapfilemaker
+    container:
+      image: codeberg.org/comaps/maps_generator:f6d53d54f794
+      volumes:
+        - /mnt/4tbexternal/:/mnt/4tbexternal/
+        - /mnt/4tbexternal/osm-planet:/home/planet
+    concurrency:
+      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
+    steps:
+      - name: Download Planet File if Absent
+        shell: bash
+        # TODO: replace wget2 with curl -Z
+        run: |
+          if [ ! -d /home/planet/planet/ ]; then
+          mkdir -p /home/planet/planet/
+          fi
+          if [ ! -f /home/planet/planet/planet-latest.osm.pbf ]; then
+          cd /home/planet/planet/
+          wget2 --verbose --progress=bar --continue https://ftpmirror.your.org/pub/openstreetmap/pbf/planet-latest.osm.pbf
+          else
+          echo "planet-latest.osm.pbf was found, raw download not required."
+          fi
+      - name: Update PBF Planet
+        shell: bash
+        run: |
+          cd /home/planet/planet/
+          rm -f planet-latest-new.osm.pbf
+          pyosmium-up-to-date planet-latest.osm.pbf -o planet-latest-new.osm.pbf -v --size 16384
+          mv planet-latest-new.osm.pbf planet-latest.osm.pbf
+      - name: Notify Zulip
+        run: |
+          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
+            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
+            --data-urlencode type=stream \
+            --data-urlencode 'to="DevOps"' \
+            --data-urlencode topic=codeberg-bot \
+            --data-urlencode 'content=PBF planet update is done!'
+
   update-planet-o5m:
     name: Update O5M Planet
     runs-on: mapfilemaker
@@ -83,7 +124,6 @@ jobs:
             --data-urlencode 'content=O5M planet update is done!'
 
   update-subways:
-    if: inputs.run-subways
     name: Update Subways
     runs-on: mapfilemaker
     needs:
@@ -94,7 +134,7 @@ jobs:
         - /mnt/4tbexternal/:/mnt/4tbexternal/
         - /mnt/4tbexternal/osm-planet:/home/planet
     concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
+      group: ${{ github.workflow }}-processs-subways-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     steps:
       - uses: actions/cache@v4

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

@@ -98,11 +98,6 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mSpeedLimit = topFrame.findViewById(R.id.nav_speed_limit);
     mCurrentSpeed = topFrame.findViewById(R.id.nav_current_speed);
 
-    View mTopbar = topFrame.findViewById(R.id.statutbar);
-    ViewCompat.setOnApplyWindowInsetsListener(mTopbar,(v, windowInsets) -> {
-        UiUtils.setViewNavigationTopInsetsMargin(v, windowInsets);
-        return windowInsets;
-    });
     // Show a blank view below the navbar to hide the menu content
     final View navigationBarBackground = mFrame.findViewById(R.id.nav_bottom_sheet_nav_bar);
     final View nextTurnContainer = mFrame.findViewById(R.id.nav_next_turn_container);

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

@@ -6,10 +6,12 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.XmlRes;
+import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import app.organicmaps.R;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
 
@@ -42,6 +44,7 @@ abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
   {
     super.onViewCreated(view, savedInstanceState);
+    view.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.bg_cards));
     RecyclerView recyclerView = getListView();
     ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new ScrollableContentInsetsListener(recyclerView));
   }

android/app/src/main/java/app/organicmaps/util/UiUtils.java

@@ -196,7 +196,7 @@ public final class UiUtils
   public static void showHomeUpButton(MaterialToolbar toolbar)
   {
     toolbar.setNavigationIcon(
-        UiUtils.getStyledResourceId(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
+        ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
   }
 
   // this method returns the total height of the display (in pixels) including notch and other touchable areas
@@ -281,14 +281,6 @@ public final class UiUtils
     view.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, view.getPaddingBottom());
   }
 
-  public static void setViewNavigationTopInsetsMargin(View view, WindowInsetsCompat windowInsets)
-  {
-      final Insets systemInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
-      ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
-      lp.topMargin = systemInsets.top;
-      view.setLayoutParams(lp);
-  }
-
   public static void setupNavigationIcon(@NonNull MaterialToolbar toolbar, @NonNull View.OnClickListener listener)
   {
     View customNavigationButton = toolbar.findViewById(R.id.back);

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M80,360v-160q0,-33 23.5,-56.5T160,120h640q33,0 56.5,23.5T880,200v160h-80v-160L160,200v160L80,360ZM160,720q-33,0 -56.5,-23.5T80,640v-200h80v200h640v-200h80v200q0,33 -23.5,56.5T800,720L160,720ZM40,840v-80h880v80L40,840ZM480,420ZM80,440v-80h240q11,0 21,6t15,16l47,93 123,-215q5,-9 14,-14.5t20,-5.5q11,0 21,5.5t15,16.5l49,98h235v80L620,440q-11,0 -21,-5.5T584,418l-26,-53 -123,215q-5,10 -15,15t-21,5q-11,0 -20.5,-6T364,578l-69,-138L80,440Z"
       android:fillColor="#fff"/>

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

@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="?iconTint"
+    android:tint="?colorControlNormal"
     android:height="24dp"
     android:width="24dp"
     android:viewportHeight="960"

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M480,840q-150,0 -255,-105T120,480q0,-150 105,-255t255,-105q14,0 27.5,1t26.5,3q-41,29 -65.5,75.5T444,300q0,90 63,153t153,63q55,0 101,-24.5t75,-65.5q2,13 3,26.5t1,27.5q0,150 -105,255T480,840ZM480,760q88,0 158,-48.5T740,585q-20,5 -40,8t-40,3q-123,0 -209.5,-86.5T364,300q0,-20 3,-40t8,-40q-78,32 -126.5,102T200,480q0,116 82,198t198,82ZM470,490Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
     <path
         android:pathData="M19,9h-4v-6h-6v6h-4l7,7 7,-7ZM5,18v2h14v-2h-14Z"
         android:fillColor="#FFF"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M216,784q-45,-45 -70.5,-104T120,558q0,-63 24,-124.5T222,318q35,-35 86.5,-60t122,-39.5Q501,204 591.5,201t202.5,7q8,106 5,195t-16.5,160.5q-13.5,71.5 -38,125T684,778q-53,53 -112.5,77.5T450,880q-65,0 -127,-25.5T216,784ZM328,768q29,17 59.5,24.5T450,800q46,0 91,-18.5t86,-59.5q18,-18 36.5,-50.5t32,-85Q709,534 716,459.5t2,-177.5q-49,-2 -110.5,-1.5T485,290q-61,9 -116,29t-90,55q-45,45 -62,89t-17,85q0,59 22.5,103.5T262,714q42,-80 111,-153.5T534,440q-72,63 -125.5,142.5T328,768ZM328,768ZM328,768Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M200,800v-280h-80v-80h240v80h-80v280h-80ZM200,360v-200h80v200h-80ZM360,360v-80h80v-120h80v120h80v80L360,360ZM440,800v-360h80v360h-80ZM680,800v-120h-80v-80h240v80h-80v120h-80ZM680,520v-360h80v360h-80Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M280,920q-33,0 -56.5,-23.5T200,840v-720q0,-33 23.5,-56.5T280,40h400q33,0 56.5,23.5T760,120v124q18,7 29,22t11,34v80q0,19 -11,34t-29,22v404q0,33 -23.5,56.5T680,920L280,920ZM280,840h400v-720L280,120v720ZM280,840v-720,720ZM394,640h172q14,0 24,-10t10,-24v-132q0,-14 -10,-24t-24,-10h-6v-40q0,-33 -23.5,-56.5T480,320q-33,0 -56.5,23.5T400,400v40h-6q-14,0 -24,10t-10,24v132q0,14 10,24t24,10ZM440,440v-40q0,-17 11.5,-28.5T480,360q17,0 28.5,11.5T520,400v40h-80Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M339,698q22,-22 49.5,-36t58.5,-19q-5,19 -8,38t-3,39q0,24 3.5,47t11.5,44L339,698ZM254,614 L170,528q62,-62 142,-95t168,-33q49,0 96,10.5t90,30.5q-44,8 -81.5,29T517,522q-9,-1 -18.5,-1.5T480,520q-64,0 -122.5,24.5T254,614ZM84,444 L0,360q95,-97 219.5,-148.5T480,160q136,0 260.5,51.5T960,360l-84,84q-79,-79 -181.5,-121.5T480,280q-112,0 -214.5,42.5T84,444ZM760,520 L772,580q12,5 22.5,10.5T816,604l58,-18 40,68 -46,40q2,12 2,26t-2,26l46,40 -40,68 -58,-18q-11,8 -21.5,13.5T772,860l-12,60h-80l-12,-60q-12,-5 -22.5,-10.5T624,836l-58,18 -40,-68 46,-40q-2,-12 -2,-26t2,-26l-46,-40 40,-68 58,18q11,-8 21.5,-13.5T668,580l12,-60h80ZM720,640q-33,0 -56.5,23.5T640,720q0,33 23.5,56.5T720,800q33,0 56.5,-23.5T800,720q0,-33 -23.5,-56.5T720,640Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M480,480q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM160,800v-112q0,-34 17.5,-62.5T224,582q62,-31 126,-46.5T480,520q66,0 130,15.5T736,582q29,15 46.5,43.5T800,688v112L160,800ZM240,720h480v-32q0,-11 -5.5,-20T700,654q-54,-27 -109,-40.5T480,600q-56,0 -111,13.5T260,654q-9,5 -14.5,14t-5.5,20v32ZM480,400q33,0 56.5,-23.5T560,320q0,-33 -23.5,-56.5T480,240q-33,0 -56.5,23.5T400,320q0,33 23.5,56.5T480,400ZM480,320ZM480,720Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="m798,638 l-62,-62q44,-41 69,-97t25,-119q0,-63 -25,-118t-69,-96l62,-64q56,53 89,125t33,153q0,81 -33,153t-89,125ZM670,510l-64,-64q18,-17 29,-38.5t11,-47.5q0,-26 -11,-47.5T606,274l64,-64q32,29 50,67.5t18,82.5q0,44 -18,82.5T670,510ZM360,520q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM40,840v-112q0,-33 17,-62t47,-44q51,-26 115,-44t141,-18q77,0 141,18t115,44q30,15 47,44t17,62v112L40,840ZM120,760h480v-32q0,-11 -5.5,-20T580,694q-36,-18 -92.5,-36T360,640q-71,0 -127.5,18T140,694q-9,5 -14.5,14t-5.5,20v32ZM360,440q33,0 56.5,-23.5T440,360q0,-33 -23.5,-56.5T360,280q-33,0 -56.5,23.5T280,360q0,33 23.5,56.5T360,440ZM360,360ZM360,760Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M360,440h80v-160h-80v160ZM480,440h80v-160h-80v160ZM600,440h80v-160h-80v160ZM240,880q-33,0 -56.5,-23.5T160,800v-480l240,-240h320q33,0 56.5,23.5T800,160v640q0,33 -23.5,56.5T720,880L240,880ZM240,800h480v-640L434,160L240,354v446ZM240,800h480,-480Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M13.26,3C8.17,2.86 4,6.95 4,12L2.21,12c-0.45,0 -0.67,0.54 -0.35,0.85l2.79,2.8c0.2,0.2 0.51,0.2 0.71,0l2.79,-2.8c0.31,-0.31 0.09,-0.85 -0.36,-0.85L6,12c0,-3.9 3.18,-7.05 7.1,-7 3.72,0.05 6.85,3.18 6.9,6.9 0.05,3.91 -3.1,7.1 -7,7.1 -1.61,0 -3.1,-0.55 -4.28,-1.48 -0.4,-0.31 -0.96,-0.28 -1.32,0.08 -0.42,0.42 -0.39,1.13 0.08,1.49C9,20.29 10.91,21 13,21c5.05,0 9.14,-4.17 9,-9.26 -0.13,-4.69 -4.05,-8.61 -8.74,-8.74zM12.75,8c-0.41,0 -0.75,0.34 -0.75,0.75v3.68c0,0.35 0.19,0.68 0.49,0.86l3.12,1.85c0.36,0.21 0.82,0.09 1.03,-0.26 0.21,-0.36 0.09,-0.82 -0.26,-1.03l-2.88,-1.71v-3.4c0,-0.4 -0.34,-0.74 -0.75,-0.74z"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M480,560q-33,0 -56.5,-23.5T400,480q0,-33 23.5,-56.5T480,400q33,0 56.5,23.5T560,480q0,33 -23.5,56.5T480,560ZM480,840q-139,0 -241,-91.5T122,520h82q14,104 92.5,172T480,760q117,0 198.5,-81.5T760,480q0,-117 -81.5,-198.5T480,200q-69,0 -129,32t-101,88h110v80L120,400v-240h80v94q51,-64 124.5,-99T480,120q75,0 140.5,28.5t114,77q48.5,48.5 77,114T840,480q0,75 -28.5,140.5t-77,114q-48.5,48.5 -114,77T480,840Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M160,720q-33,0 -56.5,-23.5T80,640v-320q0,-33 23.5,-56.5T160,240h640q33,0 56.5,23.5T880,320v320q0,33 -23.5,56.5T800,720L160,720ZM160,640h640v-320L680,320v160h-80v-160h-80v160h-80v-160h-80v160h-80v-160L160,320v320ZM280,480h80,-80ZM440,480h80,-80ZM600,480h80,-80ZM480,480Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M280,800v-520L80,280v-120h520v120L400,280v520L280,800ZM640,800v-320L520,480v-120h360v120L760,480v320L640,800Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480h80q0,115 72.5,203T418,794l-58,-58 56,-56L598,862q-29,10 -58.5,14T480,880ZM500,600v-240h120q17,0 28.5,11.5T660,400v160q0,17 -11.5,28.5T620,600L500,600ZM300,600v-60h100v-40h-60v-40h60v-40L300,420v-60h120q17,0 28.5,11.5T460,400v160q0,17 -11.5,28.5T420,600L300,600ZM560,540h40v-120h-40v120ZM800,480q0,-115 -72.5,-203T542,166l58,58 -56,56 -182,-182q29,-10 58.5,-14t59.5,-4q83,0 156,31.5T763,197q54,54 85.5,127T880,480h-80Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880h-84ZM160,760l-56,-56 202,-202q-35,-35 -63.5,-80T190,320h84q20,39 40,68t48,58q33,-33 68.5,-92.5T484,240L40,240v-80h280v-80h80v80h280v80L564,240q-21,72 -63,148t-83,116l96,98 -30,82 -122,-125 -202,201ZM628,688h144l-72,-204 -72,204Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880h-84ZM628,688h144l-72,-204 -72,204ZM254,640q-66,0 -123.5,-38.5T44,498l72,-36q21,42 58,70t79,28q38,0 62.5,-23.5T340,480q0,-33 -23.5,-56.5T260,400h-60v-80h60q25,0 42.5,-17.5T320,260q0,-25 -17,-42.5T261,200q-23,0 -41,15t-32,33l-63,-49q26,-32 60,-55.5t77,-23.5q57,0 97.5,40.5T400,259q0,27 -10,52.5T361,357q10,10 18.5,20.5T396,400h124v-200h-80v-80h240v80h-80v116l-61,164L420,480v4q0,63 -46,109.5T254,640Z"
       android:fillColor="#fff"/>

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

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="960"
     android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
   <path
       android:pathData="M480,840 L0,359q93,-93 215.5,-146T480,160q142,0 264.5,53T960,359l-56,57q-81,-81 -190,-128.5T480,240q-103,0 -195,32.5T117,363l419,420 -56,57ZM864,800L761,698q-18,11 -38,16.5t-43,5.5q-68,0 -114,-46t-46,-114q0,-68 46,-114t114,-46q68,0 114,46t46,114q0,23 -5.5,43T818,641l102,103 -56,56ZM680,640q34,0 57,-23t23,-57q0,-34 -23,-57t-57,-23q-34,0 -57,23t-23,57q0,34 23,57t57,23ZM480,783Z"
       android:fillColor="#fff"/>

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

@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
     android:clipToPadding="false"
     android:fadeScrollbars="false"
     android:fillViewport="true">

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

@@ -13,7 +13,7 @@
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
     android:fadeScrollbars="false"
     android:fillViewport="true"
     android:clipToPadding="false">

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

@@ -11,12 +11,13 @@
   <FrameLayout
     android:layout_width="match_parent"
     android:id="@+id/statutbar"
-    android:layout_height="1dp"
+    android:layout_height="15dp"
     app:layout_constraintTop_toTopOf="parent" />
   <com.google.android.material.card.MaterialCardView
     android:id="@+id/street_frame"
     android:layout_width="500dp"
     android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/margin_half_plus_eight"
     android:layout_marginEnd="@dimen/margin_quarter"
     app:cardCornerRadius="@dimen/margin_half"
     android:elevation="@dimen/nav_elevation"
@@ -51,6 +52,7 @@
     app:layout_constraintEnd_toStartOf="@+id/street_frame"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/statutbar"
+    android:layout_marginTop="@dimen/margin_half_plus_eight"
     android:layout_marginStart="@dimen/margin_quarter"
     android:clickable="true"
     android:elevation="@dimen/nav_elevation">

android/app/src/main/res/layout-w1020dp/activity_settings.xml

@@ -3,8 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical"
-  android:background="?appBackground">
+  android:orientation="vertical">
 
   <include
     layout="@layout/toolbar_extended"/>
@@ -18,8 +17,7 @@
       android:id="@+id/fragment_container"
       style="@style/MwmWidget.FrameLayout.Elevation"
       android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:background="?appBackground"/>
+      android:layout_height="match_parent"/>
   </com.google.android.material.card.MaterialCardView>
 
 </FrameLayout>

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
     android:clipToPadding="false"
     android:fadeScrollbars="false"
     android:fillViewport="true">

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

@@ -5,7 +5,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?appBackground">
+  android:background="?cardBackground">
   <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"

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

@@ -4,7 +4,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?appBackground"
+  android:background="?cardBackground"
   android:gravity="center"
   android:orientation="vertical">
 

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
     android:gravity="center"
     android:orientation="vertical">
 

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

@@ -3,8 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical"
-  android:background="?appBackground">
+  android:orientation="vertical">
 
   <include
     layout="@layout/toolbar_default"/>

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

@@ -2,11 +2,18 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?appBackground"
+  android:background="?cardBackground"
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <include layout="@layout/toolbar_default"/>
+  <com.google.android.material.appbar.MaterialToolbar
+    android:id="@+id/toolbar"
+    style="@style/MwmWidget.ToolbarStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="end|center_vertical"
+    android:theme="@style/MwmWidget.ToolbarTheme">
+  </com.google.android.material.appbar.MaterialToolbar>
   <LinearLayout
     android:layout_marginTop="@dimen/margin_half_double_plus"
     android:orientation="horizontal"

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

@@ -13,7 +13,7 @@
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
     android:fadeScrollbars="false"
     android:fillViewport="true"
     android:clipToPadding="false">

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

@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical"
-  android:background="?appBackground">
+  android:background="?cardBackground">
   <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="?appBackground">
+    android:background="?cardBackground">
 
   <com.google.android.material.textview.MaterialTextView
       android:id="@+id/header"

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

@@ -11,12 +11,13 @@
   <FrameLayout
     android:layout_width="match_parent"
     android:id="@+id/statutbar"
-    android:layout_height="1dp"
+    android:layout_height="25dp"
     app:layout_constraintTop_toTopOf="parent" />
   <com.google.android.material.card.MaterialCardView
     android:id="@+id/street_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/margin_half_plus"
     android:layout_marginStart="@dimen/nav_street_left"
     android:layout_marginEnd="@dimen/margin_quarter"
     app:cardCornerRadius="@dimen/margin_half"
@@ -54,6 +55,7 @@
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/statutbar"
     android:layout_marginStart="@dimen/margin_half"
+    android:layout_marginTop="@dimen/margin_half_plus"
     android:clickable="true"
     android:elevation="@dimen/nav_elevation">
     <LinearLayout

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

@@ -9,7 +9,7 @@ android:layout_marginHorizontal="@dimen/margin_base"
 android:layout_marginTop="@dimen/margin_half"
 app:strokeWidth="1dp"
 app:strokeColor="@color/base_accent"
-app:cardBackgroundColor="?cardBackground">
+app:cardBackgroundColor="@color/bg_cards">
 
 <LinearLayout
   android:layout_width="match_parent"

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

@@ -30,7 +30,8 @@
             android:layout_alignParentStart="true"
             android:background="?selectableItemBackgroundBorderless"
             app:srcCompat="?homeAsUpIndicator"
-            android:scaleType="center" />
+            android:scaleType="center"
+            tools:src="@drawable/ic_expand_more" />
 
         <RadioGroup
             android:id="@+id/route_type"

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:orientation="vertical">
@@ -10,8 +9,7 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:theme="@style/MwmWidget.ToolbarTheme"
-    app:navigationIcon="@drawable/ic_expand_more"/>
+    android:theme="@style/MwmWidget.ToolbarTheme.DownButton"/>
 
   <View
     android:layout_width="match_parent"

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

@@ -17,6 +17,7 @@
     android:background="?selectableItemBackgroundBorderless"
     app:srcCompat="?homeAsUpIndicator"
     android:scaleType="center"
+    tools:src="@drawable/ic_expand_more"
     android:contentDescription="@string/back"/>
 
   <com.google.android.material.textfield.TextInputEditText

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.MaterialToolbar
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/toolbar"
+  style="@style/MwmWidget.ToolbarStyle"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:theme="@style/MwmWidget.ToolbarTheme.Transparent"/>

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

@@ -9,7 +9,7 @@
     <string name="delete">Löschen</string>
     <string name="download_maps">Karten herunterladen</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Das Herunterladen ist fehlgeschlagen – antippen für einen erneuten Versuch</string>
+    <string name="download_has_failed">Das Herunterladen ist fehlgeschlagen, Antippen für einen neuen Versuch</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Wird heruntergeladen …</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -27,7 +27,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Eingeschränkte Genauigkeit</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Um eine genaue Navigation zu gewährleisten, aktiviere „Genauer Standort“ in den Einstellungen</string>
+    <string name="precise_location_is_disabled_long_text">Um eine genaue Navigation zu gewährleisten, aktivieren Sie „Genauer Standort“ in den Einstellungen</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Auf der Karte anzeigen</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -36,7 +36,7 @@
     <string name="try_again">Erneut versuchen</string>
     <string name="about_menu_title">Über CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Freies Projekt, von der Gemeinschaft entwickelt</string>
+    <string name="about_headline">Offenes Projekt, von der Gemeinschaft entwickelt</string>
     <!-- Text in About screen -->
     <string name="about_proposition_1">• Ausgereift und einfach zu bedienen</string>
     <!-- Text in About screen -->
@@ -53,10 +53,10 @@
     <!-- Used in DownloadResources startup screen -->
     <string name="disconnect_usb_cable">Bitte USB-Kabel entfernen oder Speicherkarte einsetzen, um CoMaps zu verwenden</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">Bitte zuerst den Speicherplatz auf der SD-Karte/USB-Speicher freigeben, um die Anwendung nutzen zu können</string>
-    <string name="download_resources">Bevor Sie die App verwenden, laden Sie bitte die weltweite Übersichtskarte herunter. \nEs werden %s des Speicherplatzes benötigt.</string>
+    <string name="not_enough_free_space_on_sdcard">Bitte zuerst Speicherplatz auf SD-Karte/USB-Speicher freigeben, um die Anwendung zu nutzen</string>
+    <string name="download_resources">Bevor Sie die App verwenden, laden Sie bitte die weltweite Übersichtskarte herunter. \nEs werden %s Speicherplatz benötigt.</string>
     <string name="download_resources_continue">Zur Karte</string>
-    <string name="downloading_country_can_proceed">%1$s (%2$s) wird heruntergeladen. \nSie können jetzt zur Karte weitergehen.</string>
+    <string name="downloading_country_can_proceed">%1$s (%2$s) wird heruntergeladen. Sie können jetzt \nzur Karte weitergehen.</string>
     <string name="download_country_ask">%1$s herunterladen? (%2$s)</string>
     <string name="update_country_ask">%1$s aktualisieren? (%2$s)</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
@@ -84,7 +84,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Karten speichern auf</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Wähle den Speicherort für die herunterzuladenden Karten</string>
+    <string name="maps_storage_summary">Wählen Sie den Speicherort für die herunterzuladenden Karten</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Heruntergeladene Karten</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
@@ -94,7 +94,7 @@
     <!-- Error moving map files from one storage to another -->
     <string name="move_maps_error">Fehler beim Verschieben der Karten</string>
     <!-- Ask user to wait several minutes (some long process in modal dialog). -->
-    <string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen. \nBitte warten …</string>
+    <string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen. \nBitte warten …</string>
     <!-- Measurement units title in settings activity -->
     <string name="measurement_units">Maßeinheiten</string>
     <!-- Detailed description of Measurement Units settings button -->
@@ -105,7 +105,7 @@
     <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
     <string name="category_food">Lebensmittel</string>
     <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
-    <string name="category_transport">ÖPNV</string>
+    <string name="category_transport">Verkehr</string>
     <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
     <string name="category_fuel">Tankstelle</string>
     <!-- Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! -->
@@ -125,7 +125,7 @@
     <!-- Search category for nightclubs/bars; any changes should be duplicated in categories.txt @category_nightlife! -->
     <string name="category_nightlife">Nachtleben</string>
     <!-- Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @category_children! -->
-    <string name="category_children">Familienfreizeit</string>
+    <string name="category_children">Freizeit mit Kindern</string>
     <!-- Search category for banks; any changes should be duplicated in categories.txt @category_bank! -->
     <string name="category_bank">Bank</string>
     <!-- Search category for pharmacies; any changes should be duplicated in categories.txt @category_pharmacy! -->
@@ -137,7 +137,7 @@
     <!-- Search category for post offices; any changes should be duplicated in categories.txt @category_post! -->
     <string name="category_post">Post</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
-    <string name="category_police">Polizei</string>
+    <string name="category_police">Polizeistation</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Recycling</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -148,8 +148,8 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notizen</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps-Lesezeichen wurden mit dir geteilt</string>
-    <string name="share_bookmarks_email_body">Hallo! \n \nIm Anhang sind meine Lesezeichen der CoMaps-App. Du kannst in CoMaps öffnen. Wenn du die App nicht installiert hast, kannst du sie von https://www.comaps.app/download/ für iOS oder Android herunterladen. \n \nViel Spaß beim Navigieren mit CoMaps!</string>
+    <string name="share_bookmarks_email_subject">CoMaps-Lesezeichen wurden mit Ihnen geteilt</string>
+    <string name="share_bookmarks_email_body">Hallo! \n \nIm Anhang sind meine Lesezeichen der CoMaps App. Sie können sie mit CoMaps öffnen. Wenn Sie die App nicht installiert haben, können Sie sie von https://www.comaps.app/download/ für iOS oder Android herunterladen. \n \nViel Spaß beim Reisen mit CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Lesezeichen werden geladen</string>
     <!-- Kmz file successful loading -->
@@ -163,15 +163,15 @@
     <!-- resource for context menu -->
     <string name="edit">Bearbeiten</string>
     <!-- Warning message when doing search around current position -->
-    <string name="unknown_current_position">Dein Standort konnte noch nicht ermittelt werden</string>
+    <string name="unknown_current_position">Ihr Standort konnte noch nicht ermittelt werden</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Entschuldige, die Einstellungen für die Kartenspeicherung sind aktuell deaktiviert</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Die Karte wird jetzt heruntergeladen</string>
+    <string name="downloading_is_active">Die Karte wird heruntergeladen</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">Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://www.comaps.app/de/download/</string>
+    <string name="my_position_share_sms">Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hey, sieh dir meine Stecknadel in der CoMaps-App an!</string>
+    <string name="bookmark_share_email_subject">Hey, sieh dir meine Stecknadel auf der CoMaps-Karte an!</string>
     <!-- Subject for emailed position -->
     <string name="my_position_share_email_subject">Hey, sieh dir meinen aktuellen Standort auf der CoMaps-Karte an!</string>
     <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
@@ -179,7 +179,7 @@
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
     <string name="share">Teilen</string>
     <!-- Share by email button text, also used in editor and About. -->
-    <string name="email">E-Mail</string>
+    <string name="email">Email</string>
     <!-- Text for message when used successfully copied something -->
     <string name="copied_to_clipboard">In die Zwischenablage kopiert: %s</string>
     <!-- Used for bookmark editing -->
@@ -197,7 +197,7 @@
     <string name="prefs_group_information">Information</string>
     <string name="prefs_group_route">Navigation</string>
     <string name="pref_zoom_title">Zoom-Tasten</string>
-    <string name="pref_zoom_summary">Zur Anzeige auf der Karte</string>
+    <string name="pref_zoom_summary">Auf der Karte anzeigen</string>
     <!-- Settings «Map» category: «Night style» title -->
     <string name="pref_map_style_title">Nachtmodus</string>
     <!-- Generic «Off» string -->
@@ -219,9 +219,9 @@
     <!-- Settings «Route» category: «Tts announce street names» description -->
     <string name="pref_tts_street_names_description">Wenn aktiviert, wird der Name der Straße oder Ausfahrt, in die abgebogen werden soll, laut angekündigt.</string>
     <!-- Settings «Route» category: «Tts language» title -->
-    <string name="pref_tts_language_title">Sprache der Sprachführung</string>
+    <string name="pref_tts_language_title">Sprache für Sprachführung</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Teste die Sprachanweisungen</string>
+    <string name="pref_tts_test_voice_title">Teste Sprachanweisungen</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Überprüfe die Lautstärke oder die Text-To-Speech-Einstellungen des Systems, wenn du die Stimme jetzt nicht hören kannst</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -330,7 +330,7 @@
     <string name="blue_gray">Graublau</string>
     <!-- SECTION: Routing dialogs strings -->
     <string name="dialog_routing_disclaimer_title">Wenn Sie der Route folgen, beachten Sie bitte:</string>
-    <string name="dialog_routing_disclaimer_priority">— Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;</string>
+    <string name="dialog_routing_disclaimer_priority">– Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;</string>
     <string name="dialog_routing_disclaimer_precision">– Die Karte kann ungenau sein, und die vorgeschlagene Route ist möglicherweise nicht der optimale Weg, um das Ziel zu erreichen;</string>
     <string name="dialog_routing_disclaimer_recommendations">— Die vorgeschlagenen Routen sind als Empfehlungen zu verstehen;</string>
     <string name="dialog_routing_disclaimer_borders">— Bitte seien Sie vorsichtig bei Routen in Grenzgebieten: die Routen, die unsere App erstellt, können manchmal Landesgrenzen in gesperrten Gebieten überschreiten.</string>
@@ -543,7 +543,7 @@
     <string name="big_font">Schrift auf der Karte vergrößern</string>
     <string name="traffic_update_app">Bitte aktualisieren Sie CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
-    <string name="traffic_data_unavailable">Es sind keine Verkehrsdaten verfügbar</string>
+    <string name="traffic_data_unavailable">Verkehrsdaten sind nicht verfügbar</string>
     <string name="enable_logging">Protokollierung aktivieren</string>
     <!-- Settings: "Send general feedback" button -->
     <string name="feedback_general">Allgemeines Feedback</string>
@@ -873,7 +873,7 @@
     <string name="avoid_steps">Treppen vermeiden</string>
     <string name="editor_place_doesnt_exist_description">Beschreibe wie der Ort jetzt aussieht um eine Fehlermeldung an die OpenStreetMap Community zu senden</string>
     <string name="offline_explanation_title">Offline-Karten</string>
-    <string name="offline_explanation_text">Um die Gegend anzusehen und zu erkunden, musst du eine Karte runterladen.\nLade dir Karten für die Gebiete runter, die du bereisen willst.</string>
+    <string name="offline_explanation_text">Um die Gegend anzusehen, muss eine Karte heruntergeladen werden.\nLaden Sie Karten für die Gebiete herunter, die Sie bereisen möchten.</string>
     <string name="charge_socket_type2">Typ 2 (ohne Kabel)</string>
     <string name="charge_socket_type2_cable">Typ 2 (mit Kabel)</string>
     <string name="charge_socket_type2_combo">Typ 2 Combo</string>
@@ -898,15 +898,15 @@
     <string name="opens_day_at">Öffnet am %1$s um %2$s</string>
     <string name="closes_day_at">Schließt am %1$s um %2$s</string>
     <plurals name="minutes_short">
-        <item quantity="one">(%d min)</item>
-        <item quantity="other">(%d min)</item>
+        <item quantity="one">%d min</item>
+        <item quantity="other">%d min</item>
     </plurals>
     <string name="editor_business_vacant_button">Geschäft steht leer</string>
     <string name="editor_mark_business_vacant_title">Geschäft auf leerstehend setzen</string>
     <string name="editor_submit">Absenden</string>
     <string name="editor_mark_business_vacant_description">Verwenden Sie diese Option, wenn das Geschäft ausgezogen ist und ein neues Geschäft die leerstehenden Räume übernehmen könnte.</string>
     <string name="charge_socket_schuko">Schuko</string>
-    <string name="power_management">Stromverbrauch verwalten</string>
+    <string name="power_management">Energiemanagement</string>
     <string name="place_page_map_too_old_title">Kartendaten veraltet</string>
     <string name="place_page_map_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die Karte.</string>
     <string name="place_page_app_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die CoMaps-App.</string>

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

@@ -732,7 +732,7 @@
     <!-- App tip #01 -->
     <string name="app_tip_01">Med dine donasjoner og støtte kan vi lage de beste kartene i verden!</string>
     <!-- App tip #02 -->
-    <string name="app_tip_02">Liker du appen vår? Vennligst doner for å støtte utviklingen! Liker du den ikke ennå? La oss få vite hvorfor, så fikser vi det!</string>
+    <string name="app_tip_02">Liker du appen vår? Vennligst doner for å støtte utviklingen! Liker du det ikke ennå? Gi oss beskjed, så fikser vi det!</string>
     <!-- App tip #03 -->
     <string name="app_tip_03">Hvis du kjenner en programvareutvikler, kan du be ham eller henne implementere en funksjon du trenger.</string>
     <!-- App tip #04 -->
@@ -746,7 +746,7 @@
     <!-- App tip #08 -->
     <string name="app_tip_08">Du kan enkelt fikse og forbedre kartdataene.</string>
     <!-- App tip #09 -->
-    <string name="app_tip_09">Vårt hovedmål er å lage raske, personvernfokuserte, brukervennlige kart som du vil like.</string>
+    <string name="app_tip_09">Vårt hovedmål er å bygge raske, personvernfokuserte, brukervennlige kart som du vil elske.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
     <string name="car_used_on_the_phone_screen">Du bruker nå CoMaps på telefonskjermen</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->

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

@@ -150,8 +150,6 @@
     <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
     <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
     <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
-
-    <item name="appBackground">?android:attr/colorBackground</item>
   </style>
 
   <style name="MwmTheme" parent="MwmTheme.Base"/>

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

@@ -64,7 +64,6 @@
   <color name="bg_cards">@android:color/white</color>
   <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_dialog_translucent">#BB000000</color>
   <color name="bg_text_translucent">#99FFFFFF</color>

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

@@ -148,6 +148,11 @@
     <item name="buttonGravity">center_vertical</item>
   </style>
 
+  <style name="MwmWidget.ToolbarStyle.Light">
+    <item name="android:titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title.Light</item>
+    <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title.Light</item>
+  </style>
+
   <style name="MwmWidget.ToolbarStyle.NoElevation">
     <item name="android:elevation">0dp</item>
   </style>
@@ -159,6 +164,29 @@
     <item name="iconTint">@color/white_primary</item>
   </style>
 
+  <style name="MwmWidget.ToolbarTheme.Light" parent="MwmWidget.ToolbarTheme">
+    <item name="android:gravity">center_vertical</item>
+    <item name="colorAccent">@android:color/white</item>
+    <item name="colorSecondary">#FF32363A</item>
+  </style>
+
+  <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.Material3.Dark.ActionBar">
+    <item name="android:gravity">center_vertical</item>
+    <item name="colorAccent">@android:color/white</item>
+    <item name="colorSecondary">@android:color/white</item>
+    <item name="android:windowActionBarOverlay">true</item>
+    <item name="windowActionBarOverlay">true</item>
+  </style>
+
+  <style
+    name="MwmWidget.ToolbarTheme.DownButton"
+    parent="ThemeOverlay.Material3.Dark.ActionBar">
+    <item name="android:gravity">center_vertical</item>
+    <item name="colorAccent">@android:color/white</item>
+    <item name="colorSecondary">@android:color/white</item>
+    <item name="android:homeAsUpIndicator">@drawable/ic_expand_more</item>
+  </style>
+
   <style name="MwmWidget.ListView" parent="android:Widget.Material.ListView">
     <item name="android:fadingEdge">none</item>
     <item name="android:divider">@color/divider</item>

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

@@ -6,7 +6,6 @@
     <attr name="textDialogTheme" format="reference" />
     <attr name="windowBackgroundForced" format="reference|color" />
     <attr name="cardBackground" format="reference" />
-    <attr name="appBackground" format="reference|color" />
     <attr name="clickableBackground" format="reference" />
     <attr name="statusBar" format="color" />
     <attr name="secondary" format="color" />

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

@@ -158,8 +158,6 @@
     <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
     <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
 
-    <item name="appBackground">@color/bg_app</item>
-
   </style>
 
   <style name="MwmTheme" parent="MwmTheme.Base"/>

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

@@ -50,37 +50,4 @@
     <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>
-    <string name="type.waterway.river">নদী</string>
-    <string name="type.waterway.dam">বাঁধ</string>
-    <string name="type.attraction.historic">ঐতিহাসিক আকর্ষণ</string>
-    <string name="type.area_highway.steps">সিঁড়ি</string>
-    <string name="type.area_highway.path">পথ</string>
-    <string name="type.amenity.theatre">থিয়েটার</string>
-    <string name="type.sport.soccer">ফুটবল</string>
-    <string name="type.sport.swimming">সাঁতার</string>
-    <string name="type.sport.table_tennis">টেবিল টেনিস</string>
-    <string name="type.sport.yoga">যোগ</string>
-    <string name="type.tourism">পর্যটন</string>
-    <string name="type.tourism.artwork.statue">মূর্তি</string>
-    <string name="type.tourism.attraction">আকর্ষণ</string>
-    <string name="type.tourism.artwork.sculpture">ভাস্কর্য</string>
-    <string name="type.tourism.hostel">হোস্টেল</string>
-    <string name="type.tourism.hotel">হোটেল</string>
-    <string name="type.tourism.zoo">চিড়িয়াখানা</string>
-    <string name="type.tourism.museum">জাদুঘর</string>
-    <string name="type.sport.volleyball">ভলিবল</string>
-    <string name="type.sport.golf">গল্ফ</string>
-    <string name="type.sport.cricket">ক্রিকেট</string>
-    <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.multi">বিভিন্ন ক্রীড়া</string>
-    <string name="type.amenity.toilets">শৌচালয়</string>
-    <string name="type.shop.watches">ঘড়ির দোকান</string>
-    <string name="type.shop.paint">রঙের দোকান</string>
-    <string name="type.shop.lottery">লটারি টিকিট</string>
-    <string name="type.shop.boutique">বুটিক</string>
-    <string name="type.shop.bag">ব্যাগের দোকান</string>
 </resources>

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

@@ -145,7 +145,7 @@
     <string name="type.amenity.vending_machine.cigarettes">Automat na cigarety</string>
     <string name="type.amenity.vending_machine.drinks">Automat na nápoje</string>
     <string name="type.amenity.vending_machine.parking_tickets">Parkovací automat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Automat na jízdenky MHD</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Automat na jízdenky</string>
     <string name="type.amenity.vehicle_inspection">Kontrola vozidla</string>
     <string name="type.amenity.veterinary">Veterinář</string>
     <string name="type.amenity.waste_basket">Odpadkový koš</string>
@@ -1260,7 +1260,7 @@
     <string name="type.recycling.cardboard">Lepenka</string>
     <string name="type.recycling.shoes">Boty</string>
     <string name="type.building.warehouse">Sklad</string>
-    <string name="type.amenity.shelter.lean_to">Otevřený spací přístřešek</string>
+    <string name="type.amenity.shelter.lean_to">Otevřený přístřešek</string>
     <string name="type.amenity.vending_machine.coffee">Automat na kávu</string>
     <string name="type.amenity.taxi">Stanoviště taxislužby</string>
     <string name="type.amenity.vending_machine">Prodejní automat</string>

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

@@ -11,7 +11,7 @@
     <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
     <string name="maps_storage_removable">SD-Karte</string>
     <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Externer geteilter Speicher</string>
+    <string name="maps_storage_external">Externer gemeinsamer Speicher</string>
     <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
     <string name="category_wifi">WLAN</string>
     <string name="postal_code">Postleitzahl</string>

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

@@ -154,7 +154,7 @@
     <!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
     <string name="type.amenity.shelter.basic_hut">Biwakschachtel</string>
     <!-- A traditional 3-walled shelter (one side open), suitable for overnight camping. -->
-    <string name="type.amenity.shelter.lean_to">Lean-to Schlafunterstand</string>
+    <string name="type.amenity.shelter.lean_to">Überdachung zum Schlafen</string>
     <string name="type.amenity.public_bath">Öffentliches Bad</string>
     <string name="type.amenity.shower">Dusche</string>
     <string name="type.amenity.stripclub">Stripclub</string>
@@ -173,7 +173,7 @@
     <string name="type.amenity.vending_machine.food">Essensautomat</string>
     <string name="type.amenity.vending_machine.newspapers">Zeitungsautomat</string>
     <string name="type.amenity.vending_machine.parking_tickets">Parkautomat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Fahrkartenautomat</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">5Fahrkartenautomat|4Ticketautomat|4Busticket|4Zugticket|5Bahnticket|4Zugfahrschein|U+1F3AB|U+1F39F|U+1F9FE</string>
     <string name="type.amenity.vending_machine.sweets">Süßigkeitenautomat</string>
     <string name="type.amenity.vending_machine.excrement_bags">Hundekotbeutelspender</string>
     <string name="type.amenity.parcel_locker">Paketstation</string>
@@ -374,9 +374,9 @@
     <string name="type.spherical_buoy.special_purpose">Kugelförmige Spezialboje</string>
     <string name="type.lateral.port">Backbord</string>
     <string name="type.lateral.starboard">Steuerbord</string>
-    <string name="type.cardinal.east">Osten</string>
-    <string name="type.cardinal.north">Norden</string>
-    <string name="type.cardinal.south">Süden</string>
+    <string name="type.cardinal.east">Ost</string>
+    <string name="type.cardinal.north">Nord</string>
+    <string name="type.cardinal.south">Süd</string>
     <string name="type.cardinal.west">Westen</string>
     <!-- A mountain rescue base for search and rescue activities. -->
     <string name="type.emergency.mountain_rescue">Bergrettungsstation</string>

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

@@ -1274,7 +1274,7 @@
     <string name="type.sport.beachvolleyball">Paplūdimo tinklinis</string>
     <string name="type.sport.bowls">Rutulių sportas</string>
     <string name="type.sport.chess">Šachmatai</string>
-    <string name="type.sport.climbing">Laipiojimo centras</string>
+    <string name="type.sport.climbing">Alpinizmo centras</string>
     <string name="type.sport.cricket">Kriketas</string>
     <string name="type.sport.curling">Akmenslydis</string>
     <string name="type.sport.diving">Šuoliai į vandenį</string>

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

@@ -1,35 +1,35 @@
 {
-"@category_eat": "3Essen|Trinken|4Gastronomie|Gastro|Lokal|Speisen|Verpflegung|Hunger",
-"@category_food": "4Lebensmittel|4Essen|4Nahrung|4Nahrungsmittel",
-"@category_transport": "ÖPNV",
-"@category_fuel": "2Tankstelle|4Tanken|3Benzin|4Diesel|4Sprit|3Kraftstoff|4Tankfüllung",
-"@category_parking": "4Parkplätze|Parkplatz|Parkhaus|Tiefgarage|Parken",
-"@category_shopping": "4Einkaufen|Laden|2Läden|Bummeln|Shoppen|Geschäfte",
-"@category_hotel": "Hotel|Hotels|Übernachtung|übernachten|Schlaf|schlafen|Unterkunft",
+"@category_eat": "Essmöglichkeiten|Essen|5Essensmöglichkeiten|Mahlzeit",
+"@category_food": "4Lebensmittel|Essen|Nahrung|Nahrungsmittel",
+"@category_transport": "Verkehr",
+"@category_fuel": "2Tankstelle|4Tanken|3Benzin|3Diesel|4Sprit|3Kraftstoff|3Treibstoff",
+"@category_parking": "4Parkplätze|Parkplatz|Parkhaus|Tiefgarage",
+"@category_shopping": "4Einkaufen|Laden|2Läden|Bummeln",
+"@category_hotel": "Hotel|Hotels|Übernachtung|übernachten|Schlaf|schlafen",
 "@category_tourism": "4Sehenswürdigkeit|4Attraktion|4Tourismus|Touristenattraktion|Sehenswürdigkeiten|Wahrzeichen|Attraktionen",
-"@category_entertainment": "3Unterhaltung|4Ausgehen",
-"@category_nightlife": "Nachtleben|Party|Ausgehen",
+"@category_entertainment": "4Unterhaltung",
+"@category_nightlife": "Nachtleben",
 "@category_children": "Freizeit mit Kindern|Familienurlaub|Familie|Kinder|Babies|Babys|kinderfreundlich|familienfreundlich",
 "@category_atm": "3Geldautomat|4Bankautomat|7Bargeldautomat|3Geldscheinautomat",
-"@category_rv": "6Einrichtungen für Wohnmobile|4Wohnmobile|4Wohnmobilstellplatz|Campingbus",
-"amenity-atm|@category_atm": "5Geldautomat|5Bankautomat|5Bankomat|4Bargeld|3Geld|U+1F3E7|U+1F4B2|U+1F4B3|U+1F4B4|U+1F4B5|U+1F4B6|U+1F4B7",
-"@category_bank": "3Bank|4Geldbank|4Kreditinstitut",
-"@category_secondhand": "3Second-hand|3Second Hand|3Gebrauchte Ware|3Gebrauchte Artikel",
+"@category_rv": "6Einrichtungen für Wohnmobile|4Wohnmobile|4Wohnmobilstellplatz",
+"amenity-atm|@category_atm": "3Geldautomat|4Bankautomat|5Bankomat|4Bancomat|3Bargeld|Geld|$|€",
+"@category_bank": "3Bank|4Geldbank",
+"@category_secondhand": "3Second-hand|3Gebraucht|4Gebrauchtware|4Brockenhaus|5Brockenstube",
 "amenity-bank|@category_bank": "3Bankfiliale|Geld",
-"@category_recycling": "Recycling|Abfallverwertung|Recyclebares Material|Getrennte Müllsammlung|Müllsortierung|Wiederverwendung|Wiederverwertung|Entsorgung",
+"@category_recycling": "Recycling|Abfallverwertung|Recyclebares Material|Getrennte Müllsammlung|Müllsortierung|Wiederverwendung|Wiederverwertung",
 "amenity-bureau_de_change": "3Geldwechselstelle|Wechselstube|Geld|Geldumtausch",
-"amenity-bar|amenity-pub|@category_eat|@category_nightlife": "2Bar|2Pub|4Kneipe|3Bier|4Trinken|4Gaststätte|4Bars und Kneipen|4Brauhaus|4Cocktail-Lounge|3Lokal",
-"amenity-cafe|@category_eat": "3Café|6Kaffeehaus|Kaffeebar|Cafeteria|Kaffee|Bistro",
-"amenity-fast_food|@category_eat": "4Fast Food|3Imbiss |7Schnellimbiss| Junkfood |Essen zum Mitnehmen",
-"amenity-restaurant|@category_eat": "3Restaurant|4Gasthaus|4Gaststube|6Speiselokal|4Gastwirtschaft|U+1F356|U+1F357|U+1F35A|U+1F35B|U+1F35C|U+1F35D|U+1F363|U+1F366|U+1F367|U+1F368|U+1F369|U+1F370|U+1F372|U+1F374|U+1F377|U+1F60B",
-"amenity-fuel|@category_fuel": "3Tankstelle|3Zapfsäule|U+26FD",
-"@shop": "3Verbrauchermarkt|5Geschäft|5Laden|3Shop|4Einkaufen|4Einzelhandel|5Detailgeschäft|4Einkaufsladen",
-"shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Bäckerei|3Bäckerladen|3Bäcker|4Konditorei|3Konditor|3Backwaren|3Kuchen|3Brot",
-"shop-cosmetics|@category_shopping|@shop": "4Kosmetikgeschäft|4Kosmetik|5Schönheitspflege|5Make Up|Make-Up|5Makeup|5Schönheitssalon|4Schminke",
-"shop-convenience|@category_food|@shop": "5Gemischtwarenladen|5Lebensmittelhändler|5Lebensmittelhandlung|5Lebensmittelgeschäft|4Greißler|4Tante-Emma-Laden|3Kiosk|3Späti|3Büdchen|4Trinkhalle|4Minimarkt",
-"shop-deli|@category_food|@shop": "4Feinkostladen|4Feinkostgeschäftt|4Delikatessen",
-"shop-farm|@category_food|@shop": "4Hofladen|4Bauernhofladen|4Bauernladen|4Direktvermarkter",
-"shop-garden_centre|@shop": "4Gartencenter|4Gärtnerei|4Pflanzen",
+"amenity-bar|amenity-pub|@category_eat|@category_nightlife": "2Bar|2Pub|4Kneipe|Bier|Trinken|4Gaststätte|4Bars und Kneipen|Brauhaus|Cocktail-Lounge",
+"amenity-cafe|@category_eat": "3Café|6Kaffeehaus|Kaffeebar|Cafeteria",
+"amenity-fast_food|@category_eat": "4Fast Food|Mitnahme|3Imbiss|Essen zum Mitnehmen|Junkfood|7Schnellimbiss",
+"amenity-restaurant|@category_eat": "3Restaurant|4Gasthaus|Gaststube|6Speiselokal|Gastwirtschaft",
+"amenity-fuel|@category_fuel": "7Tankstation|3Tankstelle",
+"@shop": "3Verbrauchermarkt|5Geschäft|5Laden",
+"shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Bäckerei|Bäckerladen|Bäcker|4Konditorei|Konditor",
+"shop-cosmetics|@category_shopping|@shop": "9Kosmetikgeschäft|Kosmetik|Schönheitspflege|5Make Up|Make-Up|5Makeup",
+"shop-convenience|@category_food|@shop": "5Gemischtwarenladen|Lebensmittelhändler|Lebensmittelhandlung|Lebensmittelgeschäft|4Greißler|4Tante-Emma-Laden",
+"shop-deli|@category_food|@shop": "4Feinkostladen|Feinkostgeschäft",
+"shop-farm|@category_food|@shop": "4Hofladen|4Bauernhofladen",
+"shop-garden_centre|@shop": "4Gartencenter|Gärtnerei",
 "shop-grocery|@category_food|@shop": "Lebensmittelkonserven",
 "shop-health_food|@category_food|@shop": "4Reformhaus|5Naturkostladen|5Bioladen",
 "shop-hearing_aids|@shop": "4Hörgeräte",
@@ -77,9 +77,6 @@
 "amenity-townhall": "3Rathaus|4Gemeindeamt",
 "tourism-attraction|@category_tourism": "3Attraktion|3Sehenswürdigkeit",
 "tourism-artwork": "3Kunstwerk|4Skulptur|4Gemälde|Statue",
-"tourism-artwork-sculpture": "Skulptur|Kunstwerk",
-"tourism-artwork-statue": "Statue|Kunstwerk",
-"tourism-artwork-painting": "Gemälde|Kunstwerk",
 "tourism-viewpoint|@category_tourism": "3Panorama|Ausblick|4Aussichtspunkt",
 "tourism-information": "4Tourist-Information|Information|7Touristeninformation",
 "tourism-picnic_site|amenity-bbq|leisure-picnic_table": "3Picknickplatz|5Grillplatz|3Picknicktisch|3BBQ",
@@ -90,7 +87,7 @@
 "amenity-place_of_worship-hindu": "4Hinduistischer Tempel|4Tempel|4Anbetungsstätte|4Hinduismus|U+1F64F|U+1F549",
 "amenity-place_of_worship-shinto": "4Schrein|4Anbetungsstätte|4Tempel|4Shintoismus|Shinto|U+1F64F|U+26E9",
 "amenity-place_of_worship-jewish": "4Synagoge|4Anbetungsstätte|4Tempel|4Judentum|U+1F64F|U+1F54D|U+2721",
-"amenity-place_of_worship-taoist": "3Daoistischer Tempel|3Taoistischer Tempel|4Daoismus|4Taoismus|4Tempel|4Anbetungsstätte|U+1F64F|U+262F",
+"amenity-place_of_worship-taoist": "4Tempel|4Anbetungsstätte|4Taoismus|U+1F64F|U+262F",
 "tourism-museum|@category_tourism": "2Museum|Ausstellung|3Galerie|Sehenswürdigkeit",
 "waterway-waterfall|@category_tourism": "2Wasserfall",
 "historic-archaeological_site|@category_tourism": "Ausgrabungen|4Ausgrabungsstätte|4Archäologische Stätte",
@@ -185,7 +182,7 @@
 "amenity-school": "3Schule|Schulgebäude",
 "amenity-shelter": "5Unterstand|Wetterschutz|Schutzhütte",
 "amenity-shelter-basic_hut": "4Biwakschachtel|4Schutzhütte|6Schlafunterkunft|U+1F634|U+1F4A4|U+1F6D6|U+1F6CF|U+1F6CC",
-"amenity-shelter-lean_to": "3Lean-to Schlafunterstand|Lean-to|3A-Frame Shelter|4Wetterschutz|4Schutzhütte|U+1F6D6",
+"amenity-shelter-lean_to": "3Lean-to|3A-Frame Shelter|4Wetterschutz|4Schutzhütte|U+1F6D6",
 "amenity-stripclub": "5Stripclub|5Striptease|5Strip Club|4Tabledance|5Striplokal|5Strip Lokal|5Nachtklub|5Stripklub|5Nachtclub|U+1F46F|U+1F459|U+1F460|U+1F51E",
 "amenity-telephone": "2Telefon|Fernsprecher",
 "@category_toilet": "3Toilette|WC|3Klosett|Pissoir|Null-Null|00",
@@ -213,7 +210,7 @@
 "natural-strait": "Meerenge",
 "landuse-forest": "Wald|Urwald|Nadelwald|Laubwald|Mischwald|Forst",
 "leisure-park": "Park",
-"tourism-aquarium|@category_tourism": "3Aquarium|3Aquarien",
+"tourism-aquarium|@category_tourism": "Aquarium",
 "tourism-hostel|@category_hotel": "3Herberge|Hostel|Gasthaus|Unterkunft",
 "tourism-hotel|@category_hotel": "Gasthaus",
 "tourism-guest_house|@category_hotel": "3Pension|Unterkunft|Herberge|Wohnheim|Gästehaus",
@@ -224,7 +221,7 @@
 "leisure-stadium": "4Stadion|5Sport|4Olympiastadion|5Sportanlage|5Sportstadion|5Sportkomplex|5Sporthalle|3Arena|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F4AA|U+1F3C9|U+1F3DF",
 "leisure-playground|@category_children": "Spielplatz",
 "leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sportzentrum|4Sport|4Fitness-Zentrum|4Fitness-Center|4Sportkomplex|5Sportforum|5Sporthalle|4Sportanlage|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9",
-"leisure-sports_centre-sport-swimming": "4Schwimmbad|Freibad|Hallenbad|Schwimmhalle",
+"leisure-sports_centre-sport-swimming": "4Schwimmmbad|Freibad|Hallenbad|Schwimmhalle",
 "leisure-fitness_centre-sport-yoga": "Yoga-Studio",
 "leisure-golf_course": "3Golfplatz|Golf|U+26F3|U+1F3CC",
 "leisure-miniature_golf": "4Minigolf|5Miniaturgolf|4Golf|U+26F3|U+1F3CC",
@@ -234,18 +231,18 @@
 "sport-american_football": "Amerikanischer Fußball",
 "sport-archery": "Bogenschießen",
 "sport-athletics": "Leichtathletik",
-"sport-australian_football": "4Australian Football",
+"sport-australian_football": "Australian Football",
 "sport-baseball": "Baseball",
-"sport-basketball": "3Basketball",
+"sport-basketball": "Basketball",
 "sport-beachvolleyball": "Beachvolleyball",
-"sport-bowls": "3Bowls",
+"sport-bowls": "Bowls",
 "sport-chess": "Schach",
-"sport-cricket": "3Cricket",
+"sport-cricket": "Cricket",
 "sport-curling": "Eisstockschießen|Curling",
 "sport-equestrian": "Reitsport",
 "sport-golf": "Golf",
 "sport-gymnastics": "Gymnastik",
-"sport-handball": "4Handball",
+"sport-handball": "Handball",
 "sport-scuba_diving": "4Gerätetauchen|3Tauchen|U+1F93F",
 "sport-shooting": "5Schießanlage|5Sportschießen|4Schießen|5Schützenschießanlage|5Schützenschießstand|5Schießstand|U+1F52B|U+1F3AF",
 "sport-skateboard": "Skateboarding|Skateboard",
@@ -253,11 +250,11 @@
 "sport-soccer": "Fußball",
 "sport-swimming": "Schwimmen",
 "sport-table_tennis": "5Tischtennis|4Ping Pong|4Pingpong|U+1F3D3",
-"sport-tennis": "3Tennis",
-"sport-padel": "3Padel",
-"sport-volleyball": "4Volleyball",
+"sport-tennis": "Tennis",
+"sport-padel": "Padel",
+"sport-volleyball": "Volleyball",
 "sport-9pin": "Kegeln",
-"sport-10pin": "3Bowling",
+"sport-10pin": "Bowling",
 "building": "Gebäude",
 "building-address": "Adresse",
 "@category_police": "Polizeistation|4Polizei",
@@ -275,7 +272,7 @@
 "natural-water-basin|landuse-basin|@waterbody": "Wasserbecken",
 "natural-water-pond|@waterbody": "Teich|Wasserbecken",
 "natural-water-lake|@waterbody": "See|Wasserbecken",
-"natural-water-reservoir|landuse-reservoir|@waterbody": "5Reservoir|5Wasserreservoir|5Stausee",
+"natural-water-reservoir|landuse-reservoir|@waterbody": "5Reservoir",
 "waterway-river|waterway-stream|natural-water-river": "Fluss|Strom",
 "waterway-canal": "Kanal",
 "shop-car_repair": "3Autowerkstatt|3Kfz-Werkstatt|4Reparaturwerkstatt|4Auto|4Werkstatt|5Reparieren|U+1F527",
@@ -299,118 +296,116 @@
 "craft-handicraft": "4Kunsthandwerk",
 "craft-hvac": "4Heizung|4Lüftung|4Kühlung|4Klimatisierung|U+1F32C|U+1F975|U+1F976|U+2668|U+2744|U+1F525|U+1F321",
 "craft-metal_construction": "5Metallverarbeitung|4Schlosser",
-"craft-key_cutter": "5Schlüssel-Nachmachdienst|5Schlüssel|5Schlüsselservice|5Schlüssel-Service|U+1F511|U+1F5DD|U+00A9",
+"craft-key_cutter": "4Schlüssel-Nachmachdienst",
 "craft-locksmith": "4Schlüsseldienst",
 "craft-painter": "Maler",
 "craft-photographer": "4Fotograf|Fotostudio",
-"craft-plumber": "5Installateur|4Klempner|U+1F527|U+1F6C1|U+1F6BD",
+"craft-plumber": "5Installateur",
 "craft-sawmill": "4Sägewerk",
 "craft-shoemaker": "Schuhreparatur|4Schuhmacher|Schuster",
-"craft-winery": "4Kellerei|4Weingut|3Winzer|4Weinbauer|U+1F347|U+1F377",
+"craft-winery": "4Kellerei|4Weingut|3Winzer|Weinbauer",
 "craft-tailor": "4Schneider",
 "area:highway-footway|area:highway-pedestrian|area:highway-steps|place-square": "Platz|Fußgängerzone",
 "place-sea": "Meer",
 "place-ocean": "Ozean",
-"@category_wifi": "3WLAN|3W-LAN|3WiFi|3Wi-Fi|6Internet|U+1F6DC",
+"@category_wifi": "WLAN|WiFi|Wi-Fi",
 "internet_access|internet_access-wlan|@category_wifi": "3Internet|Internetzugang",
 "natural-beach|natural-beach-sand|natural-beach-gravel|leisure-beach_resort": "Strand",
-"man_made-lighthouse": "5Leuchtturm|6Schifffahrtszeichen|5Leuchtfeuer|5Leuchtbake|U+1F6A8|U+1F4A1",
+"man_made-lighthouse": "Leuchtturm",
 "man_made-survey_point": "4Vermessungspunkt",
-"man_made-flagpole": "4Fahnenmast|4Flaggenmast|U+1F3F3",
+"man_made-flagpole": "Fahnenmast",
 "man_made-mast": "Mast",
 "man_made-communications_tower|man_made-tower-communication": "Funkturm|Kommunikationsturm",
-"man_made-petroleum_well": "4Erdölbohrung|3Ölquelle|U+1F6E2",
+"man_made-petroleum_well": "4Erdölbohrung|Ölquelle",
 "organic-only|organic-yes": "3Bio|Biologische|biologisch|5Ökologische|Ökologisches|öko|bio|4organische|organisch|naturnah|natürliches|natürlich|gesundes|gesund|umweltfreundlich",
 "shop-copyshop": "4Kopierladen|4Drucker|Copyshop",
 "shop-photo|@shop": "4Fotofachgeschäft|Foto|Rahmen",
-"shop-camera|@shop": "4Kamerageschäft|4Kamerafachgeschäft|4Fotofachgeschäft|4Fotogeschäft|4Kamera|4Photografie|4Fotografie|U+1F4F7|U+1F4F8|U+1F4F9|U+1F39E|U+1F5BC",
+"shop-camera|@shop": "Kamerageschäft",
 "shop-travel_agency": "5Reisebüro|Reisen|Rundreisen|Reisevermittlung|Reisevermittler|Reiseagentur|Touren|Ausflüge|Urlaub|Touristeninformation|Last-Minute-Tour",
 "shop-outdoor|@shop": "4Outdoor-Ausrüstungs-Laden|Outdoor-Ausrüstung|Trekking|Klettern|Camping",
 "shop-dry_cleaning": "Chemische Reinigung|4Reinigung",
-"shop-tyres|@shop": "4Reifenhändler|4Autoreifen|4Reifen|U+1F6DE",
+"shop-tyres|@shop": "4Reifenhändler|4Autoreifen|Reifen",
 "amenity-car_wash": "4Autowaschanlage|Autowäsche",
-"amenity-veterinary": "4Tierarzt|4Tierärztin|4Tierarztpraxis|4Tierpraxis|4Tierdoktor|5Hundearzt|5Katzenarzt|4Haustiere|U+2695",
+"amenity-veterinary": "4Tierarzt",
 "@charging_station": "4Ladestation|aufladen",
 "amenity-charging_station-bicycle|@charging_station": "Fahrrad aufladen",
 "amenity-childcare": "Kindertagesstätte|Kindergarten|Kinderbetreuung",
 "amenity-bicycle_parking": "6Fahrradständer",
-"amenity-waste_basket": "6Abfalleimer|4Mülleimer|4Restmüll|3Müll|4Müllkorb|U+1F6AE|U+1F5D1",
+"amenity-waste_basket": "6Abfalleimer|4Mülleimer|Papierkorb",
 "emergency-phone": "4Notruftelefon|Nottelefon",
-"leisure-fitness_centre": "3Fitnessstudio|3Fitnesscenter|3Fitness|3Fitnessraum|4Sport|3Fitnessclub|5Gesundheitsclub|4Training|4Trainingsraum|4Turnhalle|U+1F4AA|U+1F3CB",
+"leisure-fitness_centre": "3Fitnessstudio|Fitnesscenter|Fitness|Fitnessraum|Fitnessclub|Gesundheitsclub|Training|Trainingsraum|Turnhalle",
 "leisure-sauna": "3Sauna|Schwitzbad|Schwitzhütte|Dampfbad|Dampfsauna|Saunakabine",
 "shop-car_repair-tyres|shop-car_repair": "Reifenservice|Reifen|6Reifenreparatur|Reifeninstandsetzung|Reifenpannenreparatur|Reifenpannenbehebung|Reifenersatz|Pneureparatur|Pneu|Pannenreparatur",
 "shop-chemist|@shop": "4Drogerie",
 "shop-pet|@shop": "4Tierhandlung",
 "tourism-zoo|@category_tourism|@category_children": "Zoo",
 "attraction-animal": "Tiergehege",
-"tourism-information-office|amenity-ranger_station|@category_tourism": "4Fremdenverkehrsamt|4Fremdenbüro|4Touriinfo|4Touri-Info|4Touristeninfo|4Touristeninformationszentrum|4Infopoint|U+2139",
-"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "4Besucherzentrum|4Besucherinfo|4Fremdenverkehrsamt|4Fremdenbüro|4Touriinfo|4Touri-Info|4Touristeninfo|4Touristeninformationszentrum|4Infopoint|U+2139",
-"amenity-community_centre": "4Gemeinschaftszentrum|3Bürgerhaus|3Bürgerzentrum|4Gemeindesaal|4Bürgersaal|4Gemeinschaftshaus|5Dorfgemeinschaftshaus|4Gemeindezentrum|U+1F3DB",
-"amenity-compressed_air": "3Druckluft|5Pressluft|4Kompressor|U+1F32C",
+"tourism-information-office|amenity-ranger_station|@category_tourism": "Fremdenverkehrsamt",
+"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "3Besucherzentrum",
+"amenity-community_centre": "5Gemeinschaftszentrum|Bürgerhaus",
+"amenity-compressed_air": "Druckluft|Pressluft",
 "amenity-courthouse": "Justizgebäude|Gerichtsgebäude",
-"amenity-vending_machine": "Verkaufsautomat|Automat",
-"amenity-vending_machine-cigarettes": "5Zigarettenautomat|U+1F6AC",
-"amenity-vending_machine-coffee": "6Kaffeeautomat|U+2615",
-"amenity-vending_machine-condoms": "6Kondomautomat|U+1F6E1",
+"amenity-vending_machine-cigarettes": "5Zigarettenautomat",
+"amenity-vending_machine-coffee": "6Kaffeeautomat",
+"amenity-vending_machine-condoms": "6Kondomautomat",
 "amenity-vending_machine-drinks": "9Getränkeautomat",
-"amenity-vending_machine-food|@category_food": "4Lebensmittelautomat|3Snackautomat|3Snacks",
-"amenity-vending_machine-parking_tickets|@category_parking": "4Parkautomat|4Parkscheinautomat|4Parkticketautomat",
-"amenity-vending_machine-public_transport_tickets|@category_transport": "5Fahrkartenautomat|5Fahrscheinautomat|4Ticketautomat|4Fahrkarten|3Tickets",
+"amenity-vending_machine-food|@category_food": "5Essensautomat|9Lebensmittelautomat|Snacks|Knabbereien|Nahrungsmittelautomat",
+"amenity-vending_machine-parking_tickets|@category_parking": "4Parkautomat|Parkscheinautomat|Parkticketautomat",
+"amenity-vending_machine-public_transport_tickets|@category_transport": "5Fahrkartenautomat|5Fahrscheinautomat",
 "amenity-vending_machine-newspapers": "Zeitungsautomat|Zeitungsständer",
 "amenity-vending_machine-sweets": "Süßigkeitenautomat|Süßwaren|Süßigkeiten",
 "amenity-vending_machine-excrement_bags": "Hundetütenspender|Hundekotsähuckchenspender|Hundekotbeutelspender|Hundekotbeutel",
 "amenity-parcel_locker|@category_post": "5Paketstation|Paket Abholstation|Paket SB|Paket Versandstation",
 "shop-outpost": "Abholpunkt",
 "amenity-vending_machine-fuel|@category_fuel": "Zapfsäule|Tankautomat",
-"building-garage": "3Garage",
-"highway-rest_area|highway-services": "4Rastplatz|4Raststätte",
+"building-garage": "Garage",
+"highway-rest_area|highway-services": "Rastplatz|Raststätte",
 "man_made-tower|man_made-flare": "Hochhaus|Turm",
-"shop-bookmaker|@gambling": "5Buchmacher|3Wettbüro",
+"shop-bookmaker|@gambling": "Buchmacher|3Wettbüro",
 "shop-seafood|@category_food|@shop": "Fischhändler|5Fischmarkt|Fisch|Meeresfrüchte|Schalentier",
-"shop-second_hand|@category_shopping|@shop|@category_secondhand": "3Second-Hand-Laden|5Gebrauchtwarenladen|3Trödelladen|3Secondhand",
-"shop-charity|@shop|@category_secondhand": "4Sozialkaufhaus",
-"shop-ticket": "4Kartenverkauf|4Fahrkartenschalter|4Fahrkartengeschäft|4Fahrkarten|4Fahrkartenzentrum|4Fahrkartenausgabe|4Fahrkartenagentur|4Fahrkartenhäuschen|4Reisecenter|4Kassenschalter|5Zahlschalter",
-"shop-wine|@category_food|@shop": "4Weinhandlung|4Weinladen|4Weingeschäft|3Winzer|3Wein",
+"shop-second_hand|@category_shopping|@shop|@category_secondhand": "Second-Hand-Laden|5Gebrauchtwarenladen|Trödelladen",
+"shop-charity|@shop|@category_secondhand": "5Wohltätigkeitsladen",
+"shop-ticket": "4Kartenverkauf|Fahrkartenschalter|Fahrkartengeschäft|Fahrkarten|Fahrkartenzentrum|Fahrkartenausgabe|Fahrkartenagentur|Fahrkartenhäuschen|Reisecenter|Kassenschalter|Zahlschalter",
+"shop-wine|@category_food|@shop": "4Weinhandlung|Weinladen|Weingeschäft",
 "shop-car_parts|@shop": "4Autoersatzteile|Autoteile",
-"tourism-chalet|@category_hotel": "4Ferienhäuschen|4Ferienhaus",
+"tourism-chalet|@category_hotel": "Ferienhäuschen|Ferienhaus",
 "tourism-information-board": "Informationstafel",
-"tourism-information-guidepost": "Wegweiser",
-"tourism-information-map": "4Touristenkarte|4Karte|4Informationskarte|4Informationstafel|4Touristeninfokarte|U+1F5FA",
-"aerialway-station": "4Seilbahn|4Seilbahnstation|4Liftstation|U+1F6A0|U+1F6A1",
-"aeroway-helipad": "4Hubschrauberlandeplatz|4Helikopterlandeplatz|U+1F681",
+"tourism-information-map": "Touristenkarte",
+"aerialway-station": "Seilbahn|Liftstation",
+"aeroway-helipad": "Hubschrauberlandeplatz",
 "barrier-border_control": "Grenzkontrolle",
 "leisure-water_park|@category_tourism|@category_children": "Wasserpark|Freizeitbad|3Aquapark",
 "man_made-water_tower": "Wasserturm",
-"man_made-windmill": "4Windmühle",
+"man_made-windmill": "Windmühle",
 "natural-cave_entrance": "Höhle|Höhleneingang",
 "natural-volcano|@mountain": "4Vulkan",
 "office-estate_agent": "4Immobilienmakler",
 "waterway-lock_gate": "Schleuse",
-"amenity-public_bookcase": "4Bücherregal|4Büchertausch|4Bücherschrank|4Bücherbox|4Bücherzelle",
-"sport-climbing": "4Kletterzentrum|4Kletterhalle|U+1F9D7",
+"amenity-public_bookcase": "Bücherregal|Büchertausch|Bücherschrank|Bücherbox|Bücherzelle",
+"sport-climbing": "Kletterzentrum|Kletterhalle",
 "sport-yoga": "Yoga Studio",
 "tourism-apartment|@category_hotel": "4Ferienwohnung",
 "leisure-resort|@category_hotel": "Resort|4Ferienhotel",
-"amenity-biergarten|@category_eat|@category_nightlife": "4Biergarten",
-"amenity-driving_school": "4Fahrschule",
-"amenity-music_school": "4Musikschule|U+1F3EB|U+1F3BC",
-"amenity-language_school": "4Sprachschule",
-"amenity-ice_cream": "3Eis|3Eisstand|3Eisdiele",
+"amenity-biergarten|@category_eat|@category_nightlife": "5Biergarten",
+"amenity-driving_school": "Fahrschule",
+"amenity-music_school": "Musikschule",
+"amenity-language_school": "Sprachschule",
+"amenity-ice_cream": "Eis|Eisstand|Eisdiele",
 "amenity-internet_cafe": "3Internetcafé",
 "amenity-motorcycle_parking": "4Motorrad-Parkplatz|9Motorradparkplatz",
-"amenity-parking_space-disabled|@category_parking": "4Behindertenparkplatz",
+"amenity-parking_space-disabled|@category_parking": "Behindertenparkplatz",
 "amenity-nursing_home": "Pflegeheim",
-"amenity-payment_terminal": "3Bezahlterminal",
-"amenity-public_bath": "4Öffentliches Bad|4Hallenbad|5Schwimmen|5Schwimmbad|U+1F3CA",
+"amenity-payment_terminal": "Bezahlterminal",
+"amenity-public_bath": "Öffentliches Bad",
 "amenity-shower": "Dusche",
 "emergency-access_point": "4Rettungspunkt|Notfallpunkt|Notfall-Rettungspunkt|Notfall-Treffpunkt",
-"emergency-assembly_point": "4Notfall-Sammelpunkt|4Sammelstelle|U+1F46A|U+2795",
+"emergency-assembly_point": "Notfall-Sammelpunkt",
 "emergency-life_ring": "4Rettungsring",
 "emergency-defibrillator": "4Defibrillator",
-"emergency-fire_hydrant": "4Hydrant|4Feuerhydrant|4Löschwasser",
+"emergency-fire_hydrant": "4Hydrant",
 "emergency-lifeguard": "Notfall-Rettungsschwimmer|Rettungsschwimmer",
-"emergency-mountain_rescue": "4Bergrettung-Notdienst|4Bergrettung|5Notdienst",
-"leisure-fitness_station": "3Fitnessstation|4Trimm-dich-Station",
+"emergency-mountain_rescue": "4Bergrettung Notdienst",
+"leisure-fitness_station": "3Fitnessstation",
 "office-insurance": "4Versicherungsbüro",
 "office-ngo": "5Nichtregierungsorganisation",
 "shop-erotic|@shop": "Erotikladen|3Sexshop|4Erotikshop",
@@ -421,13 +416,13 @@
 "shop-pawnbroker": "5Pfandleihe",
 "shop-stationery|@shop": "7Schreibwarenladen",
 "shop-tattoo": "4Tattoo-Studio",
-"shop-variety_store|@category_shopping|@shop": "5Billigladen|6Niedrigpreisgeschäft|4 1-Euro-Laden|4Kruschladen|5Haushaltswaren",
-"shop-video|@shop": "4Videoshop|4Videothek",
-"shop-video_games|@shop": "4Gameshop|4Gamingladen|4Gaminggeschäft|4Videospiele|U+1F47E|U+1F579|U+1F3AE",
+"shop-variety_store|@category_shopping|@shop": "5Billigladen|Niedrigpreisgeschäft",
+"shop-video|@shop": "4Videoshop",
+"shop-video_games|@shop": "4Gameshop",
 "tourism-wilderness_hut|@category_hotel": "Selbstversorgerhütte|Wildnishütte",
 "tourism-gallery|@category_tourism": "4Kunstgalerie|3Galerie|Museum|Kunstausstellung",
-"tourism-theme_park|@category_tourism|@category_children": "5Freizeitpark|4Vergnügungspark|U+1F3A2",
-"boundary-national_park|@category_tourism": "5Naturschutzpark|5Nationalpark",
+"tourism-theme_park|@category_tourism|@category_children": "Freizeitpark|Vergnügungspark",
+"boundary-national_park|@category_tourism": "5Naturschutzpark|Nationalpark",
 "leisure-nature_reserve|@category_tourism": "5Naturschutzgebiet",
 "natural-cape": "Kap|Landzunge|Landspitze",
 "natural-geyser": "3Geysir",
@@ -436,16 +431,16 @@
 "leisure-marina": "5Jachthafen",
 "piste:type-downhill|piste:type-nordic": "Skifahren|Skipiste",
 "amenity-events_venue": "Veranstaltungszentrum",
-"shop-chocolate|@category_food|@shop": "4Schokoladengeschäft|4Schokolade|4Pralinen",
-"shop-coffee|@category_food|@shop": "4Kaffeegeschäft",
+"shop-chocolate|@category_food|@shop": "4Schokoladengeschäft",
+"shop-coffee|@category_food|@shop": "6Kaffeegeschäft",
 "shop-fabric|@shop": "4Textilgeschäft|Stoffgeschäft|Stoffladen|Stoffe",
-"shop-money_lender": "4Geldverleiher|4Geldverleih",
+"shop-money_lender": "4Geldverleiher",
 "shop-music|@shop": "5Musikgeschäft|5Plattenladen",
-"shop-musical_instrument|@shop": "5Musikinstrumenteladen|5Musikhaus",
+"shop-musical_instrument|@shop": "5Musikinstrumenteladen|Musikhaus",
 "shop-tea|@shop": "3Teegeschäft",
 "shop-antiques|@category_shopping|@shop|@category_secondhand": "5Antiquitäten",
 "shop-art|@category_shopping|@shop": "5Kunstgeschäft",
-"shop-baby_goods|@category_children|@shop": "4Kinderladen|4Babybedarf",
+"shop-baby_goods|@category_children|@shop": "Kinderladen|4Babybedarf",
 "shop-bag|@category_shopping|@shop": "5Taschen Shop",
 "shop-cheese|@category_food|@shop": "3Käseladen",
 "shop-dairy|@category_food|@shop": "5Milchprodukte",
@@ -454,11 +449,11 @@
 "shop-interior_decoration|@shop": "4Einrichtungsgeschäft|5Innendekorationen",
 "shop-lottery|@gambling": "Lotteriescheine",
 "shop-medical_supply|@shop": "4Sanitätshaus|4Medizinische Versorgung|5Heilbehelfe",
-"shop-nutrition_supplements|@shop": "6Nahrungsergänzungsmittel",
+"shop-nutrition_supplements|@shop": "Nahrungsergänzungsmittel",
 "shop-paint|@shop": "Farben",
 "shop-perfumery|@category_shopping|@shop": "4Parfümerie",
-"shop-sewing|@shop": "3Nähbedarf|3Nähzubehör|4Stoffe|5Kurzwaren|5Schneiderbedarf",
-"shop-storage_rental": "5Lagervermietung|6Speichermiete",
+"shop-sewing|@shop": "Nähzubehör",
+"shop-storage_rental": "5Lagervermietung|Speichermiete",
 "shop-tobacco|@shop": "5Tabakwarengeschäft|Tabak|4Trafik",
 "shop-trade|@shop": "Baustoffhandel|Handelsbedarf",
 "shop-watches|@category_shopping|@shop": "Uhrengeschäft|Uhren",
@@ -466,35 +461,34 @@
 "leisure-track": "Laufbahn",
 "leisure-bandstand": "6Musikpavillon|8Konzertpavillon|Konzertmuschel|Musikmuschel|Kurpavillon|Kurmuschel",
 "power-plant": "Kraftwerk",
-"power-generator-wind": "Windgenerator|Windrad|Windkraftanlage",
 "shop-auction|@category_secondhand": "Auktion",
 "shop-collector|@category_shopping|@category_secondhand": "Sammlerartikel|Sammlerstücke",
 "man_made-cairn": "Steinmännchen",
-"wheelchair-yes": "4Rollstuhl|6Vollständiger Zugang für Rollstühle|4Barrierefreiheit",
-"amenity-social_facility": "4Soziale Einrichtung",
+"wheelchair-yes": "Rollstuhl|Vollständiger Zugang für Rollstühle",
+"amenity-social_facility": "Soziale Einrichtung",
 "leisure-sports_hall": "Sporthalle",
 "amenity-arts_centre|@category_tourism": "Kunstzentrum",
-"amenity-prison": "4Gefängnis",
-"amenity-exhibition_centre": "4Messezentrum|4Ausstellungszentrum",
-"shop-bathroom_furnishing|@shop": "4Badezimmerausstattung",
-"shop-bed|@shop": "4Bettengeschäft",
-"shop-boutique|@shop": "4Modehaus|4Modegeschäft|4Modeshop|4Modeladen|4Boutique",
-"shop-curtain|@shop": "4Gardinengeschäft",
-"shop-gas|@shop": "4Gas-Geschäft",
-"shop-pet_grooming": "4Tiersalon|5Haustierpflege",
-"shop-hifi|@shop": "4HiFi-Audio-Geschäft|4Radiogeschäft|4Radioshop",
-"amenity-conference_centre": "4Konferenzzentrum",
-"shop-herbalist|@shop": "4Kräuterladen",
-"shop-appliance|@shop": "6Laden für Haushaltsgeräte|4Küchengeräte|4Küche",
-"shop-agrarian|@shop": "5Landwirtschaftliches Geschäft",
-"shop-fashion_accessories|@shop": "4Mode-Accessoires",
+"amenity-prison": "Gefängnis",
+"amenity-exhibition_centre": "Messezentrum|Ausstellungszentrum",
+"shop-bathroom_furnishing|@shop": "Badezimmerausstattung",
+"shop-bed|@shop": "Bettengeschäft",
+"shop-boutique|@shop": "Boutique",
+"shop-curtain|@shop": "Gardinengeschäft",
+"shop-gas|@shop": "Gas-Geschäft",
+"shop-pet_grooming": "Tiersalon|Haustierpflege",
+"shop-hifi|@shop": "HiFi-Audio",
+"amenity-conference_centre": "Konferenzzentrum",
+"shop-herbalist|@shop": "Kräuterladen",
+"shop-appliance|@shop": "Laden für Haushaltsgeräte",
+"shop-agrarian|@shop": "Landwirtschaftliches Geschäft",
+"shop-fashion_accessories|@shop": "Mode-Accessoires",
 "amenity-waste_transfer_station": "Müllumladestation",
-"shop-carpet|@shop": "4Teppichgeschäft",
-"shop-craft|@shop": "4Künstlerbedarf",
+"shop-carpet|@shop": "Teppichgeschäft",
+"shop-craft|@shop": "Künstlerbedarf",
 "shop-pasta|@shop": "Nudelgeschäft",
-"amenity-luggage_locker": "4Gepäckschließfach|4Kofferschließfach|4Schließfach",
+"amenity-luggage_locker": "Gepäckschließfach",
 "amenity-studio": "4Medienstudio|Studio|5Radiostudio|5Fernsehstudio",
-"shop-cannabis|@shop": "4Cannabis|4Hanfladen|2CBD",
+"shop-cannabis|@shop": "Cannabis",
 "man_made-cross": "Kreuz",
 "leisure-dance|@category_entertainment": "4Tanz|Tanzschule",
 "leisure-firepit": "5Feuerstelle",
@@ -502,8 +496,8 @@
 "leisure-hackerspace": "4Hackspace|4Hackerspace|4Hacker Space|4Hacklab|U+1F913|U+1F5A5|U+1F4BB",
 "natural-peak|@mountain": "Gipfel",
 "man_made-crane": "Stationärer Kran",
-"amenity-food_court": "4Gastronomiebereich",
-"amenity-animal_shelter": "4Tierheim",
+"amenity-food_court": "Gastronomiebereich",
+"amenity-animal_shelter": "Tierheim",
 "recycling-cans|@category_recycling": "4Recycling von Dosen|4Dosenrecycling|4Aluminiumdosen Recycling|3Blechdosen",
 "recycling-shoes|@category_recycling": "4Recycling von Schuhen|Schuh Recycling|Schuhe spenden|Schuhe",
 "recycling-green_waste|@category_recycling": "4Recycling von Gartenabfällen|5Organisches Müll Recycling|5Gartenabfälle",
@@ -513,7 +507,7 @@
 "recycling-cardboard|@category_recycling": "9Recycling von Karton|9Recycling von Pappe|Kartonrecycling|Pappenrecycling|Kartonmüll|Pappenmüll|Karton|Pappe|Pappkarton|Kartonpappe",
 "natural-saddle|mountain_pass": "4Sattel|4Bergsattel|Bergpass|Pass|Gebirgspass",
 "man_made-chimney": "Schornstein",
-"attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "4Attraktion|4Labyrinth",
+"attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "Attraktion|Labyrinth",
 "building-guardhouse": "4Wache",
 "shop-lighting|@shop": "Leuchtmittel|Lampen|Leuchte",
 "amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Autoladestation|5Autoladegerät|Ladestation",

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

@@ -242,7 +242,7 @@
 "leisure-stadium": "4Stadium|4sport|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F4AA|U+1F3C9|olympic stadium|sports stadium|sports complex|arena|sports arena",
 "leisure-playground|@category_children": "4Playground",
 "leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sports Center|sport|sports|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9|sports complex|sports forum",
-"leisure-sports_centre-sport-swimming": "4Swimming Centre",
+"leisure-sports_centre-sport-swimming": "4Swimmming Centre",
 "leisure-golf_course": "4Golf Course|golf|U+26F3",
 "leisure-miniature_golf": "4Minigolf|Miniature Golf|Putt Putt|mini golf|mini-golf",
 "leisure-escape_game": "4Escape Room|Escape Game|quest",

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

@@ -41,11 +41,11 @@
 "Austria_Upper Austria":"Oberösterreich",
 "Austria_Vorarlberg":"Vorarlberg",
 "Azerbaijan":"Aserbaidschan",
-"Azerbaijan Region":"Aserbaidschan Region",
+"Azerbaijan Region":"Aserbaidschan",
 "Bahrain":"Bahrain",
 "Bangladesh":"Bangladesch",
 "Barbados":"Barbados",
-"Belarus":"Belarus (Weißrussland)",
+"Belarus":"Weißrussland",
 "Belarus_Brest Region":"Breszkaja Woblasz",
 "Belarus_Homiel Region":"Homelskaja Woblasz",
 "Belarus_Hrodna Region":"Hrodsenskaja Woblasz",
@@ -55,10 +55,10 @@
 "Belgium":"Belgien",
 "Belgium_Antwerp":"Provinz Antwerpen",
 "Belgium_East Flanders":"Provinz Ostflandern",
-"Belgium_Flemish Brabant":"Provinz Flämisch-Brabant",
+"Belgium_Flemish Brabant":"Flämisch-Brabant",
 "Belgium_Hainaut":"Provinz Hennegau",
 "Belgium_Liege":"Provinz Lüttich",
-"Belgium_Limburg":"Provinz Limburg",
+"Belgium_Limburg":"Limburg",
 "Belgium_Luxembourg":"Provinz Luxemburg",
 "Belgium_Namur":"Provinz Namur",
 "Belgium_Walloon Brabant":"Provinz Wallonisch-Brabant",
@@ -80,13 +80,13 @@
 "Brazil_Goias":"Goiás",
 "Brazil_Mato Grosso":"Mato Grosso",
 "Brazil_Mato Grosso Do Sul":"Mato Grosso do Sul",
-"Brazil_North Region":"Região Norte do Brasil (Nördliche Region)",
-"Brazil_Northeast Region":"Região Nordeste do Brasil (Nordöstliche Region)",
+"Brazil_North Region":"Norden",
+"Brazil_Northeast Region":"Nordosten",
 "Brazil_Paraiba":"Paraíba",
 "Brazil_Parana":"Paraná",
 "Brazil_Rio Grande do Norte":"Rio Grande do Norte",
 "Brazil_Santa Catarina":"Santa Catarina",
-"Brazil_South Region":"Südliches Brasilien",
+"Brazil_South Region":"Süd Brasilien",
 "Brazil_Southeast Region_Espirito Santo":"Espírito Santo",
 "Brazil_Southeast Region_Minas Gerais_Contagem":"Minas Gerais — Contagem",
 "Brazil_Southeast Region_Minas Gerais_North":"Minas Gerais — Norden",
@@ -159,7 +159,7 @@
 "Canada_Ontario_Toronto":"Toronto",
 "Canada_Prince Edward Island":"Prince Edward Island",
 "Canada_Quebec":"Québec",
-"Canada_Quebec_Quebec":"Québec, Stadt",
+"Canada_Quebec_Quebec":"Québec",
 "Canada_Quebek_Far North":"Québec — Norden",
 "Canada_Quebek_Montreal":"Montreal",
 "Canada_Quebek_North":"Sept-Îles",
@@ -188,7 +188,7 @@
 "China_Fujian":"Fujian",
 "China_Gansu":"Gansu",
 "China_Guangdong":"Guangdong",
-"China_Guangxi":"Autonomes Gebiet Guangxi der Zhuang",
+"China_Guangxi":"Guangxi",
 "China_Guizhou":"Guizhou",
 "China_Hebei":"Hebei",
 "China_Heilongjiang":"Heilongjiang",
@@ -200,15 +200,15 @@
 "China_Jiangxi":"Jiangxi",
 "China_Jilin":"Jilin",
 "China_Liaoning":"Liaoning",
-"China_Ningxia Hui":"Autonomes Gebiet Ningxia der Hui",
+"China_Ningxia Hui":"Ningxia",
 "China_Qinghai":"Qinghai",
 "China_Shaanxi":"Shaanxi",
 "China_Shandong":"Shandong",
 "China_Shanghai":"Shanghai",
 "China_Shanxi":"Shanxi",
 "China_Sichuan":"Sichuan",
-"China_Tibet Autonomous Region":"Autonome Region Tibet",
-"China_Xinjiang":"Uigurisches Autonomes Gebiet Xinjiang",
+"China_Tibet Autonomous Region":"Tibet",
+"China_Xinjiang":"Xinjiang",
 "China_Yunnan":"Yunnan",
 "China_Zhejiang":"Zhejiang",
 "Colombia":"Kolumbien",
@@ -226,7 +226,7 @@
 "Croatia":"Kroatien",
 "Cuba":"Kuba",
 "Cyprus":"Zypern",
-"Czech Republic":"Tschechische Republik",
+"Czech Republic":"Tschechien",
 "Czech_Jihovychod_Jihomoravsky kraj":"Region Südmähren",
 "Czech_Jihovychod_Kraj Vysocina":"Region Hochland",
 "Czech_Jihozapad_Jihocesky kraj":"Region Südböhmen",
@@ -251,7 +251,7 @@
 "Djibouti":"Dschibuti",
 "Dominica":"Dominica",
 "Dominican Republic":"Dominikanische Republik",
-"East Timor":"Timor-Leste",
+"East Timor":"Osttimor",
 "Ecuador":"Ecuador",
 "Egypt":"Ägypten",
 "El Salvador":"El Salvador",
@@ -263,15 +263,15 @@
 "Ethiopia":"Äthiopien",
 "Falkland Islands":"Falklandinseln",
 "Faroe Islands":"Färöer",
-"Federated States of Micronesia":"Föderierten Staaten von Mikronesien",
+"Federated States of Micronesia":"Mikronesien",
 "Fiji":"Fidschi",
 "Finland":"Finnland",
-"Finland_Eastern Finland":"Ost-Finnland",
-"Finland_Northern Finland":"Nord-Finnland",
-"Finland_Southern Finland_Helsinki":"Süd-Finnland — Helsinki",
-"Finland_Southern Finland_Lappeenranta":"Süd-Finnland — Lappeenranta",
+"Finland_Eastern Finland":"Ostfinnland",
+"Finland_Northern Finland":"Nordfinnland",
+"Finland_Southern Finland_Helsinki":"Südfinnland — Helsinki",
+"Finland_Southern Finland_Lappeenranta":"Südfinnland — Lappeenranta",
 "Finland_Southern Finland_West":"Varsinais-Suomi",
-"Finland_Western Finland":"West-Finnland",
+"Finland_Western Finland":"Westfinnland",
 "Florida":"Florida",
 "France":"Frankreich",
 "France_Alsace":"Elsass",
@@ -383,7 +383,7 @@
 "France_Upper Normandy":"Haute-Normandie",
 "French Polynesia":"Französisch-Polynesien",
 "Gabon":"Gabun",
-"Georgia Region":"Georgien – Region",
+"Georgia Region":"Georgien",
 "Georgia":"Georgien",
 "Germany":"Deutschland",
 "Germany_Baden-Wurttemberg":"Baden-Württemberg",
@@ -706,7 +706,7 @@
 "Netherlands_Gelderland_North":"Provinz Gelderland — Apeldoorn",
 "Netherlands_Gelderland_Zutphen":"Provinz Gelderland — Zutphen",
 "Netherlands_Groningen":"Provinz Groningen",
-"Netherlands_Limburg":"Limburg",
+"Netherlands_Limburg":"Provinz Limburg",
 "Netherlands_North Brabant_Eindhoven":"Provinz Nordbrabant — Eindhoven",
 "Netherlands_North Brabant_Roosendaal":"Provinz Nordbrabant — Roosendaal",
 "Netherlands_North Brabant_Tiburg":"Provinz Nordbrabant — Tilburg",
@@ -1135,7 +1135,7 @@
 "US_Texas_Tyler":"Tyler",
 "US_Texas_Wako":"Waco",
 "US_Texas_West":"Odessa",
-"US_United States Minor Outlying Islands":"Kleinere, abgelegene Inseln der Vereinigten Staaten von Amerika",
+"US_United States Minor Outlying Islands":"US Kleinere abgelegene Inseln",
 "US_Utah":"Utah",
 "US_Vermont":"Vermont",
 "US_Virginia_Chesapeake":"Chesapeake",
@@ -1432,7 +1432,7 @@
 "Brazil_Southeast Region_Espirito Santo Description":"Serra, Vila Velha, Cariacica",
 "Brazil_Southeast Region_Minas Gerais_Contagem Description":"Belo Horizonte",
 "Brazil_Southeast Region_Minas Gerais_North Description":"Uberlandia, Montes Claros, Uberaba",
-"Brazil_Southeast Region_Rio de Janeiro Description":"Rio de Janeiro, São Gonçalo, Duque de Caxias",
+"Brazil_Southeast Region_Rio de Janeiro Description":"Rio de Janeiro",
 "Brazil_Southeast Region_Sao Paulo_Campinas Description":"Campinas, Sorocaba, Jundiaí",
 "Brazil_Southeast Region_Sao Paulo_City Description":"São Paulo",
 "Brazil_Southeast Region_Sao Paulo_West Description":"Ribeirão Preto, São José do Rio Preto, Franca",
@@ -1446,7 +1446,7 @@
 "Cambodia Description":"Phnom Penh",
 "Cameroon_Central Description":"Jaunde",
 "Cameroon_West Description":"Duala",
-"Canada_Alberta_Edmonton Description":"Edmonton, Lacombe, Wetaskiwin",
+"Canada_Alberta_Edmonton Description":"Edmonton",
 "Canada_Alberta_North Description":"Grande Prairie, Peace River, Fort McMurray",
 "Canada_Alberta_South Description":"Calgary, Chestermere, Lethbridge",
 "Canada_British Columbia_Central Description":"Williams Lake, Quesnel, Prince George",
@@ -1462,7 +1462,7 @@
 "Canada_Manitoba_Northeast Description":"Caribou, Manigotagan, English Brook",
 "Canada_Manitoba_Northwest Description":"Young Point, Cormorant, Pickerel Narrows",
 "Canada_Manitoba_South Description":"Foxwarren, Shoal Lake, Brandon",
-"Canada_Manitoba_Winnipeg Description":"Winnipeg, Portage La Prairie, Killarney",
+"Canada_Manitoba_Winnipeg Description":"Winnipeg",
 "Canada_New Brunswick Description":"Edmundston, Fredericton, Campbellton",
 "Canada_Newfoundland_East Description":"Mount Pearl, St John's, Badger",
 "Canada_Newfoundland_North Description":"St. Anthony, Kippens, Gallants",
@@ -1486,7 +1486,7 @@
 "Canada_Ontario_Northeastern_W Description":"Wawa, Dubreuilville, White River",
 "Canada_Ontario_Northern Description":"Thunder Bay, Geraldton, Longlac",
 "Canada_Ontario_Northwestern Description":"Pikangikum, Peawanuck, Sandy Lake",
-"Canada_Ontario_Toronto Description":"Toronto, Guelph, Mississauga",
+"Canada_Ontario_Toronto Description":"Toronto",
 "Canada_Prince Edward Island Description":"Summerside, Charlottetown, Borden",
 "Canada_Quebec_Quebec Description":"Quebec",
 "Canada_Quebek_Far North Description":"Radisson, Akulivik, Inukjuak",
@@ -1531,7 +1531,7 @@
 "China_Qinghai Description":"Delingha, Yushu",
 "China_Shaanxi Description":"Xi'an, Baoji, Hanzhong",
 "China_Shandong Description":"Jinan, Tai'an, Zibo",
-"China_Shanghai Description":"Shanghai, Jinshan, Putuo",
+"China_Shanghai Description":"Shanghai",
 "China_Shanxi Description":"Taiyuan, Changzhi, Huozhou",
 "China_Sichuan Description":"Chengdu, Panzhihua, Yibin",
 "China_Tibet Autonomous Region Description":"Gya'gya, Chabkha, Shelkar",
@@ -1573,7 +1573,7 @@
 "Denmark_North Denmark Region Description":"Hjörring, Frederikshavn",
 "Denmark_Region Zealand Description":"Nästved, Greve",
 "Denmark_Region of Southern Denmark Description":"Odense, Morud, Korup",
-"Djibouti Description":"Dschibuti, Randa, Yoboki",
+"Djibouti Description":"Dschibuti",
 "Dominica Description":"Roseau, Salisbury, Grand Bay",
 "Dominican Republic Description":"Santo Domingo, Barahona, Azua",
 "East Timor Description":"Dili, Pante Macassar, Viqueque",
@@ -1630,7 +1630,7 @@
 "France_French Guiana Description":"Cayenne, Saint-Laurent-du-Maroni, Matoury",
 "France_Ile-de-France_Essonne Description":"Évry, Corbeil-Essonnes, Massy",
 "France_Ile-de-France_Hauts-de-Seine Description":"Boulogne-Billancourt, Nanterre, Courbevoie",
-"France_Ile-de-France_Paris Description":"Paris, Campagne à Paris",
+"France_Ile-de-France_Paris Description":"Paris",
 "France_Ile-de-France_Seine-Saint-Denis Description":"Saint-Denis, Montreuil, Aubervilliers",
 "France_Ile-de-France_Seine-et-Marne Description":"Meaux, Chelles, Melun",
 "France_Ile-de-France_Val-dOise Description":"Argenteuil, Cergy, Sarcelles",
@@ -1872,7 +1872,7 @@
 "Italy_Veneto_Venezia Description":"Venedig",
 "Italy_Veneto_Verona Description":"Verona, Villafranca di Verona, Legnago",
 "Italy_Veneto_Vicenza Description":"Bassan, Schleit",
-"Jamaica Description":"Kingston, Montego Bay, Spanish Town",
+"Jamaica Description":"Kingston",
 "Japan_Chubu Region_Aichi_Nagoya Description":"Nagoya",
 "Japan_Chubu Region_Aichi_Toyohashi Description":"Tahara, Gamagori, Nishio",
 "Japan_Chubu Region_Fukui Description":"Obama, Fukui, Sakai",
@@ -2282,7 +2282,7 @@
 "UK_England_East Midlands Description":"Nottingham, Leicester, Derby",
 "UK_England_East of England_Essex Description":"Luton, Colchester, Southend-on-Sea",
 "UK_England_East of England_Norfolk Description":"Norwich, Peterborough, Cambridge",
-"UK_England_Greater London Description":"London, Croydon, Ilford",
+"UK_England_Greater London Description":"London",
 "UK_England_North East England Description":"Sunderland, Newcastle upon Tyne",
 "UK_England_North West England_Lancaster Description":"Blackpool, Whitehaven, Egremont",
 "UK_England_North West England_Manchester Description":"Manchester, Liverpool, Salford",

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

@@ -6,10 +6,10 @@
 "make_a_right_turn_street":"NULL",
 "make_a_sharp_right_turn":"Scharf rechts.",
 "make_a_sharp_right_turn_street":"NULL",
-"enter_the_roundabout":"Fahre in den Kreisverkehr ein.",
+"enter_the_roundabout":"Fahren Sie in den Kreisverkehr ein.",
 "enter_the_roundabout_street":"NULL",
 "enter_the_roundabout_street_verb":"NULL",
-"leave_the_roundabout":"Verlasse den Kreisverkehr.",
+"leave_the_roundabout":"Verlassen Sie den Kreisverkehr.",
 "leave_the_roundabout_street":"NULL",
 "leave_the_roundabout_street_verb":"NULL",
 "make_a_slight_left_turn":"Halten Sie sich links.",

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

@@ -80,7 +80,7 @@
 "type.leisure.pitch" = "Sport Pitch";
 "type.leisure.playground" = "Playground";
 "type.leisure.sports_centre" = "Sports Center";
-"type.sport.yoga" = "যোগ";
+"type.sport.yoga" = "Yoga Studio";
 "type.leisure.swimming_pool" = "Swimming Pool";
 "type.leisure.swimming_pool.private" = "Swimming Pool";
 "type.leisure.track" = "Track";
@@ -262,7 +262,7 @@
 "type.waterway.stream.tunnel" = "Stream";
 "type.railway.subway_entrance.mecca" = "Subway Entrance";
 "type.shop.chocolate" = "Chocolate Shop";
-"type.tourism" = "পর্যটন";
+"type.tourism" = "Tourism";
 "type.highway.residential.area" = "Residential Street";
 "type.wheelchair.yes" = "Full Wheelchair Access";
 "type.boundary.protected_area.2" = "Protected Area";
@@ -313,7 +313,7 @@
 "type.man_made.lighthouse" = "Lighthouse";
 "type.cuisine.tea" = "Tea";
 "type.shop.money_lender" = "Money Lender";
-"type.area_highway.steps" = "সিঁড়ি";
+"type.area_highway.steps" = "Stairs";
 "type.historic.fort" = "Fort";
 "type.railway.station.funicular" = "Funicular";
 "type.barrier.swing_gate" = "Swing Gate";
@@ -332,7 +332,7 @@
 "type.natural.geyser" = "Geyser";
 "type.amenity.bbq" = "Barbecue Grill";
 "type.landuse.reservoir" = "Reservoir";
-"type.sport.soccer" = "ফুটবল";
+"type.sport.soccer" = "Soccer";
 "type.amenity.shelter.basic_hut" = "Bivouac Hut";
 "type.natural.desert" = "মরুভূমি";
 "type.natural.wetland.mangrove" = "Mangrove";
@@ -351,19 +351,19 @@
 "type.sport.scuba_diving" = "Scuba Diving Site";
 "type.highway.living_street" = "Living Street";
 "type.railway.subway_entrance.kunming" = "Subway Entrance";
-"type.sport.cricket" = "ক্রিকেট";
+"type.sport.cricket" = "Cricket";
 "type.natural.scrub" = "Scrub";
 "type.leisure.amusement_arcade" = "Arcade";
 "type.highway.ford" = "Ford";
 "type.shop.bed" = "Bed Shop";
-"type.tourism.museum" = "জাদুঘর";
+"type.tourism.museum" = "Museum";
 "type.amenity.school" = "School";
 "type.amenity.parcel_locker" = "Parcel Locker";
 "type.historic.pillory" = "Pillory";
 "type.barrier.block" = "Block";
 "type.man_made.tower" = "Tower";
 "type.historic.archaeological_site" = "Archaeological Site";
-"type.shop.watches" = "ঘড়ির দোকান";
+"type.shop.watches" = "Watch Store";
 "type.amenity.parking_space.underground" = "Parking Space";
 "type.aeroway.runway" = "Runway";
 "type.railway.subway_entrance.lille" = "Subway Entrance";
@@ -386,7 +386,7 @@
 "type.recycling.glass_bottles" = "Glass Bottles";
 "type.amenity.shelter" = "Shelter";
 "type.landuse.grass" = "Grass";
-"type.amenity.toilets" = "শৌচালয়";
+"type.amenity.toilets" = "Toilet";
 "type.railway.subway_entrance.hongkong" = "Subway Entrance";
 "type.landuse.forest.deciduous" = "Deciduous Forest";
 "type.power.pole" = "Power Pole";
@@ -410,7 +410,7 @@
 "type.healthcare.alternative" = "Alternative Medicine";
 "type.highway.cycleway.bridge" = "Bridge";
 "type.amenity.fire_station" = "দমকল স্টেশন";
-"type.sport.table_tennis" = "টেবিল টেনিস";
+"type.sport.table_tennis" = "Table Tennis";
 "type.railway.station.subway.dnepro" = "Subway Station";
 "type.railway.subway_entrance.valencia" = "Subway Entrance";
 "type.highway.track.tunnel" = "Tunnel";
@@ -424,7 +424,7 @@
 "type.amenity.brothel" = "Brothel";
 "type.piste_type.sled" = "Sledding Piste";
 "type.shop.funeral_directors" = "Funeral Directors";
-"type.sport.volleyball" = "ভলিবল";
+"type.sport.volleyball" = "Volleyball";
 "type.amenity.bicycle_parking" = "Bicycle Parking";
 "type.railway.subway_entrance.kazan" = "Subway Entrance";
 "type.cuisine.austrian" = "Austrian";
@@ -447,8 +447,8 @@
 "type.railway.monorail.tunnel" = "Monorail Tunnel";
 "type.barrier.fence" = "বেড়া";
 "type.natural.cliff" = "Cliff";
-"type.tourism.zoo" = "চিড়িয়াখানা";
-"type.shop.paint" = "রঙের দোকান";
+"type.tourism.zoo" = "Zoo";
+"type.shop.paint" = "Paint Shop";
 "type.railway.subway_entrance.novosibirsk" = "Subway Entrance";
 "type.shop.department_store" = "Department Store";
 "type.railway.station.subway.nagoya" = "Subway Station";
@@ -476,7 +476,7 @@
 "type.natural.meadow" = "Meadow";
 "type.railway.station.subway.shenzhen" = "Subway Station";
 "type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh";
-"type.area_highway.path" = "পথ";
+"type.area_highway.path" = "Path";
 "type.mountain_pass" = "Mountain Pass";
 "type.shop.car_repair" = "Car Repair Workshop";
 "type.highway.construction" = "Road Under Construction";
@@ -528,7 +528,7 @@
 "type.railway.construction" = "Railway Construction";
 "type.railway.subway_entrance.nnov" = "Subway Entrance";
 "type.barrier.wall" = "Wall";
-"type.tourism.artwork.statue" = "মূর্তি";
+"type.tourism.artwork.statue" = "Statue";
 "type.cuisine.hungarian" = "Hungarian";
 "type.natural.cape" = "Cape";
 "type.place.islet" = "Islet";
@@ -563,7 +563,7 @@
 "type.railway.station.subway.sendai" = "Subway Station";
 "type.healthcare.speech_therapist" = "Logopedics";
 "type.area_highway.track" = "Track";
-"type.amenity.theatre" = "থিয়েটার";
+"type.amenity.theatre" = "Theatre";
 "type.sport.baseball" = "Baseball";
 "type.recycling.batteries" = "Batteries";
 "type.fee.yes" = "$";
@@ -588,7 +588,7 @@
 "type.natural.beach.gravel" = "Gravel Beach";
 "type.railway.subway_entrance.sofia" = "Subway Entrance";
 "type.area_highway.pedestrian" = "Pedestrian Street";
-"type.shop.bag" = "ব্যাগের দোকান";
+"type.shop.bag" = "Bag Shop";
 "type.highway.cycleway.permissive" = "Cycle Path";
 "type.historic.wreck" = "Shipwreck";
 "type.shop.fishing" = "Fishing Store";
@@ -637,7 +637,7 @@
 "type.sport.athletics" = "Athletics";
 "type.tourism.artwork" = "Artwork";
 "type.railway.funicular.tunnel" = "Funicular Tunnel";
-"type.tourism.attraction" = "আকর্ষণ";
+"type.tourism.attraction" = "Attraction";
 "type.railway.station.subway.rotterdam" = "Subway Station";
 "type.railway.station.subway.vienna" = "Subway Station";
 "type.barrier.hedge" = "Hedge";
@@ -711,20 +711,20 @@
 "type.highway.road.tunnel" = "Tunnel";
 "type.shop.cheese" = "Cheese Shop";
 "type.man_made.pipeline.overground" = "Overground Pipeline";
-"type.sport.multi" = "বিভিন্ন ক্রীড়া";
+"type.sport.multi" = "Various Sports";
 "type.boundary.protected_area.1" = "Protected Area";
 "type.boundary.aboriginal_lands" = "Indigenous Lands";
 "type.amenity.driving_school" = "Driving School";
 "type.amenity.payment_terminal" = "Payment Terminal";
 "type.man_made.petroleum_well" = "Oil or Gas Well";
-"type.sport.golf" = "গল্ফ";
+"type.sport.golf" = "Golf";
 "type.highway.unclassified.tunnel" = "Tunnel";
-"type.shop.lottery" = "লটারি টিকিট";
+"type.shop.lottery" = "Lottery Tickets";
 "type.railway.subway_entrance.medellin" = "Subway Entrance";
 "type.railway.subway_entrance.sf" = "Subway Entrance";
 "type.railway.station.subway.tabriz" = "Subway Station";
-"type.shop.boutique" = "বুটিক";
-"type.sport.swimming" = "সাঁতার";
+"type.shop.boutique" = "Boutique";
+"type.sport.swimming" = "Swimming";
 "type.railway.station.subway.kharkiv" = "Subway Station";
 "type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
 "type.railway.rail.main.tunnel" = "Railway Tunnel";
@@ -770,14 +770,14 @@
 "type.sport.padel" = "Padel";
 "type.sport.futsal" = "Futsal";
 "type.sport.field_hockey" = "Field Hockey";
-"type.sport.badminton" = "ব্যাডমিন্টন";
+"type.sport.badminton" = "Badminton";
 "type.sport.pelota" = "Basque Pelota";
 "type.tourism.aquarium" = "Aquarium";
 "type.waterway.dock" = "Waterway Dock";
 "type.waterway.drain" = "Drain";
 "type.natural.water.drain" = "Drain";
 "type.waterway.lock_gate" = "Lock Gate";
-"type.waterway.river" = "নদী";
+"type.waterway.river" = "River";
 "type.highway.track" = "Track";
 "type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
 "type.place.square" = "Square";
@@ -866,7 +866,7 @@
 "type.railway.subway_entrance.taipei" = "Subway Entrance";
 "type.cemetery.grave" = "Grave";
 "type.junction.roundabout" = "Roundabout";
-"type.tourism.hostel" = "হোস্টেল";
+"type.tourism.hostel" = "Hostel";
 "type.highway.tertiary_link.tunnel" = "Tunnel";
 "type.attraction.maze" = "Maze";
 "type.railway.subway_entrance.tabriz" = "Subway Entrance";
@@ -971,7 +971,7 @@
 "type.cuisine.bagel" = "Bagel";
 "type.power.plant.wind" = "Wind Power Plant";
 "type.cuisine.arab" = "Arab";
-"type.tourism.hotel" = "হোটেল";
+"type.tourism.hotel" = "Hotel";
 "type.amenity.shower" = "Shower";
 "type.barrier.chain" = "Chain";
 "type.office" = "Office";
@@ -1008,10 +1008,10 @@
 "type.natural.heath" = "Heath";
 "type.craft.electronics_repair" = "Electronics Repair";
 "type.amenity.place_of_worship.christian.mormon" = "Church of Jesus Christ of Latter Day Saints";
-"type.sport.basketball" = "বাস্কেটবল";
+"type.sport.basketball" = "Basketball";
 "type.waterway.canal" = "Canal";
 "type.shop.caravan" = "RV Dealership";
-"type.tourism.artwork.sculpture" = "ভাস্কর্য";
+"type.tourism.artwork.sculpture" = "Sculpture";
 "type.railway.subway_entrance.tianjin" = "Subway Entrance";
 "type.landuse" = "Landuse";
 "type.natural.bay" = "Bay";
@@ -1119,14 +1119,14 @@
 "type.railway.subway_entrance.lisboa" = "Subway Entrance";
 "type.noexit" = "Dead End";
 "type.railway.subway_entrance.helsinki" = "Subway Entrance";
-"type.sport.chess" = "দাবা";
+"type.sport.chess" = "Chess";
 "type.railway.station.subway.bengalore" = "Subway Station";
 "type.landuse.orchard" = "Orchard";
 "type.piste_type.downhill.area" = "Downhill Ski Run";
 "type.highway.bridleway.bridge" = "Bridge";
-"type.waterway.waterfall" = "ঝর্ণা";
+"type.waterway.waterfall" = "Waterfall";
 "type.landuse.landfill" = "Landfill";
-"type.sport" = "ক্রীড়া";
+"type.sport" = "Sport";
 "type.landuse.meadow" = "Meadow";
 "type.natural.wetland.swamp" = "Swamp";
 "type.landuse.railway" = "Railway Premises";
@@ -1165,7 +1165,7 @@
 "type.man_made.flare" = "Gas Flare";
 "type.cuisine.peruvian" = "Peruvian";
 "type.natural.water.pond" = "পুকুর";
-"type.waterway.dam" = "বাঁধ";
+"type.waterway.dam" = "Dam";
 "type.amenity.parking.park_and_ride" = "Park And Ride Parking";
 "type.amenity.fountain" = "ফাউন্টেন";
 "type.amenity.vending_machine.coffee" = "Coffee Dispenser";
@@ -1271,7 +1271,7 @@
 "type.highway.primary.bridge" = "Bridge";
 "type.railway.subway_entrance.barcelona" = "Subway Entrance";
 "type.railway.station.subway.la" = "Subway Station";
-"type.attraction.historic" = "ঐতিহাসিক আকর্ষণ";
+"type.attraction.historic" = "Historic attraction";
 "type.barrier.gate" = "Gate";
 "type.area_highway.secondary" = "Secondary Road";
 "type.cuisine.bavarian" = "Bavarian";

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

@@ -43,7 +43,7 @@
 "country_status_download_failed" = "Herunterladen fehlgeschlagen";
 
 /* Text in About screen */
-"about_headline" = "Freies Projekt, von der Gemeinschaft entwickelt";
+"about_headline" = "Ein offenes Projekt der Community";
 
 /* Text in About screen */
 "about_proposition_1" = "Offline, schnell und einfach zu benutzen";
@@ -93,7 +93,7 @@
 "category_food" = "Lebensmittel";
 
 /* Search category for public transport; any changes should be duplicated in categories.txt @category_transport! */
-"category_transport" = "ÖPNV";
+"category_transport" = "Verkehr";
 
 /* Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! */
 "category_fuel" = "Tankstelle";
@@ -123,7 +123,7 @@
 "category_nightlife" = "Nachtleben";
 
 /* Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @category_children! */
-"category_children" = "Familienfreizeit";
+"category_children" = "Freizeit mit Kindern";
 
 /* Search category for banks; any changes should be duplicated in categories.txt @category_bank! */
 "category_bank" = "Bank";
@@ -141,7 +141,7 @@
 "category_post" = "Post";
 
 /* Search category for police; any changes should be duplicated in categories.txt @category_police! */
-"category_police" = "Polizei";
+"category_police" = "Polizeistation";
 
 /* Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! */
 "category_wifi" = "WLAN";
@@ -169,16 +169,16 @@
 "edit" = "Bearbeiten";
 
 /* Warning message when doing search around current position */
-"unknown_current_position" = "Dein Standort konnte noch nicht ermittelt werden";
+"unknown_current_position" = "Ihr Standort konnte noch nicht ermittelt werden";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hey, sieh dir meine Stecknadel in der CoMaps-App an!";
+"bookmark_share_email_subject" = "Hey, sieh dir meine Stecknadel auf der CoMaps-Karte an!";
 
 /* Subject for emailed position */
 "my_position_share_email_subject" = "Hey, sieh dir meinen aktuellen Standort auf der CoMaps-Karte an!";
 
 /* Share by email button text, also used in editor and About. */
-"email" = "E-Mail";
+"email" = "Email";
 
 /* Text for message to copy something */
 "copy_to_clipboard" = "In die Zwischenablage kopieren";
@@ -250,10 +250,10 @@
 "pref_tts_street_names_description" = "Wenn aktiviert, wird der Name der Straße oder Ausfahrt, in die abgebogen werden soll, laut angekündigt.";
 
 /* Settings «Route» category: «Tts language» title */
-"pref_tts_language_title" = "Sprache der Sprachführung";
+"pref_tts_language_title" = "Sprache für Sprachführung";
 
 /* Settings «Route» category: «Test Voice Directions» title */
-"pref_tts_test_voice_title" = "Teste die Sprachanweisungen";
+"pref_tts_test_voice_title" = "Teste Sprachanweisungen";
 
 /* Title for "Other" section in TTS settings. */
 "pref_tts_other_section_title" = "Weitere";
@@ -441,7 +441,7 @@
 /* blue gray color */
 "blue_gray" = "Graublau";
 "dialog_routing_disclaimer_title" = "Wenn Sie der Route folgen, beachten Sie bitte:";
-"dialog_routing_disclaimer_priority" = "— Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;";
+"dialog_routing_disclaimer_priority" = "– Zustand der Straßen, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;";
 "dialog_routing_disclaimer_precision" = "– Die Karte kann ungenau sein, und die vorgeschlagene Route ist möglicherweise nicht der optimale Weg, um das Ziel zu erreichen;";
 "dialog_routing_disclaimer_recommendations" = "— Die vorgeschlagenen Routen sind als Empfehlungen zu verstehen;";
 "dialog_routing_disclaimer_borders" = "— Bitte seien Sie vorsichtig bei Routen in Grenzgebieten: die Routen, die unsere App erstellt, können manchmal Landesgrenzen in gesperrten Gebieten überschreiten.";
@@ -730,14 +730,14 @@
 "mobile_data_description" = "Für Benachrichtigungen über Kartenaktualisierungen und das Hochladen von Änderungen ist eine mobile Internetverbindung erforderlich.";
 "mobile_data_option_never" = "Nie verwenden";
 "mobile_data_option_ask" = "Immer fragen";
-"traffic_update_maps_text" = "Um die Verkehrsdaten anzuzeigen, müssen die Karten aktualisiert werden.";
+"traffic_update_maps_text" = "Um Verkehrsdaten anzuzeigen, müssen die Karten aktualisiert werden.";
 "big_font" = "Schrift auf der Karte vergrößern";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Zum Anzeigen von Verkehrsdaten muss die Anwendung aktualisiert werden.";
 
 /* "traffic" as in "road congestion" */
-"traffic_data_unavailable" = "Es sind keine Verkehrsdaten verfügbar";
+"traffic_data_unavailable" = "Verkehrsdaten sind nicht verfügbar";
 "enable_logging" = "Protokollierung aktivieren";
 "log_file_size" = "Größe der Protokolldatei: %@";
 "transliteration_title" = "Transliteration ins lateinische Alphabet";
@@ -813,7 +813,7 @@
 "power_managment_title" = "Stromsparmodus";
 "power_managment_description" = "Versuchen Sie, den Stromverbrauch auf Kosten einiger Funktionen zu reduzieren.";
 "power_managment_setting_never" = "Niemals";
-"power_managment_setting_auto" = "Bei niedrigem Akkustand";
+"power_managment_setting_auto" = "Auto";
 "power_managment_setting_manual_max" = "Maximale Stromsparung";
 "enable_logging_warning_message" = "Diese Option wird aktiviert, um Aktivitäten zwecks Diagnostik aufzuzeichnen. Das hilft unserem Team, Probleme mit der App zu erkennen. Aktivieren Sie diese Option, reproduzieren Sie das Problem und senden Sie die Protokolle über die Schaltfläche \"Fehler melden\" an uns.";
 "driving_options_title" = "Routenbeschränkungen";
@@ -925,7 +925,7 @@
 "elevation_profile_max_elevation" = "Max. Höhe";
 "isolines_toast_zooms_1_10" = "Karte vergrößern, um Höhelinien sichtbar zu machen";
 "downloader_updating_ios" = "Aktualisierung";
-"downloader_loading_ios" = "Wird heruntergeladen";
+"downloader_loading_ios" = "Herunterladen";
 
 /* Autoupdate dialog on start */
 "whats_new_auto_update_title" = "Aktualisieren Sie Ihre heruntergeladenen Karten";
@@ -1100,7 +1100,7 @@
 "existence_confirmed_time_ago" = "Existenz bestätigt %@";
 "hours_confirmed_time_ago" = "Bestätigt %@";
 "offline_explanation_title" = "Offline-Karten";
-"offline_explanation_text" = "Um die Gegend anzusehen und zu erkunden, musst du eine Karte runterladen.\nLade dir Karten für die Gebiete runter, die du bereisen willst.";
+"offline_explanation_text" = "Um die Gegend anzusehen, muss eine Karte heruntergeladen werden.\nLaden Sie Karten für die Gebiete herunter, die Sie bereisen möchten.";
 "editor_place_doesnt_exist_description" = "Beschreibe wie der Ort jetzt aussieht um eine Fehlermeldung an die OpenStreetMap Community zu senden";
 "voice" = "Stimme";
 "unknown" = "Unbekannt";

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

@@ -31,7 +31,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>zero</key>
-			<string>Keine Datei wurde gefunden. Du kannst sie nach der Konvertierung sehen.</string>
+			<string>%d Datei wurde gefunden. Sie können sie nach der Konvertierung sehen.</string>
 			<key>one</key>
 			<string>%d Datei wurde gefunden. Du kannst sie nach der Konvertierung sehen.</string>
 			<key>other</key>

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

@@ -397,9 +397,9 @@
 "type.spherical_buoy.special_purpose" = "Kugelförmige Spezialboje";
 "type.lateral.port" = "Backbord";
 "type.lateral.starboard" = "Steuerbord";
-"type.cardinal.east" = "Osten";
-"type.cardinal.north" = "Norden";
-"type.cardinal.south" = "Süden";
+"type.cardinal.east" = "Ost";
+"type.cardinal.north" = "Nord";
+"type.cardinal.south" = "Süd";
 "type.cardinal.west" = "Westen";
 
 /* A mountain rescue base for search and rescue activities. */

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

@@ -2,7 +2,12 @@
 "type.addr_interpolation.even" = "Adresas / blokas";
 "type.addr_interpolation.odd" = "Adresas / blokas";
 "type.aerialway" = "Oro keltuvas";
+"type.aerialway.cable_car" = "Cable Car";
+"type.aerialway.chair_lift" = "Chair Lift";
+"type.aerialway.drag_lift" = "Drag Lift";
 "type.aerialway.gondola" = "Gondola";
+"type.aerialway.mixed_lift" = "Mixed Lift";
+"type.aerialway.station" = "Aerialway Station";
 "type.aeroway" = "Oro transporto infrastruktūra";
 "type.aeroway.aerodrome" = "Oro uostas";
 "type.aeroway.aerodrome.international" = "Tarptautinis oro uostas";
@@ -75,6 +80,7 @@
 "type.amenity.internet_cafe" = "Interneto kavinė";
 "type.amenity.kindergarten" = "Vaikų darželis";
 "type.amenity.library" = "Biblioteka";
+"type.amenity.loading_dock" = "Loading Dock";
 "type.amenity.marketplace" = "Turgavietė";
 "type.amenity.motorcycle_parking" = "Motociklų stovėjimo aikštelė";
 "type.amenity.nightclub" = "Naktinis klubas";
@@ -348,6 +354,7 @@
 "type.cuisine.vegan" = "Veganiška virtuvė";
 "type.cuisine.vegetarian" = "Vegetariška virtuvė";
 "type.cuisine.vietnamese" = "Vietnamiečių virtuvė";
+"type.emergency" = "Emergency";
 "type.emergency.assembly_point" = "Evakuacijos susirinkimo vieta";
 "type.emergency.defibrillator" = "Defibriliatorius";
 "type.emergency.fire_hydrant" = "Gaisrinis hidrantas";
@@ -543,9 +550,13 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary_link.tunnel" = "Tunelis";
+"type.highway.track" = "Track";
+"type.highway.track.area" = "Track";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.track.bridge" = "Tiltas";
+"type.highway.track.grade1" = "Track";
+"type.highway.track.no.access" = "Track";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunelis";
@@ -584,11 +595,13 @@
 "type.area_highway.service" = "Privažiuojamasis kelias";
 "type.area_highway.tertiary" = "Tretinės svarbos kelias";
 "type.area_highway.steps" = "Laiptai";
+"type.area_highway.track" = "Track";
 "type.area_highway.trunk" = "Magistralinis kelias";
 "type.area_highway.unclassified" = "Vietinės reikšmės kelias";
 "type.historic" = "Senovinis / istorinis objektas";
 "type.historic.aircraft" = "Senovinis orlaivis";
 "type.historic.anchor" = "Senovinis inkaras";
+"type.historic.archaeological_site" = "Archaeological Site";
 "type.historic.battlefield" = "Istorinio mūšio laukas";
 "type.historic.boundary_stone" = "Senovinis riboženklis";
 "type.historic.cannon" = "Patranka";
@@ -702,7 +715,7 @@
 "type.leisure.sauna" = "Sauna";
 "type.leisure.slipway" = "Slipas";
 "type.leisure.sports_centre" = "Sporto centras";
-"type.sport.climbing" = "Laipiojimo centras";
+"type.sport.climbing" = "Alpinizmo centras";
 "type.sport.yoga" = "Joga";
 "type.leisure.stadium" = "Stadionas";
 "type.leisure.swimming_pool" = "Plaukimo baseinas";
@@ -1405,6 +1418,13 @@
 "type.wheelchair.limited" = "Ribota prieiga neįgaliojo vežimėliu";
 "type.wheelchair.no" = "Prieigos neįgaliojo vežimėliu nėra";
 "type.wheelchair.yes" = "Visapusė prieiga neįgaliojo vežimėliu";
+"type.aerialway.j.bar" = "J-bar Lift";
+"type.aerialway.magic_carpet" = "Magic Carpet";
+"type.aerialway.platter" = "Platter Lift";
+"type.aerialway.rope_tow" = "Rope Tow";
+"type.aerialway.t.bar" = "T-bar Lift";
+"type.piste_type.downhill" = "Downhill Ski Run";
+"type.piste_type.downhill.area" = "Downhill Ski Run";
 "type.piste_type.downhill.advanced" = "Downhill Ski Run";
 "type.piste_type.downhill.advanced.area" = "Downhill Ski Run";
 "type.piste_type.downhill.easy" = "Downhill Ski Run";
@@ -1416,6 +1436,9 @@
 "type.piste_type.downhill.intermediate.area" = "Downhill Ski Run";
 "type.piste_type.downhill.novice" = "Downhill Ski Run";
 "type.piste_type.downhill.novice.area" = "Downhill Ski Run";
+"type.piste_type.nordic" = "Nordic Ski Trail";
+"type.piste_type.sled" = "Sledding Piste";
+"type.piste_type.sled.area" = "Sledding Piste";
 "type.piste_type.snow_park" = "Sniego parkas";
 "type.piste_type.hike" = "Sniego pėsčiųjų takas";
 "type.piste_type.connection" = "\"Piste Connection";
@@ -1459,6 +1482,7 @@
 "type.amenity.luggage_locker" = "Bagažo pasaugojimo automatas";
 "type.amenity.ranger_station" = "Parko lankytojų centras";
 "type.amenity.bicycle_parking.covered" = "Dengta dviračių stovėjimo aikštelė";
+"type.post_office.post_partner" = "Post Partner";
 "type.barrier.wicket_gate" = "Varteliai";
 "type.amenity.animal_shelter" = "Gyvūnų prieglauda";
 "type.office.security" = "Saugos tarnyba";

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

@@ -957,7 +957,7 @@
 "app_tip_01" = "Med dine donasjoner og støtte kan vi lage de beste kartene i verden!";
 
 /* App tip #02 */
-"app_tip_02" = "Liker du appen vår? Vennligst doner for å støtte utviklingen! Liker du den ikke ennå? La oss få vite hvorfor, så fikser vi det!";
+"app_tip_02" = "Liker du appen vår? Vennligst doner for å støtte utviklingen! Liker du det ikke ennå? Gi oss beskjed, så fikser vi det!";
 
 /* App tip #03 */
 "app_tip_03" = "Hvis du kjenner en programvareutvikler, kan du be ham eller henne implementere en funksjon du trenger.";
@@ -978,7 +978,7 @@
 "app_tip_08" = "Du kan enkelt fikse og forbedre kartdataene.";
 
 /* App tip #09 */
-"app_tip_09" = "Vårt hovedmål er å lage raske, personvernfokuserte, brukervennlige kart som du vil like.";
+"app_tip_09" = "Vårt hovedmål er å bygge raske, personvernfokuserte, brukervennlige kart som du vil elske.";
 
 /* Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen */
 "car_used_on_the_phone_screen" = "Du bruker nå CoMaps på telefonskjermen";