[generator] Add git to mapmaker docker

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

.github/workflows/android-check.yaml

@@ -6,7 +6,7 @@ on:
       - main
 
 env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
+  JAVA_HOME: /usr/lib/jvm/temurin-21-jdk-amd64  # Java 21 is required for Android Gradle 8 plugin
   SKIP_MAP_DOWNLOAD: true
 
 jobs:

.gitignore

@@ -9,6 +9,7 @@ Makefile.Release
 object_script.*.Debug
 object_script.*.Release
 compile_commands.json
+*.local.*
 
 stxxl.errlog
 stxxl.log

CMakeLists.txt

@@ -120,7 +120,7 @@ if (PLATFORM_LINUX AND (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_BUILD_T
   add_compile_options(-fno-fat-lto-objects)
   # To fix ar and ranlib "plugin needed to handle lto object".
   string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
-  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}/liblto_plugin.so)
+  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}*/liblto_plugin.so)
   set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
   set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
   set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")

README.md

@@ -51,6 +51,9 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www
   <a href="https://f-droid.org/en/packages/app.comaps.fdroid/">
     <img src="docs/badges/fdroid.png" alt="F-Droid" width="160"/>
   </a>
+  <a href="https://apt.izzysoft.de/fdroid/index/apk/app.comaps">
+    <img src="docs/badges/izzyondroid.png" alt="Obtainium" width="160"/>
+  </a>
   <a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://codeberg.org/comaps/comaps">
     <img src="docs/badges/obtainium.png" alt="Obtainium" width="160"/>
   </a>

android/app/build.gradle

