[ios] Format all Obj C code via clang-format

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

.forgejo/workflows/appstream-check.yaml

@@ -21,12 +21,11 @@ jobs:
       - name: Install appstream validator and flatpak Builder
         shell: bash
         run: |
-          apt-get update
+          sudo apt update -y
-          apt-get install -y flatpak dbus --no-install-recommends
+          sudo apt install -y \
-          mkdir /run/dbus
+              flatpak
-          dbus-daemon --system
+          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          sudo flatpak install -y org.flatpak.Builder
-          flatpak install -y org.flatpak.Builder
 
       - name: Lint appstream data with flatpak Builder
         shell: bash

.gitmodules

@@ -65,7 +65,3 @@
 [submodule "3party/imgui/imgui"]
   path = 3party/imgui/imgui
   url = https://github.com/ocornut/imgui
-[submodule "3party/glaze"]
-  path = 3party/glaze
-  url = https://github.com/stephenberry/glaze
-  branch = main

3party/CMakeLists.txt

@@ -57,7 +57,6 @@ endif()
 
 add_subdirectory(agg)
 add_subdirectory(bsdiff-courgette)
-add_subdirectory(glaze)
 add_subdirectory(minizip)
 add_subdirectory(open-location-code)
 add_subdirectory(opening_hours)

3party/freetype/CMakeLists.txt

@@ -4,9 +4,7 @@ set(FT_DISABLE_HARFBUZZ ON)
 add_subdirectory(freetype)
 
 # Fix warning with ONE_PIXEL macro clash.
-if(NOT MSVC)
 target_compile_options(freetype PRIVATE -Wno-macro-redefined)
-endif()
 
 # Use ft2build.h from the current directory instead of the default.
 target_include_directories(freetype

3party/harfbuzz/CMakeLists.txt

@@ -11,15 +11,7 @@ target_include_directories(${PROJECT_NAME}
     harfbuzz/src
 )
 
-if (MSVC)
+# Keep these settigns in sync with xcode/harfbuzz project.
-  target_compile_options(${PROJECT_NAME}
-    PRIVATE
-      /GR-
-      /EHsc-
-      /Zc:threadSafeInit-
-  )
-else()
-  # Keep these settings in sync with xcode/harfbuzz project.
 target_compile_options(${PROJECT_NAME}
   PRIVATE
     -fno-rtti
@@ -27,7 +19,6 @@ else()
     -fno-threadsafe-statics
     $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-format-pedantic>
 )
-endif()
 
 target_compile_definitions(${PROJECT_NAME}
   PRIVATE
@@ -37,19 +28,13 @@ target_compile_definitions(${PROJECT_NAME}
     #$<$<BOOL:${APPLE}>:HAVE_CORETEXT>
     HAVE_ATEXIT
     HAVE_GETPAGESIZE
-    HAVE_MPROTECT
-    HAVE_SYSCONF
-)
-
-if (NOT MSVC)
-  target_compile_definitions(${PROJECT_NAME}
-    PRIVATE
     HAVE_MMAP
+    HAVE_MPROTECT
     HAVE_PTHREAD
+    HAVE_SYSCONF
     HAVE_SYS_MMAN_H
     HAVE_UNISTD_H
 )
-endif()
 
 target_link_libraries(${PROJECT_NAME} Freetype::Freetype)
 

3party/icu/CMakeLists.txt

@@ -172,7 +172,6 @@ add_library(icuuc
   icu/icu4c/source/common/uvector.cpp
   icu/icu4c/source/common/uvectr32.cpp
   icu/icu4c/source/common/uvectr64.h
-  icu/icu4c/source/common/wintz.cpp
   icu/icu4c/source/common/wintz.h
 )
 

3party/protobuf/CMakeLists.txt

@@ -11,7 +11,6 @@ set(SRC
   protobuf/src/google/protobuf/message_lite.cc
   protobuf/src/google/protobuf/repeated_field.cc
   protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
-  protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
   protobuf/src/google/protobuf/stubs/bytestream.cc
   protobuf/src/google/protobuf/stubs/common.cc
   protobuf/src/google/protobuf/stubs/int128.cc

3party/succinct/mapper.hpp

@@ -7,6 +7,7 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/utility.hpp>
 #include <boost/type_traits/is_pod.hpp>
+#include <boost/iostreams/device/mapped_file.hpp>
 
 #include "mappable_vector.hpp"
 
@@ -282,6 +283,12 @@ namespace succinct { namespace mapper {
         return mapper.bytes_read();
     }
 
+    template <typename T>
+    size_t map(T& val, boost::iostreams::mapped_file_source const& m, uint64_t flags = 0, const char* friendly_name = "<TOP>")
+    {
+        return map(val, m.data(), flags, friendly_name);
+    }
+
     template <typename T>
     uint64_t size_of(T& val)
     {

3party/succinct/util.hpp

@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <boost/iterator/iterator_facade.hpp>
+#include <boost/iostreams/device/mapped_file.hpp>
 
 namespace succinct { namespace util {
 
@@ -204,6 +205,29 @@ namespace succinct { namespace util {
         std::string m_cur_value;
     };
 
+    struct mmap_lines
+    {
+        typedef buffer_line_iterator iterator;
+        typedef buffer_line_iterator const_iterator;
+
+        mmap_lines(std::string filename)
+            : m_map(filename)
+        {}
+
+        const_iterator begin() const
+        {
+            return const_iterator(m_map.data(), m_map.size());
+        }
+
+        const_iterator end() const
+        {
+            return const_iterator();
+        }
+
+    private:
+        boost::iostreams::mapped_file_source m_map;
+    };
+
     struct input_error : std::invalid_argument
     {
         input_error(std::string const& what)

3party/vulkan_wrapper/vulkan_wrapper.cpp

@@ -19,18 +19,7 @@ extern "C" {
 #endif
 
 #include "vulkan_wrapper.h"
-
-#if defined(_WIN32)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-#else
 #include <dlfcn.h>
-#endif
 
 int InitVulkan(void) {
 #if defined(__APPLE__)
@@ -41,9 +30,6 @@ int InitVulkan(void) {
     if (!libvulkan) {
         libvulkan = dlopen("libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL);
     }
-#elif defined( _WIN32 )
-    HMODULE libvulkan = LoadLibraryA("vulkan-1.dll");
-    auto dlsym = [](HMODULE h, char const * name) { return GetProcAddress(h, name); };
 #else
     void* libvulkan = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
     if (!libvulkan) {

CMakeLists.txt

@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.22.1)
 
 project(omim C CXX)
 
-set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_C_STANDARD 23)
+set(CMAKE_C_STANDARD 17)
 # Our code does not rely on gnu extensions.
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_C_EXTENSIONS OFF)
@@ -39,12 +39,12 @@ if (APPLE AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))
   # https://gitlab.kitware.com/cmake/cmake/-/issues/21963
   enable_language(OBJC)
   set(CMAKE_OBJC_EXTENSIONS OFF)
-  set(CMAKE_OBJC_STANDARD 23)
+  set(CMAKE_OBJC_STANDARD 11)
   set(CMAKE_OBJC_FLAGS -fobjc-arc)
   set(CMAKE_OBJC_VISIBILITY_PRESET hidden)
   enable_language(OBJCXX)
   set(CMAKE_OBJCXX_EXTENSIONS OFF)
-  set(CMAKE_OBJCXX_STANDARD 23)
+  set(CMAKE_OBJCXX_STANDARD 20)
   set(CMAKE_OBJCXX_FLAGS -fobjc-arc)
   set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
 endif()
@@ -87,7 +87,7 @@ if (MSVC)
   add_compile_options(/utf-8)
   add_link_options(/INCREMENTAL:NO)
 else()
-  add_compile_options(-ffast-math $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>)
+  add_compile_options(-ffast-math)
 endif()
 
 if (PLATFORM_WIN)
@@ -197,7 +197,7 @@ if (USE_PCH)
 endif()
 
 # Should be on the root level, not in 3party, so tests can get these dependencies.
-if (PLATFORM_LINUX)
+if (PLATFORM_LINUX OR PLATFORM_WIN)
   find_package(ICU COMPONENTS uc i18n data REQUIRED)
   find_package(Freetype REQUIRED)
   find_package(harfbuzz REQUIRED)

README.md

@@ -20,19 +20,19 @@
 <div align="center">
   <p align="center">
     <a href="https://codeberg.org/comaps/comaps/releases">
-      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
+      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License" style="width: 90%; max-width: 150px;"/>
     </a>
     <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge&color=588157" alt="Android Build Status"/>
+      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge&color=588157" alt="Android Build Status" style="width: 90%; max-width: 170px;"/>
     </a>
     <a href="https://github.com/comaps/comaps/actions/workflows/ios-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge&color=588157" alt="iOS Build Status"/>
+      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge&color=588157" alt="iOS Build Status" style="width: 90%; max-width: 145px;"/>
     </a>
     <a href="https://opencollective.com/comaps">
-      <img src="https://img.shields.io/opencollective/all/comaps?label=Open%20Collective%20Donors&logo=opencollective&logoColor=white&style=for-the-badge&color=588157" alt="Open Collective Donors"/>
+      <img src="https://img.shields.io/opencollective/all/comaps?label=Open%20Collective%20Donors&logo=opencollective&logoColor=white&style=for-the-badge&color=588157" alt="Open Collective Donors" style="width: 90%; max-width: 191px;"/>
     </a>
     <a href="https://liberapay.com/CoMaps">
-      <img src="https://img.shields.io/liberapay/patrons/CoMaps.svg?label=Liberapay%20Patrons&logo=liberapay&logoColor=white&style=for-the-badge&color=588157" alt="Liberapay Patrons"/>
+      <img src="https://img.shields.io/liberapay/patrons/CoMaps.svg?label=Liberapay%20Patrons&logo=liberapay&logoColor=white&style=for-the-badge&color=588157" alt="Liberapay Patrons" style="width: 90%; max-width: 160px;"/>
     </a>
   </p>
 </div>

android/app/build.gradle

@@ -138,6 +138,8 @@ android {
     disable 'MissingTranslation'
     // https://github.com/organicmaps/organicmaps/issues/3551
     disable 'MissingQuantity', 'UnusedQuantity'
+    // https://github.com/organicmaps/organicmaps/issues/3550
+    disable 'ByteOrderMark'
     // https://github.com/organicmaps/organicmaps/issues/1077
     disable 'CustomSplashScreen'
     // https://github.com/organicmaps/organicmaps/issues/3610

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

@@ -24,7 +24,7 @@ Sartu komunitatean eta lagundu maparik onena aplikatzen
 • Lineaz kanpoko Wikipedia artikuluak
 • Metroaren garraio geruza eta jarraibideak
 • Arrastoen grabazioa
-• Markagailuak eta arrastoak esportatu eta inportatu KML, KMZ, GPX formatuetan
+• Laster-markak eta ibilbideak esportatu eta inportatu KML, KMZ, GPX formatuetan
 • Gauean erabiltzeko modu iluna
 • Hobetu mapako datuak guztiontzat oinarrizko editore integratua erabiliz
 

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

@@ -1 +0,0 @@
-Lett kart navigasjon - Opplev mere på din reise - Drevet av felleskapet

android/app/src/main/java/app/organicmaps/MapFragment.java

@@ -24,8 +24,9 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
 {
   private static final String TAG = MapFragment.class.getSimpleName();
 
+  @SuppressWarnings("NonNullFieldNotInitialized")
   @NonNull
-  private final Map mMap = new Map(DisplayType.Device);
+  private Map mMap;
 
   public void updateCompassOffset(int offsetX, int offsetY)
   {
@@ -86,8 +87,7 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
   {
     Logger.d(TAG);
     super.onAttach(context);
-
+    mMap = new Map(DisplayType.Device, MwmApplication.from(requireContext()).getLocationHelper());
-    mMap.setLocationHelper(MwmApplication.from(requireContext()).getLocationHelper());
     mMap.setMapRenderingListener((MapRenderingListener) context);
     mMap.setCallbackUnsupported(this::reportUnsupported);
   }

android/app/src/main/java/app/organicmaps/MwmActivity.java

@@ -18,6 +18,7 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.app.PendingIntent;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
@@ -27,6 +28,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -64,6 +66,7 @@ import app.organicmaps.downloader.OnmapDownloader;
 import app.organicmaps.editor.EditorActivity;
 import app.organicmaps.editor.EditorHostFragment;
 import app.organicmaps.editor.FeatureCategoryActivity;
+import app.organicmaps.editor.OsmLoginActivity;
 import app.organicmaps.editor.ReportFragment;
 import app.organicmaps.help.HelpActivity;
 import app.organicmaps.intent.Factory;
@@ -96,6 +99,7 @@ import app.organicmaps.sdk.display.DisplayType;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.downloader.UpdateInfo;
 import app.organicmaps.sdk.editor.Editor;
+import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.location.LocationListener;
 import app.organicmaps.sdk.location.LocationState;
@@ -286,6 +290,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
 
     processIntent();
+    migrateOAuthCredentials();
   }
 
   /**
@@ -340,6 +345,36 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
   }
 
+  private void migrateOAuthCredentials()
+  {
+    if (OsmOAuth.containsOAuth1Credentials())
+    {
+      // Remove old OAuth v1 secrets
+      OsmOAuth.clearOAuth1Credentials();
+
+      // Notify user to re-login
+      dismissAlertDialog();
+      final DialogInterface.OnClickListener navigateToLoginHandler =
+          (dialog, which) -> startActivity(new Intent(MwmActivity.this, OsmLoginActivity.class));
+
+      final int marginBase = getResources().getDimensionPixelSize(R.dimen.margin_base);
+      final float textSize = getResources().getDimension(R.dimen.line_spacing_extra_1);
+      final TextView text = new TextView(this);
+      text.setText(getText(R.string.alert_reauth_message));
+      text.setPadding(marginBase, marginBase, marginBase, marginBase);
+      text.setTextSize(textSize);
+      text.setMovementMethod(LinkMovementMethod.getInstance());
+
+      mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+                         .setTitle(R.string.login_osm)
+                         .setView(text)
+                         .setPositiveButton(R.string.login, navigateToLoginHandler)
+                         .setNegativeButton(R.string.cancel, null)
+                         .setOnDismissListener(dialog -> mAlertDialog = null)
+                         .show();
+    }
+  }
+
   private static void checkMeasurementSystem()
   {
     UnitLocale.initializeCurrentUnits();

android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java

@@ -31,7 +31,7 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
   private final CarContext mCarContext;
 
   @NonNull
-  private final Map mMap = new Map(Car);
+  private final Map mMap;
 
   @NonNull
   private Rect mVisibleArea = new Rect();
@@ -45,6 +45,7 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
   {
     Logger.d(TAG, "SurfaceRenderer()");
     mCarContext = carContext;
+    mMap = new Map(Car, MwmApplication.from(mCarContext).getLocationHelper());
     mIsRunning = true;
     lifecycle.addObserver(this);
     mMap.setMapRenderingListener(this);
@@ -59,7 +60,6 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
       mSurface.release();
     mSurface = surfaceContainer.getSurface();
 
-    mMap.setLocationHelper(MwmApplication.from(mCarContext).getLocationHelper());
     mMap.onSurfaceCreated(mCarContext, mSurface,
                           new Rect(0, 0, surfaceContainer.getWidth(), surfaceContainer.getHeight()),
                           surfaceContainer.getDpi());

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

@@ -55,23 +55,20 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
   @Override
   public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
   {
-    final LayoutInflater inflater = LayoutInflater.from(parent.getContext());
-
     switch (viewType)
     {
     case TYPE_CATEGORY ->
     {
-      return new FeatureViewHolder(inflater.inflate(R.layout.item_feature_category, parent, false));
+      return new FeatureViewHolder(
+          LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category, parent, false));
     }
     case TYPE_FOOTER ->
     {
-      return new FooterViewHolder(inflater.inflate(R.layout.item_feature_category_footer, parent, false),
+      return new FooterViewHolder(
+          LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category_footer, parent, false),
           (FooterListener) mFragment);
     }
-    default ->
+    default -> throw new IllegalArgumentException("Unsupported");
-    {
-      throw new IllegalArgumentException("Unsupported viewType: " + viewType);
-    }
     }
   }
 

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

@@ -130,6 +130,13 @@ public class FeatureCategoryFragment
   @Override
   public void onSendNoteClicked()
   {
+    if (!OsmOAuth.isAuthorized())
+    {
+      final Intent intent = new Intent(requireActivity(), OsmLoginActivity.class);
+      startActivity(intent);
+      return;
+    }
+
     final double[] center = Framework.nativeGetScreenRectCenter();
     final double lat = center[0];
     final double lon = center[1];
@@ -143,13 +150,6 @@ public class FeatureCategoryFragment
       Editor.nativeCreateStandaloneNote(lat, lon, mPendingNoteText);
       mPendingNoteText = "";
       Toast.makeText(requireContext(), R.string.osm_note_toast, Toast.LENGTH_SHORT).show();
-
-      if (!OsmOAuth.isAuthorized())
-      {
-        final Intent intent = new Intent(requireActivity(), OsmLoginActivity.class);
-        startActivity(intent);
-      }
-
       requireActivity().finish();
     }
   }
@@ -170,13 +170,6 @@ public class FeatureCategoryFragment
                              Editor.nativeCreateStandaloneNote(lat, lon, noteText);
                              mPendingNoteText = "";
                              Toast.makeText(requireContext(), R.string.osm_note_toast, Toast.LENGTH_SHORT).show();
-
-                             if (!OsmOAuth.isAuthorized())
-                             {
-                               final Intent intent = new Intent(requireActivity(), OsmLoginActivity.class);
-                               startActivity(intent);
-                             }
-
                              requireActivity().finish();
                            })
         .setNegativeButton(R.string.cancel, null)

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

@@ -149,7 +149,7 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
     tabView.setText(getResources().getString(R.string.editor_time_to));
     tabView.setTextColor(textColor);
     mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
-    mTabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+    mTabs.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
       @Override
       public void onTabSelected(TabLayout.Tab tab)
       {

android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java

@@ -29,7 +29,7 @@ public class LayersButton extends FloatingActionButton
   {
     final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
     if (mAreLayersActive)
-      mergeDrawableStates(drawableState, new int[] {R.attr.state_layers_enabled});
+      mergeDrawableStates(drawableState, new int[] {R.attr.layers_enabled});
     return drawableState;
   }
 

android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java

@@ -16,7 +16,6 @@ import android.view.ViewTreeObserver;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.OptIn;
-import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
@@ -296,7 +295,7 @@ public class MapButtonsController extends Fragment
       mBadgeDrawable.setMaxCharacterCount(0);
       mBadgeDrawable.setHorizontalOffset(verticalOffset);
       mBadgeDrawable.setVerticalOffset(dpToPx(9, context));
-      mBadgeDrawable.setBackgroundColor(ContextCompat.getColor(context, R.color.base_accent));
+      mBadgeDrawable.setBackgroundColor(getResources().getColor(R.color.base_accent));
       mBadgeDrawable.setVisible(enable);
       BadgeUtils.attachBadgeDrawable(mBadgeDrawable, menuButton);
     }

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

@@ -11,8 +11,6 @@ import android.widget.ExpandableListAdapter;
 import android.widget.ExpandableListView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
-
 import app.organicmaps.R;
 import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter;
 import app.organicmaps.base.BaseMwmDialogFragment;
@@ -124,7 +122,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
     }
 
     listView.setAdapter(buildAdapter());
-    listView.setChildDivider(new ColorDrawable(ContextCompat.getColor(requireContext(), android.R.color.transparent)));
+    listView.setChildDivider(new ColorDrawable(getResources().getColor(android.R.color.transparent)));
 
     UiUtils.waitLayout(listView, () -> {
       final int width = listView.getWidth();

android/app/src/main/java/app/organicmaps/sdk/Map.java

@@ -56,8 +56,8 @@ public final class Map
   @NonNull
   private final DisplayType mDisplayType;
 
-  @Nullable
+  @NonNull
-  private LocationHelper mLocationHelper;
+  private final LocationHelper mLocationHelper;
 
   private int mCurrentCompassOffsetX;
   private int mCurrentCompassOffsetY;
@@ -79,15 +79,11 @@ public final class Map
 
   private static int sCurrentDpi = 0;
 
-  public Map(@NonNull DisplayType mapType)
+  public Map(@NonNull DisplayType mapType, @NonNull LocationHelper locationHelper)
   {
     mDisplayType = mapType;
-    onCreate(false);
-  }
-
-  public void setLocationHelper(@NonNull LocationHelper locationHelper)
-  {
     mLocationHelper = locationHelper;
+    onCreate(false);
   }
 
   /**
@@ -146,8 +142,6 @@ public final class Map
 
   public void onSurfaceCreated(final Context context, final Surface surface, Rect surfaceFrame, int surfaceDpi)
   {
-    assert mLocationHelper != null : "LocationHelper must be initialized before calling onSurfaceCreated";
-
     if (isThemeChangingProcess(context))
     {
       Logger.d(TAG, "Theme changing process, skip 'onSurfaceCreated' callback");

android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java

@@ -29,6 +29,9 @@ public final class OsmOAuth
   @SuppressWarnings("NotNullFieldNotInitialized")
   @NonNull
   private static SharedPreferences mPrefs;
+
+  private static final String PREF_OSM_TOKEN = "OsmToken"; // Unused after migration from OAuth1 to OAuth2
+  private static final String PREF_OSM_SECRET = "OsmSecret"; // Unused after migration from OAuth1 to OAuth2
   private static final String PREF_OSM_USERNAME = "OsmUsername";
   private static final String PREF_OSM_CHANGESETS_COUNT = "OsmChangesetsCount";
   private static final String PREF_OSM_OAUTH2_TOKEN = "OsmOAuth2Token";
@@ -45,6 +48,16 @@ public final class OsmOAuth
     return mPrefs.contains(PREF_OSM_OAUTH2_TOKEN);
   }
 
+  public static boolean containsOAuth1Credentials()
+  {
+    return mPrefs.contains(PREF_OSM_TOKEN) && mPrefs.contains(PREF_OSM_SECRET);
+  }
+
+  public static void clearOAuth1Credentials()
+  {
+    mPrefs.edit().remove(PREF_OSM_TOKEN).remove(PREF_OSM_SECRET).apply();
+  }
+
   public static String getAuthToken()
   {
     return mPrefs.getString(PREF_OSM_OAUTH2_TOKEN, "");
@@ -69,6 +82,8 @@ public final class OsmOAuth
   public static void clearAuthorization()
   {
     mPrefs.edit()
+        .remove(PREF_OSM_TOKEN)
+        .remove(PREF_OSM_SECRET)
         .remove(PREF_OSM_USERNAME)
         .remove(PREF_OSM_OAUTH2_TOKEN)
         .apply();

android/app/src/main/java/app/organicmaps/search/SearchAdapter.java

@@ -65,7 +65,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     @AttrRes
     int getTintAttr()
     {
-      return androidx.appcompat.R.attr.colorAccent;
+      return com.google.android.material.R.attr.colorSecondary;
     }
 
     abstract TextView getTitleView();

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java

@@ -481,7 +481,7 @@ public class PlacePageView extends Fragment
               ? ContextCompat.getColor(
                     getContext(),
                     UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary))
-              : ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled);
+              : getResources().getColor(R.color.button_accent_text_disabled);
       mTvEditPlace.setTextColor(editPlaceButtonColor);
       mTvAddBusiness.setTextColor(editPlaceButtonColor);
       mTvAddPlace.setTextColor(editPlaceButtonColor);

android/app/src/main/res/color/accent_color_selector.xml

@@ -9,7 +9,7 @@
       android:state_checked="true"/>
 
   <item android:color="@color/base_accent"
-      app:state_layers_enabled="true"/>
+      app:layers_enabled="true"/>
 
   <item android:color="@color/icon_tint"/>
 </selector>

android/app/src/main/res/color/accent_color_selector_night.xml

@@ -9,7 +9,7 @@
         android:state_checked="true"/>
 
   <item android:color="@color/base_accent_night"
-        app:state_layers_enabled="true"/>
+        app:layers_enabled="true"/>
 
   <item android:color="@color/white_secondary"/>
 </selector>

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

@@ -1,10 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24dp" android:tint="#FFFFFF"
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportHeight="24" android:viewportWidth="24"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
+    <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
-        app:state_layers_enabled="true"
+</vector>
-        android:drawable="@drawable/ic_layers_clear"/>
-    <item
-        app:state_layers_enabled="false"
-        android:drawable="@drawable/ic_layers_default"/>
-</selector>

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
-</vector>

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

@@ -18,7 +18,7 @@
     tools:visibility="visible"/>
   <com.google.android.material.progressindicator.LinearProgressIndicator
     android:id="@+id/progressbar"
-    style="@style/Widget.Material3.LinearProgressIndicator"
+    style="@style/Widget.MaterialComponents.LinearProgressIndicator"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/margin_base_plus"
@@ -37,6 +37,5 @@
     android:layout_marginEnd="@dimen/margin_base_plus"
     android:layout_marginBottom="@dimen/margin_base_plus"
     android:text="@string/download"
-    android:textAppearance="@style/MwmTextAppearance.Body1"
+    android:textAppearance="@style/MwmTextAppearance.Body1" />
-    app:backgroundTint="?colorSecondary"/>
 </LinearLayout>

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

@@ -46,8 +46,6 @@
         </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
     <com.google.android.material.textfield.TextInputLayout
-      android:paddingStart="@dimen/margin_half"
-      android:paddingEnd="@dimen/margin_half"
       app:hintAnimationEnabled="false"
       style="@style/MwmWidget.Editor.CustomTextInput"
       android:textColorHint="?android:textColorSecondary">
@@ -56,6 +54,8 @@
       style="@style/MwmWidget.Editor.CustomTextInput"
       android:hint="@string/placepage_personal_notes_hint"
       android:minHeight="@dimen/height_item_multiline"
+      android:paddingStart="@dimen/margin_base"
+      android:paddingEnd="@dimen/margin_base"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:inputType="textMultiLine"/>

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

@@ -23,7 +23,7 @@
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
       android:id="@+id/navigation_progress"
-      style="@style/Widget.Material3.LinearProgressIndicator"
+      style="@style/Widget.MaterialComponents.LinearProgressIndicator"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       app:indicatorColor="?colorSecondary"

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

@@ -580,6 +580,8 @@
     <string name="button_plan">Beplan</string>
     <string name="placepage_remove_stop">Verwyder stop</string>
     <string name="placepage_add_stop">Voeg tussenstop toe</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Meld asseblief aan by OpenStreetMap om al jou kaartwysigings outomaties op te laai. Kom meer te wete <a href="https://github.com/organicmaps/organicmaps/issues/6144">hier</a>.</string>
     <string name="dialog_error_storage_title">Bergtoegangprobleem</string>
     <string name="dialog_error_storage_message">Eksterne bergspasie is nie toeganklik nie. Die SD-kaart is dalk verwyder, beskadig, of die lêerstelsel is leesalleen. Gaan u SD-kaart na of kontak ons by support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuleer slegte bergspasie</string>

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

@@ -607,6 +607,8 @@
     <string name="button_plan">خطة</string>
     <string name="placepage_remove_stop">إزالة نقطة توقف</string>
     <string name="placepage_add_stop">إضافة نقطة توقف</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">برجاء تسجيل الدخول إلى OpenStreetMap لتحميل جميع تعديلات الخريطة تلقائيًا. تعرف على المزيد <a href="https://github.com/organicmaps/organicmaps/issues/6144">هنا</a>.</string>
     <string name="dialog_error_storage_title">مشكلة الوصول للتخزين</string>
     <string name="dialog_error_storage_message">التخزين الخارجي غير متوفر، ربما تمت إزالة بطاقة SD، أو أنها تالفة أو نظام الملفات للقراءة فقط. افحصه أو راسلنا على support@comaps.app</string>
     <string name="setting_emulate_bad_storage">محاكاة التخزين السيء</string>

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

@@ -598,6 +598,8 @@
     <string name="button_plan">Plan</string>
     <string name="placepage_remove_stop">Kəsmə nöqtəsini silin</string>
     <string name="placepage_add_stop">Dayanacaq nöqtəsini əlavə edin</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Bütün xəritə redaktələrinizi avtomatik yükləmək üçün OpenStreetMap-a daxil olun. <a href="https://github.com/organicmaps/organicmaps/issues/6144">burada</a> ətraflı məlumat əldə edin.</string>
     <string name="dialog_error_storage_title">Yaddaş giriş problemi</string>
     <string name="dialog_error_storage_message">Xarici yaddaş mövcud deyil, ola bilsin ki, SD Kart çıxarılıb, zədələnib və ya fayl sistemi yalnız oxunur. Zəhmət olmasa yoxlayın və ya support@comaps.app ünvanında bizimlə əlaqə saxlayın</string>
     <string name="setting_emulate_bad_storage">Zədələnmiş yaddaşı təqlid edin</string>

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

@@ -588,6 +588,8 @@
     <string name="button_plan">Пракласці</string>
     <string name="placepage_remove_stop">Выдаліць прыпынак</string>
     <string name="placepage_add_stop">Дадаць прыпынак</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Увайдзіце ў OpenStreetMap, каб аўтаматычна запампоўваць усе свае праўкі карты. Даведайцеся больш <a href="https://github.com/organicmaps/organicmaps/issues/6144">тут</a>.</string>
     <string name="dialog_error_storage_title">Праблема з доступам да сховішча</string>
     <string name="dialog_error_storage_message">Знешняе сховішча недаступна. Магчыма, SD-карта была вынята або пашкоджана ці файлавая сістэма даступна толькі для чытання. Праверце SD-карту або зважыцеся з намі праз support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Эмуляваць дрэннае сховішча</string>

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

@@ -551,6 +551,8 @@
     <string name="button_plan">Планиране</string>
     <string name="placepage_remove_stop">Премахване на спирка</string>
     <string name="placepage_add_stop">Добавяне на спирка</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Моля, влезте в OpenStreetMap, за да качвате автоматично всичките си редакции на картата. Научете повече <a href="https://github.com/organicmaps/organicmaps/issues/6144">тук</a>.</string>
     <string name="dialog_error_storage_title">Проблем с достъпа до хранилището</string>
     <string name="dialog_error_storage_message">Външната памет на устройството не е налична, SD картата може да е била извадена, повредена или файловата система е само за четене. Проверете това и се свържете с нас support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Емулация на грешки с външна памет</string>

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

@@ -595,6 +595,8 @@
     <string name="button_plan">Planifica</string>
     <string name="placepage_remove_stop">Elimina parada</string>
     <string name="placepage_add_stop">Afegeix una parada</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Si us plau, inicieu sessió a OpenStreetMap per carregar automàticament totes les edicions de mapes. Més informació <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
     <string name="dialog_error_storage_title">S\'ha produït un problema en l\'accés a l\'emmagatzematge</string>
     <string name="dialog_error_storage_message">L\'emmagatzematg extern no és accessible. La targeta SD potser s\'ha retirat, malmès, o el sistema de fitxer és de només lectura. Comproveu la targeta SD o contacteu amb nosaltres a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emula un emmagatzematge malmès</string>

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

@@ -139,7 +139,7 @@
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Policie</string>
     <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">Wi-Fi</string>
+    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Recyklace</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -340,7 +340,7 @@
     <string name="dialog_routing_disclaimer_beware">Na silnici buďte pozorní a chovejte se bezpečně!</string>
     <string name="dialog_routing_check_gps">Zkontrolovat signál GPS</string>
     <string name="dialog_routing_error_location_not_found">Trasu se nepodařilo vytvořit. Nelze zjistit aktuální souřadnice GPS.</string>
-    <string name="dialog_routing_location_turn_wifi">Zkontrolujte signál GPS. Povolením připojení Wi-Fi zlepšíte přesnost určování vaší polohy.</string>
+    <string name="dialog_routing_location_turn_wifi">Zkontrolujte signál GPS. Povolením připojení WiFi zpřesníte určení vaší polohy.</string>
     <string name="dialog_routing_location_turn_on">Povolit služby určování polohy</string>
     <string name="dialog_routing_location_unknown_turn_on">Aktuální souřadnice GPS se nepodařilo zjistit. Pro výpočet trasy povolte služby určování polohy.</string>
     <string name="dialog_routing_unable_locate_route">Trasu se nepodařilo zjistit</string>
@@ -570,6 +570,8 @@
     <string name="button_plan">Naplánovat</string>
     <string name="placepage_remove_stop">Odstranit zastávku</string>
     <string name="placepage_add_stop">Přidat zastávku</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Přihlaste se do OpenStreetMap, abyste mohli automaticky nahrávat všechny své úpravy mapy. Více informací <a href="https://github.com/organicmaps/organicmaps/issues/6144">zde</a>.</string>
     <string name="dialog_error_storage_title">Problém s přístupem k úložišti</string>
     <string name="dialog_error_storage_message">Externí úložiště není k dispozici, pravděpodobně byla vyjmuta nebo poškozena SD karta, nebo je systém souborů pouze pro čtení. Zkontrolujte to prosím a kontaktujte nás na support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulovat špatné úložiště</string>
@@ -910,6 +912,4 @@
     <string name="open_now">Otevřeno</string>
     <string name="closed_now">Zavřeno</string>
     <string name="at">v %s</string>
-    <string name="osm_note_toast">Poznámka bude odeslána do OpenStreetMap</string>
-    <string name="osm_note_hint">Případně můžete zanechat poznámku komunitě OpenStreetMap, aby zde někdo jiný mohl místo přidat nebo opravit.</string>
 </resources>

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

@@ -566,6 +566,8 @@
     <string name="button_plan">Planlæg</string>
     <string name="placepage_remove_stop">Fjern stop</string>
     <string name="placepage_add_stop">Tilføj stop</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Log ind på OpenStreetMap for automatisk at uploade alle dine kortredigeringer. Få mere at vide <a href="https://github.com/organicmaps/organicmaps/issues/6144">her</a>.</string>
     <string name="dialog_error_storage_title">Problem med lageradgang</string>
     <string name="dialog_error_storage_message">Eksternt lager er ikke tilgængeligt. SD-kortet kan være blevet fjernet eller beskadiget, eller filsystemet er skrivebeskyttet. Kontroller dit SD-kort eller kontakt os på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulér beskadiget lager</string>

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

@@ -596,6 +596,8 @@
     <string name="button_plan">Planen</string>
     <string name="placepage_remove_stop">Stopp entfernen</string>
     <string name="placepage_add_stop">Stopp hinzufügen</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Bitte melde dich bei OpenStreetMap an, um alle deine Kartenbearbeitungen automatisch hochzuladen. Erfahre <a href="https://github.com/organicmaps/organicmaps/issues/6144">hier</a> mehr.</string>
     <string name="dialog_error_storage_title">Problem mit dem Zugriff auf den Speicher</string>
     <string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Überprüfen Sie das bitte oder kontaktieren Sie uns unter support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Fehlerhaften Speicher emulieren</string>
@@ -919,6 +921,4 @@
     <string name="open_now">Jetzt geöffnet</string>
     <string name="at">um %s</string>
     <string name="closed_now">Jetzt geschlossen</string>
-    <string name="osm_note_hint">Oder hinterlasse alternativ einen Hinweis für die OpenStreetMap Community, sodass jemand anders einen Ort hinzufügen oder korrigieren kann.</string>
-    <string name="osm_note_toast">Ein Hinweis wird zu OpenStreetMap geschickt</string>
 </resources>

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

@@ -591,6 +591,8 @@
     <string name="button_plan">Σχεδιασμός</string>
     <string name="placepage_remove_stop">Αφαίρεση στάσης</string>
     <string name="placepage_add_stop">Προσθήκη στάσης</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Παρακαλούμε συνδεθείτε στο OpenStreetMap για να ανεβάσετε αυτόματα όλες τις επεξεργασίες του χάρτη σας. Μάθετε περισσότερα <a href="https://github.com/organicmaps/organicmaps/issues/6144">εδώ</a>.</string>
     <string name="dialog_error_storage_title">Πρόβλημα πρόσβασης στον αποθηκευτικό χώρο</string>
     <string name="dialog_error_storage_message">Ο εξωτερικός απθηκευτικός χώρος δεν είναι διαθέσιμος, πιθανότατα έχει αφαιρεθεί η κάρτα SD, είναι κατεστραμμένη ή το σύστημα αρχείων είναι μόνο για ανάγνωση. Ελέγξτε το και επικοινωνήστε μαζί μας στη διεύθυνση support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Εξομείωση κακού αποθηκευτικού χώρου</string>

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

@@ -60,6 +60,8 @@
     <string name="osm_presentation">Datos de OpenStreetMap creados por la comunidad a partir de %s. Obtenga más información sobre cómo editar y actualizar el mapa en OpenStreetMap.org</string>
     <string name="placepage_add_place_button">Agregar lugar a OpenStreetMap</string>
     <string name="transliteration_title">Transliteración al alfabeto latino</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Inicie sesión en OpenStreetMap para cargar automáticamente todas las ediciones de su mapa. Obtenga más información <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
     <string name="dialog_error_storage_title">Problema de acceso al almacenamiento</string>
     <string name="dialog_error_storage_message">El almacenamiento externo no está disponible. Es posible que se haya quitado o dañado la tarjeta SD, o que el sistema de archivos solo permita la lectura. Revíselo y escríbanos a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular el almacenamiento dañado</string>

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

@@ -598,11 +598,13 @@
     <string name="button_plan">Planificar</string>
     <string name="placepage_remove_stop">Eliminar parada</string>
     <string name="placepage_add_stop">Añadir parada</string>
-    <string name="dialog_error_storage_title">Error de acceso al almacenamiento</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="dialog_error_storage_message">El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébalo ó escríbenos a support@comaps.app</string>
+    <string name="alert_reauth_message">Inicia sesión en OpenStreetMap para cargar automáticamente todas tus ediciones de mapas. Más información <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
+    <string name="dialog_error_storage_title">Problema de acceso al almacenamiento</string>
+    <string name="dialog_error_storage_message">El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébelo ó escríbanos a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular almacenamiento dañado</string>
     <string name="core_entrance">Entrada</string>
-    <string name="error_enter_correct_name">Por favor, introduce un nombre válido</string>
+    <string name="error_enter_correct_name">Por favor, introduzca el nombre correcto</string>
     <string name="bookmark_lists">Listas</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Ocultar todo</string>
@@ -646,7 +648,7 @@
     <string name="layers_title">Estilos y capas del mapa</string>
     <string name="subway_data_unavailable">El mapa del metro no está disponible</string>
     <string name="bookmarks_empty_list_title">Esta lista está vacía</string>
-    <string name="bookmarks_empty_list_message">Para agregar un marcador, toca un lugar en el mapa y después toca el icono de la estrella</string>
+    <string name="bookmarks_empty_list_message">Para agregar un marcador, toque un lugar en el mapa y después toque el icono de la estrella</string>
     <string name="category_desc_more">…más</string>
     <string name="export_file">Exportar KMZ</string>
     <string name="export_file_gpx">Exportar GPX</string>
@@ -729,10 +731,10 @@
     <string name="mountains">Montañas</string>
     <string name="animals">Animales</string>
     <string name="hotels">Hoteles</string>
-    <string name="buildings">Edificaciones</string>
+    <string name="buildings">Edificios</string>
     <string name="money">Dinero</string>
     <string name="shops">Tiendas</string>
-    <string name="parkings">Aparcamiento</string>
+    <string name="parkings">Estacionamiento</string>
     <string name="fuel_places">Gasolineras</string>
     <string name="medicine">Medicina</string>
     <string name="search_in_the_list">Buscar en la lista</string>
@@ -768,7 +770,7 @@
     <!-- A preference title; keep short! -->
     <string name="enable_show_on_lock_screen">Mostrar en la pantalla de bloqueo</string>
     <!-- Description in preferences -->
-    <string name="enable_show_on_lock_screen_description">Cuando se activa, no tienes que desbloquear el dispositivo para ejecutar la aplicación.</string>
+    <string name="enable_show_on_lock_screen_description">Cuando se activa, no tiene que desbloquear el dispositivo para ejecutar la aplicación.</string>
     <!-- Current language of the map! -->
     <string name="change_map_locale">Idioma del mapa</string>
     <!-- OpenStreetMap text on splash screen -->
@@ -782,27 +784,27 @@
     <!-- App Tip #00 -->
     <string name="app_tip_00">¡Gracias por utilizar nuestros mapas creados por la comunidad!</string>
     <!-- App tip #01 -->
-    <string name="app_tip_01">¡Con tus donaciones y apoyo, podemos crear los mejores mapas del mundo!</string>
+    <string name="app_tip_01">¡Con sus donaciones y apoyo, podemos crear los mejores mapas del mundo!</string>
     <!-- App tip #02 -->
-    <string name="app_tip_02">¿Te gusta nuestra aplicación? ¡Por favor dona para apoyar su desarrollo! ¿Todavía no te gusta? ¡Dinos por qué y lo arreglaremos!</string>
+    <string name="app_tip_02">¿Le gusta nuestra aplicación? ¡Por favor done para apoyar su desarrollo! ¿Todavía no le gusta? ¡Díganos por qué y lo arreglaremos!</string>
     <!-- App tip #03 -->
     <string name="app_tip_03">Si conoce a algún desarrollador o desarrolladora de software, le puede pedir que implemente alguna funcionalidad que usted necesite.</string>
     <!-- App tip #04 -->
-    <string name="app_tip_04">Toca en cualquier lugar del mapa para seleccionar cualquier elemento. Manten pulsado para ocultar y volver a mostrar la interfaz.</string>
+    <string name="app_tip_04">Toque en cualquier lugar del mapa para seleccionar cualquier elemento. Mantenga pulsado para ocultar y volver a mostrar la interfaz.</string>
     <!-- App tip #05 -->
-    <string name="app_tip_05">¿Sabías que tu ubicación actual en el mapa se puede seleccionar?</string>
+    <string name="app_tip_05">¿Sabía que su ubicación actual en el mapa se puede seleccionar?</string>
     <!-- App tip #06 -->
-    <string name="app_tip_06">Puedes ayudar a traducir nuestra aplicación a tu idioma.</string>
+    <string name="app_tip_06">Puede ayudar a traducir nuestra aplicación a su idioma.</string>
     <!-- App tip #07 -->
     <string name="app_tip_07">Nuestra aplicación está desarrollada por unos pocos entusiastas y la comunidad.</string>
     <!-- App tip #08 -->
-    <string name="app_tip_08">Puedes arreglar y mejorar fácilmente los datos del mapa.</string>
+    <string name="app_tip_08">Puede arreglar y mejorar fácilmente los datos del mapa.</string>
     <!-- App tip #09 -->
-    <string name="app_tip_09">Nuestro principal objetivo es crear mapas rápidos, centrados en la privacidad y fáciles de utilizar, que te encantarán.</string>
+    <string name="app_tip_09">Nuestro principal objetivo es crear mapas rápidos, centrados en la privacidad y fáciles de utilizar que le encantarán.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Ahora estás usando CoMaps en la pantalla del teléfono</string>
+    <string name="car_used_on_the_phone_screen">Ahora usa CoMaps en la pantalla del teléfono</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Ahora estás usando CoMaps en la pantalla del coche</string>
+    <string name="car_used_on_the_car_screen">Ahora usa CoMaps en la pantalla del coche</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Se ha conectado a Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -810,9 +812,9 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">A la pantalla del coche</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">CoMaps necesita acceder a la ubicación. Cuando sea seguro, comprueba la notificación en el teléfono.</string>
+    <string name="aa_location_permissions_request">CoMaps necesita acceder a la ubicación. Cuando sea seguro, compruebe la notificación en el teléfono.</string>
     <!-- Notification title for permission request from AA. -->
-    <string name="aa_request_permission_notification">Esta aplicación necesita tu permiso</string>
+    <string name="aa_request_permission_notification">Esta aplicación necesita su permiso</string>
     <!-- The text in the activity for location permission request. -->
     <string name="aa_request_permission_activity_text">CoMaps en Android Auto necesita permiso de ubicación para funcionar eficazmente</string>
     <!-- Grant Permissions button. -->
@@ -823,7 +825,7 @@
     <string name="browser_not_available">El navegador web no está disponible</string>
     <string name="volume">Volumen</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exportar todos los marcadores y trazas</string>
+    <string name="bookmarks_export">Exportar todos los marcadores y trayectos</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Configuración de síntesis de voz del sistema</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -924,6 +926,4 @@
     <string name="open_now">Abierto ahora</string>
     <string name="closed_now">Cerrado ahora</string>
     <string name="at">a las %s</string>
-    <string name="osm_note_hint">O, como alternativa, deja una nota a la comunidad de OpenStreetMap para que alguien lo agregue o arregle.</string>
-    <string name="osm_note_toast">Una nota será enviada a OpenStreetMap</string>
 </resources>

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

@@ -322,19 +322,19 @@
     <string name="type.cuisine.noodles">Fideos</string>
     <string name="type.cuisine.oriental">Oriental</string>
     <string name="type.cuisine.pancake">Tortitas</string>
-    <string name="type.cuisine.pasta">Pasta</string>
+    <string name="type.cuisine.pasta">Pastas</string>
     <string name="type.cuisine.persian">Persa</string>
     <string name="type.cuisine.peruvian">Peruana</string>
     <string name="type.cuisine.pizza">Pizzas</string>
     <string name="type.cuisine.polish">Polaca</string>
     <string name="type.cuisine.portuguese">Portuguesa</string>
     <string name="type.cuisine.ramen">Ramen</string>
-    <string name="type.cuisine.regional">Regional</string>
+    <string name="type.cuisine.regional">Cocina regional</string>
     <string name="type.cuisine.russian">Rusa</string>
     <string name="type.cuisine.sandwich">Sándwiches</string>
     <string name="type.cuisine.sausage">Salchichas</string>
     <string name="type.cuisine.savory_pancakes">Tortitas saladas</string>
-    <string name="type.cuisine.seafood">del mar</string>
+    <string name="type.cuisine.seafood">Mariscos</string>
     <string name="type.cuisine.soba">Soba</string>
     <string name="type.cuisine.spanish">Española</string>
     <string name="type.cuisine.steak_house">Asador</string>
@@ -373,10 +373,10 @@
     <string name="type.healthcare.speech_therapist">Logopedia</string>
     <!-- SECTION: Types: Roads -->
     <string name="type.highway">Carretera</string>
-    <string name="type.highway.bridleway">Camino ecuestre</string>
+    <string name="type.highway.bridleway">Camino de caballos</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.bridleway.bridge">Puente</string>
-    <string name="type.highway.bridleway.permissive">Camino ecuestre</string>
+    <string name="type.highway.bridleway.permissive">Camino de caballos</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.bridleway.tunnel">Túnel</string>
     <string name="type.highway.busway">Carretera exclusiva para autobuses</string>
@@ -384,7 +384,7 @@
     <string name="type.highway.busway.bridge">Puente</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.busway.tunnel">Túnel</string>
-    <string name="type.highway.bus_stop">Parada de bus</string>
+    <string name="type.highway.bus_stop">Parada de autobús</string>
     <string name="type.highway.construction">Vía en construcción</string>
     <string name="type.highway.cycleway">Ciclovía</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
@@ -440,7 +440,7 @@
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.primary.bridge">Puente</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.primary.tunnel">Túnel</string>
+    <string name="type.highway.primary.tunnel">Túnel de carretera principal</string>
     <string name="type.highway.primary_link">Enlace de carretera principal</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.primary_link.bridge">Puente</string>
@@ -788,18 +788,18 @@
     <string name="type.power.generator">Generador</string>
     <string name="type.power.generator.solar">Generador solar</string>
     <string name="type.power.generator.wind">Generador de viento</string>
-    <string name="type.power.generator.gas">Planta termoeléctrica de gas</string>
+    <string name="type.power.generator.gas">Planta de energía de turbina de gas</string>
-    <string name="type.power.generator.hydro">Planta hidroeléctrica</string>
+    <string name="type.power.generator.hydro">Planta de energía hidroeléctrica</string>
     <string name="type.power.line">Línea eléctrica</string>
     <string name="type.power.line.underground">Línea eléctrica subterránea</string>
-    <string name="type.power.minor_line">Línea eléctrica menor</string>
+    <string name="type.power.minor_line">Línea eléctrica de baja tensión</string>
-    <string name="type.power.plant">Planta eléctrica</string>
+    <string name="type.power.plant">Planta de energía</string>
     <string name="type.power.plant.coal">Central eléctrica de carbón</string>
-    <string name="type.power.plant.gas">Planta termoeléctrica de gas</string>
+    <string name="type.power.plant.gas">Planta de energía de turbina de gas</string>
-    <string name="type.power.plant.hydro">Planta hidroeléctrica</string>
+    <string name="type.power.plant.hydro">Planta de energía hidroeléctrica</string>
     <string name="type.power.plant.solar">Planta de energía solar</string>
     <string name="type.power.plant.wind">Planta eólica</string>
-    <string name="type.power.substation">Subestación</string>
+    <string name="type.power.substation">Subestación eléctrica</string>
     <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Torre eléctrica</string>
     <string name="type.public_transport">Transporte público</string>
@@ -813,9 +813,9 @@
     <string name="type.railway.halt">Punto de parada</string>
     <string name="type.railway.level_crossing">Cruce a nivel</string>
     <string name="type.railway.light_rail">Tren ligero</string>
-    <string name="type.railway.monorail">Monorriel</string>
+    <string name="type.railway.monorail">Monorraíl</string>
     <string name="type.railway.narrow_gauge">Vía férrea estrecha</string>
-    <string name="type.railway.platform">Plataforma ferroviaria</string>
+    <string name="type.railway.platform">Plataforma de vía férrea</string>
     <string name="type.railway.rail">Ferrocarril</string>
     <string name="type.railway.rail.highspeed">Ferrocarril de alta velocidad</string>
     <string name="type.railway.rail.tourism">Ferrocarril turístico</string>
@@ -1147,7 +1147,7 @@
     <string name="type.shop.mobile_phone">Tienda de Móviles</string>
     <string name="type.shop.money_lender">Prestamista</string>
     <string name="type.shop.motorcycle">Tienda de motos</string>
-    <string name="type.shop.motorcycle_repair">Taller de motos</string>
+    <string name="type.shop.motorcycle_repair">Reparación de motos</string>
     <string name="type.shop.music">Tienda de discos</string>
     <string name="type.shop.musical_instrument">Instrumentos musicales</string>
     <string name="type.shop.newsagent">Puesto de venta de periódicos</string>
@@ -1165,7 +1165,7 @@
     <string name="type.shop.seafood">Pescadería</string>
     <string name="type.shop.second_hand">Tienda de segunda mano</string>
     <string name="type.shop.shoes">Zapatería</string>
-    <string name="type.shop.sports">Tienda deportiva</string>
+    <string name="type.shop.sports">Artículos de deporte</string>
     <string name="type.shop.stationery">Papelería</string>
     <string name="type.shop.supermarket">Supermercado</string>
     <string name="type.shop.tattoo">Estudio de tatuajes</string>
@@ -1362,8 +1362,8 @@
     <string name="type.railway.funicular.bridge">Puente de funicular</string>
     <string name="type.railway.funicular.tunnel">Túnel de funicular</string>
     <string name="type.railway.light_rail.tunnel">Túnel de tren ligero</string>
-    <string name="type.railway.monorail.bridge">Puente de monorriel</string>
+    <string name="type.railway.monorail.bridge">Puente de monorraíl</string>
-    <string name="type.railway.monorail.tunnel">Túnel de monorriel</string>
+    <string name="type.railway.monorail.tunnel">Túnel de monorraíl</string>
     <string name="type.railway.narrow_gauge.bridge">Puente de vía férrea estrecha</string>
     <string name="type.railway.preserved">Raíl conservado</string>
     <string name="type.fee.yes">$</string>

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

@@ -590,6 +590,8 @@
     <string name="button_plan">Kavanda</string>
     <string name="placepage_remove_stop">Eemalda peatus</string>
     <string name="placepage_add_stop">Lisa peatus</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Oma kaastöö automaatseks üleslaadimiseks palun logi OpenStreetMappi sisse. Lisateave <a href="https://github.com/organicmaps/organicmaps/issues/6144">leidub siin</a>.</string>
     <string name="dialog_error_storage_title">Andmeruumi ligipääsu probleem</string>
     <string name="dialog_error_storage_message">Väline andmeruum pole juurdepääsetav. SD-kaart võib olla eemaldatud, kahjustatud või failisüsteem on kirjutuskaitstud. Palun kontrolli oma SD-kaarti või võta meiega ühendust aadressil support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Imiteeri vigast andmeruumi</string>
@@ -914,6 +916,4 @@
     <string name="open_now">Hetkel avatud</string>
     <string name="at">kell %s</string>
     <string name="closed_now">Praegu suletud</string>
-    <string name="osm_note_toast">Märge salvestatakse OpenStreetMapi andmebaasi</string>
-    <string name="osm_note_hint">Või alternatiivina jäta märge OpenStreetMapi kogukonnale ja keegi teine saab selle koha andmed parandada või uue lisada.</string>
 </resources>

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

@@ -74,7 +74,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Markagailuak</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Markagailuak eta arrastoak</string>
+    <string name="bookmarks_and_tracks">Markagailuak eta ibilbideak</string>
     <!-- Default bookmark list name -->
     <string name="core_my_places">Nire tokiak</string>
     <!-- Add bookmark dialog - bookmark name -->
@@ -203,7 +203,7 @@
     <!-- Confirmation for OpenStreetMap log out. -->
     <string name="osm_log_out_confirmation">Ziur zure OpenStreetMap kontutik saioa amaitu nahi duzula?</string>
     <!-- Title for tracks category in bookmarks manager -->
-    <string name="tracks_title">Arrastoak</string>
+    <string name="tracks_title">Arrasto</string>
     <!-- Length of track in cell that describes route -->
     <string name="length">Luzera</string>
     <string name="share_my_location">Partekatu nire kokapena</string>
@@ -559,7 +559,7 @@
     <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editoreek aldaketak egiaztatuko dituzte eta zurekin harremanetan jarriko dira zalantzaren bat izanez gero.</string>
     <string name="navigation_stop_button">Gelditu</string>
     <!-- Shown as toast when starting the recent track recording -->
-    <string name="track_recording">Arrastoa grabatzea</string>
+    <string name="track_recording">Ibilbidea grabatzea</string>
     <!-- For the first routing -->
     <string name="accept">Onartu</string>
     <!-- For the first routing -->
@@ -596,6 +596,8 @@
     <string name="button_plan">Planifikatu</string>
     <string name="placepage_remove_stop">Kendu geltokia</string>
     <string name="placepage_add_stop">Gehitu geltokia</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Hasi saioa OpenStreetMap-en zure mapen aldaketa guztiak automatikoki kargatzeko. Lortu informazio gehiago <a href="https://github.com/organicmaps/organicmaps/issues/6144">hemen</a>.</string>
     <string name="dialog_error_storage_title">Biltegiratze sarbidearen arazoa</string>
     <string name="dialog_error_storage_message">Kanpoko biltegiratzea ez dago erabilgarri; Baliteke SD txartela kendu edo hondatuta egotea, edo fitxategi sistema irakurtzeko soilik izatea. Mesedez, begiratu edo idatzi iezaguzu support@comaps.app helbidera</string>
     <string name="setting_emulate_bad_storage">Emulatu kaltetutako biltegiratzea</string>
@@ -611,7 +613,7 @@
     </plurals>
     <string name="bookmarks_create_new_group">Sortu zerrenda berria</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Inportatu markagailuak eta arrastoak</string>
+    <string name="bookmarks_import">Inportatu markagailuak eta ibilbideak</string>
     <string name="bookmarks_error_message_share_general">Ezin izan da partekatu aplikazioaren errore baten ondorioz</string>
     <string name="bookmarks_error_title_share_empty">Partekatzeak huts egin du</string>
     <string name="bookmarks_error_message_share_empty">Ezin da partekatu zerrenda hutsik</string>
@@ -629,8 +631,8 @@
     </plurals>
     <string name="restore">Berreskuratu</string>
     <plurals name="tracks">
-        <item quantity="one">arrasto %d</item>
+        <item quantity="one">%d arrasto</item>
-        <item quantity="other">%d arrasto</item>
+        <item quantity="other">%d arrastos</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Pribatutasuna</string>
@@ -814,7 +816,7 @@
     <string name="browser_not_available">Web arakatzailea ez dago erabilgarri</string>
     <string name="volume">Bolumena</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Esportatu markagailu eta arrasto guztiak</string>
+    <string name="bookmarks_export">Esportatu Laster-marka eta Pista guztiak</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Sistemaren ahots-sintesiaren ezarpenak</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -838,17 +840,17 @@
     <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
     <string name="power_save_dialog_summary">Nabigazio zehatzena lortzeko, telefonoaren bateriaren ezarpenetan energia aurrezteko modua desgaitzea gomendatzen dugu.</string>
     <!-- Prompt to start recording a track. -->
-    <string name="start_track_recording">Grabatu arrastoa</string>
+    <string name="start_track_recording">Ibilbidearen grabaketa</string>
     <!-- Prompt for stopping a track recording. -->
-    <string name="stop_track_recording">Gelditu arrastoaren grabaketa</string>
+    <string name="stop_track_recording">Gelditu ibilbidearen grabaketa</string>
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="stop_without_saving">Gelditu gorde gabe</string>
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Jarraitu grabatzen</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Markagailu eta arrastoetan gorde nahi duzu?</string>
+    <string name="track_recording_alert_title">Ibilbidearen grabaketa markagailuetan eta ibilbideetan gorde nahi duzu?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
-    <string name="track_recording_toast_nothing_to_save">Arrastoa hutsik dago; ez dago ezer gordetzeko</string>
+    <string name="track_recording_toast_nothing_to_save">Ibilbidea hutsik dago; ez dago ezer gordetzeko</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">Ezin da karpeta hautatzeko elkarrizketa-koadroa erakutsi zure gailuan ez dagoelako aplikazio egokirik instalatuta. Instalatu fitxategi-kudeatzaile aplikazio bat eta saiatu berriro.</string>
     <string name="choose_color">Aukeratu kolorea</string>
@@ -907,7 +909,7 @@
     <string name="backup_interval_every_week">Astero</string>
     <string name="backup_interval_manual_only">Itzalita (eskuz bakarrik)</string>
     <string name="pref_backup_title">Markagailu eta arrastoen babeskopia</string>
-    <string name="pref_backup_summary">Automatikoki egin babeskopia zure gailuan</string>
+    <string name="pref_backup_summary">Egin babeskopia zure gailuan automatikoki</string>
     <string name="pref_backup_now_summary_folder_unavailable">Babeskopiaren karpeta ez dago eskuragarri</string>
     <string name="dialog_report_error_missing_folder">Babeskopiarako hautatutako kokapena ez dago eskuragarri edo ezin da idatzi. Hautatu beste kokapen bat.</string>
     <string name="pref_backup_now_summary_progress">Babeskopia egiten…</string>

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

@@ -484,12 +484,12 @@
     <string name="type.highway.tertiary_link.bridge">Zubia</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.tertiary_link.tunnel">Tunel</string>
-    <string name="type.highway.track">Arrastoa</string>
+    <string name="type.highway.track">Kalea</string>
-    <string name="type.highway.track.area">Arrastoa</string>
+    <string name="type.highway.track.area">Kalea</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.track.bridge">Zubia</string>
-    <string name="type.highway.track.grade1">Arrastoa</string>
+    <string name="type.highway.track.grade1">Kalea</string>
-    <string name="type.highway.track.no.access">Arrastoa</string>
+    <string name="type.highway.track.no.access">Kalea</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.track.tunnel">Tunel</string>
     <string name="type.highway.traffic_signals">Semaforoak</string>
@@ -521,7 +521,7 @@
     <string name="type.area_highway.service">Kalea</string>
     <string name="type.area_highway.tertiary">Kalea</string>
     <string name="type.area_highway.steps">Bidea</string>
-    <string name="type.area_highway.track">Arrastoa</string>
+    <string name="type.area_highway.track">Kalea</string>
     <string name="type.area_highway.trunk">Kalea</string>
     <string name="type.area_highway.unclassified">Kalea</string>
     <!-- SECTION: Types: Historic -->
@@ -749,7 +749,7 @@
     <string name="type.railway.rail.utility">Erabilgarritasun trena</string>
     <string name="type.railway.rail.spur">Trenbide-spur</string>
     <!-- Short service tracks: siding, yard, crossover. -->
-    <string name="type.railway.rail.service">Zerbitzuko trenbidea</string>
+    <string name="type.railway.rail.service">Trenbide laguntzailea</string>
     <string name="type.railway.rail.bridge">Trenbide zubia</string>
     <string name="type.railway.rail.highspeed.bridge">Trenbide zubia</string>
     <string name="type.railway.rail.tourism.bridge">Trenbide zubia</string>
@@ -1274,8 +1274,8 @@
     <string name="type.landuse.military">Militar-gunea</string>
     <string name="type.leisure.recreation_ground">Parkea</string>
     <string name="type.leisure.slipway">Arrapala</string>
-    <string name="type.leisure.track">Arrastoa</string>
+    <string name="type.leisure.track">Pista</string>
-    <string name="type.leisure.track.area">Arrastoa</string>
+    <string name="type.leisure.track.area">Pista</string>
     <string name="type.landuse.plant_nursery">Landare haztegia</string>
     <string name="type.leisure.firepit">Su-ontzi</string>
     <string name="type.man_made.breakwater">Dike</string>

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

@@ -560,6 +560,8 @@
     <string name="button_plan">برنامه</string>
     <string name="placepage_remove_stop">توقف را حذف کنید</string>
     <string name="placepage_add_stop">اضافه کردن توقف</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">لطفاً به OpenStreetMap وارد شوید تا به طور خودکار تمام ویرایش های نقشه خود را آپلود کنید. <a href="https://github.com/organicmaps/organicmaps/issues/6144">اینجا</a> بیشتر بیاموزید.</string>
     <string name="dialog_error_storage_title">مشکل دسترسی به ذخیره‌سازی</string>
     <string name="dialog_error_storage_message">ذخیره سازی خارجی در دسترس نیست کارت SD ممکن است برداشته شده باشد، آسیب دیده باشد یا سیستم فایل فقط خواندنی باشد. لطفا کارت SD خود را بررسی کنید یا با ما در support@comaps.app تماس بگیرید</string>
     <string name="setting_emulate_bad_storage">شبیه سازی ذخیره سازی بد</string>

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

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- SECTION: Types -->
-    <string name="type.addr_interpolation">نشانی/بست</string>
+    <string name="type.addr_interpolation">آدرس/بلاک</string>
-    <string name="type.addr_interpolation.even">نشانی/بست</string>
+    <string name="type.addr_interpolation.even">آدرس/بلاک</string>
-    <string name="type.addr_interpolation.odd">نشانی/بست</string>
+    <string name="type.addr_interpolation.odd">آدرس/بلاک</string>
     <string name="type.aeroway.aerodrome">فرودگاه</string>
-    <string name="type.aeroway.aerodrome.international">فرودگاه فرامرزی</string>
+    <string name="type.aeroway.aerodrome.international">فرودگاه</string>
-    <string name="type.aeroway.helipad">بالگَردنشین</string>
+    <string name="type.aeroway.helipad">پد فرود بالگرد</string>
-    <string name="type.amenity">امکانات آسایشی</string>
+    <string name="type.amenity">زیر ساخت</string>
-    <string name="type.amenity.arts_centre">کانون هنری</string>
+    <string name="type.amenity.arts_centre">مرکز هنری</string>
     <string name="type.amenity.atm">خودپرداز</string>
     <string name="type.amenity.bank">بانک</string>
-    <string name="type.amenity.bar">می‌کده</string>
+    <string name="type.amenity.bar">میکده</string>
-    <string name="type.amenity.bbq">اَدیشت کباب</string>
+    <string name="type.amenity.bbq">منقل کباب</string>
-    <string name="type.amenity.bench">نیمکت</string>
+    <string name="type.amenity.bench">سَکو</string>
-    <string name="type.amenity.bicycle_parking">ایستگاه دوچرخه</string>
+    <string name="type.amenity.bicycle_parking">پارکینگ دوچرخه</string>
-    <string name="type.amenity.bicycle_rental">جایگاه کرایه دوچرخه</string>
+    <string name="type.amenity.bicycle_rental">مکان اجاره دوچرخه</string>
     <string name="type.amenity.bicycle_repair_station">ایستگاه تعمیر دوچرخه</string>
     <string name="type.amenity.biergarten">غذا</string>
     <string name="type.amenity.brothel">فاحشه خانه</string>
@@ -1092,13 +1092,8 @@
     <string name="type.leisure.sports_hall">سالن ورزشی</string>
     <string name="type.man_made.silo">سیلو</string>
     <string name="type.man_made.storage_tank">مخازن سیال</string>
-    <string name="type.aerialway.cable_car">خودردو کابلی</string>
+    <string name="type.aerialway.cable_car">ماشین کابلی</string>
-    <string name="type.aerialway.station">ایستگاه راه‌هوایی</string>
+    <string name="type.aerialway.station">ایستگاه راه هوایی</string>
-    <string name="type.aeroway">زیرساخت مرز‌هوایی</string>
+    <string name="type.aeroway">­زیرساخت هوا و فضا</string>
     <string name="type.aerialway">راه هوایی</string>
-    <string name="type.amenity.bicycle_parking.covered">ایستگاه پوشیده‌ی دوچرخه</string>
-    <string name="type.aeroway.apron">پیشگاه</string>
-    <string name="type.aeroway.gate">دروازه</string>
-    <string name="type.aeroway.taxiway">رج وزیگ</string>
-    <string name="type.aeroway.terminal">پایانه</string>
 </resources>

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

@@ -600,6 +600,8 @@
     <string name="button_plan">Suunnittele</string>
     <string name="placepage_remove_stop">Poista pysähdys</string>
     <string name="placepage_add_stop">Lisää pysähdys</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Kirjaudu sisään OpenStreetMapiin, jotta voit ladata kaikki karttamuutoksesi automaattisesti. Lisätietoja <a href="https://github.com/organicmaps/organicmaps/issues/6144">täältä</a>.</string>
     <string name="dialog_error_storage_title">Ongelma tallennustilan käyttämisessä</string>
     <string name="dialog_error_storage_message">Ulkoinen tallennustila ei ole käytettävissä, SD-kortti on luultavasti poistettu tai vahingoittunut tai tiedostojärjestelmä on vain luku -tilassa. Tarkista SD-kortin toiminta tai ota yhteyttä osoitteeseen support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Jäljittele virheellistä tallennustilaa</string>
@@ -919,6 +921,4 @@
     <string name="open_now">Auki nyt</string>
     <string name="closed_now">Suljettu nyt</string>
     <string name="at">kello %s</string>
-    <string name="osm_note_toast">Huomio lähetetään OpenStreetMap:iin</string>
-    <string name="osm_note_hint">Vaihtoehtoisesti voit jättää huomion OpenStreetMap yhteisölle, jotta joku muu voi lisätä tai korjata paikan tiedot.</string>
 </resources>

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

@@ -602,6 +602,8 @@
     <string name="button_plan">Planifier</string>
     <string name="placepage_remove_stop">Supprimer l\'arrêt</string>
     <string name="placepage_add_stop">Ajouter un arrêt</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Connecte-toi à OpenStreetMap pour télécharger automatiquement toutes tes modifications de cartes. En savoir plus <a href="https://github.com/organicmaps/organicmaps/issues/6144">ici</a>.</string>
     <string name="dialog_error_storage_title">Problème d\'accès au stockage</string>
     <string name="dialog_error_storage_message">Le stockage externe n\'est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier votre carte SD ou nous contacter via support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Émuler le mauvais stockage</string>
@@ -925,6 +927,4 @@
     <string name="dialog_report_error_with_logs">Veuillez nous envoyer un rapport d\'erreur :\n - \"Activer la journalisation\" dans les paramètres\n - reproduire le problème\n - dans l\'écran \"À propos &amp; Help\", appuyez sur le bouton \"SIGNAER UN BUG\" et envoyez-le par e-mail ou par chat\n - désactiver la journalisation</string>
     <string name="pref_backup_now_summary">Créer une sauvegarde immédiatement</string>
     <string name="at">à %s</string>
-    <string name="osm_note_hint">Sinon, laissez une note à la communauté OpenStreetMap pour que quelqu\'un d\'autre puisse ajouter ou corriger ce lieu.</string>
-    <string name="osm_note_toast">La note va être envoyée à OpenStreetMap</string>
 </resources>

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

@@ -402,6 +402,7 @@
     <string name="planning_route_manage_route">Administrar roteiro</string>
     <string name="placepage_remove_stop">Eliminar parada</string>
     <string name="placepage_add_stop">Engadir parada</string>
+    <string name="alert_reauth_message">Por favor, Inicia sesión en OpenStreetMap para cargar automaticamente todas as túas edicións de mapas. Más información <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
     <string name="dialog_error_storage_title">Problema de acceso ao almacenamento</string>
     <string name="dialog_error_storage_message">Non se pode acceder ao almacenamento externo. É posible que a tarxeta SD fose eliminada, danada ou que o sistema de ficheiros sexa só de lectura. Comprobe a súa tarxeta SD ou póñase en contacto connosco en support@comaps.app</string>
     <string name="error_enter_correct_name">Por favor, introduza o nome correcto</string>
@@ -638,6 +639,4 @@
     <string name="open_now">Aberto agora</string>
     <string name="closed_now">Agora Fechado</string>
     <string name="at">ás %s</string>
-    <string name="osm_note_hint">Ou, de xeito alternativo, deixarlle unha nota á comunidade OpenStreetMap para que alguén poida engadir ou arranxar a localización.</string>
-    <string name="osm_note_toast">Enviarase unha nota a OpenStreetMap</string>
 </resources>

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

@@ -81,6 +81,7 @@
     <string name="dialog_report_error_with_logs">Bitte schick eus en Fehlerbricht:\n - i de Iistellige \"Protokollierig aktiviere\"\n - s Problem reproduziere\n - im Bildschirm \"Über &amp; Hilf\" drück de \"App-Fehler melde\"-Chnopf und schicks via E-Mail oder Chat\n - d Protokollierig deaktiviere</string>
     <string name="route_type">Routetyp</string>
     <string name="routing_add_start_point">Nutz d Suechi oder tipp uf d Charte, zum en Routestartpunkt hinzuezfüege</string>
+    <string name="alert_reauth_message">Bitte meld dich vi OpenStreetMap aa, zum all dini Chartebearbeitige automatisch ufezlade. Erfahr <a href="https://github.com/organicmaps/organicmaps/issues/6144">da</a> meh.</string>
     <string name="error_enter_correct_name">Bitte gib en korrekte Name ii</string>
     <string name="bookmark_lists_hide_all">Alli uusblende</string>
     <plurals name="bookmarks_places">
@@ -638,6 +639,4 @@
     <string name="open_now">Jetzt offe</string>
     <string name="closed_now">Jetzt zue</string>
     <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>
 </resources>

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

@@ -423,6 +423,8 @@
     <string name="routing_add_finish_point">गंतव्य बिंदु जोड़ने के लिए खोज का उपयोग करें या मानचित्र पर टैप करें</string>
     <string name="planning_route_manage_route">मार्ग प्रबंधित करें</string>
     <string name="placepage_add_stop">गंतव्य जोड़ें</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">कृपया अपने सभी मानचित्र संपादनों को स्वचालित रूप से अपलोड करने के लिए OpenStreetMap पर लॉगिन करें। अधिक जानें <a href="https://github.com/organicmaps/organicmaps/issues/6144">यहां</a>।</string>
     <string name="bookmark_lists">सूचियों</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">सभी को छिपाएं</string>

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

@@ -576,6 +576,8 @@
     <string name="button_plan">Tervezés</string>
     <string name="placepage_remove_stop">Megálló eltávolítása</string>
     <string name="placepage_add_stop">Köztes célpont hozzáadása</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Jelentkezzen be az OpenStreetMap rendszerébe, hogy automatikusan feltölthesse az összes térképszerkesztését. További információ <a href="https://github.com/organicmaps/organicmaps/issues/6144">itt</a>.</string>
     <string name="dialog_error_storage_title">Tárhelyhozzáférési probléma</string>
     <string name="dialog_error_storage_message">Külső tárhely nem áll rendelkezésre, valószínűleg az SD-kártyát eltávolították vagy sérült, vagy rendszerfájl csak olvasható. Ellenőrizze, és lépjen kapcsolatba velünk a support@comaps.app címen</string>
     <string name="setting_emulate_bad_storage">Sérült tároló emulálása</string>

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

@@ -565,6 +565,8 @@
     <string name="button_plan">Rencana</string>
     <string name="placepage_remove_stop">Hapus pemberhentian</string>
     <string name="placepage_add_stop">Tambah perhentian</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Silahkan login ke OpenStreetMap untuk mengupload semua hasil edit peta Anda secara otomatis. Pelajari lebih lanjut <a href="https://github.com/organicmaps/organicmaps/issues/6144">di sini</a>.</string>
     <string name="dialog_error_storage_title">Masalah akses penyimpanan</string>
     <string name="dialog_error_storage_message">Penyimpanan eksternal tidak tersedia, mungkin Kartu SD sudah dilepaskan, rusak, atau sistem berkasnya hanya dapat dibaca. Silakan periksa dan beri tahu kami di alamat support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulasi penyimpanan yang buruk</string>

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

@@ -506,6 +506,7 @@
     <string name="car_used_on_the_phone_screen">Þú ert núna að nota CoMaps á símaskjánum</string>
     <string name="aa_request_permission_activity_text">CoMaps í Android Auto þarf heimildir fyrir staðsetningar til að virka eðlilega</string>
     <string name="routing_add_finish_point">Notaðu leit eða ýttu á kortið til að bæta við áfangastað</string>
+    <string name="alert_reauth_message">Skráðu þig inn á OpenStreetMap til að senda sjálfkrafa inn allar breytingar þínar á kortinu. Kannaðu þetta nánar <a href="https://github.com/organicmaps/organicmaps/issues/6144">hér</a>.</string>
     <string name="dialog_routing_disclaimer_title">Þegar ferðast er eftir leið, skaltu hafa eftirfarandi í huga:</string>
     <string name="dialog_routing_disclaimer_beware">Vertu vakandi og settu öryggið ofar öllu á vegum úti!</string>
     <string name="dialog_routing_error_location_not_found">Tókst ekki að útbúa leið. Fyrirliggjandi GPS-hnit var ekki hægt að auðkenna.</string>

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

@@ -581,6 +581,8 @@
     <string name="button_plan">Pianifica</string>
     <string name="placepage_remove_stop">Rimuovi sosta</string>
     <string name="placepage_add_stop">Aggiungi sosta</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Accedi a OpenStreetMap per caricare automaticamente tutte le tue modifiche alla mappa. Per saperne di più clicca <a href="https://github.com/organicmaps/organicmaps/issues/6144">qui</a>.</string>
     <string name="dialog_error_storage_title">Problema di accesso alla memoria</string>
     <string name="dialog_error_storage_message">Memoria esterna non disponibile. Probabilmente la scheda SD è stata rimossa, danneggiata o il file system è di sola lettura. Controlla la tua scheda SD o contattaci a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simula memoria danneggiata</string>

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

@@ -587,6 +587,8 @@
     <string name="button_plan">תכנון</string>
     <string name="placepage_remove_stop">הסר עצירה</string>
     <string name="placepage_add_stop">הוסף עצירה</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">התחבר ל-OpenStreetMap כדי להעלות אוטומטית את כל עריכות המפה שלך. למידע נוסף <a href="https://github.com/organicmaps/organicmaps/issues/6144">כאן</a>.</string>
     <string name="dialog_error_storage_title">בעיית גישה לאחסון</string>
     <string name="dialog_error_storage_message">לא ניתן לגשת לאחסון החיצוני. ייתכן כי כרטיס הזיכרון הוסר, נפגם, או שמערכת הקבצים היא לקריאה בלבד. נא לבדוק את כרטיס הזיכרון או ליצור איתנו קשר בכתובת support@comaps.app</string>
     <string name="setting_emulate_bad_storage">בצע אמולציה לאחסון רע</string>

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

@@ -600,6 +600,8 @@
     <string name="button_plan">プラン</string>
     <string name="placepage_remove_stop">停留所を削除</string>
     <string name="placepage_add_stop">中間地点を追加</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">すべてのマップ編集を自動的にアップロードするには、OpenStreetMapにログインしてください。詳しくは <a href="https://github.com/organicmaps/organicmaps/issues/6144">こちら</a>.</string>
     <string name="dialog_error_storage_title">ストレージアクセスの問題</string>
     <string name="dialog_error_storage_message">外部ストレージは使用できません。おそらく SD カードが取り外されたか、破損しているか、あるいはファイルシステムが読み取り専用になっています。SD カードを確認するか、support@comaps.app までご連絡ください</string>
     <string name="setting_emulate_bad_storage">壊れたストレージをシミュレートする</string>

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

@@ -563,6 +563,8 @@
     <string name="button_plan">계획</string>
     <string name="placepage_remove_stop">정류장 제거</string>
     <string name="placepage_add_stop">스톱 추가</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">모든 지도 편집 내용을 자동으로 업로드하려면 OpenStreetMap에 로그인하세요. 자세히 알아보기 <a href="https://github.com/organicmaps/organicmaps/issues/6144">여기</a>.</string>
     <string name="dialog_error_storage_title">저장소 액세스 문제</string>
     <string name="dialog_error_storage_message">외부 저장소를 사용할 수 없습니다. SD 카드가 제거되었거나 손상되었거나 파일 시스템이 읽기 전용일 수 있습니다. 확인 후 support@comaps.app로 문의하세요.</string>
     <string name="setting_emulate_bad_storage">불량 저장소 에뮬레이션</string>

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

@@ -587,6 +587,8 @@
     <string name="button_plan">Planas</string>
     <string name="placepage_remove_stop">Šalinti stotelę</string>
     <string name="placepage_add_stop">Pridėti stotelę</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Prisijunkite prie „OpenStreetMap“, kad galėtumėte automatiškai įkelti visus savo žemėlapio pakeitimus. Išsamesnė informacija – <a href="https://github.com/organicmaps/organicmaps/issues/6144">čia</a>.</string>
     <string name="dialog_error_storage_title">Prieigos prie saugyklos problema</string>
     <string name="dialog_error_storage_message">Išorinė saugykla yra nepasiekiama. SD kortelė galimai yra pašalinta, pažeista, arba failų sistema joje yra nustatyta tik skaitymui. Patikrinkite SD kortelę arba susisiekite su mumis adresu support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuliuoti blogą saugyklą</string>

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

@@ -590,6 +590,8 @@
     <string name="button_plan">Plānot</string>
     <string name="placepage_remove_stop">Noņemt starppunktu</string>
     <string name="placepage_add_stop">Pievienot starppunktu</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Ierakstieties „OpenStreetMap“, lai automātiski augšupielādētu visus kartes rediģējumus. Uzziniet vairāk <a href="https://github.com/organicmaps/organicmaps/issues/6144">te</a>.</string>
     <string name="dialog_error_storage_title">Krātuves pieejas problēma</string>
     <string name="dialog_error_storage_message">Ārējā krātuve nav pieejama. Iespējams, ir izņemta vai bojāta SD karte, vai arī datņu sistēma ir tikai lasāma. Pārbaudiet savu SD karti vai sazinieties ar mums, rakstot uz support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simulēt bojātu krātuvi</string>

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

@@ -562,6 +562,8 @@
     <string name="button_plan">नियोजन</string>
     <string name="placepage_remove_stop">थांबा काढा</string>
     <string name="placepage_add_stop">स्टॉप जोडा</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">तुमची सर्व नकाशा संपादने स्वयंचलितपणे अपलोड करण्यासाठी कृपया OpenStreetMap वर लॉग इन करा. <a href="https://github.com/organicmaps/organicmaps/issues/6144">येथे</a> अधिक जाणून घ्या.</string>
     <string name="dialog_error_storage_title">स्टोरेज प्रवेश समस्या</string>
     <string name="dialog_error_storage_message">बाह्य साठ्याचा प्रवेश अपयशी. SD कार्ड कदाचित काढले गेले असेल, खराब झाले असेल किंवा फाइल सिस्टम ही केवळ-वाचनीय असावी. कृपया, तुमचे SD कार्ड तपासा किंवा support@comaps.app वर आमच्याशी संपर्क साधा</string>
     <string name="setting_emulate_bad_storage">खराब साठ्याचे अनुकरण करा</string>

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

@@ -518,6 +518,7 @@
     <string name="mobile_data_description">L-internet mobbli huwa meħtieġ għan-notifiki tal-aġġornament tal-mapep u għat-tlugħ tal-editjar.</string>
     <string name="bookmarks_error_message_share_empty">Ma tistax tixxerja lista vojta</string>
     <string name="category_desc_more">…aktar</string>
+    <string name="alert_reauth_message">Illoggja f’ OpenStreetMap biex awtomatikament ittella’ l-editjar kollu tal-mappa tiegħek. Tgħallem aktar <a href="https://github.com/organicmaps/organicmaps/issues/6144">hawn</a>.</string>
     <string name="blue_gray">Blu Griż</string>
     <string name="dialog_routing_system_error">Żball fis-sistema</string>
     <string name="level">Livell</string>

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

@@ -598,6 +598,8 @@
     <string name="button_plan">Planlegge</string>
     <string name="placepage_remove_stop">Fjern stopp</string>
     <string name="placepage_add_stop">Angi stopp</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Logg inn på OpenStreetMap for automatisk å laste opp alle kartredigeringene dine. Finn ut mer <a href="https://github.com/organicmaps/organicmaps/issues/6144">her</a>.</string>
     <string name="dialog_error_storage_title">Problemer med tilgang til lagring</string>
     <string name="dialog_error_storage_message">Ekstern lagring er ikke tilgjengelig. Sannsynligvis er SD-kortet fjernet eller skadet eller så er filsystemet skrivebeskyttet. Undersøk og kontakt oss på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulere skadet lagring</string>

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

@@ -1193,5 +1193,4 @@
     <string name="type.leisure.sports_hall">Idrettshall</string>
     <string name="type.leisure.hackerspace">Skaperverksted</string>
     <string name="type.man_made.silo">Silo</string>
-    <string name="type.aeroway">Luftromsinfrastruktur</string>
 </resources>

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="MwmTheme.Night.MainActivity">
-        <item name="android:colorPrimaryDark">@android:color/black</item>
         <item name="colorPrimaryVariant">@android:color/black</item>
         <item name="android:windowBackground">@null</item>
         <item name="android:windowTranslucentNavigation">false</item>

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

@@ -13,7 +13,6 @@
         <item name="android:textColorPrimaryInverse">@color/text_dark</item>
         <item name="android:textColorSecondary">@color/text_light_subtitle</item>
         <item name="android:windowBackground">?windowBackgroundForced</item>
-        <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
         <item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
         <item name="android:fontFamily">@string/robotoRegular</item>
@@ -31,7 +30,6 @@
         <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
         <item name="colorPrimary">@color/bg_primary_night</item>
         <item name="colorControlNormal">?secondary</item>
-        <item name="colorAccent">@color/base_accent_night</item>
         <item name="colorSecondary">@color/base_accent_night</item>
         <item name="colorAccentTransparent">@color/base_accent_transparent</item>
         <item name="colorBtnHighlight">@color/white_24</item>
@@ -134,7 +132,6 @@
 
     <!-- Theme is overridden in v27 folder to handle cutouts -->
     <style name="MwmTheme.Night.MainActivity">
-        <item name="android:colorPrimaryDark">@android:color/black</item>
         <item name="colorPrimaryVariant">@android:color/black</item>
         <item name="android:windowBackground">@null</item>
         <item name="android:windowTranslucentNavigation">false</item>
@@ -150,7 +147,6 @@
     </style>
 
     <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="colorAccent">?buttonDialogTextColor</item>
         <item name="colorSecondary">?buttonDialogTextColor</item>
         <item name="colorPrimary">?buttonDialogTextColor</item>
         <item name="android:background">?cardBackground</item>
@@ -166,8 +162,6 @@
     </style>
 
     <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
-        <item name="android:colorPrimaryDark">?statusBar</item>
-        <item name="colorAccent">@color/base_accent_night</item>
         <item name="colorPrimary">@color/bg_primary_night</item>
         <item name="colorPrimaryVariant">?statusBar</item>
         <item name="colorSecondary">@color/base_accent_night</item>
@@ -188,7 +182,6 @@
     </style>
 
     <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="colorAccent">@color/base_accent_night</item>
         <item name="colorSecondary">@color/base_accent_night</item>
         <item name="colorPrimary">?buttonDialogTextColor</item>
         <item name="android:fontFamily">@string/robotoMedium</item>

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

@@ -4,10 +4,10 @@
     <!-- Button text (should be short) -->
     <string name="back">Terug</string>
     <!-- Button text (should be short) -->
-    <string name="cancel">Annuleren</string>
+    <string name="cancel">Annuleer</string>
     <!-- Button which deletes downloaded country -->
-    <string name="delete">Verwijderen</string>
+    <string name="delete">Verwijder</string>
-    <string name="download_maps">Kaarten downloaden</string>
+    <string name="download_maps">Download kaarten</string>
     <!-- Settings/Downloader - info for country when download fails -->
     <string name="download_has_failed">Downloaden is mislukt, tik om het opnieuw te proberen.</string>
     <!-- Settings/Downloader - info for country which started downloading -->
@@ -21,21 +21,21 @@
     <!-- Update maps later button text -->
     <string name="later">Later</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
-    <string name="search">Zoeken</string>
+    <string name="search">Zoek</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
-    <string name="search_map">Zoeken op de kaart</string>
+    <string name="search_map">Zoek op de kaart</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">U heeft momenteel alle locatieservices voor dit apparaat of deze app uitgeschakeld. Schakel ze in bij Instellingen.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Beperkte nauwkeurigheid</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie moet Nauwkeurige Locatie worden ingesteld bij Instellingen</string>
+    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie schakelt u Precise Location in bij instellingen</string>
     <!-- View and button titles for accessibility -->
-    <string name="zoom_to_country">Weergeven op de kaart</string>
+    <string name="zoom_to_country">Toon op de kaart</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
     <string name="country_status_download_failed">Downloaden is mislukt</string>
     <!-- Button text for the button under the country_status_download_failed message -->
-    <string name="try_again">Opnieuw proberen</string>
+    <string name="try_again">Probeer opnieuw</string>
     <string name="about_menu_title">Over CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Open project, gemaakt door de community</string>
@@ -46,29 +46,29 @@
     <!-- Text in About screen -->
     <string name="about_proposition_3">• Offline, snel en compact</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Volledig open source, non-profit, transparante besluitvorming en financiering.</string>
+    <string name="about_developed_by_enthusiasts">Volledig open source, non-profit, transparante besluitvorming en financiën.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">Locatie-instellingen</string>
-    <string name="close">Sluiten</string>
+    <string name="close">Sluit</string>
-    <string name="unsupported_phone">De app vereist hardwareversnelde OpenGL. Helaas wordt dit apparaat niet ondersteund.</string>
+    <string name="unsupported_phone">Een hardware geaccellereerde OpenGL is nodig. Jammer genoeg wordt uw apparaat niet ondersteund.</string>
-    <string name="download">Downloaden</string>
+    <string name="download">Download</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="disconnect_usb_cable">Verwijder de USB-kabel of plaats een geheugenkaart om CoMaps te gebruiken</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Maak eerst ruimte vrij op de SD-kaart/USB-opslag om de app te gebruiken</string>
-    <string name="download_resources">Laten we, voor de eerste start, de algemene wereldkaart downloaden. \nDeze gebruikt %s aan opslag.</string>
+    <string name="download_resources">Voordat u start, laten we de algemene wereldkaart naar uw apparaat downloaden. \nDeze neemt %s in beslag.</string>
     <string name="download_resources_continue">Ga naar de kaart</string>
-    <string name="downloading_country_can_proceed">%1$s (%2$s) downloaden. U kunt nu \ndoorgaan naar de kaart.</string>
+    <string name="downloading_country_can_proceed">%1$s (%2$s) aan het downloaden. U kunt nu \ndoorgaan naar de kaart.</string>
     <string name="download_country_ask">%1$s downloaden? (%2$s)</string>
-    <string name="update_country_ask">%1$s bijwerken? (%2$s)</string>
+    <string name="update_country_ask">%1$s updaten? (%2$s)</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
-    <string name="pause">Pauzeren</string>
+    <string name="pause">Pauzeer</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
-    <string name="continue_button">Doorgaan</string>
+    <string name="continue_button">Ga verder</string>
     <!-- Show popup notification on top of the map when country download has failed. -->
     <string name="download_country_failed">%s download is mislukt</string>
     <!-- "Add new bookmark list" dialog title -->
-    <string name="add_new_set">Nieuwe groep toevoegen</string>
+    <string name="add_new_set">Voeg nieuwe groep toe</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
     <string name="bookmark_set_name">Naam van bladwijzergroep</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
@@ -88,19 +88,19 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Kaarten opslaan in</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Selecteer de map om kaarten naar te downloaden</string>
+    <string name="maps_storage_summary">Selecteer de map waar kaarten naar gedownload worden</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
-    <string name="maps_storage_downloaded">Gedownloade kaarten</string>
+    <string name="maps_storage_downloaded">Kaarten</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Interne persoonlijke opslag</string>
+    <string name="maps_storage_internal">Intern persoonlijk geheugen</string>
     <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Interne gedeelde opslag</string>
+    <string name="maps_storage_shared">Intern gedeeld geheugen</string>
     <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
     <string name="maps_storage_removable">SD-kaart</string>
     <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Externe gedeelde opslag</string>
+    <string name="maps_storage_external">Extern gedeeld geheugen</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
-    <string name="maps_storage_free_size">%1$s van %2$s beschikbaar</string>
+    <string name="maps_storage_free_size">%1$s beschikbaar van %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
     <string name="move_maps">Kaarten verplaatsen?</string>
     <!-- Error moving map files from one storage to another -->
@@ -162,20 +162,20 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notities</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps bladwijzers zijn met u gedeeld</string>
+    <string name="share_bookmarks_email_subject">Bladwijzers van CoMaps zijn met u gedeeld</string>
     <string name="share_bookmarks_email_body">Hallo! \n \nBijgesloten zijn mijn bladwijzers uit de CoMaps app. Open ze als je CoMaps geïnstalleerd hebt. Of, als je dat niet hebt, download de app voor je iOS- of Android-apparaat door deze link te volgen: https://www.comaps.app/download/ \n \nGeniet van het reizen met CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Bladwijzers laden</string>
+    <string name="load_kmz_title">Bladwijzers worden geladen</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bladwijzers succesvol geladen! U vindt ze op de kaart of op het scherm van de Bladwijzerbeheerder.</string>
+    <string name="load_kmz_successful">Bladwijzers succesvol geüpload! U vindt ze op de kaart of op het scherm van de Bladwijzerbeheerder.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Bladwijzers laden is mislukt. Het bestand is mogelijk beschadigd of defect.</string>
+    <string name="load_kmz_failed">Bladwijzers uploaden is mislukt. Het bestand is mogelijk beschadigd of defect.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Het bestandstype wordt niet herkend door de app: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Bestand openen mislukt %1$s \n \n%2$s</string>
     <!-- resource for context menu -->
-    <string name="edit">Bewerken</string>
+    <string name="edit">Wijzig</string>
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Je locatie is nog niet vastgesteld</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
@@ -191,7 +191,7 @@
     <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hoi, \n \nMomenteel ben ik hier: %1$s. Klik op deze %2$s link of deze %3$s link om de plaats op de kaart te zien. \n \nBedankt.</string>
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
-    <string name="share">Delen</string>
+    <string name="share">Deel</string>
     <!-- Share by email button text, also used in editor and About. -->
     <string name="email">E-mail</string>
     <!-- Text for message when used successfully copied something -->
@@ -206,7 +206,7 @@
     <string name="tracks_title">Tracks</string>
     <!-- Length of track in cell that describes route -->
     <string name="length">Lengte</string>
-    <string name="share_my_location">Mijn locatie delen</string>
+    <string name="share_my_location">Deel mijn locatie</string>
     <!-- Settings general group in settings screen -->
     <string name="prefs_group_general">Algemene instellingen</string>
     <!-- Settings information group in settings screen -->
@@ -237,14 +237,14 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Gesproken taal</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Gesproken aanwijzingen testen</string>
+    <string name="pref_tts_test_voice_title">Test gesproken aanwijzingen</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Controleer het volume of de tekst-naar-spraak instellingen van het systeem als je de stem nu niet hoort</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Niet beschikbaar</string>
     <string name="pref_map_auto_zoom">Automatisch zoomen</string>
     <string name="placepage_distance">Afstand</string>
-    <string name="search_show_on_map">Weergeven op kaart</string>
+    <string name="search_show_on_map">Bekijk op de kaart</string>
     <!-- Text in menu -->
     <string name="website">Website</string>
     <!-- Text in About menu, opens CoMaps news website -->
@@ -258,7 +258,7 @@
     <!-- Button in the main Help dialog -->
     <string name="faq">Vragen en antwoorden</string>
     <!-- Button in the main menu -->
-    <string name="donate">Doneren</string>
+    <string name="donate">Doneer</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Steun het project</string>
     <!-- Button in the main Help dialog -->
@@ -272,30 +272,30 @@
     <!-- Toast text when user hides UI with a long tap anywhere on the map -->
     <string name="long_tap_toast">Tik nogmaals lang op de kaart om de interface te zien</string>
     <!-- Update all button text -->
-    <string name="downloader_update_all_button">Alles bijwerken</string>
+    <string name="downloader_update_all_button">Update alles</string>
     <!-- Cancel all button text -->
-    <string name="downloader_cancel_all">Alles annuleren</string>
+    <string name="downloader_cancel_all">Annuleer alles</string>
     <!-- Downloaded maps list header -->
     <string name="downloader_downloaded_subtitle">Gedownload</string>
     <!-- Country queued for download -->
     <string name="downloader_queued">In de wachtrij</string>
-    <string name="downloader_near_me_subtitle">In de buurt</string>
+    <string name="downloader_near_me_subtitle">Bij mij in de buurt</string>
     <!-- In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" -->
     <string name="downloader_status_maps">Kaarten</string>
-    <string name="downloader_download_all_button">Alles downloaden</string>
+    <string name="downloader_download_all_button">Download alles</string>
-    <string name="downloader_downloading">Downloaden:</string>
+    <string name="downloader_downloading">Aan het downloaden:</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">Stop de navigatie om de kaart te verwijderen</string>
     <!-- PointsInDifferentMWM -->
-    <string name="routing_failed_cross_mwm_building">Alleen routes die volledig in één kaart passen, kunnen gecreëerd worden.</string>
+    <string name="routing_failed_cross_mwm_building">Enkel routes die volledig in één kaart passen, kunnen gecreëerd worden.</string>
     <!-- Context menu item for downloader. -->
-    <string name="downloader_download_map">Kaart downloaden</string>
+    <string name="downloader_download_map">Download de kaart</string>
     <!-- Item status in downloader. -->
-    <string name="downloader_retry">Opnieuw</string>
+    <string name="downloader_retry">Probeer opnieuw</string>
     <!-- Item in context menu. -->
-    <string name="downloader_delete_map">Kaart verwijderen</string>
+    <string name="downloader_delete_map">Verwijder kaart</string>
     <!-- Item in context menu. -->
-    <string name="downloader_update_map">Kaart bijwerken</string>
+    <string name="downloader_update_map">Update kaart</string>
     <!-- Preference title -->
     <string name="google_play_services">Google Fused-locatieservices</string>
     <!-- Preference text -->
@@ -305,12 +305,12 @@
     <!-- Text for routing error dialog -->
     <string name="routing_download_maps_along">Download kaarten op de route</string>
     <!-- Text for routing error dialog -->
-    <string name="routing_requires_all_map">Voor het creëren van een route is het nodig dat alle kaarten van uw locatie naar de bestemming gedownload en bijgewerkt zijn.</string>
+    <string name="routing_requires_all_map">Voor het creëren van een route is het nodig dat alle kaarten van uw locatie naar uw bestemming gedownload en bijgewerkt zijn.</string>
     <!-- Text for routing error dialog -->
     <string name="routing_not_enough_space">Niet genoeg ruimte</string>
     <!-- location service disabled -->
-    <string name="enable_location_services">Locatiediensten inschakelen</string>
+    <string name="enable_location_services">Schakel locatiediensten in</string>
-    <string name="save">Opslaan</string>
+    <string name="save">Bewaar</string>
     <string name="create">aanmaken</string>
     <!-- red color -->
     <string name="red">Rood</string>
@@ -358,15 +358,15 @@
     <string name="dialog_routing_location_unknown_turn_on">De huidige gps-coördinaten kunnen niet worden gevonden. Schakel locatiediensten in om de route te berekenen.</string>
     <string name="dialog_routing_unable_locate_route">Route vinden mislukt</string>
     <string name="dialog_routing_cant_build_route">Route samenstellen mislukt</string>
-    <string name="dialog_routing_change_start_or_end">Pas het startpunt of de bestemming aan.</string>
+    <string name="dialog_routing_change_start_or_end">Kies een ander startpunt of een andere bestemming.</string>
-    <string name="dialog_routing_change_start">Startpunt aanpassen</string>
+    <string name="dialog_routing_change_start">Kies ander startpunt</string>
     <string name="dialog_routing_start_not_determined">Route samenstellen mislukt. Startpunt kan niet worden gevonden.</string>
     <string name="dialog_routing_select_closer_start">Kies een startpunt dat dichter bij een weg ligt.</string>
-    <string name="dialog_routing_change_end">Bestemming aanpassen</string>
+    <string name="dialog_routing_change_end">Kies andere bestemming</string>
     <string name="dialog_routing_end_not_determined">Route samenstellen mislukt. Bestemming kan niet worden gevonden.</string>
     <string name="dialog_routing_select_closer_end">Kies een bestemming die dichter bij een weg ligt</string>
     <string name="dialog_routing_change_intermediate">Kan de tussenstop niet vinden</string>
-    <string name="dialog_routing_intermediate_not_determined">Pas de tussenstop aan</string>
+    <string name="dialog_routing_intermediate_not_determined">Gelieve uw tussenstop aan te passen</string>
     <string name="dialog_routing_system_error">Systeemfout</string>
     <string name="dialog_routing_application_error">Route samenstellen mislukt door een applicatiefout</string>
     <string name="dialog_routing_try_again">Probeer het opnieuw</string>
@@ -377,21 +377,21 @@
     <string name="search_without_internet_advertisement">Om te beginnen met zoeken en om routebeschrijvingen te kunnen maken, moet u de kaart downloaden. U heeft vervolgens geen internetverbinding meer nodig.</string>
     <string name="search_select_map">Selecteer de kaart</string>
     <!-- «Show» context menu -->
-    <string name="show">Tonen</string>
+    <string name="show">Toon</string>
     <!-- «Hide» context menu -->
-    <string name="hide">Verbergen</string>
+    <string name="hide">Verberg</string>
     <string name="categories">Categorieën</string>
     <string name="history">Geschiedenis</string>
-    <string name="search_not_found">Geen resultaten gevonden</string>
+    <string name="search_not_found">Sorry, geen resultaten gevonden</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Download de regio waar u zoekt of probeer een nabijgelegen stad/dorpnaam toe te voegen.</string>
     <string name="search_history_title">Zoekgeschiedenis</string>
-    <string name="search_history_text">Recente zoekopdrachten</string>
+    <string name="search_history_text">Snel toegang tot recente zoekopdrachten</string>
-    <string name="clear_search">Zoekgeschiedenis wissen</string>
+    <string name="clear_search">Wis zoekgeschiedenis</string>
     <string name="p2p_your_location">Uw locatie</string>
     <string name="p2p_start">Start</string>
     <string name="p2p_from_here">Van</string>
-    <string name="p2p_to_here">Naar</string>
+    <string name="p2p_to_here">Route naar</string>
     <string name="p2p_only_from_current">Navigatie is uitsluitend beschikbaar vanuit uw huidige locatie</string>
     <string name="p2p_reroute_from_current">Wilt u een route plannen vanaf uw huidige locatie?</string>
     <!-- Edit open hours/set time and minutes dialog -->
@@ -400,10 +400,10 @@
     <string name="editor_time_from">Van</string>
     <!-- Tab title in the Edit Opening Hours time picker -->
     <string name="editor_time_to">Tot</string>
-    <string name="editor_time_add">Schema toevoegen</string>
+    <string name="editor_time_add">Voeg schema toe</string>
-    <string name="editor_time_delete">Schema verwijderen</string>
+    <string name="editor_time_delete">Verwijder schema</string>
     <!-- Text for allday switch. -->
-    <string name="editor_time_allday">Hele dag (24 uur)</string>
+    <string name="editor_time_allday">Elke dag (24 uur)</string>
     <string name="editor_time_open">Open</string>
     <string name="editor_time_close">Gesloten</string>
     <string name="editor_time_add_closed">Sluitingstijden toevoegen</string>
@@ -416,12 +416,12 @@
     <string name="editor_add_select_location">Locatie selecteren</string>
     <string name="editor_report_problem_desription_1">Beschrijf het probleem gedetailleerd, zodat de OpenStreetMap-community de fout kan oplossen.</string>
     <string name="editor_report_problem_desription_2">Of doe het zelf op https://www.openstreetmap.org/</string>
-    <string name="editor_report_problem_send_button">Verzenden</string>
+    <string name="editor_report_problem_send_button">Verzend</string>
     <string name="editor_report_problem_title">Probleem</string>
     <string name="editor_report_problem_no_place_title">De plaats bestaat niet</string>
-    <string name="editor_report_problem_under_construction_title">Gesloten i.v.m. onderhoud</string>
+    <string name="editor_report_problem_under_construction_title">Gesloten voor onderhoud</string>
     <string name="editor_report_problem_duplicate_place_title">Dubbele plaats</string>
-    <string name="autodownload">Kaarten automatisch downloaden</string>
+    <string name="autodownload">Download kaarten automatisch</string>
     <!-- Place Page opening hours text -->
     <string name="daily">Dagelijks</string>
     <string name="twentyfour_seven">24/7</string>
@@ -431,7 +431,7 @@
     <string name="opens_in">Opent over %s</string>
     <string name="closes_in">Sluit over %s</string>
     <string name="closed">Gesloten</string>
-    <string name="edit_opening_hours">Openingstijden bewerken</string>
+    <string name="edit_opening_hours">Bewerk openingstijden</string>
     <string name="no_osm_account">Geen account bij OpenStreetMap?</string>
     <string name="register_at_openstreetmap">Registreer bij OpenStreetMap</string>
     <string name="login">Log in</string>
@@ -441,8 +441,8 @@
     <string name="password">Wachtwoord</string>
     <string name="forgot_password">Wachtwoord vergeten?</string>
     <string name="logout">Log uit</string>
-    <string name="edit_place">Locatie bewerken</string>
+    <string name="edit_place">Bewerk de locatie</string>
-    <string name="add_language">Taal toevoegen</string>
+    <string name="add_language">Voeg een taal toe</string>
     <string name="street">Straat</string>
     <!-- Editable House Number text field (in address block). -->
     <string name="house_number">Huisnummer</string>
@@ -450,9 +450,9 @@
     <string name="social_media">Sociale media</string>
     <string name="building">Gebouw</string>
     <!-- Text field to enter non-existing street name, below list of known streets around -->
-    <string name="add_street">Een straat toevoegen</string>
+    <string name="add_street">Voeg een straat toe</string>
     <!-- Error to display when a new street name is not entered in the New street dialog -->
-    <string name="empty_street_name_error">Voer een straatnaam in</string>
+    <string name="empty_street_name_error">Voer een straatnaam in a.u.b.</string>
     <string name="choose_language">Kies een taal</string>
     <string name="choose_street">Kies een straat</string>
     <string name="postal_code">Postcode</string>
@@ -460,14 +460,14 @@
     <string name="select_cuisine">Selecteer keuken</string>
     <!-- login text field -->
     <string name="email_or_username">E-mailadres of gebruikersnaam</string>
-    <string name="editor_add_phone">Telefoonnummer toevoegen</string>
+    <string name="editor_add_phone">Voeg telefoonnummer toe</string>
     <string name="level">Verdieping</string>
     <string name="downloader_delete_map_dialog">Alle wijzigingen aan de kaart zullen samen met de kaart worden verwijderd</string>
-    <string name="downloader_update_maps">Kaarten bijwerken</string>
+    <string name="downloader_update_maps">Update kaarten</string>
     <string name="downloader_mwm_migration_dialog">Om een route te creëren, moet je alle kaarten updaten en dan de route opnieuw plannen.</string>
-    <string name="downloader_search_field_hint">Kaart zoeken</string>
+    <string name="downloader_search_field_hint">Vind een kaart</string>
     <string name="common_check_internet_connection_dialog">Controleer je instellingen en zorg ervoor dat het apparaat verbonden is met het internet</string>
-    <string name="downloader_no_space_title">Onvoldoende ruimte</string>
+    <string name="downloader_no_space_title">Niet genoeg ruimte</string>
     <string name="downloader_no_space_message">Verwijder overbodige gegevens</string>
     <string name="editor_login_error_dialog">Inlogfout</string>
     <string name="editor_profile_changes">Gecontroleerde wijzigingen</string>
@@ -480,16 +480,16 @@
     <string name="editor_edit_place_category_title">Categorie</string>
     <string name="detailed_problem_description">Gedetailleerde probleemomschrijving</string>
     <string name="editor_report_problem_other_title">Een ander probleem</string>
-    <string name="placepage_add_business_button">Bedrijf toevoegen</string>
+    <string name="placepage_add_business_button">Voeg een organisatie toe</string>
     <string name="message_invalid_feature_position">Hier kan geen object worden geplaatst</string>
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Door de gemeenschap gemaakte OpenStreetMap-gegevens tot %s. Lees meer over hoe je de kaart kunt bewerken en bijwerken op OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) is een gemeenschapsproject om een vrije en open kaart te bouwen. Het is de belangrijkste bron van kaartgegevens in CoMaps en werkt ongeveer hetzelfde als Wikipedia. U kunt plaatsen toevoegen of bewerken en deze worden dan beschikbaar voor miljoenen gebruikers over de hele wereld. \nSluit u aan bij de gemeenschap en help mee om een betere kaart voor iedereen te maken!</string>
-    <string name="login_to_make_edits_visible">Maak een OpenStreetMap-account aan of log in om uw kaartbewerkingen voor de wereld te publiceren</string>
+    <string name="login_to_make_edits_visible">Maak een OpenStreetMap account aan of log in om uw kaartbewerkingen voor de wereld te publiceren</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d van %2$d</string>
-    <string name="download_over_mobile_header">Downloaden via mobiele internetverbinding?</string>
+    <string name="download_over_mobile_header">Downloaden via een mobiele gegevensverbinding?</string>
     <string name="download_over_mobile_message">Met sommige abonnementen of bij roaming kan dit behoorlijk duur zijn</string>
     <string name="error_enter_correct_house_number">Voer een geldig huisnummer in</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
@@ -522,15 +522,15 @@
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
     <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
+    <string name="mi">mijl</string>
     <!-- A unit of measure -->
-    <string name="ft">ft</string>
+    <string name="ft">voet</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">u</string>
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Meer</string>
-    <string name="placepage_edit_bookmark_button">Bladwijzer bewerken</string>
+    <string name="placepage_edit_bookmark_button">Bewerk bladwijzer</string>
     <string name="placepage_personal_notes_hint">Persoonlijke aantekeningen (tekst of html)</string>
     <string name="editor_comment_hint">Reactie…</string>
     <string name="editor_reset_edits_message">Alle lokale wijzigingen weggooien?</string>
@@ -594,6 +594,8 @@
     <string name="button_plan">Plan</string>
     <string name="placepage_remove_stop">Verwijder tussenstop</string>
     <string name="placepage_add_stop">Voeg tussenstop toe</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Log in op OpenStreetMap om al je kaartbewerkingen automatisch te uploaden. Meer informatie <a href="https://github.com/organicmaps/organicmaps/issues/6144">hier</a>.</string>
     <string name="dialog_error_storage_title">Probleem met opslagtoegang</string>
     <string name="dialog_error_storage_message">Externe opslag is niet beschikbaar, wellicht is de SD-kaart verwijderd, beschadigd of is het bestandssysteem alleen-lezen. Gelieve dit te controleren en ons te contacteren via support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Slechte opslag emuleren</string>
@@ -860,7 +862,7 @@
     <string name="github">GitHub</string>
     <string name="gb">GB</string>
     <string name="telegram">Telegram</string>
-    <string name="matrix">[Matrix]</string>
+    <string name="matrix">Matrix</string>
     <string name="mastodon">Mastodon</string>
     <string name="facebook">Facebook</string>
     <string name="twitter">X (Twitter)</string>
@@ -917,7 +919,4 @@
     <string name="open_now">Nu open</string>
     <string name="closed_now">Nu gesloten</string>
     <string name="at">om %s</string>
-    <string name="dialog_report_error_with_logs">Stuur ons een foutenrapport:\n - stel \"Logboek inschakelen\" in bij de Instellingen\n - reproduceer het probleem\n - druk in het scherm \"Over &amp; Hulp\" op de knop \"Meld een fout\" en verzend via e-mail of chat\n - logboek uitschakelen</string>
-    <string name="osm_note_toast">Opmerking wordt verzonden naar OpenStreetMap</string>
-    <string name="osm_note_hint">Of laat een opmerking achter bij de OpenStreetMap-gemeenschap, zodat iemand anders hier een plaats kan toevoegen of verbeteren.</string>
 </resources>

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

@@ -597,6 +597,8 @@
     <string name="button_plan">Zaplanuj</string>
     <string name="placepage_remove_stop">Usuń postój</string>
     <string name="placepage_add_stop">Dodaj postój</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Zaloguj się do OpenStreetMap, aby automatycznie przesyłać wszystkie zmiany na mapie. Dowiedz się więcej <a href="https://github.com/organicmaps/organicmaps/issues/6144">tutaj</a>.</string>
     <string name="dialog_error_storage_title">Problem z dostępem do pamięci masowej</string>
     <string name="dialog_error_storage_message">Zewnętrzny nośnik pamięci masowej jest niedostępny. Prawdopodobnie usunięto lub uszkodzono kartę SD bądź jej system plików służy tylko do odczytu. Zweryfikuj to i skontaktuj się z nami pod adresem support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuluj wadliwą pamięć masową</string>

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

@@ -534,6 +534,8 @@
     <string name="button_plan">Planejar</string>
     <string name="placepage_remove_stop">Remover parada</string>
     <string name="placepage_add_stop">Adicionar parada</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Faça login no OpenStreetMap para carregar automaticamente todas as edições de mapas que você fizer. Saiba mais <a href="https://github.com/organicmaps/organicmaps/issues/6144">aqui</a>.</string>
     <string name="dialog_error_storage_title">Problema de acesso ao armazenamento</string>
     <string name="dialog_error_storage_message">O armazenamento externo não está disponível, é provável que o cartão SD tenha sido removido, danificado ou o sistema de arquivo seja apenas para leitura. Verifique e entre em contato conosco em support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular memória ruim</string>
@@ -895,6 +897,4 @@
     <string name="open_now">Aberto agora</string>
     <string name="closed_now">Fechado agora</string>
     <string name="at">às %s</string>
-    <string name="osm_note_hint">Ou, em vez disso, deixe uma nota para a comunidade do OpenStreetMap para que outra pessoa possa adicionar ou corrigir um lugar aqui.</string>
-    <string name="osm_note_toast">A nota será enviada ao OpenStreetMap</string>
 </resources>

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

@@ -380,8 +380,8 @@
     <string name="read_in_wikipedia">Wikipédia</string>
     <string name="p2p_your_location">Localização atual</string>
     <string name="p2p_start">Iniciar</string>
-    <string name="p2p_from_here">Rota desde</string>
+    <string name="p2p_from_here">De</string>
-    <string name="p2p_to_here">Rota para</string>
+    <string name="p2p_to_here">Itinerário para</string>
     <string name="p2p_only_from_current">Só é possível navegar a partir da sua localização atual</string>
     <string name="p2p_reroute_from_current">Quer planear uma rota a partir da sua localização atual?</string>
     <!-- Edit open hours/set time and minutes dialog -->
@@ -572,6 +572,8 @@
     <string name="button_plan">Planear</string>
     <string name="placepage_remove_stop">Remover paragem</string>
     <string name="placepage_add_stop">Adicionar paragem</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Por favor, faz o login no OpenStreetMap para carregar automaticamente todas as tuas edições de mapas. Sabe mais <a href="https://github.com/organicmaps/organicmaps/issues/6144">aqui</a>.</string>
     <string name="dialog_error_storage_title">Problema de acesso ao armazenamento</string>
     <string name="dialog_error_storage_message">O armazenamento externo não está disponível. Provavelmente porque o cartão SD foi removido, danificado ou o sistema de ficheiros é apenas para leitura. Verifique e contacte-nos através do email support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular o armazenamento defeituoso</string>
@@ -907,6 +909,4 @@
     <string name="open_now">Aberto agora</string>
     <string name="closed_now">Fechado agora</string>
     <string name="at">às %s</string>
-    <string name="osm_note_toast">Nota será enviada para o OpenStreetMap</string>
-    <string name="osm_note_hint">Ou, em vez disso, deixe uma nota para a comunidade do OpenStreetMap de tal maneira que outra pessoa possa adicionar ou consertar um local aqui.</string>
 </resources>

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

@@ -580,6 +580,8 @@
     <string name="button_plan">Planifică</string>
     <string name="placepage_remove_stop">Scoateți opritorul</string>
     <string name="placepage_add_stop">Adaugă oprire</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Vă rugăm să vă conectați la OpenStreetMap pentru a încărca automat toate modificările aduse hărții. Aflați mai multe <a href="https://github.com/organicmaps/organicmaps/issues/6144">aici</a>.</string>
     <string name="dialog_error_storage_title">Problemă de acces la spațiul de stocare</string>
     <string name="dialog_error_storage_message">Spațiul de stocare extern nu este disponibil. Probabil cardul SD nu este introdus, este deteriorat sau sistemul de fișiere este doar pentru citire. Verifică sau contactează-ne la support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simulare arhivă deteriorată</string>

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

@@ -603,6 +603,8 @@
     <string name="button_plan">Построить</string>
     <string name="placepage_remove_stop">Удалить остановку</string>
     <string name="placepage_add_stop">Добавить остановку</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Пожалуйста войдите в аккаунт OpenStreetMap.org, чтобы публиковать ваши изменения карты. Подробности по <a href="https://github.com/organicmaps/organicmaps/issues/6144">ссылке</a>.</string>
     <string name="dialog_error_storage_title">Проблема с доступом к хранилищу</string>
     <string name="dialog_error_storage_message">Внешняя память устройства недоступна, возможно SD карта была удалена, повреждена или файловая система доступна только для чтения. Проверьте это и свяжитесь, пожалуйста, с нами support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Эмуляция ошибки с внешней памятью</string>

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

@@ -1386,5 +1386,4 @@
     <string name="type.man_made.crane">Кран</string>
     <string name="type.landuse.religious">Церковный двор</string>
     <string name="type.railway.station.subway.qingdao">Станция метро</string>
-    <string name="type.amenity.ranger_station">Пост лесников</string>
 </resources>

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

@@ -593,6 +593,8 @@
     <string name="button_plan">Naplánovať</string>
     <string name="placepage_remove_stop">Odstrániť zastávku</string>
     <string name="placepage_add_stop">Pridať zastávku</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Prihláste sa do OpenStreetMap, aby ste mohli automaticky nahrať všetky svoje úpravy mapy. Viac informácií sa dozviete <a href="https://github.com/organicmaps/organicmaps/issues/6144">tade</a>.</string>
     <string name="dialog_error_storage_title">Problém s prístupom k úložisku</string>
     <string name="dialog_error_storage_message">Externý úložný priestor nie je dostupný, pravdepodobne je vytiahnutá alebo poškodená SD karta alebo je systém súborov určený iba na čítanie. Skontrolujte to, prosím, a kontaktujte nás na support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Imitovať poškodené úložisko</string>

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

@@ -585,6 +585,8 @@
     <string name="button_plan">План</string>
     <string name="placepage_remove_stop">Уклони међуодредиште</string>
     <string name="placepage_add_stop">Међуодредиште</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Молим Вас да се пријавите на OpenStreetMap да бисте аутоматски послали своје промене на мапи. Сазнајте више о томе <a href="https://github.com/organicmaps/organicmaps/issues/6144">овде</a>.</string>
     <string name="dialog_error_storage_title">Проблем са приступом меморији</string>
     <string name="dialog_error_storage_message">Екстерна меморија није доступна. SD картица је можда уклоњена, оштећена, или је фајл систем само за читање. Молим Вас, проверите Вашу SD картицу или нас контактирајте на support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Симулирај неисправну меморију</string>

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

@@ -561,6 +561,8 @@
     <string name="button_plan">Planera</string>
     <string name="placepage_remove_stop">Ta bort stoppet</string>
     <string name="placepage_add_stop">Lägg till stopp</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Logga in på OpenStreetMap för att automatiskt ladda upp alla dina kartredigeringar. Läs mer <a href="https://github.com/organicmaps/organicmaps/issues/6144">här</a>.</string>
     <string name="dialog_error_storage_title">Lagringsåtkomstproblem</string>
     <string name="dialog_error_storage_message">Extern lagring är inte tillgänglig. SD-kortet är borttaget, skadat eller så är filsystemet skrivskyddat. Kontrollera det och kontakta oss på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulera dålig lagring</string>

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

@@ -149,6 +149,8 @@
     <string name="button_plan">Panga</string>
     <string name="placepage_remove_stop">Ondoa eneo la kusimama</string>
     <string name="placepage_add_stop">Ongeza eneo la kusimama</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Tafadhali ingia kwenye OpenStreetMap ili kupakia kiotomatiki hariri zako zote za ramani. Pata maelezo zaidi <a href="https://github.com/organicmaps/organicmaps/issues/6144">hapa</a>.</string>
     <string name="dialog_error_storage_title">Tatizo la kufikia hifadhi</string>
     <string name="dialog_error_storage_message">Hifadhi ya nje haipatikani, pengine Kadi ya SD imeondolewa, imeharibika au mfumo wa faili ni wa kusoma pekee. Tafadhali ikague na uwasiliane nasi kwa kutumia support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Onyeshana hifadhi mbaya</string>

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

@@ -565,6 +565,8 @@
     <string name="button_plan">วางแผน</string>
     <string name="placepage_remove_stop">ลบจุดแวะพัก</string>
     <string name="placepage_add_stop">เพิ่มจุดแวะพัก</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">กรุณาเข้าสู่ระบบ OpenStreetMap เพื่ออัปโหลดการแก้ไขแผนที่ทั้งหมดของคุณโดยอัตโนมัติ เรียนรู้เพิ่มเติม<a href="https://github.com/organicmaps/organicmaps/issues/6144">ที่นี่</a></string>
     <string name="dialog_error_storage_title">ปัญหาการเข้าถึงที่เก็บข้อมูล</string>
     <string name="dialog_error_storage_message">ที่เก็บข้อมูลภายนอกไม่พร้อมใช้งาน อาจเป็นเพราะการ์ด SD ถูกถอดออกไป ได้รับความเสียหาย หรือระบบไฟล์ให้เขียนได้อย่างเดียว กรุณาตรวจสอบและติดต่อเราได้ที่ support@comaps.app</string>
     <string name="setting_emulate_bad_storage">จำลองแบบที่เก็บข้อมูลที่ไม่ดี</string>

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

@@ -9,7 +9,7 @@
     <string name="delete">Sil</string>
     <string name="download_maps">Harita İndir</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">İndirme başarısız olmuştur, yeniden denemek için dokunun.</string>
+    <string name="download_has_failed">İndirme başarısız. Yeniden denemek için dokun.</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">İndiriliyor…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -90,7 +90,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Haritaları şuraya kaydet:</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Haritaların indirileceği klasörü seçin</string>
+    <string name="maps_storage_summary">Haritaların indirileceği yeri seç.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Haritalar</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -183,7 +183,7 @@
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Üzgünüz, Harita Depolama ayarları şu anda devre dışı.</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Harita indiriliyor</string>
+    <string name="downloading_is_active">Harita indirme işlemi şu anda sürüyor.</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">Hey, CoMaps’te geçerli konumumu incele! %1$s veya %2$s Çevrimdışı haritalar sende yok mu? Buradan indir: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -239,9 +239,9 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Ses Dili</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Sesli Navigasyon Testi</string>
+    <string name="pref_tts_test_voice_title">Sesli Yönlendirmeleri Sına (TTS, Text-To-Speech)</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Sesi duyamıyorsanız ses seviyesini veya sistem metin okuma ayarlarını kontrol edin.</string>
+    <string name="pref_tts_playing_test_voice">Sesi şimdi duymuyorsanız ses düzeyini veya sistem metin okuma ayarlarını denetleyin.</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Yok</string>
     <string name="pref_map_auto_zoom">Kendiliğinden yaklaştır</string>
@@ -287,7 +287,7 @@
     <string name="downloader_download_all_button">Tümünü İndir</string>
     <string name="downloader_downloading">İndiriliyor:</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">Haritayı silmek için lütfen navigasyonu kapatın.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Haritayı silmek için lütfen navigasyonu durdurun.</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Rotalar yalnızca tümüyle tek bir bölgenin haritası içinde oluşturulabilir.</string>
     <!-- Context menu item for downloader. -->
@@ -357,18 +357,18 @@
     <string name="dialog_routing_location_turn_on">Konum hizmetlerini etkinleştir</string>
     <string name="dialog_routing_location_unknown_turn_on">Mevcut GPS koordinatları belirlenemiyor. Rota hesaplamak için konum hizmetlerini etkinleştirin.</string>
     <string name="dialog_routing_unable_locate_route">Rota belirlenemiyor</string>
-    <string name="dialog_routing_cant_build_route">Rota oluşturulamıyor</string>
+    <string name="dialog_routing_cant_build_route">Rota oluşturulamıyor.</string>
     <string name="dialog_routing_change_start_or_end">Lütfen başlangıç noktanızı veya hedefinizi ayarlayın.</string>
     <string name="dialog_routing_change_start">Başlangıç noktasını ayarla</string>
     <string name="dialog_routing_start_not_determined">Rota oluşturulamadı. Başlangıç noktası belirlenemiyor.</string>
     <string name="dialog_routing_select_closer_start">Lütfen yola daha yakın bir başlangıç noktası seçin.</string>
     <string name="dialog_routing_change_end">Hedefinizi ayarlayın</string>
     <string name="dialog_routing_end_not_determined">Rota oluşturulamadı. Hedef belirlenemiyor.</string>
-    <string name="dialog_routing_select_closer_end">Lütfen yola daha yakın hedef noktası seçin</string>
+    <string name="dialog_routing_select_closer_end">Lütfen yola daha yakın hedef noktası seçin.</string>
-    <string name="dialog_routing_change_intermediate">Ara nokta bulunamadı</string>
+    <string name="dialog_routing_change_intermediate">Ara nokta bulunamadı.</string>
-    <string name="dialog_routing_intermediate_not_determined">Lütfen ara noktanızı ayarlayın</string>
+    <string name="dialog_routing_intermediate_not_determined">Lütfen ara noktanızı ayarlayın.</string>
     <string name="dialog_routing_system_error">Sistem hatası</string>
-    <string name="dialog_routing_application_error">Uygulama hatası nedeniyle rota oluşturulamadı</string>
+    <string name="dialog_routing_application_error">Uygulama hatası nedeniyle rota oluşturulamadı.</string>
     <string name="dialog_routing_try_again">Lütfen yeniden deneyin</string>
     <string name="not_now">Şimdi Değil</string>
     <string name="dialog_routing_download_and_build_cross_route">Haritayı indirerek birden çok haritaya uzanan daha uygun bir rota oluşturmak ister misiniz?</string>
@@ -382,11 +382,11 @@
     <string name="hide">Gizle</string>
     <string name="categories">Kategoriler</string>
     <string name="history">Geçmiş</string>
-    <string name="search_not_found">Tüh, sonuç bulunamadı</string>
+    <string name="search_not_found">Tüh, sonuç bulunamadı.</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Arama yapmak istediğiniz bölgenin haritasını indirin veya yakındaki bir yerleşim yeri adını eklemeyi deneyin.</string>
     <string name="search_history_title">Arama Geçmişi</string>
-    <string name="search_history_text">Son aramalarınızı görüntüleyin</string>
+    <string name="search_history_text">Son aramalarınızı görüntüleyin.</string>
     <string name="clear_search">Arama Geçmişini Temizle</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Vikipedi</string>
@@ -394,7 +394,7 @@
     <string name="p2p_start">Başla</string>
     <string name="p2p_from_here">Başlangıç</string>
     <string name="p2p_to_here">Varış yeri</string>
-    <string name="p2p_only_from_current">Navigasyon yalnızca mevcut konumunuzdan başlatılabilir.</string>
+    <string name="p2p_only_from_current">Navigasyon yalnızca şu anki konumunuzdan kullanılabilir.</string>
     <string name="p2p_reroute_from_current">Şu anki konumunuzdan rota planlamamızı ister misiniz?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Sonraki</string>
@@ -466,14 +466,14 @@
     <string name="level">Kat</string>
     <!-- Building level -->
     <string name="level_value_generic">Kat sayısı: %s</string>
-    <string name="downloader_delete_map_dialog">Harita ile birlikte tüm harita değişiklikleri de silinecektir</string>
+    <string name="downloader_delete_map_dialog">Harita ile birlikte tüm harita değişiklikleri de silinecektir.</string>
     <string name="downloader_update_maps">Haritaları güncelle</string>
     <string name="downloader_mwm_migration_dialog">Rota oluşturmak için tüm haritaları güncellemeli ve rotayı yeniden planlamalısınız.</string>
     <string name="downloader_search_field_hint">Harita bul</string>
-    <string name="common_check_internet_connection_dialog">Lütfen cihazın internete bağlandığından emin olun.</string>
+    <string name="common_check_internet_connection_dialog">Lütfen aygıtınızın internete bağlandığından emin olun.</string>
     <string name="downloader_no_space_title">Yeterli alan yok</string>
     <string name="downloader_no_space_message">Lütfen gereksiz verileri silin</string>
-    <string name="editor_login_error_dialog">Giriş hatası</string>
+    <string name="editor_login_error_dialog">Giriş hatası.</string>
     <string name="editor_profile_changes">Doğrulanan Düzenleme</string>
     <string name="editor_focus_map_on_location">Çarpı imini mekân veya işletmenin konumuna yerleştirmek için haritayı sürükleyin.</string>
     <string name="editor_edit_place_title">Düzenleme</string>
@@ -490,16 +490,16 @@
     <string name="osm_presentation">%s tarihine ait topluluk tarafından oluşturulmuş OpenStreetMap verilerini kullanıyorsunuz. OpenStreetMap.org adresinden haritayı nasıl düzenleyebileceğiniz hakkında bilgi edinebilirsiniz</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM), ücretsiz ve açık harita oluşturmayı amaçlayan bir topluluk projesidir. OSM, CoMaps\'teki harita verilerinin ana kaynağıdır ve Vikipedi\'ye benzer şekilde çalışır. Haritadaki yerleri ekleyebilir veya düzenleyebilirsiniz ve bunlar tüm dünyadaki milyonlarca kullanıcı tarafından kullanılabilir hale gelir. \nTopluluğa katılın ve herkes için daha iyi bir harita oluşturmaya yardımcı olun!</string>
-    <string name="login_to_make_edits_visible">Harita düzenlemelerinizi herkese ulaştırmak için OpenStreetMap hesabı oluşturun veya oturum açın</string>
+    <string name="login_to_make_edits_visible">Harita düzenlemelerinizi herkese ulaştırmak için OpenStreetMap hesabı oluşturun veya oturum açın.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d/%2$d</string>
     <string name="download_over_mobile_header">Hücresel bir ağ bağlantısı kullanarak indirilsin mi?</string>
-    <string name="download_over_mobile_message">Bu işlem, bazı planlarda veya dolaşımda oldukça pahalı olabilir</string>
+    <string name="download_over_mobile_message">Bu işlem, bazı planlarda veya dolaşımda oldukça pahalı olabilir.</string>
     <string name="error_enter_correct_house_number">Geçerli bir bina numarası girin</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">Kat sayısı %d\'i geçmemelidir</string>
     <string name="editor_zip_code">Posta Kodu</string>
-    <string name="error_enter_correct_zip_code">Geçerli bir posta kodu girin</string>
+    <string name="error_enter_correct_zip_code">Geçerli posta kodu gir</string>
     <!-- Place Page title for long tap -->
     <string name="core_placepage_unknown_place">Harita Noktası</string>
     <!-- Title for OSM note section in the editor -->
@@ -517,8 +517,8 @@
     <string name="editor_category_unsuitable_title">Uygun bir kategori bulamıyor musunuz?</string>
     <string name="editor_category_unsuitable_text">CoMaps yalnızca basit nokta kategorilerini eklemeye izin verir. Yani kasaba, yol, göl, bina vb. çizgi/alan verisi ekleme desteği yoktur. Lütfen bu tür kategorileri doğrudan <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> üzerinden ekleyin. Adım adım ayrıntılı yönergeler için <a href="https://www.comaps.app/support/advanced-map-editing/">rehberimize</a> göz atabilirsiniz.</string>
     <string name="downloader_no_downloaded_maps_title">Hiç harita indirmediniz</string>
-    <string name="downloader_no_downloaded_maps_message">İnternetsiz olarak biyerleri bulmak ve gezinmek için haritaları indirin.</string>
+    <string name="downloader_no_downloaded_maps_message">Çevrim dışı olarak adres bulmak ve gezinmek için haritaları indirin.</string>
-    <string name="current_location_unknown_error_title">Mevcut konum bilinmiyor.</string>
+    <string name="current_location_unknown_error_title">Geçerli konum bilinmiyor.</string>
     <!-- abbreviation for meters -->
     <string name="m">m</string>
     <!-- abbreviation for kilometers -->
@@ -557,8 +557,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Bunu tüm kullanıcılara göndermek ister misiniz?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Herhangi bir kişisel bilgi girmediğinizden emin olun</string>
+    <string name="editor_share_to_all_dialog_message_1">Herhangi bir kişisel bilgi girmediğinizden emin olun.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editörleri değişikliklerinizi denetleyecek ve bir soruları olursa sizinle iletişime geçecektir</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editörleri değişikliklerinizi denetleyecek ve bir soruları olursa sizinle iletişime geçecek.</string>
     <string name="navigation_stop_button">Dur</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">GPS iziniz kaydediliyor</string>
@@ -572,10 +572,10 @@
     <string name="mobile_data_option_not_today">Bugün Kullanma</string>
     <string name="mobile_data">Mobil İnternet</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Harita güncelleme bildirimleri ve yapılan düzenlemelerin yüklenmesi için mobil internet gereklidir</string>
+    <string name="mobile_data_description">Harita güncelleme bildirimleri ve yapılan düzenlemelerin yüklenmesi için mobil internet gereklidir.</string>
     <string name="mobile_data_option_never">Asla Kullanma</string>
     <string name="mobile_data_option_ask">Her Zaman Sor</string>
-    <string name="traffic_update_maps_text">Trafik verilerini görüntülemek için haritaların güncellenmesi gerekiyor</string>
+    <string name="traffic_update_maps_text">Trafik verilerini görüntülemek için haritaların güncellenmesi gerekiyor.</string>
     <string name="big_font">Haritadaki yazı tipi boyutunu artır</string>
     <string name="traffic_update_app">Lütfen CoMaps\'i güncelleyin</string>
     <!-- "traffic" as in "road congestion" -->
@@ -585,7 +585,7 @@
     <string name="feedback_general">Genel Geri Bildirim</string>
     <string name="prefs_languages_information">Sesli yönlendirme için TTS sistemini kullanıyoruz. Çoğu Android aygıt, Google TTS\'yi kullanıyor. Uygulamayı, Google Play\'den indirebilir veya güncelleyebilirsiniz (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Bazı diller için uygulama mağazasından (Google Play, Galaxy Store, App Gallery, FDroid) başka konuşma sentezleyici ya da ek dil paketi kurmanız gerekebilir.\nAygıt ayarları → Dil ve Giriş → Konuşma → Metin Okuma seçeneğini açın.\nBuradan konuşma sentezi ayarlarını yönetebilir (örneğin, çevrim dışı kullanım için dil paketini karşıdan yükleyebilir) ve başka metin okuma motorunu seçebilirsiniz.</string>
-    <string name="prefs_languages_information_off_link">Daha fazla bilgi için lütfen bu kılavuzu inceleyin</string>
+    <string name="prefs_languages_information_off_link">Daha fazla bilgi için lütfen bu kılavuzu inceleyin.</string>
     <string name="transliteration_title">Latin alfabesine çevir</string>
     <string name="learn_more">Daha fazla bilgi edinin</string>
     <!-- Subway exits for public transport marks on the map -->
@@ -598,6 +598,8 @@
     <string name="button_plan">Hesapla</string>
     <string name="placepage_remove_stop">Durağı Kaldır</string>
     <string name="placepage_add_stop">Ara nokta ekle</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Tüm harita düzenlemelerinizi kendiliğinden yüklemek için lütfen OpenStreetMap\'e giriş yapın. Daha çok bilgi <a href="https://github.com/organicmaps/organicmaps/issues/6144">buradadır</a>.</string>
     <string name="dialog_error_storage_title">Depolama alanı erişim sorunu</string>
     <string name="dialog_error_storage_message">Harici bellek kullanılamıyor, muhtemelen SD Kart çıkarılmış, hasarlı veya dosya sistemi salt okunur. Lütfen kontrol edin veya support@comaps.app adresinden bizimle iletişime geçin</string>
     <string name="setting_emulate_bad_storage">Bozuk depolama alanını taklit et</string>
@@ -662,7 +664,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Hiçbir zaman uyarma</string>
     <string name="power_managment_title">Güç tasarrufu modu</string>
-    <string name="power_managment_description">Bazı fonksiyonlardan kısarak güç tüketimini azaltır</string>
+    <string name="power_managment_description">Kimi işlevler pahasına olsa da güç kullanımını düşürmeyi dener.</string>
     <string name="power_managment_setting_never">Asla</string>
     <string name="power_managment_setting_auto">Pil düşükken</string>
     <string name="power_managment_setting_manual_max">Her zaman</string>
@@ -679,7 +681,7 @@
     <string name="unable_to_calc_alert_title">Rota hesaplanamıyor</string>
     <string name="unable_to_calc_alert_subtitle">Rota bulunamadı. Bunun nedeni, belirlediğiniz seçenekler ya da eksik OpenStreetMap verisi olabilir. Lütfen rota seçeneklerinizi değiştirin ve yeniden deneyin.</string>
     <string name="define_to_avoid_btn">Kaçınılması gereken yolları tanımlayın</string>
-    <string name="change_driving_options_btn">Yönlendirme seçenekleri etkin</string>
+    <string name="change_driving_options_btn">Sürüş seçenekleri etkinleştirildi</string>
     <string name="toll_road">Paralı yol</string>
     <string name="unpaved_road">Asfaltsız yol</string>
     <string name="ferry_crossing">Vapur geçişi</string>
@@ -921,6 +923,4 @@
     <string name="pref_backup_now_summary_folder_unavailable">Yedekleme klasörü kullanılamıyor</string>
     <string name="pref_backup_now_summary_empty_lists">Yedeklenecek yer imi ve parça yok</string>
     <string name="dialog_report_error_missing_folder">Seçilen yedekleme konumu kullanılamıyor veya yazılabilir değil. Lütfen farklı bir konum seçin.</string>
-    <string name="osm_note_hint">Veya alternatif olarak, OpenStreetMap topluluğuna bir not bırakın, böylece başka biri buraya ekleme yapabilir veya hatayı düzeltebilir.</string>
-    <string name="osm_note_toast">Notunuz OpenStreetMap\'e gönderilecektir</string>
 </resources>

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

@@ -1365,7 +1365,7 @@
     <string name="type.power.pole">Elektrik Direği</string>
     <string name="type.man_made.utility_pole">Hizmet Direği</string>
     <string name="type.amenity.studio">Stüdyo</string>
-    <string name="type.sport.diving">Yüksek Dalış Alanı</string>
+    <string name="type.sport.diving">Dalış Sporu</string>
     <string name="type.man_made.survey_point">Anket Noktası</string>
     <string name="type.highway.ladder">Merdiven</string>
     <string name="type.man_made.crane">Vinç</string>
@@ -1377,8 +1377,4 @@
     <string name="type.natural.wetland.saltmarsh">Tuz Bataklığı</string>
     <string name="type.natural.wetland.saltmarsh.tidal">Gelgit Tuz Bataklığı</string>
     <string name="type.natural.wetland.fen">Bataklık</string>
-    <string name="type.amenity.bicycle_parking.covered">Üstü kapalı bisiklet park alanı</string>
-    <string name="type.natural.wetland.swamp">Bataklık</string>
-    <string name="type.railway.station.subway.qingdao">Metro İstasyonu</string>
-    <string name="type.attraction.big_wheel">Dönme Dolap</string>
 </resources>

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

@@ -600,6 +600,8 @@
     <string name="button_plan">Прокласти маршрут</string>
     <string name="placepage_remove_stop">Видалити зупинку</string>
     <string name="placepage_add_stop">Додати зупинку</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Будь ласка увійдіть в акаунт OpenStreetMap.org, щоб автоматично публікувати зміни до мапи. Подробиці за <a href="https://github.com/organicmaps/organicmaps/issues/6144">посиланням</a>.</string>
     <string name="dialog_error_storage_title">Не вдалося отримати доступ до сховища</string>
     <string name="dialog_error_storage_message">Зовнішнє сховище не доступно. Ймовірно, SD-картку пам\'яті було вилучено, пошкоджено, або система файлів доступна тільки для читання. Перевірте та зв\'яжіться з нами, написавши на поштову адресу support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Емулювати проблемне сховище</string>

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

@@ -2,7 +2,6 @@
 <!-- Cutouts API is available for API >= 27 -->
 <resources>
   <style name="MwmTheme.MainActivity">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
     <item name="android:windowTranslucentNavigation">false</item>

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

@@ -563,6 +563,8 @@
     <string name="button_plan">Kế hoạch</string>
     <string name="placepage_remove_stop">Xóa điểm dừng</string>
     <string name="placepage_add_stop">Thêm điểm dừng</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Vui lòng đăng nhập vào OpenStreetMap để tự động tải lên tất cả các chỉnh sửa bản đồ của bạn. Tìm hiểu thêm <a href="https://github.com/organicmaps/organicmaps/issues/6144">tại đây</a>.</string>
     <string name="dialog_error_storage_title">Vấn đề truy cập ổ lưu trữ</string>
     <string name="dialog_error_storage_message">Ổ lưu trữ bên ngoài không khả dụng, có thể Thẻ SD đã bị tháo, bị hỏng hoặc hệ thống tập tin được thiết lập chỉ đọc. Hãy kiểm tra và liên hệ với chúng tôi qua support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Giả lập ổ lưu trữ hỏng</string>

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

@@ -609,6 +609,8 @@
     <string name="button_plan">計畫</string>
     <string name="placepage_remove_stop">刪除停止</string>
     <string name="placepage_add_stop">新增中途點</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">請登入 OpenStreetMap 以自動上傳您的所有地圖編輯。若要了解更多資訊請點擊<a href="https://github.com/organicmaps/organicmaps/issues/6144">這裡</a>。</string>
     <string name="dialog_error_storage_title">儲存空間存儲問題</string>
     <string name="dialog_error_storage_message">外部儲存空間不可用，很可能是因為 SD 卡已移除、毀損，或檔案系統處於唯讀狀態。請進行檢查，然後透過 support@comaps.app 聯絡我們</string>
     <string name="setting_emulate_bad_storage">模擬不良儲存空間</string>

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

@@ -609,6 +609,8 @@
     <string name="button_plan">规划</string>
     <string name="placepage_remove_stop">删除站点</string>
     <string name="placepage_add_stop">添加经停点</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">请登录 OpenStreetMap 以自动上传您的所有地图编辑。诺要了解更多信息请点击<a href="https://github.com/organicmaps/organicmaps/issues/6144">这里</a>。</string>
     <string name="dialog_error_storage_title">存储空间访问问题</string>
     <string name="dialog_error_storage_message">外部存储空间不可用，很可能是因为 SD 卡已移除、损毁，或者文件系统为只读状态。请进行检查，然后通过 support@comaps.app 联系我们</string>
     <string name="setting_emulate_bad_storage">模拟不良存储空间</string>
@@ -922,6 +924,4 @@
     <string name="closed_now">已歇业</string>
     <string name="open_now">营业中</string>
     <string name="at">%s</string>
-    <string name="osm_note_hint">或者，也可以给 OpenStreetMap 社区留言，以便其他人可以在此添加或修复地点。</string>
-    <string name="osm_note_toast">注释将发送至 OpenStreetMap</string>
 </resources>

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

@@ -28,7 +28,7 @@
   </declare-styleable>
 
   <declare-styleable name="layersButton">
-    <attr name="state_layers_enabled" format="boolean"/>
+    <attr name="layers_enabled" format="boolean"/>
   </declare-styleable>
 
   <declare-styleable name="PlacePageView">

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

@@ -659,6 +659,8 @@
     <string name="placepage_remove_stop">Remove Stop</string>
     <string name="placepage_add_stop">Add Stop</string>
     <string name="saved">Saved</string>
+    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
+    <string name="alert_reauth_message">Please login to OpenStreetMap to automatically upload all your map edits. Learn more <a href="https://github.com/organicmaps/organicmaps/issues/6144">here</a>.</string>
     <string name="dialog_error_storage_title">Storage access problem</string>
     <string name="dialog_error_storage_message">External storage is not accessible. The SD card may have been removed, damaged, or the file system is read-only. Please, check your SD card or contact us at support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulate bad storage</string>

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

@@ -38,7 +38,7 @@
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:checked">true</item>
-    <item name="buttonTint">?colorAccent</item>
+    <item name="buttonTint">?colorSecondary</item>
   </style>
 
   <style name="MwmWidget.Editor.DayText">

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

@@ -144,20 +144,17 @@
 
   <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@android:color/white</item>
     <item name="iconTint">@color/white_primary</item>
   </style>
 
   <style name="MwmWidget.ToolbarTheme.Light" parent="MwmWidget.ToolbarTheme">
     <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@color/bg_window_night</item>
   </style>
 
   <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@android:color/white</item>
     <item name="android:windowActionBarOverlay">true</item>
     <item name="windowActionBarOverlay">true</item>
@@ -167,7 +164,6 @@
     name="MwmWidget.ToolbarTheme.DownButton"
     parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@android:color/white</item>
     <item name="android:homeAsUpIndicator">@drawable/ic_down</item>
   </style>
@@ -356,8 +352,12 @@
     <item name="android:minWidth">30dp</item>
     <item name="android:paddingTop">7dp</item>
     <item name="android:paddingBottom">7dp</item>
-    <item name="android:paddingStart">12dp</item>
+    <item name="android:paddingStart" >
-    <item name="android:paddingEnd">12dp</item>
+      12dp
+    </item>
+    <item name="android:paddingEnd" >
+      12dp
+    </item>
     <item name="android:paddingLeft">12dp</item>
     <item name="android:paddingRight">12dp</item>
     <item name="iconPadding">4dp</item>

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

@@ -13,7 +13,6 @@
     <item name="android:textColorPrimaryInverse">@color/text_light</item>
     <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
     <item name="android:windowBackground">?windowBackgroundForced</item>
-    <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
     <item name="colorPrimaryVariant">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
@@ -29,7 +28,6 @@
     <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
     <item name="colorPrimary">@color/bg_primary</item>
     <item name="colorControlNormal">?secondary</item>
-    <item name="colorAccent">@color/base_accent</item>
     <item name="colorSecondary">@color/base_accent</item>
     <item name="colorAccentTransparent">@color/base_accent_transparent</item>
     <item name="colorBtnHighlight">@color/white_38</item>
@@ -148,7 +146,6 @@
 
   <!-- Theme is overridden in v27 folder to handle cutouts -->
   <style name="MwmTheme.MainActivity">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
     <item name="android:windowTranslucentNavigation">false</item>
@@ -168,7 +165,6 @@
   </style>
 
   <style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
-    <item name="colorAccent">?buttonDialogTextColor</item>
     <item name="colorSecondary">?buttonDialogTextColor</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
     <item name="android:background">?cardBackground</item>
@@ -187,8 +183,6 @@
   </style>
 
   <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
-    <item name="android:colorPrimaryDark">?statusBar</item>
-    <item name="colorAccent">@color/base_accent</item>
     <item name="colorPrimary">@color/bg_primary</item>
     <item name="colorPrimaryVariant">?statusBar</item>
     <item name="colorSecondary">@color/base_accent</item>
@@ -209,7 +203,6 @@
   </style>
 
   <style name="MwmTheme.DialogFragment.Fullscreen.Translucent">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@color/bg_dialog_translucent</item>
     <item name="android:windowIsTranslucent">true</item>
@@ -217,7 +210,6 @@
   </style>
 
   <style name="MwmMain.DialogFragment.TimePicker" parent="Theme.MaterialComponents.Light.Dialog.Alert">
-    <item name="colorAccent">@color/base_accent</item>
     <item name="colorSecondary">@color/base_accent</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
     <item name="android:fontFamily">@string/robotoMedium</item>

android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp

@@ -1,4 +1,4 @@
-#include <jni.h>
+#include <jni.h>
 
 #include "app/organicmaps/sdk/Framework.hpp"
 #include "app/organicmaps/sdk/core/jni_helper.hpp"

cmake/OmimHelpers.cmake

@@ -159,8 +159,8 @@ function(add_precompiled_headers header pch_target_name)
   export_directory_flags("${pch_flags_file}")
   set(compiler_flags "@${pch_flags_file}")
 
-  # CMAKE_CXX_STANDARD 23 flags:
+  # CMAKE_CXX_STANDARD 20 flags:
-  set(c_standard_flags "-std=c++23")
+  set(c_standard_flags "-std=c++20")
   get_filename_component(pch_file_name ${header} NAME)
 
   add_pic_pch_target(${header} ${pch_target_name} ${pch_file_name} lib "-fPIC")