@@ -29,12 +29,12 @@ def getCommitMessage() {
 project.ext.appId = 'app.comaps'
 project.ext.appName = 'CoMaps'
 
-// I have Java 21 installed, but this doesn't work on MacOS.
-//java {
-//  toolchain {
-//    languageVersion.set(JavaLanguageVersion.of(17))
-//  }
-//}
+
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(21))
+  }
+}
 
 android {
   namespace = 'app.organicmaps'
@@ -311,8 +311,8 @@ android {
   compileOptions {
     coreLibraryDesugaringEnabled = true
 
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
+    sourceCompatibility JavaVersion.VERSION_21
+    targetCompatibility JavaVersion.VERSION_21
   }
 }
 

android/app/src/fdroid/play/listings/sr/full-description.txt

@@ -1,4 +1,4 @@
-Бесплатна апликација отвореног кода коју одржава заједница, која се заснива на ОpenStreetMap подацима. Непрофитна, транспарентна и цени вашу приватност. CoMaps је настала од апликације Organic Maps,  које је настала од апликације Maps.ME.
+Бесплатна апликација отвореног кода коју одржава заједница и која се заснива на ОpenStreetMap подацима. Непрофитна, транспарентна и цени вашу приватност. CoMaps је настала од апликације Organic Maps, која је настала од апликације Maps.ME.
 
 Прочитајте о разлозима пројекта и његовог правца на <b><i>codeberg.org/comaps</i></b>
 Придружите се отвореној заједници и помозите да направимо најбољу апликацију за мапе
@@ -10,7 +10,7 @@
 ‣ <b>Поштовање приватности</b>: Апликација је осмишљена са приватношћу корисника на уму - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
 ‣ <b>Једноставно и елегантно</b>: Апликација је лака за употребу и једноставно функционише.
 ‣ <b>Чува вашу батерију и простор</b>: Не троши батерију као остале апликације за навигацију. Компактне мапе чувају драгоцени простор на вашем телефону.
-‣ <b>Отворено и направљено од стране заједнице</b>: Људи попут вас су допринели развоју апликације додавањем локација на OpenStreetMap, тестирањем, давањем повратних информација о апликацији и помогли су својим програмерским вештинама  и донацијама.
+‣ <b>Отворено и направљено од стране заједнице</b>: Људи попут вас су допринели развоју апликације додавањем локација на OpenStreetMap, тестирањем, давањем повратних информација о апликацији и помогли су својим програмерским вештинама и донацијама.
 ‣ <b>Отворено и транспарентно доношење одлука и употреба донација, непрофитна и потпуно отвореног кода.</b>
 
 <b> Главне карактеристике </b>:

android/app/src/fdroid/play/listings/sr/short-description.txt

@@ -1 +1 @@
-Једноставна навигација - Сазнајте више о свом путовању - Ради на бази заједнице
+Једноставна навигација - Сазнајте више о свом путовању - Одржава заједница

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

@@ -1 +1 @@
-CoMaps - пешачење, бицикл, вожња
+CoMaps - пешачење, бицикл и вожња, са приватношћу

android/app/src/fdroid/play/version.yaml

@@ -1 +1 @@
-version: 2025.08.31-15-FDroid+25083115
+version: 2025.03.02-7-FDroid+25030207

android/app/src/google/play/listings/sr/short-description.txt

@@ -1 +1 @@
-Једноставна навигација - Сазнајте више о свом путовању - Ради на бази заједнице
+Једноставна навигација - Сазнајте више о свом путовању - Одржава заједница

android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java

@@ -31,18 +31,19 @@ public final class RoutingHelpers
   @NonNull
   public static LaneDirection createLaneDirection(@NonNull LaneWay laneWay, boolean isRecommended)
   {
-    int shape = LaneDirection.SHAPE_UNKNOWN;
-    shape = switch (laneWay)
+    @LaneDirection.Shape
+    final int shape = switch (laneWay)
     {
-      case REVERSE -> LaneDirection.SHAPE_U_TURN_LEFT;
-      case SHARP_LEFT -> LaneDirection.SHAPE_SHARP_LEFT;
-      case LEFT -> LaneDirection.SHAPE_NORMAL_LEFT;
-      case SLIGHT_LEFT, MERGE_TO_LEFT -> LaneDirection.SHAPE_SLIGHT_LEFT;
-      case SLIGHT_RIGHT, MERGE_TO_RIGHT -> LaneDirection.SHAPE_SLIGHT_RIGHT;
-      case THROUGH -> LaneDirection.SHAPE_STRAIGHT;
-      case RIGHT -> LaneDirection.SHAPE_NORMAL_RIGHT;
-      case SHARP_RIGHT -> LaneDirection.SHAPE_SHARP_RIGHT;
-      default -> shape;
+      case ReverseLeft -> LaneDirection.SHAPE_U_TURN_LEFT;
+      case SharpLeft -> LaneDirection.SHAPE_SHARP_LEFT;
+      case Left -> LaneDirection.SHAPE_NORMAL_LEFT;
+      case MergeToLeft, SlightLeft -> LaneDirection.SHAPE_SLIGHT_LEFT;
+      case Through -> LaneDirection.SHAPE_STRAIGHT;
+      case SlightRight, MergeToRight -> LaneDirection.SHAPE_SLIGHT_RIGHT;
+      case Right -> LaneDirection.SHAPE_NORMAL_RIGHT;
+      case SharpRight -> LaneDirection.SHAPE_SHARP_RIGHT;
+      case ReverseRight -> LaneDirection.SHAPE_U_TURN_RIGHT;
+      default -> LaneDirection.SHAPE_UNKNOWN;
     };
 
         return LaneDirection.create(shape, isRecommended);

android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java

@@ -8,14 +8,15 @@ import androidx.car.app.CarContext;
 import androidx.car.app.model.CarIcon;
 import androidx.car.app.navigation.model.Destination;
 import androidx.car.app.navigation.model.Lane;
+import androidx.car.app.navigation.model.LaneDirection;
 import androidx.car.app.navigation.model.Step;
 import androidx.car.app.navigation.model.TravelEstimate;
 import androidx.car.app.navigation.model.Trip;
 import androidx.core.graphics.drawable.IconCompat;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
+import app.organicmaps.sdk.routing.LaneInfo;
 import app.organicmaps.sdk.routing.LaneWay;
 import app.organicmaps.sdk.routing.RoutingInfo;
-import app.organicmaps.sdk.routing.SingleLaneInfo;
 import app.organicmaps.sdk.util.Distance;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.widget.LanesDrawable;
@@ -69,11 +70,12 @@ public final class RoutingUtils
     builder.setManeuver(RoutingHelpers.createManeuver(context, info.carDirection, info.exitNum));
     if (info.lanes != null)
     {
-      for (final SingleLaneInfo laneInfo : info.lanes)
+      for (final LaneInfo laneInfo : info.lanes)
       {
         final Lane.Builder laneBuilder = new Lane.Builder();
-        for (final LaneWay laneWay : laneInfo.mLane)
-          laneBuilder.addDirection(RoutingHelpers.createLaneDirection(laneWay, laneInfo.mIsActive));
+        for (final LaneWay laneWay : laneInfo.mLaneWays)
+          laneBuilder.addDirection(
+              RoutingHelpers.createLaneDirection(laneWay, /* isRecommended */ laneWay == laneInfo.mActiveLaneWay));
         builder.addLane(laneBuilder.build());
       }
       final LanesDrawable lanesDrawable = new LanesDrawable(context, info.lanes);

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

@@ -9,7 +9,6 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
@@ -27,6 +26,7 @@ import app.organicmaps.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.divider.MaterialDividerItemDecoration;
 import java.util.ArrayList;
 
@@ -42,10 +42,10 @@ public class ManageRouteBottomSheet
   {
     View v = inflater.inflate(R.layout.manage_route_bottom_sheet, container, false);
 
-    Button cancelButton = v.findViewById(R.id.btn__cancel);
+    MaterialButton cancelButton = v.findViewById(R.id.btn__cancel);
     cancelButton.setOnClickListener(this);
 
-    Button planButton = v.findViewById(R.id.btn__plan);
+    MaterialButton planButton = v.findViewById(R.id.btn__plan);
     planButton.setOnClickListener(this);
 
     mMyLocationImageView = v.findViewById(R.id.image_my_location);

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

@@ -68,7 +68,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
   @NonNull
   private final MaterialTextView mError;
   @NonNull
-  private final Button mStart;
+  private final MaterialButton mStart;
   @NonNull
   private final ImageView mAltitudeChart;
   @NonNull
@@ -101,7 +101,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
     View timeElevationLine = getViewById(activity, frame, R.id.time_elevation_line);
     View transitFrame = getViewById(activity, frame, R.id.transit_panel);
     MaterialTextView error = (MaterialTextView) getViewById(activity, frame, R.id.error);
-    Button start = (Button) getViewById(activity, frame, R.id.start);
+    MaterialButton start = (MaterialButton) getViewById(activity, frame, R.id.start);
     ImageView altitudeChart = (ImageView) getViewById(activity, frame, R.id.altitude_chart);
     MaterialTextView time = (MaterialTextView) getViewById(activity, frame, R.id.time);
     TextView timeVehicle = (TextView) getViewById(activity, frame, R.id.time_vehicle);
@@ -123,7 +123,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
 
   private RoutingBottomMenuController(@NonNull Activity context, @NonNull View altitudeChartFrame,
                                       @NonNull View timeElevationLine, @NonNull View transitFrame,
-                                      @NonNull MaterialTextView error, @NonNull Button start,
+                                      @NonNull MaterialTextView error, @NonNull MaterialButton start,
                                       @NonNull ImageView altitudeChart, @NonNull MaterialTextView time,
                                       @NonNull MaterialTextView altitudeDifference, @NonNull TextView timeVehicle,
                                       @Nullable MaterialTextView arrival, @NonNull View actionFrame,

android/app/src/main/java/app/organicmaps/widget/LanesDrawable.java

@@ -8,12 +8,14 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import app.organicmaps.R;
-import app.organicmaps.sdk.routing.SingleLaneInfo;
+import app.organicmaps.sdk.routing.LaneInfo;
+import app.organicmaps.sdk.routing.LaneWay;
 import java.util.Objects;
 
 public class LanesDrawable extends Drawable
@@ -41,16 +43,19 @@ public class LanesDrawable extends Drawable
   {
     private final Drawable mDrawable;
 
-    private LaneDrawable(@NonNull final Context context, @NonNull SingleLaneInfo laneInfo, int horizontalOffset,
+    private LaneDrawable(@NonNull final Context context, @NonNull LaneInfo laneInfo, int horizontalOffset,
                          TintColorInfo colorInfo)
     {
-      mDrawable = Objects.requireNonNull(AppCompatResources.getDrawable(context, laneInfo.mLane[0].mTurnRes));
+      final boolean isActive = laneInfo.mActiveLaneWay != LaneWay.None;
+      @DrawableRes
+      final int turnRes = isActive ? laneInfo.mActiveLaneWay.mTurnRes : laneInfo.mLaneWays[0].mTurnRes;
+      mDrawable = Objects.requireNonNull(AppCompatResources.getDrawable(context, turnRes));
 
       final int width = mDrawable.getIntrinsicWidth();
       final int height = mDrawable.getIntrinsicHeight();
 
       mDrawable.setBounds(horizontalOffset, 0, horizontalOffset + width, height);
-      mDrawable.setTint(laneInfo.mIsActive ? colorInfo.mActiveLaneTint : colorInfo.mInactiveLaneTint);
+      mDrawable.setTint(isActive ? colorInfo.mActiveLaneTint : colorInfo.mInactiveLaneTint);
     }
 
     private void draw(@NonNull final Canvas canvas)
@@ -65,14 +70,14 @@ public class LanesDrawable extends Drawable
   private int mWidth;
   private int mHeight;
 
-  public LanesDrawable(@NonNull final Context context, @NonNull SingleLaneInfo[] lanes)
+  public LanesDrawable(@NonNull final Context context, @NonNull LaneInfo[] lanes)
   {
     final TintColorInfo tintColorInfo = new TintColorInfo(ContextCompat.getColor(context, ACTIVE_LANE_TINT_RES),
                                                           ContextCompat.getColor(context, INACTIVE_LANE_TINT_RES));
     mLanes = createLaneDrawables(context, lanes, tintColorInfo);
   }
 
-  public LanesDrawable(@NonNull final Context context, @NonNull SingleLaneInfo[] lanes, @ColorInt int activeLaneTint,
+  public LanesDrawable(@NonNull final Context context, @NonNull LaneInfo[] lanes, @ColorInt int activeLaneTint,
                        @ColorInt int inactiveLaneTint)
   {
     final TintColorInfo tintColorInfo = new TintColorInfo(activeLaneTint, inactiveLaneTint);
@@ -143,7 +148,7 @@ public class LanesDrawable extends Drawable
   }
 
   @NonNull
-  private LaneDrawable[] createLaneDrawables(@NonNull Context context, @NonNull SingleLaneInfo[] lanes,
+  private LaneDrawable[] createLaneDrawables(@NonNull Context context, @NonNull LaneInfo[] lanes,
                                              @NonNull TintColorInfo tintColorInfo)
   {
     assert lanes.length > 0;

android/app/src/main/java/app/organicmaps/widget/LanesView.java

@@ -16,7 +16,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleableRes;
 import app.organicmaps.R;
-import app.organicmaps.sdk.routing.SingleLaneInfo;
+import app.organicmaps.sdk.routing.LaneInfo;
+import app.organicmaps.sdk.routing.LaneWay;
 
 public class LanesView extends View
 {
@@ -77,7 +78,7 @@ public class LanesView extends View
     mBackgroundPaint.setColor(backgroundColor);
   }
 
-  public void setLanes(@Nullable SingleLaneInfo[] lanes)
+  public void setLanes(@Nullable LaneInfo[] lanes)
   {
     if (lanes == null || lanes.length == 0)
       mLanesDrawable = null;
@@ -157,16 +158,16 @@ public class LanesView extends View
 
   private void createLanesForEditMode(int lanesCount)
   {
-    final SingleLaneInfo[] lanes = new SingleLaneInfo[lanesCount];
-    lanes[0] = new SingleLaneInfo(new byte[] {1}, false);
+    final LaneInfo[] lanes = new LaneInfo[lanesCount];
+    lanes[0] = new LaneInfo(new LaneWay[] {LaneWay.ReverseLeft, LaneWay.Left}, LaneWay.None);
     if (lanes.length > 1)
-      lanes[1] = new SingleLaneInfo(new byte[] {3}, false);
+      lanes[1] = new LaneInfo(new LaneWay[] {LaneWay.SharpLeft, LaneWay.Left, LaneWay.Through}, LaneWay.None);
     for (int i = 2; i <= lanes.length - 1; i++)
-      lanes[i] = new SingleLaneInfo(new byte[] {0}, true);
+      lanes[i] = new LaneInfo(new LaneWay[] {LaneWay.Through, LaneWay.Left}, LaneWay.Through);
     if (lanes.length > 2)
-      lanes[lanes.length - 2] = new SingleLaneInfo(new byte[] {8}, false);
+      lanes[lanes.length - 2] = new LaneInfo(new LaneWay[] {LaneWay.SlightRight, LaneWay.Right}, LaneWay.SlightRight);
     if (lanes.length > 3)
-      lanes[lanes.length - 1] = new SingleLaneInfo(new byte[] {9}, false);
+      lanes[lanes.length - 1] = new LaneInfo(new LaneWay[] {LaneWay.ReverseRight}, LaneWay.None);
 
     setLanes(lanes);
   }

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

@@ -166,7 +166,7 @@
         android:orientation="horizontal">
         <com.google.android.material.button.MaterialButton
           android:id="@+id/donate"
-          style="@style/MwmWidget.Button.Accent"
+          style="@style/MwmWidget.M3.Button.Primary"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:padding="@dimen/margin_quarter"
@@ -182,10 +182,9 @@
           app:layout_constraintVertical_bias="0.5" />
         <com.google.android.material.button.MaterialButton
           android:id="@+id/report"
-          style="@style/MwmWidget.Button"
+          style="@style/MwmWidget.M3.Button"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
-          android:background="@color/light_gray"
           android:text="@string/report_a_bug"
           android:textAlignment="center"
           android:textColor="@color/text_dark"
@@ -195,7 +194,8 @@
           app:layout_constraintHorizontal_bias="0.5"
           app:layout_constraintStart_toEndOf="@+id/donate"
           app:layout_constraintTop_toTopOf="parent"
-          app:layout_constraintVertical_bias="0.5" />
+          app:layout_constraintVertical_bias="0.5"
+          app:backgroundTint="@color/light_gray"/>
       </androidx.constraintlayout.widget.ConstraintLayout>
 
       <com.google.android.material.textview.MaterialTextView

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

@@ -69,9 +69,10 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="6dp"
-      style="@style/MwmWidget.Button"
+      style="@style/Widget.Material3.Button.TextButton"
       android:text="@string/planning_route_manage_route"
       android:textColor="?android:textColorPrimary"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
       app:icon="@drawable/ic_manage_route"
       app:iconTint="?android:textColorPrimary"
       app:iconPadding="6dp"/>
@@ -84,13 +85,14 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/margin_base"
         android:minHeight="@dimen/primary_button_min_height"
-        style="@style/MwmWidget.Button"
+        style="@style/Widget.Material3.Button.TextButton"
         android:text="@string/save"
-        android:textColor="?android:textColorPrimary"/>
+        android:textColor="?android:textColorPrimary"
+        android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
       android:id="@+id/start"
-      style="@style/MwmWidget.Button.Primary"
+      style="@style/MwmWidget.M3.Button.Primary"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_weight="0"

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

@@ -110,11 +110,10 @@
             android:layout_marginBottom="@dimen/margin_base">
             <com.google.android.material.button.MaterialButton
               android:id="@+id/login"
-              style="@style/MwmWidget.Button.Accent"
+              style="@style/MwmWidget.M3.Button.Primary"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:text="@string/login_osm"
-              android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
+              android:text="@string/login_osm" />
             <ProgressBar
               android:id="@+id/osm_login_progress"
               android:layout_width="@dimen/editor_auth_btn_height"
@@ -147,15 +146,14 @@
             android:textColor="?android:textColorPrimary" />
           <com.google.android.material.button.MaterialButton
             android:id="@+id/register"
-            style="@style/MwmWidget.Button.Accent"
+            style="@style/MwmWidget.M3.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin_base"
-            android:background="@drawable/button_editor_light"
             android:padding="@dimen/margin_quarter"
             android:text="@string/register_at_openstreetmap"
-            android:textAppearance="@style/MwmTextAppearance.Body2"
-            android:textColor="@color/text_dark" />
+            android:textColor="@color/text_dark"
+            app:backgroundTint="@color/bg_editor_light"/>
         </LinearLayout>
       </LinearLayout>
     </LinearLayout>

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

@@ -60,7 +60,7 @@
         android:clipChildren="false">
         <com.google.android.material.button.MaterialButton
           android:id="@+id/downloader_button"
-          style="@style/MwmWidget.Button.Primary"
+          style="@style/MwmWidget.M3.Button.Primary"
           android:layout_width="180dp"
           android:layout_gravity="center"
           android:visibility="gone"

android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml

@@ -88,9 +88,10 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="6dp"
-      style="@style/MwmWidget.Button"
+      style="@style/Widget.Material3.Button.TextButton"
       android:text="@string/planning_route_manage_route"
       android:textColor="?android:textColorPrimary"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
       app:icon="@drawable/ic_manage_route"
       app:iconTint="?android:textColorPrimary"
       app:iconPadding="6dp"/>
@@ -100,14 +101,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_base"
-        style="@style/MwmWidget.Button"
+        style="@style/Widget.Material3.Button.TextButton"
         android:minHeight="@dimen/primary_button_min_height"
         android:text="@string/save"
-        android:textColor="?android:textColorPrimary"/>
+        android:textColor="?android:textColorPrimary"
+        android:textAppearance="@style/MwmTextAppearance.Body1"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
       android:id="@+id/start"
-      style="@style/MwmWidget.Button.Primary"
+      style="@style/MwmWidget.M3.Button.Primary"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_weight="0"

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

@@ -112,7 +112,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/donate"
-        style="@style/MwmWidget.Button.Accent"
+        style="@style/MwmWidget.M3.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
@@ -121,13 +121,13 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/report"
-        style="@style/MwmWidget.Button"
+        style="@style/MwmWidget.M3.Button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_base"
-        android:background="@color/light_gray"
+        android:layout_marginTop="@dimen/margin_half"
         android:text="@string/report_a_bug"
-        android:textColor="@color/text_dark" />
+        android:textColor="@color/text_dark"
+        app:backgroundTint="@color/light_gray"/>
 
     <com.google.android.material.textview.MaterialTextView
       android:id="@+id/faq"

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

@@ -41,7 +41,7 @@
 
   <com.google.android.material.button.MaterialButton
       android:id="@+id/btn_continue"
-      style="@style/MwmWidget.Button.Accent"
+      style="@style/MwmWidget.M3.Button.Primary"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginEnd="32dp"

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

@@ -25,7 +25,7 @@
 
   <com.google.android.material.button.MaterialButton
       android:id="@+id/btn_grant_permissions"
-      style="@style/MwmWidget.Button.Accent"
+      style="@style/MwmWidget.M3.Button.Primary"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginEnd="32dp"

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

@@ -71,9 +71,9 @@
               tools:visibility="visible" />
         </LinearLayout>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
           android:id="@+id/start"
-          style="@style/MwmWidget.Button.Primary"
+          style="@style/MwmWidget.M3.Button.Primary"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_weight="0"
@@ -94,10 +94,11 @@
           android:id="@+id/btn__manage_route"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          style="@style/MwmWidget.Button"
+          style="@style/Widget.Material3.Button.TextButton"
           android:text="@string/planning_route_manage_route"
           android:textColor="?android:textColorPrimary"
           android:textAlignment="viewStart"
+          android:textAppearance="@style/MwmTextAppearance.Body1"
           app:icon="@drawable/ic_manage_route"
           app:iconTint="?android:textColorPrimary"
           app:iconPadding="@dimen/margin_quarter_plus"/>
@@ -107,11 +108,12 @@
           android:id="@+id/btn__save"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          style="@style/MwmWidget.Button"
+          style="@style/Widget.Material3.Button.TextButton"
           android:layout_marginStart="@dimen/margin_base"
           android:minHeight="@dimen/primary_button_min_height"
           android:text="@string/save"
-          android:textColor="?android:textColorPrimary"/>
+          android:textColor="?android:textColorPrimary"
+          android:textAppearance="@style/MwmTextAppearance.Body1"/>
     </LinearLayout>
 
 </LinearLayout>

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

@@ -31,7 +31,7 @@
     app:trackColor="@color/bg_routing_progress"/>
   <com.google.android.material.button.MaterialButton
     android:id="@+id/btn_download_resources"
-    style="@style/MwmWidget.Button.Primary"
+    style="@style/MwmWidget.M3.Button.Primary"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/margin_base_plus"

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

@@ -94,11 +94,10 @@
         android:layout_marginBottom="@dimen/margin_base">
         <com.google.android.material.button.MaterialButton
           android:id="@+id/login"
-          style="@style/MwmWidget.Button.Accent"
+          style="@style/MwmWidget.M3.Button.Primary"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:text="@string/login_osm"
-          android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
+          android:text="@string/login_osm" />
         <ProgressBar
           android:id="@+id/osm_login_progress"
           android:layout_width="@dimen/editor_auth_btn_height"
@@ -109,14 +108,16 @@
       </FrameLayout>
       <com.google.android.material.button.MaterialButton
         android:id="@+id/lost_password"
-        style="@style/MwmWidget.Button"
+        style="@style/MwmWidget.M3.Button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:background="?clickableBackground"
         android:padding="@dimen/margin_half"
         android:text="@string/forgot_password"
-        android:textAppearance="@style/MwmTextAppearance.Body3" />
+        android:textAppearance="@style/MwmTextAppearance.Body3"
+        android:textColor="@color/text_dark"
+          tools:visibility="invisible"/>
       <com.google.android.material.divider.MaterialDivider
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -130,15 +131,14 @@
         android:textColor="?android:textColorPrimary" />
       <com.google.android.material.button.MaterialButton
         android:id="@+id/register"
-        style="@style/MwmWidget.Button.Accent"
+        style="@style/MwmWidget.M3.Button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
-        android:background="@drawable/button_editor_light"
         android:padding="@dimen/margin_quarter"
         android:text="@string/register_at_openstreetmap"
-        android:textAppearance="@style/MwmTextAppearance.Body2"
-        android:textColor="@color/text_dark" />
+        android:textColor="@color/text_dark"
+        app:backgroundTint="@color/bg_editor_light"/>
     </LinearLayout>
   </ScrollView>
 </LinearLayout>

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

@@ -60,7 +60,7 @@
 
       <com.google.android.material.button.MaterialButton
         android:id="@+id/btn__download_map"
-        style="@style/MwmWidget.Button.Primary"
+        style="@style/MwmWidget.M3.Button.Primary"
         android:layout_marginTop="@dimen/margin_half"
         android:text="@string/downloader_download_map"/>
     </LinearLayout>
@@ -85,7 +85,7 @@
 
       <com.google.android.material.button.MaterialButton
         android:id="@+id/btn__select_map"
-        style="@style/MwmWidget.Button.Primary"
+        style="@style/MwmWidget.M3.Button.Primary"
         android:layout_marginTop="@dimen/margin_half"
         android:text="@string/search_select_map"/>
     </LinearLayout>

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

@@ -45,13 +45,15 @@
       android:maxLines="6" />
   </com.google.android.material.textfield.TextInputLayout>
   
-  <Button
+  <com.google.android.material.button.MaterialButton
     android:id="@+id/send_note_button"
-    style="@style/MwmWidget.Button.Accent"
+    style="@style/MwmWidget.M3.Button.Primary"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
+    android:background="?accentButtonBackground"
     android:layout_marginTop="@dimen/margin_base"
-    android:enabled="false"
-    android:text="@string/editor_report_problem_send_button" />
+    android:enabled="true"
+    android:text="@string/editor_report_problem_send_button"
+    app:backgroundTint="@null"/>
 </LinearLayout>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
   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:paddingBottom="@dimen/margin_base_plus"
@@ -8,10 +9,12 @@
 
   <com.google.android.material.button.MaterialButton
     android:id="@+id/btn__add_time"
-    style="@style/MwmWidget.Button.Primary"
+    style="@style/MwmWidget.M3.Button.Primary"
     android:layout_gravity="center"
     android:enabled="false"
+    android:background="?accentButtonBackground"
     android:padding="@dimen/margin_base"
-    android:text="@string/editor_time_add"/>
+    android:text="@string/editor_time_add"
+    app:backgroundTint="@null"/>
 
 </FrameLayout>

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

@@ -89,21 +89,22 @@
     android:paddingStart="0dp"
     android:paddingEnd="@dimen/altitude_chart_container_padding_left">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
       android:id="@+id/btn__cancel"
-      style="@style/MwmWidget.Button"
+      style="@style/Widget.Material3.Button.TextButton"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_vertical"
       android:text="@string/cancel"
-      android:textColor="?android:attr/textColorPrimary"
+      android:textColor="?android:textColorPrimary"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
       android:id="@+id/btn__plan"
-      style="@style/MwmWidget.Button.Primary"
+      style="@style/MwmWidget.M3.Button.Primary"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_vertical"

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

@@ -53,7 +53,7 @@
       android:clipChildren="false">
       <com.google.android.material.button.MaterialButton
         android:id="@+id/downloader_button"
-        style="@style/MwmWidget.Button.Primary"
+        style="@style/MwmWidget.M3.Button.Primary"
         android:layout_width="180dp"
         android:layout_gravity="center"
         android:visibility="gone"

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button
+<com.google.android.material.button.MaterialButton
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/start"
-  style="@style/MwmWidget.Button.Primary"
+  style="@style/MwmWidget.M3.Button.Primary"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
   android:minWidth="@dimen/start_button_width"

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

@@ -23,7 +23,7 @@
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
     <string name="search_map">Auf der Karte suchen</string>
     <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">Standortdienste sind für dieses Gerät oder App deaktiviert. Bitte aktivieren Sie diese in den Einstellungen.</string>
+    <string name="location_is_disabled_long_text">Standortdienste sind für dieses Gerät oder diese App deaktiviert. Bitte aktivieren Sie diese in den Einstellungen.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Begrenzte Genauigkeit</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
@@ -225,7 +225,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <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>
+    <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 -->
     <string name="pref_tts_unavailable">Nicht verfügbar</string>
     <string name="pref_map_auto_zoom">Auto-Zoom</string>
@@ -256,7 +256,7 @@
     <!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
     <string name="compass_calibration_required">Bewegen Sie das Telefon in einer Achterbewegung, um den Kompass zu kalibrieren und die Pfeilrichtung auf der Karte festzulegen.</string>
     <!-- Toast text when user hides UI with a long tap anywhere on the map -->
-    <string name="long_tap_toast">Tippe erneut lange auf die Karte, um das Interface zu sehen</string>
+    <string name="long_tap_toast">Tippe erneut lange auf die Karte, um die Benutzeroberfläche zu sehen</string>
     <!-- Update all button text -->
     <string name="downloader_update_all_button">Alle aktualisieren</string>
     <!-- Cancel all button text -->
@@ -346,10 +346,10 @@
     <string name="dialog_routing_cant_build_route">Route konnte nicht erstellt werden</string>
     <string name="dialog_routing_change_start_or_end">Bitte passen Sie Ihren Startpunkt oder Ihr Ziel an.</string>
     <string name="dialog_routing_change_start">Startpunkt anpassen</string>
-    <string name="dialog_routing_start_not_determined">Route wurde nicht erstellt. Startpunkt kann nicht gefunden werden.</string>
+    <string name="dialog_routing_start_not_determined">Route wurde nicht erstellt. Startpunkt konnte nicht gefunden werden.</string>
     <string name="dialog_routing_select_closer_start">Bitte wählen Sie einen Startpunkt, der näher an einer Straße liegt.</string>
     <string name="dialog_routing_change_end">Ziel anpassen</string>
-    <string name="dialog_routing_end_not_determined">Route wurde nicht erstellt. Ziel kann nicht gefunden werden.</string>
+    <string name="dialog_routing_end_not_determined">Route wurde nicht erstellt. Ziel konnte nicht gefunden werden.</string>
     <string name="dialog_routing_select_closer_end">Bitte wählen Sie einen Zielort näher an einer Straße</string>
     <string name="dialog_routing_change_intermediate">Der Zwischenstopp konnte nicht gefunden werden</string>
     <string name="dialog_routing_intermediate_not_determined">Bitte passen Sie Ihren Zwischenstopp an</string>
@@ -358,7 +358,7 @@
     <string name="dialog_routing_try_again">Bitte versuchen Sie es erneut</string>
     <string name="not_now">Nicht jetzt</string>
     <string name="dialog_routing_download_and_build_cross_route">Möchten Sie die Karte herunterladen und eine bessere Route erstellen, die mehr als eine Karte umfasst?</string>
-    <string name="dialog_routing_download_cross_route">Laden Sie zusätzliche Karten herunter, um eine bessere Route zu erstellen, die die Grenzen dieser Karte überschreitet.</string>
+    <string name="dialog_routing_download_cross_route">Laden Sie zusätzliche Karten herunter, um eine bessere Route zu erstellen, welche die Grenzen dieser Karte überschreitet.</string>
     <!-- SECTION: Strings for downloading map from search -->
     <string name="search_without_internet_advertisement">Um mit der Suche und dem Erstellen von Routen zu beginnen, laden Sie bitte die Karte herunter. Sie benötigen danach keine Internetverbindung mehr.</string>
     <string name="search_select_map">Karte auswählen</string>
@@ -395,18 +395,18 @@
     <string name="editor_time_add_closed">Schließzeiten hinzufügen</string>
     <string name="editor_time_title">Öffnungszeiten</string>
     <string name="editor_time_advanced">Erweiterter Modus</string>
-    <string name="editor_time_simple">Einfachmodus</string>
+    <string name="editor_time_simple">Einfacher Modus</string>
     <string name="editor_hours_closed">Schließzeiten</string>
     <string name="editor_example_values">Beispiele</string>
     <string name="editor_correct_mistake">Fehler korrigieren</string>
     <string name="editor_add_select_location">Standort auswählen</string>
     <string name="editor_report_problem_desription_1">Bitte beschreiben Sie das Problem detailliert, damit die OpenStreetMap-Community den Fehler korrigieren kann.</string>
-    <string name="editor_report_problem_desription_2">Oder kümmern Sie sich selbst darum auf https://www.openstreetmap.org/</string>
+    <string name="editor_report_problem_desription_2">Oder korrigieren Sie es selbst auf https://www.openstreetmap.org/</string>
     <string name="editor_report_problem_send_button">Senden</string>
     <string name="editor_report_problem_title">Problem</string>
-    <string name="editor_report_problem_no_place_title">Der Ort existiert nicht</string>
-    <string name="editor_report_problem_under_construction_title">Wegen Wartung geschlossen</string>
-    <string name="editor_report_problem_duplicate_place_title">Doppelter Ort</string>
+    <string name="editor_report_problem_no_place_title">Dieser Ort existiert nicht</string>
+    <string name="editor_report_problem_under_construction_title">Wegen Bauarbeiten geschlossen</string>
+    <string name="editor_report_problem_duplicate_place_title">Doppelt vorhanderer Ort</string>
     <string name="autodownload">Karten automatisch herunterladen</string>
     <!-- Place Page opening hours text -->
     <string name="daily">Täglich</string>
@@ -416,7 +416,7 @@
     <string name="opens_in">Öffnet in %s</string>
     <string name="closes_in">Schließt in %s</string>
     <string name="closed">Geschlossen</string>
-    <string name="edit_opening_hours">Geschäftszeiten bearbeiten</string>
+    <string name="edit_opening_hours">Öffnungszeiten bearbeiten</string>
     <string name="no_osm_account">Kein Konto bei OpenStreetMap?</string>
     <string name="register_at_openstreetmap">Bei OpenStreetMap registrieren</string>
     <string name="login">Bei OpenStreetMap anmelden</string>
@@ -444,7 +444,7 @@
     <string name="select_cuisine">Küche auswählen</string>
     <!-- login text field -->
     <string name="email_or_username">Email oder Benutzername</string>
-    <string name="editor_add_phone">Telefon hinzufügen</string>
+    <string name="editor_add_phone">Telefonnummer hinzufügen</string>
     <string name="level">Stockwerk</string>
     <!-- Building level -->
     <string name="level_value_generic">Stock: %s</string>
@@ -476,8 +476,8 @@
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d von %2$d</string>
     <string name="download_over_mobile_header">Über eine Mobilfunknetzverbindung herunterladen?</string>
-    <string name="download_over_mobile_message">Das könnte mit einigen Tarifen oder beim Roaming sehr teuer werden</string>
-    <string name="error_enter_correct_house_number">Richtige Hausnummer eingeben</string>
+    <string name="download_over_mobile_message">Das könnte je nach Tarif oder beim Roaming sehr teuer werden</string>
+    <string name="error_enter_correct_house_number">Gültige Hausnummer eingeben</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Das Gebäude kann nicht mehr als %d Etagen haben</string>
     <string name="editor_zip_code">Postleitzahl</string>
@@ -527,7 +527,7 @@
     <string name="error_enter_correct_line_page">Geben Sie eine gültige LINE-Webadresse oder LINE ID ein</string>
     <string name="placepage_add_place_button">Ort zu OpenStreetMap hinzufügen</string>
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
-    <string name="editor_share_to_all_dialog_title">An alle Benutzer senden?</string>
+    <string name="editor_share_to_all_dialog_title">An alle Nutzer*innen senden?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
     <string name="editor_share_to_all_dialog_message_1">Stellen Sie sicher, dass Sie keine persönlichen oder privaten Daten eingegeben haben</string>
     <string name="editor_share_to_all_dialog_message_2">Freiwillige von OpenStreetMap werden die Änderungen prüfen und sich bei Fragen mit Ihnen in Verbindung setzen</string>
@@ -558,7 +558,7 @@
     <string name="prefs_languages_information">Wir verwenden Text-to-Speech-Systeme für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das Sie bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren können</string>
     <string name="prefs_languages_information_off">Für einige Sprachen müssen Sie einen anderen Sprachgenerator oder ein zusätzliches Sprachpaket aus dem App Store installieren (Google Play, Galaxy Store, App Gallery, FDroid).\nÖffnen Sie die Einstellungen Ihres Gerätes → Sprache und Eingabe → Sprache → Text-to-Speech-Ausgabe.\nHier können Sie die Einstellungen für Sprachsynthese verwalten (beispielsweise ein Sprachpaket für die Offline-Verwendung herunterladen) und ein anderes Sprachausgabeprogramm auswählen.</string>
     <string name="prefs_languages_information_off_link">Weitere Informationen finden Sie in dieser Anleitung</string>
-    <string name="transliteration_title">Transliteration ins Lateinische alphabet</string>
+    <string name="transliteration_title">Transliteration ins lateinische Alphabet</string>
     <string name="learn_more">Weitere Informationen</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Verwende die Suche oder tippe auf die Karte, um einen Routenstartpunkt hinzuzufügen</string>
@@ -589,7 +589,7 @@
     <string name="bookmarks_error_title_empty_list_name">Der Name darf nicht leer sein</string>
     <string name="bookmarks_error_message_empty_list_name">Bitte geben Sie den Listennamen ein</string>
     <string name="bookmarks_new_list_hint">Neue Liste</string>
-    <string name="bookmarks_error_title_list_name_already_taken">Dieser Name ist bereits vergeben</string>
+    <string name="bookmarks_error_title_list_name_already_taken">Dieser Name wird bereits verwendet</string>
     <string name="bookmarks_error_message_list_name_already_taken">Bitte wähle einen anderen Namen</string>
     <string name="please_wait">Bitte warten…</string>
     <string name="phone_number">Telefonnummer</string>
@@ -619,9 +619,9 @@
     <string name="speedcams_alert_title">Blitzer</string>
     <string name="place_description_title">Ortsbeschreibung</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
-    <string name="notification_channel_downloader">Karten werden geladen</string>
+    <string name="notification_channel_downloader">Laden von Karten</string>
     <!-- "Speed cameras" settings menu option (should be short! no more than 47-50 chars) to warn a driver if there is a risk of exceeding the speed limit -->
-    <string name="pref_tts_speedcams_auto">Warnen wenn zu schnell</string>
+    <string name="pref_tts_speedcams_auto">Warnen bei Geschwindigkeitsübertretung</string>
     <!-- Speed camera settings menu option - Always warn (about speedcams) -->
     <string name="pref_tts_speedcams_always">Immer warnen</string>
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
@@ -701,7 +701,7 @@
     <string name="select_list">Wählen Sie eine Liste</string>
     <string name="transit_not_found">Die U-Bahn-Navigation ist in dieser Region noch nicht verfügbar</string>
     <string name="dialog_pedestrian_route_is_long_header">Keine U-Bahn-Route gefunden</string>
-    <string name="dialog_pedestrian_route_is_long_message">Wählen Sie einen zu einer U-Bahn-Station nähergelegenen Start- oder Endpunkt</string>
+    <string name="dialog_pedestrian_route_is_long_message">Wählen Sie einen Start- oder Endpunkt näher an einer U-Bahn-Station</string>
     <string name="button_layer_isolines">Höhenlinien</string>
     <string name="isolines_activation_error_dialog">Um die Höhenlinien nutzen zu können, aktualisieren Sie die Karte des betreffenden Gebiets oder laden Sie diese herunter</string>
     <string name="isolines_location_error_dialog">Topographieebene ist für dieses Gebiet noch nicht verfügbar</string>
@@ -745,7 +745,7 @@
     <!-- App tip #02 -->
     <string name="app_tip_02">Gefällt Ihnen unsere App? Bitte spenden Sie, um die Entwicklung zu unterstützen! Gefällt es Ihnen noch nicht? Bitte lassen Sie uns wissen warum und wir werden das Problem beheben!</string>
     <!-- App tip #03 -->
-    <string name="app_tip_03">Wenn Sie einen Softwareentwickler kennen, können Sie ihn oder sie bitten, eine Funktion zu implementieren, die Sie benötigen.</string>
+    <string name="app_tip_03">Wenn Sie eine*n Softwareentwickler*in kennen, können Sie ihn oder sie bitten, eine Funktion zu implementieren, die Sie benötigen.</string>
     <!-- App tip #04 -->
     <string name="app_tip_04">Tippen Sie irgendwo auf die Karte, um etwas auszuwählen. Tippen Sie lange, um die Oberfläche aus- und wieder einzublenden.</string>
     <!-- App tip #05 -->
@@ -850,7 +850,7 @@
     <string name="saved">Gespeichert</string>
     <string name="pref_left_button_disable">Deaktivieren</string>
     <string name="editor_building_levels">Etagen (inkl. Erdgeschoss, ohne Dach)</string>
-    <string name="error_enter_correct_level">Geben Sie eine gültige Etagen Nummer ein</string>
+    <string name="error_enter_correct_level">Geben Sie eine gültige Stockwerk-Nummer ein</string>
     <string name="editor_level">Etage (0 ist Erdgeschoss)</string>
     <string name="clear">Löschen</string>
     <string name="vehicle">Fahrzeug</string>
@@ -860,26 +860,26 @@
     <string name="pedestrian">Fußgänger</string>
     <string name="bookmark_color">Lesezeichenfarbe</string>
     <string name="about_help">Über &amp; Hilfe</string>
-    <string name="panoramax">Panoramax Bild</string>
-    <string name="pref_backup_summary">Sichere automatisch in einen Ordner auf deinem Gerät</string>
-    <string name="pref_backup_now_summary">Sicherung sofort erstellen</string>
-    <string name="pref_backup_now_summary_ok">Sicherung erfolgreich abgeschlossen</string>
-    <string name="pref_backup_now_summary_empty_lists">Keine Lesezeichen und Tracks zum Sichern</string>
-    <string name="pref_backup_now_summary_failed">Sicherung fehlgeschlagen</string>
-    <string name="pref_backup_now_summary_folder_unavailable">Der Sicherungsordner ist nicht verfügbar</string>
+    <string name="panoramax">Panoramax-Bild</string>
+    <string name="pref_backup_summary">Backup automatisch in einem Ordner auf deinem Gerät erstellen</string>
+    <string name="pref_backup_now_summary">Backup sofort erstellen</string>
+    <string name="pref_backup_now_summary_ok">Backup erfolgreich abgeschlossen</string>
+    <string name="pref_backup_now_summary_empty_lists">Keine Lesezeichen und Tracks für Backup vorhanden</string>
+    <string name="pref_backup_now_summary_failed">Backup fehlgeschlagen</string>
+    <string name="pref_backup_now_summary_folder_unavailable">Der Backup-Ordner ist nicht verfügbar</string>
     <string name="pref_backup_location_summary_initial">Bitte wähle zuerst einen Ordner und erteile die Berechtigung</string>
-    <string name="pref_backup_history_title">Anzahl zu speichernder Sicherungen</string>
-    <string name="pref_backup_interval_title">Automatische Sicherung</string>
+    <string name="pref_backup_history_title">Anzahl zu speichernder Backups</string>
+    <string name="pref_backup_interval_title">Automatisches Backup</string>
     <string name="backup_interval_every_day">Täglich</string>
     <string name="backup_interval_manual_only">Aus (nur manuell)</string>
-    <string name="pref_backup_title">Sicherung von Lesezeichen und Tracks</string>
-    <string name="pref_backup_status_summary_success">Letzte erfolgreiche Sicherung</string>
+    <string name="pref_backup_title">Backup von Lesezeichen und Tracks</string>
+    <string name="pref_backup_status_summary_success">Letztes erfolgreiches Backup</string>
     <string name="dialog_report_error_with_logs">Bitte sende uns einen Fehlerbericht:\n - in den Einstellungen \"Protokollierung aktivieren\"\n - das Problem reproduzieren\n - im Bildschirm \"Über &amp; Hilfe\" drücke den \"App-Fehler melden\"-Knopf und sende via E-Mail oder Chat\n - die Protokollierung deaktivieren</string>
-    <string name="dialog_report_error_missing_folder">Der ausgewählte Sicherungsort ist nicht verfügbar oder beschreibbar. Bitte wähle einen anderen Ort.</string>
-    <string name="pref_backup_now_title">Jetzt sichern</string>
-    <string name="pref_backup_location_title">Sicherungsort</string>
+    <string name="dialog_report_error_missing_folder">Der ausgewählte Backup-Ort ist nicht verfügbar oder beschreibbar. Bitte wähle einen anderen Ort.</string>
+    <string name="pref_backup_now_title">Backup jetzt erstellen</string>
+    <string name="pref_backup_location_title">Ort für Backup</string>
     <string name="backup_interval_every_week">Wöchentlich</string>
-    <string name="pref_backup_now_summary_progress">Sicherung wird durchgeführt…</string>
+    <string name="pref_backup_now_summary_progress">Backup wird durchgeführt…</string>
     <string name="open_now">Jetzt geöffnet</string>
     <string name="at">um %s</string>
     <string name="closed_now">Jetzt geschlossen</string>
@@ -889,5 +889,5 @@
     <string name="delete_track_dialog_title">%s löschen?</string>
     <string name="existence_confirmed_time_ago">Existenz bestätigt %s</string>
     <string name="hours_confirmed_time_ago">Bestätigt %s</string>
-    <string name="pref_tts_no_system_tts_short">Kein Text-zu-Sprache Modul gefunden, überprüfe die App-Einstellungen</string>
+    <string name="pref_tts_no_system_tts_short">Kein Text-zu-Sprache-Modul gefunden, überprüfe die App-Einstellungen</string>
 </resources>

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

@@ -38,7 +38,7 @@
     <!-- Text in About screen -->
     <string name="about_headline">Proyecto abierto impulsado por la comunidad</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• Fácil de utilizar y depurado</string>
+    <string name="about_proposition_1">• Fácil de utilizar y completo</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Enfocado en la privacidad y sin anuncios</string>
     <!-- Text in About screen -->
@@ -103,7 +103,7 @@
     <!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! -->
     <string name="category_eat">Dónde comer</string>
     <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
-    <string name="category_food">Provisiones</string>
+    <string name="category_food">Productos de alimentación</string>
     <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
     <string name="category_transport">Transporte</string>
     <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
@@ -248,7 +248,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Donar</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Apoye el proyecto</string>
+    <string name="how_to_support_us">Hazte voluntari@ y mejora CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Derechos de autor</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -468,7 +468,7 @@
     <string name="editor_edit_place_category_title">Categoría</string>
     <string name="detailed_problem_description">Descripción detallada del problema</string>
     <string name="editor_report_problem_other_title">Un problema diferente</string>
-    <string name="placepage_add_business_button">Añadir organización</string>
+    <string name="placepage_add_business_button">Añadir empresa</string>
     <string name="message_invalid_feature_position">No se puede ubicar ningún objeto aquí</string>
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Datos de OpenStreetMap creados por la comunidad a partir de %s. Más información sobre cómo editar y actualizar el mapa en OpenStreetMap.org</string>
@@ -492,7 +492,7 @@
     <string name="editor_about_osm">Sus ediciones se cargan en la base de datos pública <a href="https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap">OpenStreetMap</a>. Por favor, no añada información personal o protegida por derechos de autor.</string>
     <string name="editor_more_about_osm">Más acerca de OpenStreetMap</string>
     <string name="editor_osm_history">Tu historial de ediciones</string>
-    <string name="editor_osm_notes">Tus notas de datos cartográficos</string>
+    <string name="editor_osm_notes">Tus notas de del mapa</string>
     <string name="editor_operator">Operador</string>
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operador: %s</string>
@@ -892,4 +892,7 @@
     <string name="osm_note_toast">Una nota será enviada a OpenStreetMap</string>
     <string name="delete_track_dialog_title">Eliminar %s?</string>
     <string name="existence_confirmed_time_ago">Existencia confirmada %s</string>
+    <string name="hours_confirmed_time_ago">Confirmado %s</string>
+    <string name="share_track">Compartir traza</string>
+    <string name="pref_tts_no_system_tts_short">No se ha encontrado ningún motor de texto-a-voz, comprueba la configuración de la aplicación</string>
 </resources>

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

@@ -886,4 +886,7 @@
     <string name="osm_note_hint">Vaihtoehtoisesti voit jättää huomion OpenStreetMap yhteisölle, jotta joku muu voi lisätä tai korjata paikan tiedot.</string>
     <string name="delete_track_dialog_title">Poista %s?</string>
     <string name="share_track">Jaa Reitti</string>
+    <string name="hours_confirmed_time_ago">Vahvistettu %s</string>
+    <string name="existence_confirmed_time_ago">Olemassaolo vahvistettu %s</string>
+    <string name="pref_tts_no_system_tts_short">Tekstistä puheeksi -moottoria ei löytynyt, tarkista sovelluksen asetukset</string>
 </resources>

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

@@ -165,7 +165,7 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Votre position n\'a pas encore été déterminée</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Désolé, les paramètres de stockage de cartes sont actuellement désactivés</string>
+    <string name="cant_change_this_setting">Désolé, le stockage des cartes n\'est pas activé dans les paramètres actuellement</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Le téléchargement de la carte est en cours</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. -->
@@ -337,7 +337,7 @@
     <string name="dialog_routing_disclaimer_priority">— Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur les conseils de navigation ;</string>
     <string name="dialog_routing_disclaimer_precision">— La carte peut être erronée et l\'itinéraire proposé n\'est pas forcément optimal pour arriver à destination ;</string>
     <string name="dialog_routing_disclaimer_recommendations">— L\'itinéraire proposé doit être considéré comme une simple recommandation ;</string>
-    <string name="dialog_routing_disclaimer_borders">— Faites attention à proximité des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir les frontières entre états dans des zones interdites ;</string>
+    <string name="dialog_routing_disclaimer_borders">— Faites attention à proximité des zones frontalières : les itinéraires calculés par l\'application peuvent emprunter des zones interdites.</string>
     <string name="dialog_routing_disclaimer_beware">Restez vigilants et soyez prudents sur la route !</string>
     <string name="dialog_routing_check_gps">Vérifiez le signal GPS</string>
     <string name="dialog_routing_error_location_not_found">Impossible de créer l\'itinéraire. Les coordonnées GPS actuelles n\'ont pas pu être déterminées.</string>
@@ -461,7 +461,7 @@
     <string name="downloader_no_space_message">Veuillez supprimer les données inutiles</string>
     <string name="editor_login_error_dialog">Erreur de connexion</string>
     <string name="editor_profile_changes">Modifications vérifiées</string>
-    <string name="editor_focus_map_on_location">Déplacez la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise.</string>
+    <string name="editor_focus_map_on_location">Déplacez la carte pour positionner la croix à l\'emplacement du lieu ou de l\'entreprise.</string>
     <string name="editor_edit_place_title">Modification</string>
     <string name="editor_add_place_title">Ajout</string>
     <string name="editor_edit_place_name_hint">Nom du lieu</string>
@@ -476,7 +476,7 @@
     <string name="osm_presentation">Données OpenStreetMap créées par la communauté en date du %s. Pour en savoir plus sur la façon de modifier et de mettre à jour la carte, consultez le site OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) est un projet communautaire visant à créer une carte libre et ouverte. C\'est la principale source de données cartographiques de CoMaps et son fonctionnement est similaire à celui de Wikipédia. Vous pouvez ajouter ou modifier des lieux et ils deviennent accessibles à des millions d\'utilisateurs dans le monde entier. \nRejoignez la communauté et aidez-nous à créer une meilleure carte pour tout le monde !</string>
-    <string name="login_to_make_edits_visible">Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de carte dans le monde entier</string>
+    <string name="login_to_make_edits_visible">Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de carte et les diffuser au monde entier</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d de %2$d</string>
     <string name="download_over_mobile_header">Télécharger avec une connexion réseau cellulaire ?</string>
@@ -550,7 +550,7 @@
     <string name="mobile_data_description">Une connexion Internet est nécessaire pour recevoir les mises à jour de cartes et pour envoyer vos modifications</string>
     <string name="mobile_data_option_never">Ne jamais utiliser</string>
     <string name="mobile_data_option_ask">Toujours demander</string>
-    <string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être mises à jour</string>
+    <string name="traffic_update_maps_text">Pour afficher le traffic, les cartes doivent être mises à jour</string>
     <string name="big_font">Augmenter la taille de police sur la carte</string>
     <string name="traffic_update_app">Veuillez mettre à jour CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -647,7 +647,7 @@
     <string name="avoid_ferry">Éviter les ferries</string>
     <string name="avoid_motorways">Éviter les autoroutes</string>
     <string name="unable_to_calc_alert_title">Impossible de calculer l\'itinéraire</string>
-    <string name="unable_to_calc_alert_subtitle">Malheureusement, nous n\'avons pas pu créer l\'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez.</string>
+    <string name="unable_to_calc_alert_subtitle">Malheureusement aucun itinéraire n\'a pu être calculé soit en raison d\'un manque de données OpenStreetMap soit à cause des options de routage choisies. Modifiez les paramètres de routage et réessayez.</string>
     <string name="define_to_avoid_btn">Définissez les routes à éviter</string>
     <string name="change_driving_options_btn">Paramètres d\'itinéraire activés</string>
     <string name="toll_road">Route à péage</string>
@@ -824,7 +824,7 @@
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">L\'itinéraire est vide - il n\'y a rien à sauvegarder</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
-    <string name="error_no_file_manager_app">Impossible d\'afficher la boîte de dialogue de sélection des dossiers car aucune application appropriée n\'est installée sur votre appareil. Veuillez installer une application de gestion de fichiers et réessayer.</string>
+    <string name="error_no_file_manager_app">Impossible d\'afficher la fenêtre de sélection des dossiers car aucune application n\'a été trouvée sur votre appareil. Veuillez installer une application de gestion de fichiers puis réessayer.</string>
     <string name="choose_color">Choisir la couleur</string>
     <string name="edit_track">Modifier la trace</string>
     <string name="uri_open_location_failed">Aucune application installée ne permet d\'ouvrir l\'emplacement</string>
@@ -894,5 +894,5 @@
     <string name="delete_track_dialog_title">Supprimer %s ?</string>
     <string name="existence_confirmed_time_ago">Existance confirmée %s</string>
     <string name="hours_confirmed_time_ago">Confirmé %s</string>
-    <string name="pref_tts_no_system_tts_short">Pas de synthèse vocale disponible, vérifiez les paramètres de l\'application</string>
+    <string name="pref_tts_no_system_tts_short">Impossible de lire ce texte à voix haute, vérifiez les paramètres de l\'application</string>
 </resources>

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

@@ -621,4 +621,5 @@
     <string name="hours_confirmed_time_ago">Confirmado %s</string>
     <string name="existence_confirmed_time_ago">Existencia confirmada %s</string>
     <string name="share_track">Compartir ruta</string>
+    <string name="pref_tts_no_system_tts_short">Non se atopa un motor texto-a-fala, comproba os axustes da app</string>
 </resources>

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

@@ -252,7 +252,7 @@
     <string name="help">Hilf</string>
     <string name="faq">Hüüfigi Frage und Antworte</string>
     <string name="donate">Spende</string>
-    <string name="how_to_support_us">Unterstütz s Projekt</string>
+    <string name="how_to_support_us">Freiwillig helfe und CoMaps verbessere</string>
     <string name="copyright">Copyright</string>
     <string name="report_a_bug">App-Fehler melde</string>
     <string name="compass_calibration_recommended">Verbesser d Pfiilrichtig, indem du s Telefon inere Achterbewegig bewegsch, zum de Kompass z kalibriere.</string>
@@ -617,4 +617,9 @@
     <string name="at">am %s</string>
     <string name="osm_note_hint">Oder hinterlaa alternativ en Hiiwiis für d OpenStreetMap Community, sodass öpper andersch en Ort hinzuefüege oder korrigiere cha.</string>
     <string name="osm_note_toast">En Hiiwiis wird zu OpenStreetMap gschickt</string>
+    <string name="share_track">Strecki teile</string>
+    <string name="delete_track_dialog_title">%s lösche?</string>
+    <string name="existence_confirmed_time_ago">Existenz bestätigt %s</string>
+    <string name="hours_confirmed_time_ago">Bestätigt %s</string>
+    <string name="pref_tts_no_system_tts_short">Keis Text-to-Speech-Modul gfunde, überprüef d App-Iistellige</string>
 </resources>

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

@@ -3,10 +3,10 @@
     <string name="back">Nazad</string>
     <string name="download_has_failed">Preuzimanje neuspješno. Dotaknite za ponovni pokušaj.</string>
     <string name="cancel">Odustani</string>
-    <string name="delete">Obriši</string>
+    <string name="delete">Izbriši</string>
     <string name="kilometres">Kilometara</string>
     <string name="downloading">Preuzimanje…</string>
-    <string name="download_maps">Preuzmi Karte</string>
+    <string name="download_maps">Skini karte</string>
     <string name="miles">Milje</string>
     <string name="later">Kasnije</string>
     <string name="search">Traži</string>

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

@@ -232,7 +232,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Paaukoti</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Paremti projektą</string>
+    <string name="how_to_support_us">Prisidėti prie „CoMaps“ tobulinimo</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Autorių teisės</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -861,4 +861,11 @@
     <string name="open_now">Dabar atidaryta</string>
     <string name="closed_now">Dabar uždaryta</string>
     <string name="at">%s val.</string>
+    <string name="share_track">Dalintis trasa</string>
+    <string name="delete_track_dialog_title">Pašalinti %s?</string>
+    <string name="osm_note_hint">Arba, jeigu norite, galite palikti pastabą „OpenStreetMap“ bendruomenei, kad kas nors kitas pridėtų ar pakoreguotų šią vietą.</string>
+    <string name="hours_confirmed_time_ago">Patvirtinta %s</string>
+    <string name="existence_confirmed_time_ago">Egzistavimas patvirtintas %s</string>
+    <string name="pref_tts_no_system_tts_short">Neaptikta jokia šnekos sintezės sistema, patikrinkite programėlės nustatymus</string>
+    <string name="osm_note_toast">Pastaba bus nusiųsta į „OpenStreetMap“</string>
 </resources>

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

@@ -9,7 +9,7 @@
     <string name="delete">Dzēst</string>
     <string name="download_maps">Lejupielādēt kartes</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Lejupielāde neizdevās. Uzklikšķiniet, lai mēģinātu vēlreiz.</string>
+    <string name="download_has_failed">Lejupielāde neizdevās. Piesist, lai mēģinātu vēlreiz</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Lejupielādē…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -25,9 +25,9 @@
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Šobrīd ierīcē visi atrašanās vietas pakalpojumi vai to nodrošinošās programmas ir izslēgtas. Ieslēdziet tās iestatījumos.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="limited_accuracy">Piekļuve precīzai atrašanās vietai ir ierobežota.</string>
+    <string name="limited_accuracy">Ierobežota precizitāte</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">Lai nodrošinātu pareizu navigāciju, ieslēdziet iestatījumos \"Precīzo\" atrašanās vietas noteikšanu.</string>
+    <string name="precise_location_is_disabled_long_text">Lai nodrošinātu pareizu navigāciju, iestatījumos jāiespējo “Precīza atrašanās vieta”</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Rādīt kartē</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -36,13 +36,13 @@
     <string name="try_again">Mēģināt vēlreiz</string>
     <string name="about_menu_title">Par „CoMaps“</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• Nesatur reklāmas, izsekošanu un nevāc datus</string>
+    <string name="about_proposition_1">• Vienkārši izmantojama un noslīpēta</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_2">• Neizlādē bateriju, darbojas bez interneta pieslēguma</string>
+    <string name="about_proposition_2">• Vērsta uz privātumu un bez reklāmām</string>
     <!-- Text in About screen -->
     <string name="about_proposition_3">• Bezsaistē, ātri un kompakti</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Atvērtā pirmkoda programma, ko veidojuši entuziasti un brīvprātīgie.</string>
+    <string name="about_developed_by_enthusiasts">Pilnībā atvērts pirmkods, bezpeļņas, caurskatāma lēmumu pieņemšana un naudas plūsma.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">Atrašanās vietas iestatījumi</string>
     <string name="close">Aizvērt</string>
@@ -82,7 +82,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Kartes saglabāšanas vieta</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Norādiet mapi, kurā lejupielādēt kartes.</string>
+    <string name="maps_storage_summary">Atlasīt mapi, kurā lejupielādēt kartes</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Lejupielādētās kartes</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
@@ -163,9 +163,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Jūsu atrašanās vieta vēl nav noteikta</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Atvainojamies, bet kartes saglabāšanas iestatījumi šobrīd ir izslēgti.</string>
+    <string name="cant_change_this_setting">Atvainojamies, karšu krātuves iestatījumi šobrīd ir atspējoti</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Notiek kartes lejupielāde.</string>
+    <string name="downloading_is_active">Notiek kartes lejupielāde</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">Apskatiet manu atrašanās vietu „CoMaps“ lietotnē! %1$s vai %2$s Vai Jums nav nesaistes kartes? Lejupielādējiet to: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -221,9 +221,9 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Balss valoda</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Pārbaudīt balss norādes (TTS, teksta pārvēršana runā)</string>
+    <string name="pref_tts_test_voice_title">Pārbaudīt balss norādes</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Ja nedzirdat balsi, pārbaudiet skaļumu vai teksta pārvēršanas runā iestatījumus.</string>
+    <string name="pref_tts_playing_test_voice">Jāpārbauda skaļums vai sistēmas teksta pārveidošanas runā iestatījumi, ja tagad nav dzirdama balss</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Nav pieejama</string>
     <string name="pref_map_auto_zoom">Automātisks mērogs</string>
@@ -246,7 +246,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Ziedot</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Atbalstiet projektu</string>
+    <string name="how_to_support_us">Iesaistīties un uzlabot CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Autortiesības</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -271,7 +271,7 @@
     <string name="downloader_download_all_button">Lejupielādēt visus</string>
     <string name="downloader_downloading">Lejupielādē:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Lai dzēstu karti, apturiet navigāciju.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Lai izdzēstu karti, lūgums apturēt navigāciju</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Maršrutus var izveidot, ja atrodas vienas reģiona kartes robežās.</string>
     <!-- Context menu item for downloader. -->
@@ -283,9 +283,9 @@
     <!-- Item in context menu. -->
     <string name="downloader_update_map">Atjaunināt karti</string>
     <!-- Preference title -->
-    <string name="google_play_services">„Google Play“ vietas noteikšanas pakalpojumi</string>
+    <string name="google_play_services">Google Fused atrašanās vietu pakalpojums</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Ātri nosakiet atrašanās vietu, izmantojot „Bluetooth“, „WiFi“ vai mobilo tīklu</string>
+    <string name="pref_use_google_play">Īpašniecisks pakalpojums, kas apvieno GPS, Wi-Fi, mobilo sakaru tīklus u.c., lai pareizāk noteiktu atrašanās vietu. Tas var savienoties ar Google serveriem.</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -343,18 +343,18 @@
     <string name="dialog_routing_location_turn_on">Ieslēgt vietas noteikšanas servisus</string>
     <string name="dialog_routing_location_unknown_turn_on">Neizdodas noteikt pašreizējās GPS koordinātes. Ieslēdziet atrašanās vietas servisus, lai aprēķināt maršrutu.</string>
     <string name="dialog_routing_unable_locate_route">Neizdevās noteikt maršrutu</string>
-    <string name="dialog_routing_cant_build_route">Neizdevās izveidot maršrutu.</string>
+    <string name="dialog_routing_cant_build_route">Nevar izveidot maršrutu</string>
     <string name="dialog_routing_change_start_or_end">Precizējiet savu sākuma punktu vai galamērķi.</string>
     <string name="dialog_routing_change_start">Precizēt sākumpunktu</string>
     <string name="dialog_routing_start_not_determined">Maršruts nav izveidots. Neizdodas noteikt sākuma punktu.</string>
     <string name="dialog_routing_select_closer_start">Atlasiet sākuma punktu tuvāk pie ceļa.</string>
     <string name="dialog_routing_change_end">Precizēt galamērķi</string>
     <string name="dialog_routing_end_not_determined">Maršruts nav izveidots. Neizdodas noteikt galamērķi.</string>
-    <string name="dialog_routing_select_closer_end">Atlasiet galamērķa punktu pēc iespējas tuvāk ceļam.</string>
-    <string name="dialog_routing_change_intermediate">Neizdevās noteikt starppunktu.</string>
-    <string name="dialog_routing_intermediate_not_determined">Labojiet starppunktu.</string>
+    <string name="dialog_routing_select_closer_end">Lūgums atlasīt galamērķi, kas atrodas tuvāk ceļam</string>
+    <string name="dialog_routing_change_intermediate">Nevar noteikt starppunktu</string>
+    <string name="dialog_routing_intermediate_not_determined">Lūgums pielāgot starppunktu</string>
     <string name="dialog_routing_system_error">Sistēmas kļūda</string>
-    <string name="dialog_routing_application_error">Kļūdas dēļ neizdevās izveidot maršrutu.</string>
+    <string name="dialog_routing_application_error">Lietotnes kļūdas dēļ nevar izvaidot maršrutu</string>
     <string name="dialog_routing_try_again">Mēģiniet vēlreiz</string>
     <string name="not_now">Ne tagad</string>
     <string name="dialog_routing_download_and_build_cross_route">Vai vēlaties lejupielādēt karti un izveidot piemērotāku maršrutu, kas ietver vairāk par vienu karti?</string>
@@ -368,11 +368,11 @@
     <string name="hide">Slēpt</string>
     <string name="categories">Kategorijas</string>
     <string name="history">Vēsture</string>
-    <string name="search_not_found">Nekas nav atrasts.</string>
+    <string name="search_not_found">Ak vai, nekas nav atrasts</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Lejupielādējiet reģionu, kurā meklēt, vai mēģiniet pievienot tuvumā esošas apdzīvotas vietas nosaukumu.</string>
     <string name="search_history_title">Meklēšanas vēsture</string>
-    <string name="search_history_text">Apskatiet meklēšanas vēsturi.</string>
+    <string name="search_history_text">Apskatīt savus nesenos meklējumus</string>
     <string name="clear_search">Notīrīt vēsturi</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Vikipēdija</string>
@@ -380,7 +380,7 @@
     <string name="p2p_start">Sākt</string>
     <string name="p2p_from_here">Doties iz</string>
     <string name="p2p_to_here">Doties turp</string>
-    <string name="p2p_only_from_current">Navigācija ir pieejama tikai no jūsu pašreizējās atrašanās vietas.</string>
+    <string name="p2p_only_from_current">Navigācija ir pieejama tikai no pašreizējās atrašanās vietas</string>
     <string name="p2p_reroute_from_current">Vai vēlaties plānot maršrutu no savas pašreizējās atrašanās vietas?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Tālāk</string>
@@ -394,7 +394,7 @@
     <string name="editor_time_allday">Visu dienu (24 stundas)</string>
     <string name="editor_time_open">Atvērts</string>
     <string name="editor_time_close">Slēgts</string>
-    <string name="editor_time_add_closed">Pievienot laiku, kad nestrādā</string>
+    <string name="editor_time_add_closed">Pievienot ārpus darba laiku</string>
     <string name="editor_time_title">Darba laiks</string>
     <string name="editor_time_advanced">Paplašinātais režīms</string>
     <string name="editor_time_simple">Parastais režīms</string>
@@ -450,14 +450,14 @@
     <string name="level">Stāvs</string>
     <!-- Building level -->
     <string name="level_value_generic">Stāvi virs zemes: %s</string>
-    <string name="downloader_delete_map_dialog">Kopā ar karti dzēsīsies visas jūsu veiktās kartes izmaiņas.</string>
+    <string name="downloader_delete_map_dialog">Kopā ar karti tiks izdzēsti visi Tavi kartes labojumi</string>
     <string name="downloader_update_maps">Atjaunināt kartes</string>
     <string name="downloader_mwm_migration_dialog">Lai izveidotu maršrutu, atjauniniet visas kartes un plānojiet maršrutu no jauna.</string>
     <string name="downloader_search_field_hint">Atrast karti</string>
-    <string name="common_check_internet_connection_dialog">Pārliecinieties, ka ierīce ir savienota ar internetu.</string>
+    <string name="common_check_internet_connection_dialog">Lūgums pārliecināties, ka ierīce ir savienota ar internetu</string>
     <string name="downloader_no_space_title">Trūkst vietas</string>
     <string name="downloader_no_space_message">Dzēsiet liekos datus</string>
-    <string name="editor_login_error_dialog">Ierakstīšanās kļūda.</string>
+    <string name="editor_login_error_dialog">Pieteikšanās kļūda</string>
     <string name="editor_profile_changes">Apstiprinātas izmaiņas</string>
     <string name="editor_focus_map_on_location">Velciet karti, lai novietotu krustiņu objekta vai iestādes atrašanās vietā.</string>
     <string name="editor_edit_place_title">Rediģēšana</string>
@@ -471,19 +471,19 @@
     <string name="placepage_add_business_button">Pievienot iestādi</string>
     <string name="message_invalid_feature_position">Šeit objekti nevar atrasties</string>
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
-    <string name="osm_presentation">Kopienas veidotie „OpenStreetMap“ dati, %s. Uzziniet vairāk par to, kā piedalīties kartes rediģēšanā un uzlabošanā vietnē „OpenStreetMap.org“.</string>
+    <string name="osm_presentation">Kopienas veidotie OpenStreetMap dati, %s. Uzzināt vairāk par to, kā labot un atjaunināt karti, var OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) ir kopienas projekts, kura mērķis ir izveidot atvērtajos datos balstītu karti, kura ir pieejama bez maksas. Tas ir CoMaps galvenais karšu datu avots un darbojas līdzīgi kā Vikipēdija. Jūs varat pievienot vai rediģēt vietas, un tās kļūst pieejamas miljoniem lietotāju visā pasaulē.\nPievienojieties kopienai, lai palīdzētu izveidot labāku karti visiem!</string>
-    <string name="login_to_make_edits_visible">Izveidojiet OpenStreetMap kontu vai piesakieties, lai publicētu savas kartes rediģējumus visā pasaulē.</string>
+    <string name="login_to_make_edits_visible">Izveido OpenStreetMap kontu vai piesakies, lai padarītu savus karšu labojumus pieejamus visiem</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d no %2$d</string>
     <string name="download_over_mobile_header">Vai lejupielādēt arī mobilajā tīklā?</string>
-    <string name="download_over_mobile_message">Ja lietojat ierobežotus datus vai viesabonēšanu, tas var izmaksāt dārgi.</string>
+    <string name="download_over_mobile_message">Tas varētu būt samērā dārgi ar dažiem plāniem vai viesabonēšanā</string>
     <string name="error_enter_correct_house_number">Ierakstiet derīgu ēkas numuru</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Stāvu skaits nedrīkst pārsniegt %d</string>
     <string name="editor_zip_code">Pasta indekss</string>
-    <string name="error_enter_correct_zip_code">Ierakstiet pasta indeksu</string>
+    <string name="error_enter_correct_zip_code">Jāievada derīgs pasta kods</string>
     <string name="editor_more_about_osm">Vairāk par „OpenStreetMap“</string>
     <string name="editor_osm_history">Tava kartes izmaiņu vēsture</string>
     <string name="editor_osm_notes">Tavas kartes datu piezīmes</string>
@@ -493,8 +493,8 @@
     <string name="editor_category_unsuitable_title">Vai neatrodat atbilstošu kategoriju?</string>
     <string name="editor_category_unsuitable_text">„CoMaps“ ļauj pievienot tikai vienkāršu punktu kategorijas, proti, nevarat pievienot pilsētas, ceļus, ezerus, ēku aprises u.tml. Šādas kategorijas lūdzam pievienot tiešā veidā <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Lai uzzinātu, kā to izdarīt, sekojiet norādēm <a href="https://www.comaps.app/support/advanced-map-editing/">rokasgrāmatā</a>.</string>
     <string name="downloader_no_downloaded_maps_title">Ierīcē nav lejupielādētu karšu</string>
-    <string name="downloader_no_downloaded_maps_message">Lai darbotos nesaistes navigācija un meklēšana, lejupielādējiet kartes.</string>
-    <string name="current_location_unknown_error_title">Pašreizējā vieta nav zināma.</string>
+    <string name="downloader_no_downloaded_maps_message">Lejupielādē kartes, lai meklētu un saņemtu pārvietošanās norādes bezsaistē</string>
+    <string name="current_location_unknown_error_title">Pašreizējā atrašanās vieta nav zināma</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
     <string name="miles_per_hour">mph</string>
@@ -525,8 +525,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Vai vēlaties to nosūtīt visiem lietotājiem?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Pārliecinieties, ka neievadījāt nekādus privātus vai personīgus datus.</string>
-    <string name="editor_share_to_all_dialog_message_2">„OpenStreetMap“ redaktori pārskatīs veiktās izmaiņas un jautājumu gadījumā ar jums sazināsies.</string>
+    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi</string>
     <string name="navigation_stop_button">Apturēt</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Maršruta reģistrēšana</string>
@@ -540,10 +540,10 @@
     <string name="mobile_data_option_not_today">Šodien neizmantot</string>
     <string name="mobile_data">Mobilie dati</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Kartes atjauninājumu paziņojumiem un rediģējumu augšupielādēšanai ir nepieciešami mobilie dati.</string>
+    <string name="mobile_data_description">Karšu atjauninājumu paziņojumiem un labojumu augšupielādēšanai ir nepieciešami mobilie dati</string>
     <string name="mobile_data_option_never">Nekad neizmantot</string>
     <string name="mobile_data_option_ask">Jautāt vienmēr</string>
-    <string name="traffic_update_maps_text">Lai parādītu satiksmes datus, kartes ir jāatjaunina.</string>
+    <string name="traffic_update_maps_text">Lai attēlotu satiksmes datus, ir jāatjaunina kartes</string>
     <string name="big_font">Palielināt fonta lielumu kartē</string>
     <string name="traffic_update_app">Atjauniniet „CoMaps“</string>
     <!-- "traffic" as in "road congestion" -->
@@ -553,7 +553,7 @@
     <string name="feedback_general">Vispārīgas atsauksmes</string>
     <string name="prefs_languages_information">Balss norādēm lietotne izmanto teksta pārveides runā sistēmu (TTS). Daudzas „Android“ ierīces izmanto „Google TTS“, ko varat lejupielādēt un atjaunināt „Google Play“ veikalā (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Dažām valodām nepieciešams instalēt runas sintezatoru vai papildu valodas paku, kas parasti atrodama lietotņu veikalā („Google Play“, „Galaxy Store“, „App Gallery“, „FDroid“). \nAtveriet ierīces iestatījumus → Valoda un ievade → Runa → Teksta pārveide runā. \nTe varat pārvaldīt runas sintēzes iestatījumus (piemēram, lejupielādēt valodas paku lietošanai nesaistē, kā arī varat nomainīt dzini teksta pārvēršanai runā.</string>
-    <string name="prefs_languages_information_off_link">Vairāk informācijas atradīsiet šajā pamācībā</string>
+    <string name="prefs_languages_information_off_link">Lai iegūtu vairāk informācijas, lūgums ieskatīties šajās norādēs</string>
     <string name="transliteration_title">Transliterācija uz latīņu alfabētu</string>
     <string name="learn_more">Uzzināt vairāk</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
@@ -626,7 +626,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Nekad nebrīdināt</string>
     <string name="power_managment_title">Energotaupības režīms</string>
-    <string name="power_managment_description">Mēģināt samazināt enerģijas patēriņu, izslēdzot atsevišķas funkcijas.</string>
+    <string name="power_managment_description">Mēģināt samazināt jaudas patēriņu uz dažu iespēju rēķina</string>
     <string name="power_managment_setting_never">Nekad</string>
     <string name="power_managment_setting_auto">Kad ir zems uzlādes līmenis</string>
     <string name="power_managment_setting_manual_max">Vienmēr</string>
@@ -820,4 +820,5 @@
     <string name="editor_line_social_network">LINE</string>
     <string name="app_site_url">https://comaps.app/</string>
     <string name="saved">Saglabāts</string>
+    <string name="about_headline">Atvērts projekts, kuru darbina kopiena</string>
 </resources>

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

@@ -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">Begrenset nøyaktighet</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">For å sikre nøyaktig navigering aktiverer du Precise Location i innstillingene.</string>
+    <string name="precise_location_is_disabled_long_text">For å sikre nøyaktig navigering aktiverer du Precise Location i innstillingene</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Vis på kartet</string>
     <!-- Message to display at the center of the screen when the country download has failed -->

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

@@ -9,7 +9,7 @@
     <string name="delete">Usuń</string>
     <string name="download_maps">Pobierz mapy</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Nie udało się pobrać. Proszę nacisnąć, aby spróbować ponownie.</string>
+    <string name="download_has_failed">Nie udało się pobrać. Naciśnij, aby spróbować ponownie</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Pobieranie…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -167,7 +167,7 @@
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Przepraszamy, ustawienia pamięci mapy są aktualnie wyłączone.</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Trwa pobieranie mapy kraju.</string>
+    <string name="downloading_is_active">Trwa pobieranie mapy</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">Hej, spójrz na moją aktualną lokalizację w CoMaps! %1$s lub %2$s Nie masz map offline? Pobierz tutaj: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -223,7 +223,7 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Język komunikatów</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Testuj wskazówki głosowe (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Testuj wskazówki głosowe</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Jeśli nie słyszysz głosu, sprawdź głośność lub systemowe ustawienia zamiany tekstu na mowę.</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -393,7 +393,7 @@
     <string name="editor_time_add">Dodaj harmonogram</string>
     <string name="editor_time_delete">Usuń harmonogram</string>
     <!-- Text for allday switch. -->
-    <string name="editor_time_allday">Całą dobę (24 godziny)</string>
+    <string name="editor_time_allday">Całodobowo (24 godziny)</string>
     <string name="editor_time_open">Otwarte</string>
     <string name="editor_time_close">Zamknięte</string>
     <string name="editor_time_add_closed">Dodaj godziny zamknięcia</string>
@@ -628,7 +628,7 @@
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
     <string name="notification_channel_downloader">Pobieranie map</string>
     <!-- "Speed cameras" settings menu option (should be short! no more than 47-50 chars) to warn a driver if there is a risk of exceeding the speed limit -->
-    <string name="pref_tts_speedcams_auto">Aby ostrzec Cię przed przekroczeniem prędkości</string>
+    <string name="pref_tts_speedcams_auto">Ostrzegaj przy przekraczaniu prędkości</string>
     <!-- Speed camera settings menu option - Always warn (about speedcams) -->
     <string name="pref_tts_speedcams_always">Zawsze ostrzegaj</string>
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->

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

@@ -549,7 +549,7 @@
     <string name="mobile_data">Мобильный интернет</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
     <string name="mobile_data_description">Мобильный интернет требуется для уведомлений об обновлении карты и для отображения более подробной информации о местах и метках</string>
-    <string name="mobile_data_option_never">Никогда не использовать</string>
+    <string name="mobile_data_option_never">Никогда</string>
     <string name="mobile_data_option_ask">Всегда спрашивать</string>
     <string name="traffic_update_maps_text">Для отображения пробок необходимо обновить карты</string>
     <string name="big_font">Увеличить шрифт на карте</string>
@@ -623,8 +623,8 @@
     <string name="bookmarks_empty_list_title">Список пустой</string>
     <string name="bookmarks_empty_list_message">Чтобы добавить метку, нажмите на место на карте, а затем на иконку звёздочки</string>
     <string name="category_desc_more">…ещё</string>
-    <string name="export_file">Экспорт KMZ</string>
-    <string name="export_file_gpx">Экспорт GPX</string>
+    <string name="export_file">Экспортировать в KMZ</string>
+    <string name="export_file_gpx">Экспортировать в GPX</string>
     <string name="delete_list">Удалить список</string>
     <string name="speedcams_alert_title">Камеры скорости</string>
     <string name="place_description_title">Описание места</string>
@@ -639,8 +639,8 @@
     <string name="power_managment_title">Режим энергосбережения</string>
     <string name="power_managment_description">Попробовать уменьшить потребление заряда батареи за счёт отключения некоторых возможностей</string>
     <string name="power_managment_setting_never">Никогда</string>
-    <string name="power_managment_setting_auto">Авто</string>
-    <string name="power_managment_setting_manual_max">Максимальное энергосбережение</string>
+    <string name="power_managment_setting_auto">При низком заряде</string>
+    <string name="power_managment_setting_manual_max">Всегда</string>
     <string name="enable_logging_warning_message">Эта настройка включается для записи действий в целях диагностики, чтобы помочь нашей команде выявить проблемы с приложением. Включайте ее только на время для отправки детальной информации о неполадках, обнаруженных в приложении, через кнопку «Сообщить о проблеме». Логи могут включать данные о местоположении.</string>
     <string name="driving_options_title">Настройки объезда</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->

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

@@ -242,7 +242,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Донација</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Подржи пројекат</string>
+    <string name="how_to_support_us">Волонтирај и унапреди CoMaps</string>
     <!-- Text in menu + Button in the main Help dialog -->
     <string name="report_a_bug">Пријавите проблем</string>
     <!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
@@ -880,4 +880,11 @@
     <string name="open_now">Сада је отворено</string>
     <string name="at">на %s</string>
     <string name="about_headline">Отворени пројекат који покреће заједница</string>
+    <string name="delete_track_dialog_title">Обрисати %s?</string>
+    <string name="share_track">Подели путању</string>
+    <string name="existence_confirmed_time_ago">Проверено да постоји %s</string>
+    <string name="hours_confirmed_time_ago">Проверено %s</string>
+    <string name="pref_tts_no_system_tts_short">Није пронађен програм за претварање текста у говор, проверите подешавања апликације</string>
+    <string name="osm_note_hint">Или оставите напомену OpenStreetMap заједници да би неко други могао да дода или паправи ово место.</string>
+    <string name="osm_note_toast">Напомена ће бити послата на OpenStreetMap</string>
 </resources>

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

@@ -390,4 +390,18 @@
   <style name="MwmWidget.SwitchPreferenceCompat" parent="Preference.SwitchPreferenceCompat.Material">
     <item name="android:widgetLayout">@layout/preference_switch</item>
   </style>
+
+  <style name="MwmWidget.M3.Button" parent="Widget.Material3.Button">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:textColor">?accentButtonTextColor</item>
+    <item name="backgroundTint">@null</item>
+    <item name="android:textAllCaps">false</item>
+    <item name="cornerRadius">20dp</item>
+    <item name="android:textSize">16sp</item>
+  </style>
+
+  <style name="MwmWidget.M3.Button.Primary" parent="@style/MwmWidget.M3.Button">
+    <item name="backgroundTint">?colorSecondary</item>
+  </style>
 </resources>

android/sdk/build.gradle

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

android/sdk/src/main/cpp/CMakeLists.txt

@@ -26,13 +26,14 @@ set(SRC
   app/organicmaps/sdk/search/SearchEngine.cpp
   app/organicmaps/sdk/search/SearchRecents.cpp
   app/organicmaps/sdk/routing/JunctionInfo.hpp
+  app/organicmaps/sdk/routing/LaneInfo.cpp
+  app/organicmaps/sdk/routing/LaneInfo.hpp
   app/organicmaps/sdk/routing/RouteMarkData.hpp
   app/organicmaps/sdk/routing/RouteMarkType.hpp
   app/organicmaps/sdk/routing/RoutePointInfo.hpp
   app/organicmaps/sdk/routing/RouteRecommendationType.hpp
   app/organicmaps/sdk/routing/RoutingInfo.hpp
   app/organicmaps/sdk/routing/RoutingOptions.cpp
-  app/organicmaps/sdk/routing/SingleLaneInfo.hpp
   app/organicmaps/sdk/routing/TransitRouteInfo.hpp
   app/organicmaps/sdk/routing/TransitStepInfo.hpp
   app/organicmaps/sdk/ChoosePositionMode.cpp

android/sdk/src/main/cpp/app/organicmaps/sdk/routing/LaneInfo.cpp

@@ -0,0 +1,50 @@
+#include "LaneInfo.hpp"
+
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
+
+#include <vector>
+
+namespace
+{
+jobject ToJavaLaneWay(JNIEnv * env, routing::turns::lanes::LaneWay const & laneWay)
+{
+  static jclass const laneWayClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/LaneWay");
+  jfieldID fieldID =
+      env->GetStaticFieldID(laneWayClass, DebugPrint(laneWay).c_str(), "Lapp/organicmaps/sdk/routing/LaneWay;");
+  return env->GetStaticObjectField(laneWayClass, fieldID);
+}
+}  // namespace
+
+jobjectArray CreateLanesInfo(JNIEnv * env, routing::turns::lanes::LanesInfo const & lanes)
+{
+  if (lanes.empty())
+    return nullptr;
+
+  static jclass const laneWayClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/LaneWay");
+  static jclass const laneInfoClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/LaneInfo");
+  auto const lanesSize = static_cast<jsize>(lanes.size());
+  jobjectArray jLanes = env->NewObjectArray(lanesSize, laneInfoClass, nullptr);
+  ASSERT(jLanes, (jni::DescribeException()));
+  // Java signature : LaneInfo(LaneWay[] laneWays, LaneWay activeLane)
+  static jmethodID const ctorLaneInfoID = jni::GetConstructorID(
+      env, laneInfoClass, "([Lapp/organicmaps/sdk/routing/LaneWay;Lapp/organicmaps/sdk/routing/LaneWay;)V");
+
+  for (jsize j = 0; j < lanesSize; ++j)
+  {
+    auto const laneWays = lanes[j].laneWays.GetActiveLaneWays();
+    auto const laneWaysSize = static_cast<jsize>(laneWays.size());
+    jni::TScopedLocalObjectArrayRef jLaneWays(env, env->NewObjectArray(laneWaysSize, laneWayClass, nullptr));
+    ASSERT(jLanes, (jni::DescribeException()));
+    for (jsize i = 0; i < laneWaysSize; ++i)
+    {
+      jni::TScopedLocalRef jLaneWay(env, ToJavaLaneWay(env, laneWays[i]));
+      env->SetObjectArrayElement(jLaneWays.get(), i, jLaneWay.get());
+    }
+    jni::TScopedLocalRef jLaneInfo(env, env->NewObject(laneInfoClass, ctorLaneInfoID, jLaneWays.get(),
+                                                       ToJavaLaneWay(env, lanes[j].recommendedWay)));
+    ASSERT(jLaneInfo.get(), (jni::DescribeException()));
+    env->SetObjectArrayElement(jLanes, j, jLaneInfo.get());
+  }
+
+  return jLanes;
+}

android/sdk/src/main/cpp/app/organicmaps/sdk/routing/LaneInfo.hpp

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <jni.h>
+
+#include "routing/lanes/lane_info.hpp"
+
+jobjectArray CreateLanesInfo(JNIEnv * env, routing::turns::lanes::LanesInfo const & lanes);

android/sdk/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "app/organicmaps/sdk/core/jni_helper.hpp"
-#include "app/organicmaps/sdk/routing/SingleLaneInfo.hpp"
+#include "app/organicmaps/sdk/routing/LaneInfo.hpp"
 #include "app/organicmaps/sdk/util/Distance.hpp"
 
 #include "map/routing_manager.hpp"
@@ -13,12 +13,13 @@ jobject CreateRoutingInfo(JNIEnv * env, routing::FollowingInfo const & info, Rou
   //                              String currentStreet, String nextStreet, String nextNextStreet,
   //                              double completionPercent, int vehicleTurnOrdinal, int
   //                              vehicleNextTurnOrdinal, int pedestrianTurnOrdinal, int exitNum,
-  //                              int totalTime, SingleLaneInfo[] lanes)
+  //                              int totalTime, LaneInfo[] lanes, double speedLimitMps, boolean speedLimitExceeded,
+  //                              boolean shouldPlayWarningSignal)
   static jmethodID const ctorRouteInfoID =
       jni::GetConstructorID(env, klass,
                             "(Lapp/organicmaps/sdk/util/Distance;Lapp/organicmaps/sdk/util/Distance;"
                             "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DIIIII"
-                            "[Lapp/organicmaps/sdk/routing/SingleLaneInfo;DZZ)V");
+                            "[Lapp/organicmaps/sdk/routing/LaneInfo;DZZ)V");
 
   jobjectArray jLanes = CreateLanesInfo(env, info.m_lanes);
 

android/sdk/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp

@@ -1,34 +0,0 @@
-#pragma once
-
-#include "app/organicmaps/sdk/core/jni_helper.hpp"
-
-#include "routing/following_info.hpp"
-
-#include <vector>
-
-jobjectArray CreateLanesInfo(JNIEnv * env, std::vector<routing::FollowingInfo::SingleLaneInfoClient> const & lanes)
-{
-  if (lanes.empty())
-    return nullptr;
-
-  static jclass const laneClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/SingleLaneInfo");
-  auto const lanesSize = static_cast<jsize>(lanes.size());
-  jobjectArray jLanes = env->NewObjectArray(lanesSize, laneClass, nullptr);
-  ASSERT(jLanes, (jni::DescribeException()));
-  static jmethodID const ctorSingleLaneInfoID = jni::GetConstructorID(env, laneClass, "([BZ)V");
-
-  for (jsize j = 0; j < lanesSize; ++j)
-  {
-    auto const laneSize = static_cast<jsize>(lanes[j].m_lane.size());
-    jni::TScopedLocalByteArrayRef singleLane(env, env->NewByteArray(laneSize));
-    ASSERT(singleLane.get(), (jni::DescribeException()));
-    env->SetByteArrayRegion(singleLane.get(), 0, laneSize, lanes[j].m_lane.data());
-
-    jni::TScopedLocalRef singleLaneInfo(
-        env, env->NewObject(laneClass, ctorSingleLaneInfoID, singleLane.get(), lanes[j].m_isRecommended));
-    ASSERT(singleLaneInfo.get(), (jni::DescribeException()));
-    env->SetObjectArrayElement(jLanes, j, singleLaneInfo.get());
-  }
-
-  return jLanes;
-}

android/sdk/src/main/java/app/organicmaps/sdk/routing/LaneInfo.java

@@ -0,0 +1,27 @@
+package app.organicmaps.sdk.routing;
+
+import androidx.annotation.NonNull;
+
+public final class LaneInfo
+{
+  public final LaneWay[] mLaneWays;
+  public final LaneWay mActiveLaneWay;
+
+  public LaneInfo(@NonNull LaneWay[] laneWays, LaneWay activeLane)
+  {
+    mLaneWays = laneWays;
+    mActiveLaneWay = activeLane;
+  }
+
+  @NonNull
+  @Override
+  public String toString()
+  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("LaneInfo{activeLaneWay=").append(mActiveLaneWay.toString()).append(", laneWays=[");
+    for (LaneWay i : mLaneWays)
+      sb.append(" ").append(i);
+    sb.append("]}");
+    return sb.toString();
+  }
+}

android/sdk/src/main/java/app/organicmaps/sdk/routing/LaneWay.java

@@ -3,25 +3,20 @@ package app.organicmaps.sdk.routing;
 import androidx.annotation.DrawableRes;
 import app.organicmaps.sdk.R;
 
-/**
- * IMPORTANT : Order of enum values MUST BE the same
- * with native LaneWay enum (see routing/turns.hpp for details).
- * Information for every lane is composed of some number values below.
- * For example, a lane may have THROUGH and RIGHT values.
- */
 public enum LaneWay
 {
-  NONE(R.drawable.ic_turn_straight),
-  REVERSE(R.drawable.ic_turn_uleft),
-  SHARP_LEFT(R.drawable.ic_turn_left_sharp),
-  LEFT(R.drawable.ic_turn_left),
-  SLIGHT_LEFT(R.drawable.ic_turn_left_slight),
-  MERGE_TO_RIGHT(R.drawable.ic_turn_right_slight),
-  THROUGH(R.drawable.ic_turn_straight),
-  MERGE_TO_LEFT(R.drawable.ic_turn_left_slight),
-  SLIGHT_RIGHT(R.drawable.ic_turn_right_slight),
-  RIGHT(R.drawable.ic_turn_right),
-  SHARP_RIGHT(R.drawable.ic_turn_right_sharp);
+  None(R.drawable.ic_turn_straight),
+  ReverseLeft(R.drawable.ic_turn_uleft),
+  SharpLeft(R.drawable.ic_turn_left_sharp),
+  Left(R.drawable.ic_turn_left),
+  MergeToLeft(R.drawable.ic_turn_left_slight),
+  SlightLeft(R.drawable.ic_turn_left_slight),
+  Through(R.drawable.ic_turn_straight),
+  SlightRight(R.drawable.ic_turn_right_slight),
+  MergeToRight(R.drawable.ic_turn_right_slight),
+  Right(R.drawable.ic_turn_right),
+  SharpRight(R.drawable.ic_turn_right_sharp),
+  ReverseRight(R.drawable.ic_turn_uright);
 
   public final int mTurnRes;
 

android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java

@@ -1,6 +1,7 @@
 package app.organicmaps.sdk.routing;
 
 import androidx.annotation.Keep;
+import androidx.annotation.Nullable;
 import app.organicmaps.sdk.util.Distance;
 
 // Called from JNI.
@@ -25,7 +26,8 @@ public final class RoutingInfo
   public final CarDirection carDirection;
   public final CarDirection nextCarDirection;
   public final int exitNum;
-  public final SingleLaneInfo[] lanes;
+  @Nullable
+  public final LaneInfo[] lanes;
   // For pedestrian routing.
   public final PedestrianTurnDirection pedestrianTurnDirection;
   // Current speed limit in meters per second.
@@ -37,7 +39,7 @@ public final class RoutingInfo
   private RoutingInfo(Distance distToTarget, Distance distToTurn, String currentStreet, String nextStreet,
                       String nextNextStreet, double completionPercent, int vehicleTurnOrdinal,
                       int vehicleNextTurnOrdinal, int pedestrianTurnOrdinal, int exitNum, int totalTime,
-                      SingleLaneInfo[] lanes, double speedLimitMps, boolean speedLimitExceeded,
+                      @Nullable LaneInfo[] lanes, double speedLimitMps, boolean speedLimitExceeded,
                       boolean shouldPlayWarningSignal)
   {
     this.distToTarget = distToTarget;

android/sdk/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java

@@ -1,31 +0,0 @@
-package app.organicmaps.sdk.routing;
-
-import androidx.annotation.NonNull;
-
-public final class SingleLaneInfo
-{
-  public LaneWay[] mLane;
-  public boolean mIsActive;
-
-  public SingleLaneInfo(@NonNull byte[] laneOrdinals, boolean isActive)
-  {
-    mLane = new LaneWay[laneOrdinals.length];
-    final LaneWay[] values = LaneWay.values();
-    for (int i = 0; i < mLane.length; i++)
-      mLane[i] = values[laneOrdinals[i]];
-
-    mIsActive = isActive;
-  }
-
-  @NonNull
-  @Override
-  public String toString()
-  {
-    final int initialCapacity = 32;
-    StringBuilder sb = new StringBuilder(initialCapacity);
-    sb.append("Is the lane active? ").append(mIsActive).append(". The lane directions IDs are");
-    for (LaneWay i : mLane)
-      sb.append(" ").append(i.ordinal());
-    return sb.toString();
-  }
-}

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

@@ -410,6 +410,8 @@
     <string name="type.highway.pedestrian.area">Voetgangergebied</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Voetgangerbrug</string>
+
+    <string name="type.highway.pedestrian.square">Plein</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Voetgangertonnel</string>
     <string name="type.highway.primary">Primêre pad</string>

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

@@ -431,6 +431,8 @@
     <string name="type.highway.pedestrian.area">شارع للمشاة</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">جسر</string>
+
+    <string name="type.highway.pedestrian.square">ميدان</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">نفق</string>
     <string name="type.highway.primary">شارع رئيسي</string>

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

@@ -421,6 +421,8 @@
     <string name="type.highway.pedestrian.area">Piyada ərazisi</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Körpü</string>
+
+    <string name="type.highway.pedestrian.square">Kvadrat</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Tunel</string>
     <string name="type.highway.primary">Əsas yol</string>

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

@@ -211,6 +211,8 @@
     <string name="type.highway.path.tunnel">Тунэль</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Мост</string>
+
+    <string name="type.highway.pedestrian.square">Плошча</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Тунэль</string>
     <!-- These translations are used for all type.highway.*.bridge. -->

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

@@ -164,6 +164,8 @@
     <string name="type.highway.path.tunnel">Тунел</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Мост</string>
+
+    <string name="type.highway.pedestrian.square">Площад</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Тунел</string>
     <!-- These translations are used for all type.highway.*.bridge. -->

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

@@ -912,6 +912,8 @@
     <string name="type.highway.pedestrian.tunnel">Túnel de vianants</string>
     <string name="type.cuisine.turkish">Turca</string>
     <string name="type.highway.pedestrian.bridge">Pont de vianants</string>
+
+    <string name="type.highway.pedestrian.square">Plaça</string>
     <string name="type.historic.city_gate">Porta de la ciutat</string>
     <string name="type.cuisine.irish">Irlandesa</string>
     <string name="type.cuisine.italian">Italiana</string>

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

@@ -375,6 +375,8 @@
     <string name="type.highway.pedestrian.area">Ulice</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Most</string>
+
+    <string name="type.highway.pedestrian.square">Náměstí</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Tunel pro pěší</string>
     <string name="type.highway.primary">Ulice</string>
@@ -1390,4 +1392,7 @@
     <string name="type.amenity.ranger_station">Správci parku</string>
     <string name="type.amenity.animal_shelter">Útulek pro zvířata</string>
     <string name="type.barrier.wicket_gate">Branka</string>
+    <string name="type.power.portal">Portál el. vedení</string>
+    <string name="type.office.security">Strážnice</string>
+    <string name="type.building.guardhouse">Vrátnice</string>
 </resources>

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

@@ -365,6 +365,8 @@
     <string name="type.highway.pedestrian.area">Gågadeareal</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Bro</string>
+
+    <string name="type.highway.pedestrian.square">Torv</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Tunnel</string>
     <string name="type.highway.primary">Hovedvej</string>

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

@@ -420,6 +420,8 @@
     <string name="type.highway.pedestrian.area">Fußgängerzone</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Brücke</string>
+
+    <string name="type.highway.pedestrian.square">Platz</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Fußgängertunnel</string>
     <string name="type.highway.primary">Hauptstraße</string>
@@ -1391,4 +1393,7 @@
     <string name="type.amenity.ranger_station">Försterstation</string>
     <string name="type.amenity.animal_shelter">Tierheim</string>
     <string name="type.barrier.wicket_gate">Schlupfpforte</string>
+    <string name="type.office.security">Büro des Sicherheitsdienstes</string>
+    <string name="type.building.guardhouse">Sicherheitsstand</string>
+    <string name="type.power.portal">Abspannportal</string>
 </resources>

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

@@ -383,6 +383,8 @@
     <string name="type.highway.pedestrian.area">Οδός</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Γέφυρα</string>
+
+    <string name="type.highway.pedestrian.square">Πλατεία</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Σήραγγα</string>
     <string name="type.highway.primary">Οδός</string>

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

@@ -435,6 +435,8 @@
     <string name="type.highway.pedestrian.area">Zona peatonal</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Puente peatonal</string>
+
+    <string name="type.highway.pedestrian.square">Plaza</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Túnel peatonal</string>
     <string name="type.highway.primary">Carretera principal</string>
@@ -1393,4 +1395,5 @@
     <string name="type.railway.station.subway.qingdao">Estación de Metro</string>
     <string name="type.leisure.escape_game">Sala de Escape</string>
     <string name="type.amenity.animal_shelter">Refugio de animales</string>
+    <string name="type.barrier.wicket_gate">Portillo</string>
 </resources>

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

@@ -433,6 +433,8 @@
     <string name="type.highway.pedestrian.area">Jalakäijate ala</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Jalakäijate sild</string>
+
+    <string name="type.highway.pedestrian.square">Väljak</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Jalakäijate tunnel</string>
     <string name="type.highway.primary">Põhimaantee</string>
@@ -1393,4 +1395,7 @@
     <string name="type.amenity.ranger_station">Pargivahi maja</string>
     <string name="type.amenity.animal_shelter">Loomade varjupaik</string>
     <string name="type.barrier.wicket_gate">Jalgvärav</string>
+    <string name="type.building.guardhouse">Valvuriputka</string>
+    <string name="type.power.portal">Õhuliini värava-tüüpi mast</string>
+    <string name="type.office.security">Turvafirma kontor</string>
 </resources>

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

@@ -424,6 +424,8 @@
     <string name="type.highway.pedestrian.area">Oinezkoen eremua</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Oinezkoen zubia</string>
+
+    <string name="type.highway.pedestrian.square">Plaza</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Oinezkoen tunela</string>
     <string name="type.highway.primary">Errepide nagusia</string>

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

@@ -4,14 +4,14 @@
     <string name="mb">مگابایت</string>
     <string name="gb">گیگابایت</string>
     <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">مکان من</string>
+    <string name="core_my_position">ایستار من</string>
     <!-- Default bookmark list name -->
-    <string name="core_my_places">مکان من</string>
+    <string name="core_my_places">گیاگ‌های من</string>
     <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">وای فای</string>
+    <string name="category_wifi">وای‌فای</string>
     <string name="postal_code">کد پستی</string>
     <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">نقطه نقشه</string>
+    <string name="core_placepage_unknown_place">خَجَکِ نقشه</string>
     <!-- abbreviation for meters -->
     <string name="m">متر</string>
     <!-- abbreviation for kilometers -->
@@ -19,14 +19,26 @@
     <!-- abbreviation for mile(s) -->
     <string name="mi">مایل</string>
     <!-- A unit of measure -->
-    <string name="ft">فوت</string>
+    <string name="ft">پای</string>
     <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">خروج</string>
-    <string name="core_entrance">ورودی</string>
-    <string name="subway_data_unavailable">نقشه مترو موجود نیست</string>
-    <string name="public_access">دسترسی عمومی</string>
-    <string name="limited_access">دسترسی محدود</string>
-    <string name="not_shared">خصوصی</string>
+    <string name="core_exit">اوزیدن</string>
+    <string name="core_entrance">آدین</string>
+    <string name="subway_data_unavailable">نقشه مترو ناهَندِمان است</string>
+    <string name="public_access">دسترسی اَمَرکانیگ</string>
+    <string name="limited_access">دسترسی کرانمند</string>
+    <string name="not_shared">خوشیک</string>
     <string name="access_rules_author_only">ویرایش آنلاین</string>
     <string name="today">امروز</string>
+    <string name="yesterday">دیروز</string>
+    <string name="days_ago">%s روز پیش</string>
+    <string name="week_ago">%s هفته پیش</string>
+    <string name="weeks_ago">%s هفته پیش</string>
+    <string name="month_ago">%s ماه پیش</string>
+    <string name="months_ago">%s ماه پیش</string>
+    <string name="year_ago">%s سال پیش</string>
+    <string name="years_ago">%s سال پیش</string>
+    <string name="maps_storage_shared">ویر درونی اَنبازیده</string>
+    <string name="maps_storage_external">ویر بیرونی اَنبازیده</string>
+    <string name="maps_storage_removable">کارت SD</string>
+    <string name="maps_storage_internal">ویر درونی خوِشیک</string>
 </resources>

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

@@ -291,6 +291,8 @@
     <string name="type.highway.pedestrian.area">جاده</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">پل</string>
+
+    <string name="type.highway.pedestrian.square">میدان</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">تونل</string>
     <string name="type.highway.primary">جاده</string>

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

@@ -37,4 +37,12 @@
     <string name="not_shared">Yksityinen</string>
     <string name="access_rules_author_only">Nettimuokkaus</string>
     <string name="today">Tänään</string>
+    <string name="yesterday">Eilen</string>
+    <string name="days_ago">%s päivää sitten</string>
+    <string name="week_ago">%s viikko sitten</string>
+    <string name="weeks_ago">%s viikkoa sitten</string>
+    <string name="month_ago">%s kuukausi sitten</string>
+    <string name="months_ago">%s kuukautta sitten</string>
+    <string name="year_ago">%s vuosi sitten</string>
+    <string name="years_ago">%s vuotta sitten</string>
 </resources>

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

@@ -425,6 +425,8 @@
     <string name="type.highway.pedestrian.area">Jalankulkualue</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Jalankulkusilta</string>
+
+    <string name="type.highway.pedestrian.square">Tori</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Jalankulkutunneli</string>
     <string name="type.highway.primary">Pääkatu</string>

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

@@ -420,6 +420,8 @@
     <string name="type.highway.pedestrian.area">Rue piétonne</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Pont</string>
+
+    <string name="type.highway.pedestrian.square">Place</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Tunnel</string>
     <string name="type.highway.primary">Rue</string>
@@ -1393,4 +1395,7 @@
     <string name="type.leisure.escape_game">Escape Room</string>
     <string name="type.amenity.animal_shelter">Abri pour animaux</string>
     <string name="type.barrier.wicket_gate">Portillon</string>
+    <string name="type.office.security">Bureau des agents de sécurité</string>
+    <string name="type.building.guardhouse">Guérite de sécurité</string>
+    <string name="type.power.portal">Portique haute tension</string>
 </resources>

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

@@ -403,6 +403,8 @@
     <string name="type.highway.pedestrian">Cale peonil</string>
     <string name="type.highway.pedestrian.area">Zona peonil</string>
     <string name="type.highway.pedestrian.bridge">Puente peonil</string>
+
+    <string name="type.highway.pedestrian.square">Praza</string>
     <string name="type.highway.pedestrian.tunnel">Túnel peonil</string>
     <string name="type.highway.primary">Estrada principal</string>
     <string name="type.highway.primary.bridge">Puente</string>

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

@@ -23,4 +23,12 @@
     <string name="core_entrance">Iigang</string>
     <string name="public_access">Öffentliche Zuegriff</string>
     <string name="today">Hüt</string>
+    <string name="days_ago">vor %s Täg</string>
+    <string name="week_ago">vor %s Wuche</string>
+    <string name="weeks_ago">vor %s Wuche</string>
+    <string name="month_ago">vor %s Monet</string>
+    <string name="months_ago">vor %s Mönet</string>
+    <string name="year_ago">vor %s Jahr</string>
+    <string name="years_ago">vor %s Jahre</string>
+    <string name="yesterday">Geschter</string>
 </resources>

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

@@ -365,6 +365,8 @@
     <string name="type.highway.pedestrian">Fuessgängerzone</string>
     <string name="type.highway.pedestrian.area">Fuessgängerzone</string>
     <string name="type.highway.pedestrian.bridge">Fuessgängerzonebrugg</string>
+
+    <string name="type.highway.pedestrian.square">Platz</string>
     <string name="type.highway.primary">Hauptstrass</string>
     <string name="type.highway.primary.bridge">Brugg</string>
     <string name="type.highway.primary.tunnel">Hauptstrassetunnel</string>
@@ -1297,4 +1299,6 @@
     <string name="type.amenity.bicycle_parking.covered">Überdachte Veloparkplatz</string>
     <string name="type.amenity.luggage_locker">Gepäckschlüüssfach</string>
     <string name="type.amenity.ranger_station">Förschterstation</string>
+    <string name="type.barrier.wicket_gate">Schlupfpforte</string>
+    <string name="type.amenity.animal_shelter">Tierheim</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="type.leisure.hackerspace">Hackerspace</string>
     <string name="type.man_made.silo">Silo</string>
+    <string name="type.addr_interpolation.even">adresa/blok</string>
+    <string name="type.addr_interpolation.odd">adresa/blok</string>
+    <string name="type.aerialway">Žičara</string>
+    <string name="type.addr_interpolation">adresa/blok</string>
 </resources>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- SECTION: Types -->
-    <string name="type.addr_interpolation">Cím/blokk</string>
+    <string name="type.addr_interpolation">Cím/Háztömb</string>
     <string name="type.addr_interpolation.even">Cím/blokk</string>
     <string name="type.addr_interpolation.odd">Cím/blokk</string>
     <string name="type.aerialway.station">Felvonóállomás</string>
@@ -377,6 +377,8 @@
     <string name="type.highway.pedestrian.area">Sétálóutca</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Híd</string>
+
+    <string name="type.highway.pedestrian.square">Tér</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Alagút</string>
     <string name="type.highway.primary">Utca</string>

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

@@ -371,6 +371,8 @@
     <string name="type.highway.pedestrian.area">Jalan</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Menjembatani</string>
+
+    <string name="type.highway.pedestrian.square">Lapangan kota</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Terowongan</string>
     <string name="type.highway.primary">Jalan</string>

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

@@ -1018,6 +1018,8 @@
     <string name="type.highway.footway.bridge">Göngubrú</string>
     <string name="type.highway.footway.tunnel">Göng fyrir fótgangandi</string>
     <string name="type.highway.pedestrian.bridge">Göngubrú</string>
+
+    <string name="type.highway.pedestrian.square">Torg</string>
     <string name="type.historic">Sögulegur hlutur</string>
     <string name="type.historic.stone">Sögulegur steinn</string>
     <string name="type.historic.memorial.war_memorial">Stríðsminnismerki</string>

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

@@ -432,6 +432,8 @@
     <string name="type.highway.pedestrian.area">Area pedonale</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Ponte</string>
+
+    <string name="type.highway.pedestrian.square">Piazza</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Tunnel</string>
     <string name="type.highway.primary">Strada</string>

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

@@ -433,6 +433,8 @@
     <string name="type.highway.pedestrian.area">אזור הולכי רגל</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">גשר הולכי רגל</string>
+
+    <string name="type.highway.pedestrian.square">כיכר עירונית</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">מנהרה להולכי רגל</string>
     <string name="type.highway.primary">כביש ראשי</string>

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

@@ -406,6 +406,8 @@
     <string name="type.highway.pedestrian.area">ストリート</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">橋</string>
+
+    <string name="type.highway.pedestrian.square">広場</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">トンネル</string>
     <string name="type.highway.primary">ストリート</string>

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

@@ -377,6 +377,8 @@
     <string name="type.highway.pedestrian.area">거리</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">다리</string>
+
+    <string name="type.highway.pedestrian.square">광장</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">터널</string>
     <string name="type.highway.primary">거리</string>

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

@@ -37,4 +37,12 @@
     <string name="not_shared">Privatus</string>
     <string name="access_rules_author_only">Taisymas internete</string>
     <string name="today">Šiandien</string>
+    <string name="week_ago">Prieš %s sav.</string>
+    <string name="weeks_ago">prieš %s sav.</string>
+    <string name="month_ago">prieš %s mėn.</string>
+    <string name="months_ago">prieš %s mėn.</string>
+    <string name="year_ago">prieš %s m.</string>
+    <string name="years_ago">prieš %s m.</string>
+    <string name="days_ago">prieš %s d.</string>
+    <string name="yesterday">Vakar</string>
 </resources>

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

@@ -57,4 +57,19 @@
     <string name="type.highway.busway.tunnel">Tunelis</string>
     <string name="type.aeroway.aerodrome.international">Starptautiskā lidosta</string>
     <string name="type.highway.bus_stop">Pietura</string>
+    <string name="type.amenity.studio">Studija</string>
+    <string name="type.amenity.luggage_locker">Bagāžas glabātava</string>
+    <string name="type.cuisine.noodles">Nūdeles</string>
+    <string name="type.leisure.firepit">Ugunskura vieta</string>
+    <string name="type.railway.narrow_gauge.bridge">Šaursliežu dzelzceļa tilts</string>
+    <string name="type.shop.mobile_phone">Viedtālruņa veikals</string>
+    <string name="type.tourism.viewpoint">Skatu laukums</string>
+    <string name="type.tourism.information.visitor_centre">Apmeklētāju centrs</string>
+    <string name="type.amenity.bicycle_parking.covered">Divriteņu novietne ar jumtu</string>
+    <string name="type.highway.ladder">Kāpnes</string>
+    <string name="type.landuse.plant_nursery">Stādaudzētava</string>
+    <string name="type.man_made.silo">Krātuve</string>
+    <string name="type.amenity.animal_shelter">Dzīvnieku patversme</string>
+    <string name="type.natural.wetland.swamp">Purvs</string>
+    <string name="type.railway.station.subway.qingdao">Metro stacija</string>
 </resources>

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

@@ -340,6 +340,8 @@
     <string name="type.highway.pedestrian.area">पादचारी झोन</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">पादचारी पूल</string>
+
+    <string name="type.highway.pedestrian.square">चौरस</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">पादचारी बोगदा</string>
     <string name="type.highway.primary">प्राथमिक मार्ग</string>

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

@@ -387,6 +387,8 @@
     <string name="type.highway.pedestrian.area">Gågate</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Bru</string>
+
+    <string name="type.highway.pedestrian.square">Torg</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Tunnel</string>
     <string name="type.highway.primary">Hovedvei</string>
@@ -1195,4 +1197,10 @@
     <string name="type.leisure.hackerspace">Skaperverksted</string>
     <string name="type.man_made.silo">Silo</string>
     <string name="type.aeroway">Luftromsinfrastruktur</string>
+    <string name="type.aeroway.apron">Oppstillingsplass</string>
+    <string name="type.aeroway.gate">Gate</string>
+    <string name="type.aeroway.helipad">Helipad</string>
+    <string name="type.aeroway.runway">Rullebane</string>
+    <string name="type.aeroway.taxiway">Taxibane</string>
+    <string name="type.aeroway.terminal">Terminal</string>
 </resources>

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

@@ -33,7 +33,7 @@
     <string name="limited_access">Beperkte toegang</string>
     <string name="not_shared">Privé</string>
     <string name="access_rules_author_only">Wordt online bewerkt</string>
-    <string name="gb">VK</string>
+    <string name="gb">GB</string>
     <string name="mb">MB</string>
     <string name="today">Vandaag</string>
     <string name="yesterday">Gisteren</string>
@@ -42,6 +42,6 @@
     <string name="weeks_ago">%s weken geleden</string>
     <string name="month_ago">%s maand geleden</string>
     <string name="year_ago">%s jaar geleden</string>
-    <string name="years_ago">%s jaar geleden</string>
+    <string name="years_ago">%s jaren geleden</string>
     <string name="months_ago">%s maanden geleden</string>
 </resources>

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

@@ -29,7 +29,7 @@
     <string name="type.amenity.bench">Zitbank</string>
     <string name="type.amenity.bicycle_parking">Fietsenstalling</string>
     <string name="type.amenity.bicycle_rental">Fietsverhuur</string>
-    <string name="type.amenity.bicycle_repair_station">Fiets reparatie station</string>
+    <string name="type.amenity.bicycle_repair_station">Fietsreparatie</string>
     <string name="type.amenity.biergarten">Biertuin</string>
     <string name="type.amenity.brothel">Bordeel</string>
     <string name="type.amenity.bureau_de_change">Wisselkantoor</string>
@@ -38,11 +38,11 @@
     <string name="type.amenity.car_rental">Autoverhuur</string>
     <string name="type.amenity.motorcycle_rental">Motorverhuur</string>
     <string name="type.amenity.car_sharing">Autodelen</string>
-    <string name="type.amenity.car_wash">Wasserette</string>
+    <string name="type.amenity.car_wash">Autowasstraat</string>
     <string name="type.amenity.casino">Casino</string>
     <string name="type.amenity.gambling">Gokken</string>
     <string name="type.leisure.adult_gaming_centre">Gamingcentrum voor volwassenen</string>
-    <string name="type.leisure.amusement_arcade">Spelletjeshal</string>
+    <string name="type.leisure.amusement_arcade">Speelhal</string>
     <string name="type.amenity.charging_station">Oplaadstation</string>
     <string name="type.amenity.charging_station.bicycle">Oplaadstation voor fietsen</string>
     <string name="type.amenity.charging_station.motorcar">Oplaadstation voor auto\'s</string>
@@ -56,7 +56,7 @@
     <string name="type.amenity.conference_centre">Conferentiecentrum</string>
     <string name="type.amenity.courthouse">Rechtbank</string>
     <string name="type.amenity.dentist">Tandarts</string>
-    <string name="type.amenity.doctors">Huisartsenpost</string>
+    <string name="type.amenity.doctors">Artsenpost</string>
     <string name="type.amenity.drinking_water">Drinkwater</string>
     <string name="type.drinking_water.yes">Drinkwater</string>
     <string name="type.amenity.driving_school">Rijschool</string>
@@ -80,7 +80,7 @@
     <string name="type.amenity.internet_cafe">Internetcafé</string>
     <string name="type.amenity.kindergarten">Kleuterschool</string>
     <string name="type.amenity.library">Bibliotheek</string>
-    <string name="type.amenity.loading_dock">Laad-dock</string>
+    <string name="type.amenity.loading_dock">Laaddek</string>
     <string name="type.amenity.marketplace">Markt</string>
     <string name="type.amenity.motorcycle_parking">Parking Motorfietsen</string>
     <string name="type.amenity.nightclub">Nachtclub</string>
@@ -430,6 +430,8 @@
     <string name="type.highway.pedestrian.area">Voetgangersgebied</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Voetgangersbrug</string>
+
+    <string name="type.highway.pedestrian.square">Plein</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Voetgangerstunnel</string>
     <string name="type.highway.primary">Hoofdweg</string>
@@ -1393,4 +1395,7 @@
     <string name="type.amenity.ranger_station">Boswachterkantoor</string>
     <string name="type.amenity.animal_shelter">Dierenasiel</string>
     <string name="type.barrier.wicket_gate">Klinket</string>
+    <string name="type.office.security">Beveiligingskantoor</string>
+    <string name="type.building.guardhouse">Beveiligingsloket</string>
+    <string name="type.power.portal">Verdeelstation</string>
 </resources>

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

@@ -77,7 +77,7 @@
     <string name="type.amenity.grave_yard.christian">Cmentarz chrześcijański</string>
     <string name="type.amenity.hospital">Szpital</string>
     <string name="type.amenity.hunting_stand">Ambona myśliwska</string>
-    <string name="type.amenity.ice_cream">Stoisko z lodami</string>
+    <string name="type.amenity.ice_cream">Lodziarnia</string>
     <string name="type.amenity.internet_cafe">Kafejka internetowa</string>
     <string name="type.amenity.kindergarten">Przedszkole</string>
     <string name="type.amenity.library">Biblioteka</string>
@@ -97,14 +97,14 @@
     <string name="type.amenity.parking.underground">Parking podziemny</string>
     <string name="type.amenity.parking.underground.fee">Parking podziemny</string>
     <string name="type.amenity.parking.underground.private">Prywatny parking podziemny</string>
-    <string name="type.amenity.parking.street_side">Parking od strony ulicy</string>
-    <string name="type.amenity.parking.street_side.fee">Parking od strony ulicy</string>
-    <string name="type.amenity.parking.street_side.private">Prywatna ulica parking boczny</string>
+    <string name="type.amenity.parking.street_side">Parking obok jezdni</string>
+    <string name="type.amenity.parking.street_side.fee">Parking obok jezdni</string>
+    <string name="type.amenity.parking.street_side.private">Prywatny parking obok jezdni</string>
     <string name="type.amenity.parking.lane">Parking na pasie ruchu</string>
     <string name="type.amenity.parking.lane.fee">Parking na pasie ruchu</string>
-    <string name="type.amenity.parking.lane.private">Parking na prywatnym pasie ruchu</string>
+    <string name="type.amenity.parking.lane.private">Prywatny parking na pasie ruchu</string>
     <string name="type.amenity.parking_entrance">Wjazd na parking</string>
-    <string name="type.amenity.parking_entrance.private">Prywatne wejście na parking</string>
+    <string name="type.amenity.parking_entrance.private">Prywatny wjazd na parking</string>
     <string name="type.amenity.parking_entrance.permissive">Wjazd na parking</string>
     <string name="type.amenity.parking_space">Miejsce parkingowe</string>
     <string name="type.amenity.parking_space.permissive">Miejsce parkingowe</string>
@@ -173,7 +173,7 @@
     <string name="type.amenity.vending_machine.food">Automat z jedzeniem</string>
     <string name="type.amenity.vending_machine.newspapers">Automat z gazetami</string>
     <string name="type.amenity.vending_machine.parking_tickets">Parkometr</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Automat biletowy do transportu publicznego</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Automat biletowy</string>
     <string name="type.amenity.vending_machine.sweets">Automat ze słodyczami</string>
     <string name="type.amenity.vending_machine.excrement_bags">Automat z torebkami na odchody</string>
     <string name="type.amenity.parcel_locker">Paczkomat</string>
@@ -247,7 +247,7 @@
     <string name="type.craft.handicraft">Rzemiosło artystyczne</string>
     <!-- Heating, Ventilation, and Air Conditioning -->
     <string name="type.craft.hvac">Klimatyzacja</string>
-    <string name="type.craft.key_cutter">Cięcie kluczy</string>
+    <string name="type.craft.key_cutter">Dorabianie kluczy</string>
     <string name="type.craft.locksmith">Ślusarz</string>
     <string name="type.craft.metal_construction">Ślusarz, obrabiacz metalu</string>
     <string name="type.craft.painter">Malarz</string>
@@ -278,7 +278,7 @@
     <string name="type.cuisine.chicken">Kurczak</string>
     <string name="type.cuisine.chinese">Kuchnia chińska</string>
     <string name="type.cuisine.coffee_shop">Kawa</string>
-    <string name="type.cuisine.crepe">Naleśnikarnia</string>
+    <string name="type.cuisine.crepe">Crepe</string>
     <string name="type.cuisine.croatian">Kuchnia chorwacka</string>
     <string name="type.cuisine.curry">Curry</string>
     <string name="type.cuisine.deli">Delikatesy</string>
@@ -298,7 +298,7 @@
     <string name="type.cuisine.heuriger">Heuriger</string>
     <string name="type.cuisine.hotdog">Hot-dogi</string>
     <string name="type.cuisine.hungarian">Kuchnia węgierska</string>
-    <string name="type.cuisine.ice_cream">Lodziarnia</string>
+    <string name="type.cuisine.ice_cream">Lody</string>
     <string name="type.cuisine.indian">Kuchnia indyjska</string>
     <string name="type.cuisine.indonesian">Kuchnia indonezyjska</string>
     <string name="type.cuisine.international">Kuchnia międzynarodowa</string>
@@ -322,14 +322,14 @@
     <string name="type.cuisine.pasta">Makarony</string>
     <string name="type.cuisine.persian">Kuchnia perska</string>
     <string name="type.cuisine.peruvian">Kuchnia peruwiańska</string>
-    <string name="type.cuisine.pizza">Pizzeria</string>
+    <string name="type.cuisine.pizza">Pizza</string>
     <string name="type.cuisine.polish">Kuchnia polska</string>
     <string name="type.cuisine.portuguese">Kuchnia portugalska</string>
-    <string name="type.cuisine.ramen">Zupa ramen</string>
+    <string name="type.cuisine.ramen">Ramen</string>
     <string name="type.cuisine.regional">Kuchnia regionalna</string>
     <string name="type.cuisine.russian">Kuchnia rosyjska</string>
     <string name="type.cuisine.sandwich">Kanapki</string>
-    <string name="type.cuisine.sausage">Kiełbasiarnia</string>
+    <string name="type.cuisine.sausage">Kiełbasa</string>
     <string name="type.cuisine.savory_pancakes">Wytrawne naleśniki</string>
     <string name="type.cuisine.seafood">Owoce morza</string>
     <string name="type.cuisine.soba">Soba</string>
@@ -337,7 +337,7 @@
     <string name="type.cuisine.steak_house">Steki</string>
     <string name="type.cuisine.sushi">Sushi</string>
     <string name="type.cuisine.tapas">Tapas</string>
-    <string name="type.cuisine.tea">Herbaciarnia</string>
+    <string name="type.cuisine.tea">Herbata</string>
     <string name="type.cuisine.thai">Kuchnia tajska</string>
     <string name="type.cuisine.turkish">Kuchnia turecka</string>
     <string name="type.cuisine.vegan">Kuchnia wegańska</string>
@@ -431,6 +431,8 @@
     <string name="type.highway.pedestrian.area">Obszar deptaka</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Most dla pieszych</string>
+
+    <string name="type.highway.pedestrian.square">Plac</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Tunel dla pieszych</string>
     <string name="type.highway.primary">Ulica</string>
@@ -629,9 +631,9 @@
     <string name="type.leisure.nature_reserve">Rezerwat przyrody</string>
     <string name="type.leisure.outdoor_seating">Siedzenia zewnętrzne</string>
     <string name="type.leisure.park">Park</string>
-    <string name="type.leisure.park.no.access">Park</string>
+    <string name="type.leisure.park.no.access">Prywatny park</string>
     <string name="type.leisure.park.permissive">Park</string>
-    <string name="type.leisure.park.private">Park</string>
+    <string name="type.leisure.park.private">Prywatny park</string>
     <string name="type.leisure.picnic_table">Stół piknikowy</string>
     <string name="type.leisure.pitch">Boisko sportowe</string>
     <string name="type.leisure.playground">Plac zabaw</string>
@@ -829,124 +831,124 @@
     <string name="type.railway.station">Dworzec kolejowy</string>
     <string name="type.railway.station.funicular">Kolej linowo-terenowa</string>
     <string name="type.railway.station.light_rail">Dworzec kolejowy</string>
-    <string name="type.railway.station.light_rail.berlin">Dworzec kolejowy</string>
-    <string name="type.railway.station.light_rail.london">Dworzec kolejowy</string>
-    <string name="type.railway.station.light_rail.porto">Dworzec kolejowy</string>
+    <string name="type.railway.station.light_rail.berlin">Stacja S-Bahn</string>
+    <string name="type.railway.station.light_rail.london">Stacja DLR</string>
+    <string name="type.railway.station.light_rail.porto">Stacja Metra Porto</string>
     <string name="type.railway.station.monorail">Dworzec kolejowy</string>
-    <string name="type.railway.station.subway">Metro</string>
-    <string name="type.railway.station.subway.adana">Metro</string>
-    <string name="type.railway.station.subway.algiers">Metro</string>
-    <string name="type.railway.station.subway.almaty">Metro</string>
-    <string name="type.railway.station.subway.amsterdam">Metro</string>
-    <string name="type.railway.station.subway.ankara">Metro</string>
-    <string name="type.railway.station.subway.athens">Metro</string>
-    <string name="type.railway.station.subway.baku">Metro</string>
-    <string name="type.railway.station.subway.bangkok">Metro</string>
-    <string name="type.railway.station.subway.barcelona">Metro</string>
-    <string name="type.railway.station.subway.beijing">Metro</string>
-    <string name="type.railway.station.subway.bengalore">Metro</string>
-    <string name="type.railway.station.subway.berlin">Metro</string>
-    <string name="type.railway.station.subway.bilbao">Metro</string>
-    <string name="type.railway.station.subway.brasilia">Metro</string>
-    <string name="type.railway.station.subway.brescia">Metro</string>
-    <string name="type.railway.station.subway.brussels">Metro</string>
-    <string name="type.railway.station.subway.bucharest">Metro</string>
-    <string name="type.railway.station.subway.budapest">Metro</string>
-    <string name="type.railway.station.subway.buenos_aires">Metro</string>
-    <string name="type.railway.station.subway.bursa">Metro</string>
-    <string name="type.railway.station.subway.cairo">Metro</string>
-    <string name="type.railway.station.subway.caracas">Metro</string>
-    <string name="type.railway.station.subway.catania">Metro</string>
-    <string name="type.railway.station.subway.changchun">Metro</string>
-    <string name="type.railway.station.subway.chengdu">Metro</string>
-    <string name="type.railway.station.subway.chicago">Metro</string>
-    <string name="type.railway.station.subway.chongqing">Metro</string>
-    <string name="type.railway.station.subway.dalian">Metro</string>
-    <string name="type.railway.station.subway.delhi">Metro</string>
-    <string name="type.railway.station.subway.dnepro">Metro</string>
-    <string name="type.railway.station.subway.dubai">Metro</string>
-    <string name="type.railway.station.subway.ekb">Metro</string>
-    <string name="type.railway.station.subway.fukuoka">Metro</string>
-    <string name="type.railway.station.subway.glasgow">Metro</string>
-    <string name="type.railway.station.subway.guangzhou">Metro</string>
-    <string name="type.railway.station.subway.hamburg">Metro</string>
-    <string name="type.railway.station.subway.helsinki">Metro</string>
-    <string name="type.railway.station.subway.hiroshima">Metro</string>
-    <string name="type.railway.station.subway.hongkong">Metro</string>
-    <string name="type.railway.station.subway.isfahan">Metro</string>
-    <string name="type.railway.station.subway.istanbul">Metro</string>
-    <string name="type.railway.station.subway.izmir">Metro</string>
-    <string name="type.railway.station.subway.kazan">Metro</string>
-    <string name="type.railway.station.subway.kharkiv">Metro</string>
-    <string name="type.railway.station.subway.kiev">Metro</string>
-    <string name="type.railway.station.subway.kobe">Metro</string>
-    <string name="type.railway.station.subway.kolkata">Metro</string>
-    <string name="type.railway.station.subway.kunming">Metro</string>
-    <string name="type.railway.station.subway.kyoto">Metro</string>
-    <string name="type.railway.station.subway.la">Metro</string>
-    <string name="type.railway.station.subway.lausanne">Metro</string>
-    <string name="type.railway.station.subway.lille">Metro</string>
-    <string name="type.railway.station.subway.lima">Metro</string>
-    <string name="type.railway.station.subway.lisboa">Metro</string>
-    <string name="type.railway.station.subway.london">Metro</string>
-    <string name="type.railway.station.subway.lyon">Metro</string>
-    <string name="type.railway.station.subway.madrid">Metro</string>
-    <string name="type.railway.station.subway.malaga">Metro</string>
-    <string name="type.railway.station.subway.manila">Metro</string>
-    <string name="type.railway.station.subway.maracaibo">Metro</string>
-    <string name="type.railway.station.subway.mashhad">Metro</string>
-    <string name="type.railway.station.subway.mecca">Metro</string>
-    <string name="type.railway.station.subway.medellin">Metro</string>
-    <string name="type.railway.station.subway.mexico">Metro</string>
-    <string name="type.railway.station.subway.milan">Metro</string>
-    <string name="type.railway.station.subway.minsk">Metro</string>
-    <string name="type.railway.station.subway.montreal">Metro</string>
-    <string name="type.railway.station.subway.moscow">Metro</string>
-    <string name="type.railway.station.subway.munchen">Metro</string>
-    <string name="type.railway.station.subway.nagoya">Metro</string>
-    <string name="type.railway.station.subway.newyork">Metro</string>
-    <string name="type.railway.station.subway.nnov">Metro</string>
-    <string name="type.railway.station.subway.novosibirsk">Metro</string>
-    <string name="type.railway.station.subway.osaka">Metro</string>
-    <string name="type.railway.station.subway.oslo">Metro</string>
-    <string name="type.railway.station.subway.palma">Metro</string>
-    <string name="type.railway.station.subway.panama">Metro</string>
-    <string name="type.railway.station.subway.paris">Metro</string>
-    <string name="type.railway.station.subway.philadelphia">Metro</string>
-    <string name="type.railway.station.subway.pyongyang">Metro</string>
-    <string name="type.railway.station.subway.rennes">Metro</string>
-    <string name="type.railway.station.subway.rio">Metro</string>
-    <string name="type.railway.station.subway.roma">Metro</string>
-    <string name="type.railway.station.subway.rotterdam">Metro</string>
-    <string name="type.railway.station.subway.samara">Metro</string>
-    <string name="type.railway.station.subway.santiago">Metro</string>
-    <string name="type.railway.station.subway.santo_domingo">Metro</string>
-    <string name="type.railway.station.subway.saopaulo">Metro</string>
-    <string name="type.railway.station.subway.sapporo">Metro</string>
-    <string name="type.railway.station.subway.sendai">Metro</string>
-    <string name="type.railway.station.subway.sf">Metro</string>
-    <string name="type.railway.station.subway.shanghai">Metro</string>
-    <string name="type.railway.station.subway.shenzhen">Metro</string>
-    <string name="type.railway.station.subway.shiraz">Metro</string>
-    <string name="type.railway.station.subway.singapore">Metro</string>
-    <string name="type.railway.station.subway.sofia">Metro</string>
-    <string name="type.railway.station.subway.spb">Metro</string>
-    <string name="type.railway.station.subway.stockholm">Metro</string>
-    <string name="type.railway.station.subway.tabriz">Metro</string>
-    <string name="type.railway.station.subway.taipei">Metro</string>
-    <string name="type.railway.station.subway.taoyuan">Metro</string>
-    <string name="type.railway.station.subway.tashkent">Metro</string>
-    <string name="type.railway.station.subway.tbilisi">Metro</string>
-    <string name="type.railway.station.subway.tehran">Metro</string>
-    <string name="type.railway.station.subway.tianjin">Metro</string>
-    <string name="type.railway.station.subway.tokyo">Metro</string>
-    <string name="type.railway.station.subway.valencia">Metro</string>
-    <string name="type.railway.station.subway.vienna">Metro</string>
-    <string name="type.railway.station.subway.warszawa">Metro</string>
-    <string name="type.railway.station.subway.washington">Metro</string>
-    <string name="type.railway.station.subway.wuhan">Metro</string>
-    <string name="type.railway.station.subway.yerevan">Metro</string>
-    <string name="type.railway.station.subway.yokohama">Metro</string>
+    <string name="type.railway.station.subway">Stacja metra</string>
+    <string name="type.railway.station.subway.adana">Stacja metra</string>
+    <string name="type.railway.station.subway.algiers">Stacja metra</string>
+    <string name="type.railway.station.subway.almaty">Stacja metra</string>
+    <string name="type.railway.station.subway.amsterdam">Stacja metra</string>
+    <string name="type.railway.station.subway.ankara">Stacja metra</string>
+    <string name="type.railway.station.subway.athens">Stacja metra</string>
+    <string name="type.railway.station.subway.baku">Stacja metra</string>
+    <string name="type.railway.station.subway.bangkok">Stacja metra</string>
+    <string name="type.railway.station.subway.barcelona">Stacja metra</string>
+    <string name="type.railway.station.subway.beijing">Stacja metra</string>
+    <string name="type.railway.station.subway.bengalore">Stacja metra</string>
+    <string name="type.railway.station.subway.berlin">Stacja metra</string>
+    <string name="type.railway.station.subway.bilbao">Stacja metra</string>
+    <string name="type.railway.station.subway.brasilia">Stacja metra</string>
+    <string name="type.railway.station.subway.brescia">Stacja metra</string>
+    <string name="type.railway.station.subway.brussels">Stacja metra</string>
+    <string name="type.railway.station.subway.bucharest">Stacja metra</string>
+    <string name="type.railway.station.subway.budapest">Stacja metra</string>
+    <string name="type.railway.station.subway.buenos_aires">Stacja metra</string>
+    <string name="type.railway.station.subway.bursa">Stacja metra</string>
+    <string name="type.railway.station.subway.cairo">Stacja metra</string>
+    <string name="type.railway.station.subway.caracas">Stacja metra</string>
+    <string name="type.railway.station.subway.catania">Stacja metra</string>
+    <string name="type.railway.station.subway.changchun">Stacja metra</string>
+    <string name="type.railway.station.subway.chengdu">Stacja metra</string>
+    <string name="type.railway.station.subway.chicago">Stacja metra</string>
+    <string name="type.railway.station.subway.chongqing">Stacja metra</string>
+    <string name="type.railway.station.subway.dalian">Stacja metra</string>
+    <string name="type.railway.station.subway.delhi">Stacja metra</string>
+    <string name="type.railway.station.subway.dnepro">Stacja metra</string>
+    <string name="type.railway.station.subway.dubai">Stacja metra</string>
+    <string name="type.railway.station.subway.ekb">Stacja metra</string>
+    <string name="type.railway.station.subway.fukuoka">Stacja metra</string>
+    <string name="type.railway.station.subway.glasgow">Stacja metra</string>
+    <string name="type.railway.station.subway.guangzhou">Stacja metra</string>
+    <string name="type.railway.station.subway.hamburg">Stacja metra</string>
+    <string name="type.railway.station.subway.helsinki">Stacja metra</string>
+    <string name="type.railway.station.subway.hiroshima">Stacja metra</string>
+    <string name="type.railway.station.subway.hongkong">Stacja metra</string>
+    <string name="type.railway.station.subway.isfahan">Stacja metra</string>
+    <string name="type.railway.station.subway.istanbul">Stacja metra</string>
+    <string name="type.railway.station.subway.izmir">Stacja metra</string>
+    <string name="type.railway.station.subway.kazan">Stacja metra</string>
+    <string name="type.railway.station.subway.kharkiv">Stacja metra</string>
+    <string name="type.railway.station.subway.kiev">Stacja metra</string>
+    <string name="type.railway.station.subway.kobe">Stacja metra</string>
+    <string name="type.railway.station.subway.kolkata">Stacja metra</string>
+    <string name="type.railway.station.subway.kunming">Stacja metra</string>
+    <string name="type.railway.station.subway.kyoto">Stacja metra</string>
+    <string name="type.railway.station.subway.la">Stacja metra</string>
+    <string name="type.railway.station.subway.lausanne">Stacja metra</string>
+    <string name="type.railway.station.subway.lille">Stacja metra</string>
+    <string name="type.railway.station.subway.lima">Stacja metra</string>
+    <string name="type.railway.station.subway.lisboa">Stacja metra</string>
+    <string name="type.railway.station.subway.london">Stacja metra</string>
+    <string name="type.railway.station.subway.lyon">Stacja metra</string>
+    <string name="type.railway.station.subway.madrid">Stacja metra</string>
+    <string name="type.railway.station.subway.malaga">Stacja metra</string>
+    <string name="type.railway.station.subway.manila">Stacja metra</string>
+    <string name="type.railway.station.subway.maracaibo">Stacja metra</string>
+    <string name="type.railway.station.subway.mashhad">Stacja metra</string>
+    <string name="type.railway.station.subway.mecca">Stacja metra</string>
+    <string name="type.railway.station.subway.medellin">Stacja metra</string>
+    <string name="type.railway.station.subway.mexico">Stacja metra</string>
+    <string name="type.railway.station.subway.milan">Stacja metra</string>
+    <string name="type.railway.station.subway.minsk">Stacja metra</string>
+    <string name="type.railway.station.subway.montreal">Stacja metra</string>
+    <string name="type.railway.station.subway.moscow">Stacja metra</string>
+    <string name="type.railway.station.subway.munchen">Stacja metra</string>
+    <string name="type.railway.station.subway.nagoya">Stacja metra</string>
+    <string name="type.railway.station.subway.newyork">Stacja metra</string>
+    <string name="type.railway.station.subway.nnov">Stacja metra</string>
+    <string name="type.railway.station.subway.novosibirsk">Stacja metra</string>
+    <string name="type.railway.station.subway.osaka">Stacja metra</string>
+    <string name="type.railway.station.subway.oslo">Stacja metra</string>
+    <string name="type.railway.station.subway.palma">Stacja metra</string>
+    <string name="type.railway.station.subway.panama">Stacja metra</string>
+    <string name="type.railway.station.subway.paris">Stacja metra</string>
+    <string name="type.railway.station.subway.philadelphia">Stacja metra</string>
+    <string name="type.railway.station.subway.pyongyang">Stacja metra</string>
+    <string name="type.railway.station.subway.rennes">Stacja metra</string>
+    <string name="type.railway.station.subway.rio">Stacja metra</string>
+    <string name="type.railway.station.subway.roma">Stacja metra</string>
+    <string name="type.railway.station.subway.rotterdam">Stacja metra</string>
+    <string name="type.railway.station.subway.samara">Stacja metra</string>
+    <string name="type.railway.station.subway.santiago">Stacja metra</string>
+    <string name="type.railway.station.subway.santo_domingo">Stacja metra</string>
+    <string name="type.railway.station.subway.saopaulo">Stacja metra</string>
+    <string name="type.railway.station.subway.sapporo">Stacja metra</string>
+    <string name="type.railway.station.subway.sendai">Stacja metra</string>
+    <string name="type.railway.station.subway.sf">Stacja metra</string>
+    <string name="type.railway.station.subway.shanghai">Stacja metra</string>
+    <string name="type.railway.station.subway.shenzhen">Stacja metra</string>
+    <string name="type.railway.station.subway.shiraz">Stacja metra</string>
+    <string name="type.railway.station.subway.singapore">Stacja metra</string>
+    <string name="type.railway.station.subway.sofia">Stacja metra</string>
+    <string name="type.railway.station.subway.spb">Stacja metra</string>
+    <string name="type.railway.station.subway.stockholm">Stacja metra</string>
+    <string name="type.railway.station.subway.tabriz">Stacja metra</string>
+    <string name="type.railway.station.subway.taipei">Stacja metra</string>
+    <string name="type.railway.station.subway.taoyuan">Stacja metra</string>
+    <string name="type.railway.station.subway.tashkent">Stacja metra</string>
+    <string name="type.railway.station.subway.tbilisi">Stacja metra</string>
+    <string name="type.railway.station.subway.tehran">Stacja metra</string>
+    <string name="type.railway.station.subway.tianjin">Stacja metra</string>
+    <string name="type.railway.station.subway.tokyo">Stacja metra</string>
+    <string name="type.railway.station.subway.valencia">Stacja metra</string>
+    <string name="type.railway.station.subway.vienna">Stacja metra</string>
+    <string name="type.railway.station.subway.warszawa">Stacja metra</string>
+    <string name="type.railway.station.subway.washington">Stacja metra</string>
+    <string name="type.railway.station.subway.wuhan">Stacja metra</string>
+    <string name="type.railway.station.subway.yerevan">Stacja metra</string>
+    <string name="type.railway.station.subway.yokohama">Stacja metra</string>
     <string name="type.railway.subway_entrance">Wejście do metra</string>
     <string name="type.railway.subway_entrance.adana">Wejście do metra</string>
     <string name="type.railway.subway_entrance.algiers">Wejście do metra</string>
@@ -1285,7 +1287,7 @@
     <string name="type.wheelchair.yes">Wyposażono dla osób niepełnosprawnych</string>
     <string name="type.piste_type.snow_park">Snow Park</string>
     <string name="type.piste_type.hike">Śnieżny szlak turystyczny</string>
-    <string name="type.piste_type.connection">Piste Connection</string>
+    <string name="type.piste_type.connection">Łącznik stoków</string>
     <string name="type.piste_type.skitour">Szlak Skitour</string>
     <string name="type.amenity.events_venue">Sala bankietowa</string>
     <string name="type.shop.auction">Dom aukcyjny</string>
@@ -1307,7 +1309,7 @@
     <string name="type.fee.yes">$</string>
     <string name="type.leisure.track">Ścieżka</string>
     <string name="type.internet_access">Internet</string>
-    <string name="type.internet_access.wlan">Internet</string>
+    <string name="type.internet_access.wlan">Internet bezprzewodowy</string>
     <string name="type.leisure.marina">Przystań</string>
     <string name="type.cuisine.bubble_tea">Herbata bąbelkowa</string>
     <string name="type.power.pole">Słup elektryczny</string>
@@ -1387,4 +1389,10 @@
     <string name="type.barrier.guard_rail">Barierka ochronna</string>
     <string name="type.railway.station.subway.qingdao">Stacja metra</string>
     <string name="type.amenity.bicycle_parking.covered">Zadaszony parking dla rowerów</string>
+    <string name="type.building.guardhouse">Wartownia</string>
+    <string name="type.amenity.luggage_locker">Skrytka do przechowywania bagażu</string>
+    <string name="type.amenity.animal_shelter">Schronisko dla zwierząt</string>
+    <string name="type.amenity.ranger_station">Budynek obsługi parku</string>
+    <string name="type.power.portal">Portal elektroenergetyczny</string>
+    <string name="type.office.security">Biuro ochrony</string>
 </resources>

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

@@ -383,6 +383,8 @@
     <string name="type.highway.pedestrian.area">Rua pedonal</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Ponte para pedestres</string>
+
+    <string name="type.highway.pedestrian.square">Praça ou largo</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Túnel para pedestres</string>
     <string name="type.highway.primary">Estrada</string>
@@ -1382,4 +1384,6 @@
     <string name="type.amenity.ranger_station">Posto de guardas florestais</string>
     <string name="type.barrier.wicket_gate">Postigo</string>
     <string name="type.amenity.animal_shelter">Abrigo de animais</string>
+    <string name="type.building.guardhouse">Cabine de Segurança</string>
+    <string name="type.office.security">Escritório dos Guardas de Segurança</string>
 </resources>

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

@@ -418,6 +418,8 @@
     <string name="type.highway.pedestrian.area">Rua pedonal</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Ponte</string>
+
+    <string name="type.highway.pedestrian.square">Praça ou largo</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Túnel</string>
     <string name="type.highway.primary">Estrada primária</string>
@@ -1394,4 +1396,7 @@
     <string name="type.natural.wetland.tidalflat">Planície de maré</string>
     <string name="type.amenity.animal_shelter">Abrigo Animal</string>
     <string name="type.barrier.wicket_gate">Postigo</string>
+    <string name="type.office.security">Escritório dos Guardas de Segurança</string>
+    <string name="type.building.guardhouse">Cabine de Segurança</string>
+    <string name="type.power.portal">Portal de Energia</string>
 </resources>

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

@@ -370,6 +370,8 @@
     <string name="type.highway.pedestrian.area">Stradă</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Pod</string>
+
+    <string name="type.highway.pedestrian.square">Spațiu</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Tunel</string>
     <string name="type.highway.primary">Stradă</string>

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

@@ -437,6 +437,8 @@
     <string name="type.highway.pedestrian.area">Пешеходная зона</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Пешеходный мост</string>
+
+    <string name="type.highway.pedestrian.square">Площадь</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Пешеходный тоннель</string>
     <string name="type.highway.primary">Шоссе</string>

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

@@ -425,6 +425,8 @@
     <string name="type.highway.pedestrian.area">Pešia zóna</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Most pre chodcov</string>
+
+    <string name="type.highway.pedestrian.square">Námestie</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Tunel pre chodcov</string>
     <string name="type.highway.primary">Cesta I. triedy</string>

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

@@ -434,6 +434,8 @@
     <string name="type.highway.pedestrian.area">Пешачка зона</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Пешачки мост</string>
+
+    <string name="type.highway.pedestrian.square">Трг</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Пешачки тунел</string>
     <string name="type.highway.primary">Пут прве класе</string>
@@ -646,7 +648,7 @@
     <string name="type.leisure.sauna">Сауна</string>
     <string name="type.leisure.slipway">Навоз</string>
     <string name="type.leisure.sports_centre">Спортски центар</string>
-    <string name="type.sport.climbing">Зид за пењање</string>
+    <string name="type.sport.climbing">Вештачка стена</string>
     <string name="type.sport.yoga">Јога студио</string>
     <string name="type.leisure.stadium">Стадион</string>
     <string name="type.leisure.swimming_pool">Базен</string>
@@ -675,7 +677,7 @@
     <!-- A regular telecommunications tower / mast. -->
     <string name="type.man_made.tower.communication">Телекомуникациони торањ</string>
     <!-- A deep hole drilled into the earth to extract oil or gas. -->
-    <string name="type.man_made.petroleum_well">Naftna ili gasna bušotina</string>
+    <string name="type.man_made.petroleum_well">Нафтна или гасна бушотина</string>
     <!-- A tower/mast constructed to burn off excess gas. -->
     <string name="type.man_made.flare">Газни факел</string>
     <string name="type.man_made.wastewater_plant">Пречишћивач отпадних вода</string>
@@ -1370,12 +1372,12 @@
     <string name="type.railway.funicular.tunnel">Тунел успињаче</string>
     <string name="type.railway.narrow_gauge.tunnel">Тунел уског колосека</string>
     <string name="type.sport.diving">Слободни скокови</string>
-    <string name="type.amenity.love_hotel">Ljubavni hotel</string>
-    <string name="type.leisure.firepit">Ognjište</string>
+    <string name="type.amenity.love_hotel">Љубавни хотел</string>
+    <string name="type.leisure.firepit">Огњиште</string>
     <string name="type.landuse.plant_nursery">Расадник</string>
     <string name="type.barrier.guard_rail">Заштитна ограда</string>
     <string name="type.amenity.studio">Студио</string>
-    <string name="type.highway.ladder">Merdevine</string>
+    <string name="type.highway.ladder">Мердевине</string>
     <string name="type.man_made.crane">Кран</string>
     <string name="type.railway.station.subway.qingdao">Метро станица</string>
     <string name="type.landuse.religious">Верско земљиште</string>

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

@@ -373,6 +373,8 @@
     <string name="type.highway.pedestrian.area">Gata</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Bro</string>
+
+    <string name="type.highway.pedestrian.square">Torg</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Tunnel</string>
     <string name="type.highway.primary">Gata</string>