[Android] Use ExtendedFab, download icon for download maps screen fab

Signed-off-by: Harry Bond <me@hbond.xyz>


Signed-off-by: Harry Bond <me@hbond.xyz>

Signed-off-by: Harry Bond <me@hbond.xyz>

.forgejo/workflows/dco.yml

@@ -3,6 +3,6 @@ on: [pull_request]
 
 jobs:
   check:
-    runs-on: codeberg-tiny
+    runs-on: ubuntu-latest
     steps:
       - uses: https://github.com/KineticCafe/actions-dco@v1

.forgejo/workflows/linux-check.yaml

@@ -133,6 +133,14 @@ jobs:
         with:
           key: ${{ github.workflow }}-unity-${{ matrix.compiler.CC }}-${{ matrix.CMAKE_BUILD_TYPE }}
 
+      - name: Configure repository
+        shell: bash
+        env:
+          SKIP_MAP_DOWNLOAD: 1
+          SKIP_GENERATE_SYMBOLS: 1
+          SKIP_GENERATE_DRULES: 1
+        run: ./configure.sh
+
       - name: CMake
         shell: bash
         env:

.gitignore

@@ -14,12 +14,10 @@ stxxl.errlog
 stxxl.log
 screenlog.0
 
-data/symbols/*/design/
 # symbols png/sdf are now generated at build
 data/symbols/**/symbols.png
 data/symbols/**/symbols.sdf
-data/colors_design.txt
-data/patterns_design.txt
+
 data/bookmarks
 data/edits.xml
 data/World.mwm
@@ -27,11 +25,15 @@ data/WorldCoasts.mwm
 data/world_mwm/*
 data/*_hash
 data/drules_proto*
-data/classificator.txt
-data/types.txt
-data/visibility.txt
-data/colors.txt
-data/patterns.txt
+data/classificator.txt*
+data/types.txt*
+data/visibility.txt*
+data/colors.txt*
+data/patterns.txt*
+# TODO: designer is not used at the moment
+# data/symbols/*/design/
+# data/colors_design.txt
+# data/patterns_design.txt
 
 # Compiled Python
 *.pyc

.gitmodules

@@ -65,3 +65,7 @@
 [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,6 +57,7 @@ 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,7 +4,9 @@ set(FT_DISABLE_HARFBUZZ ON)
 add_subdirectory(freetype)
 
 # Fix warning with ONE_PIXEL macro clash.
-target_compile_options(freetype PRIVATE -Wno-macro-redefined)
+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,14 +11,23 @@ target_include_directories(${PROJECT_NAME}
     harfbuzz/src
 )
 
-# Keep these settigns in sync with xcode/harfbuzz project.
-target_compile_options(${PROJECT_NAME}
-  PRIVATE
-    -fno-rtti
-    -fno-exceptions
-    -fno-threadsafe-statics
-    $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-format-pedantic>
-)
+if (MSVC)
+  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
+      -fno-exceptions
+      -fno-threadsafe-statics
+      $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-format-pedantic>
+  )
+endif()
 
 target_compile_definitions(${PROJECT_NAME}
   PRIVATE
@@ -28,14 +37,20 @@ target_compile_definitions(${PROJECT_NAME}
     #$<$<BOOL:${APPLE}>:HAVE_CORETEXT>
     HAVE_ATEXIT
     HAVE_GETPAGESIZE
-    HAVE_MMAP
     HAVE_MPROTECT
-    HAVE_PTHREAD
     HAVE_SYSCONF
-    HAVE_SYS_MMAN_H
-    HAVE_UNISTD_H
 )
 
+if (NOT MSVC)
+  target_compile_definitions(${PROJECT_NAME}
+    PRIVATE
+      HAVE_MMAP
+      HAVE_PTHREAD
+      HAVE_SYS_MMAN_H
+      HAVE_UNISTD_H
+  )
+endif()
+
 target_link_libraries(${PROJECT_NAME} Freetype::Freetype)
 
 add_library(harfbuzz::harfbuzz ALIAS harfbuzz)

3party/icu/CMakeLists.txt

@@ -172,6 +172,7 @@ 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,6 +11,7 @@ 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,7 +7,6 @@
 #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"
 
@@ -283,12 +282,6 @@ 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,7 +8,6 @@
 #include <stdint.h>
 
 #include <boost/iterator/iterator_facade.hpp>
-#include <boost/iostreams/device/mapped_file.hpp>
 
 namespace succinct { namespace util {
 
@@ -205,29 +204,6 @@ 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,7 +19,18 @@ 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__)
@@ -30,6 +41,9 @@ 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 20)
-set(CMAKE_C_STANDARD 17)
+set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_C_STANDARD 23)
 # Our code does not rely on gnu extensions.
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_C_EXTENSIONS OFF)
@@ -39,18 +39,16 @@ 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 11)
+  set(CMAKE_OBJC_STANDARD 23)
   set(CMAKE_OBJC_FLAGS -fobjc-arc)
   set(CMAKE_OBJC_VISIBILITY_PRESET hidden)
   enable_language(OBJCXX)
   set(CMAKE_OBJCXX_EXTENSIONS OFF)
-  set(CMAKE_OBJCXX_STANDARD 20)
+  set(CMAKE_OBJCXX_STANDARD 23)
   set(CMAKE_OBJCXX_FLAGS -fobjc-arc)
   set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
 endif()
 
-execute_process(COMMAND "./configure.sh" WORKING_DIRECTORY ${OMIM_ROOT})
-
 message(STATUS "Using compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
 
 if (CMAKE_UNITY_BUILD)
@@ -87,7 +85,7 @@ if (MSVC)
   add_compile_options(/utf-8)
   add_link_options(/INCREMENTAL:NO)
 else()
-  add_compile_options(-ffast-math)
+  add_compile_options(-ffast-math $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>)
 endif()
 
 if (PLATFORM_WIN)
@@ -197,7 +195,7 @@ if (USE_PCH)
 endif()
 
 # Should be on the root level, not in 3party, so tests can get these dependencies.
-if (PLATFORM_LINUX OR PLATFORM_WIN)
+if (PLATFORM_LINUX)
   find_package(ICU COMPONENTS uc i18n data REQUIRED)
   find_package(Freetype REQUIRED)
   find_package(harfbuzz REQUIRED)

README.md

@@ -19,20 +19,20 @@
 </div>
 <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" style="width: 90%; max-width: 150px;"/>
+    <a href="https://codeberg.org/comaps/comaps/src/branch/main/LICENSE">
+      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
     </a>
     <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
-      <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;"/>
+      <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"/>
     </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" style="width: 90%; max-width: 145px;"/>
+      <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"/>
     </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" style="width: 90%; max-width: 191px;"/>
+      <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"/>
     </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" style="width: 90%; max-width: 160px;"/>
+      <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"/>
     </a>
   </p>
 </div>
@@ -41,8 +41,6 @@
 
 A community-led free & open source maps app based on [OpenStreetMap](https://www.openstreetmap.org), built for transparency, privacy, and not-for-profit values. A fork of Organic Maps, originally based on Maps.ME.
 
-**Available for:** Android, iOS, ARM macOS, and alpha Linux/macOS desktop builds (also usable on Linux phones).
-
 <p align="center">
   <a href="https://apps.apple.com/app/comaps/id6747180809">
     <img src="docs/badges/apple-appstore.png" alt="App Store" width="160"/>
@@ -77,9 +75,10 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www
 ## ⚡️ Highlights
 
 - **Offline-first**: Navigate without a connection
-- **Privacy-respecting**: No tracking, Ads or data collection
+- **Privacy-respecting**: No tracking, ads or data collection
 - **Lightweight**: Battery- and space-efficient
 - **Simple**: Polished, user-focused interface
+- **Cross-platform**: Available for Android, iOS, MacOS, and Linux.
 - **Community-built**: Free, open source, and collaborative
 - **Transparent**: Open finances and governance
 

android/app/build.gradle

@@ -138,8 +138,6 @@ 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
-• Laster-markak eta ibilbideak esportatu eta inportatu KML, KMZ, GPX formatuetan
+• Markagailuak eta arrastoak 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

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

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

@@ -24,9 +24,8 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
 {
   private static final String TAG = MapFragment.class.getSimpleName();
 
-  @SuppressWarnings("NonNullFieldNotInitialized")
   @NonNull
-  private Map mMap;
+  private final Map mMap = new Map(DisplayType.Device);
 
   public void updateCompassOffset(int offsetX, int offsetY)
   {
@@ -87,7 +86,8 @@ 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,7 +18,6 @@ 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;
@@ -28,7 +27,6 @@ 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;
@@ -66,7 +64,6 @@ 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;
@@ -99,7 +96,6 @@ 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;
@@ -290,7 +286,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
 
     processIntent();
-    migrateOAuthCredentials();
   }
 
   /**
@@ -345,36 +340,6 @@ 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;
+  private final Map mMap = new Map(Car);
 
   @NonNull
   private Rect mVisibleArea = new Rect();
@@ -45,7 +45,6 @@ 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);
@@ -60,6 +59,7 @@ 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/downloader/BottomPanel.java

@@ -17,12 +17,12 @@ import app.organicmaps.sdk.downloader.UpdateInfo;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.button.MaterialButton;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 
 class BottomPanel
 {
   private final DownloaderFragment mFragment;
-  private final FloatingActionButton mFab;
+  private final ExtendedFloatingActionButton mFab;
   private final MaterialButton mButton;
 
   private final View.OnClickListener mDownloadListener = new View.OnClickListener() {

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

@@ -236,6 +236,11 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     return true;
   }
 
+  boolean saveEdits()
+  {
+    return setEdits() && beforeSavingValidation();
+  }
+
   @NonNull
   protected String getDescription()
   {
@@ -282,6 +287,18 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     return validateNames();
   }
 
+  private boolean beforeSavingValidation() {
+    // Validation to make sure address features have a house number
+    if (!Editor.nativeCheckHouseNumberWhenIsAddress())
+    {
+      mHouseNumber.requestFocus();
+      UiUtils.setInputError(mInputHouseNumber, R.string.error_enter_correct_house_number);
+      InputUtils.showKeyboard(mHouseNumber);
+      return false;
+    }
+    return true;
+  }
+
   private boolean validateNames()
   {
     for (int pos = 0; pos < mNamesAdapter.getItemCount(); pos++)

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

@@ -276,6 +276,11 @@ public class EditorHostFragment
     return ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).setEdits();
   }
 
+  private boolean saveEdits()
+  {
+    return ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).saveEdits();
+  }
+
   @Override
   public void onClick(View v)
   {
@@ -310,7 +315,7 @@ public class EditorHostFragment
       case LANGUAGE -> editMapObject();
       case MAP_OBJECT ->
       {
-        if (!setEdits())
+        if (!saveEdits())
           return;
 
         // Save object edits

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

@@ -55,20 +55,23 @@ 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(
-          LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category, parent, false));
+      return new FeatureViewHolder(inflater.inflate(R.layout.item_feature_category, parent, false));
     }
     case TYPE_FOOTER ->
     {
-      return new FooterViewHolder(
-          LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category_footer, parent, false),
-          (FooterListener) mFragment);
+      return new FooterViewHolder(inflater.inflate(R.layout.item_feature_category_footer, parent, false),
+                                  (FooterListener) mFragment);
+    }
+    default ->
+    {
+      throw new IllegalArgumentException("Unsupported viewType: " + viewType);
     }
-    default -> throw new IllegalArgumentException("Unsupported");
     }
   }
 

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

@@ -130,13 +130,6 @@ 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];
@@ -150,6 +143,13 @@ 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,6 +170,13 @@ 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.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+    mTabs.addOnTabSelectedListener(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.layers_enabled});
+      mergeDrawableStates(drawableState, new int[] {R.attr.state_layers_enabled});
     return drawableState;
   }
 

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

@@ -16,6 +16,7 @@ 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;
@@ -295,7 +296,7 @@ public class MapButtonsController extends Fragment
       mBadgeDrawable.setMaxCharacterCount(0);
       mBadgeDrawable.setHorizontalOffset(verticalOffset);
       mBadgeDrawable.setVerticalOffset(dpToPx(9, context));
-      mBadgeDrawable.setBackgroundColor(getResources().getColor(R.color.base_accent));
+      mBadgeDrawable.setBackgroundColor(ContextCompat.getColor(context, R.color.base_accent));
       mBadgeDrawable.setVisible(enable);
       BadgeUtils.attachBadgeDrawable(mBadgeDrawable, menuButton);
     }

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

@@ -11,6 +11,8 @@ 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;
@@ -122,7 +124,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
     }
 
     listView.setAdapter(buildAdapter());
-    listView.setChildDivider(new ColorDrawable(getResources().getColor(android.R.color.transparent)));
+    listView.setChildDivider(new ColorDrawable(ContextCompat.getColor(requireContext(), 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;
 
-  @NonNull
-  private final LocationHelper mLocationHelper;
+  @Nullable
+  private LocationHelper mLocationHelper;
 
   private int mCurrentCompassOffsetX;
   private int mCurrentCompassOffsetY;
@@ -79,13 +79,17 @@ public final class Map
 
   private static int sCurrentDpi = 0;
 
-  public Map(@NonNull DisplayType mapType, @NonNull LocationHelper locationHelper)
+  public Map(@NonNull DisplayType mapType)
   {
     mDisplayType = mapType;
-    mLocationHelper = locationHelper;
     onCreate(false);
   }
 
+  public void setLocationHelper(@NonNull LocationHelper locationHelper)
+  {
+    mLocationHelper = locationHelper;
+  }
+
   /**
    * Moves the map compass using the given offsets.
    *
@@ -142,6 +146,8 @@ 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/Editor.java

@@ -112,6 +112,7 @@ public final class Editor
   public static native String nativeGetHouseNumber();
   public static native void nativeSetHouseNumber(String houseNumber);
   public static native boolean nativeIsHouseValid(String houseNumber);
+  public static native boolean nativeCheckHouseNumberWhenIsAddress();
   public static boolean nativeIsLevelValid(String level)
   {
     return nativeIsMetadataValid(Metadata.MetadataType.FMD_BUILDING_LEVELS.toInt(), level);

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

@@ -29,9 +29,6 @@ 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";
@@ -48,16 +45,6 @@ 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, "");
@@ -82,8 +69,6 @@ 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 com.google.android.material.R.attr.colorSecondary;
+      return androidx.appcompat.R.attr.colorAccent;
     }
 
     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))
-              : getResources().getColor(R.color.button_accent_text_disabled);
+              : ContextCompat.getColor(getContext(), 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:layers_enabled="true"/>
+      app:state_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:layers_enabled="true"/>
+        app:state_layers_enabled="true"/>
 
   <item android:color="@color/white_secondary"/>
 </selector>

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

@@ -1,5 +1,10 @@
-<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>
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        app:state_layers_enabled="true"
+        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

@@ -0,0 +1,5 @@
+<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.MaterialComponents.LinearProgressIndicator"
+    style="@style/Widget.Material3.LinearProgressIndicator"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/margin_base_plus"
@@ -37,5 +37,6 @@
     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,6 +46,8 @@
         </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">
@@ -54,8 +56,6 @@
       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/fragment_downloader.xml

@@ -24,7 +24,7 @@
     android:layout_below="@id/toolbar"
     android:layout_above="@id/action"/>
 
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
+  <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
     android:id="@+id/fab"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -33,8 +33,10 @@
     android:layout_alignParentEnd="true"
     android:layout_marginEnd="@dimen/margin_base"
     android:layout_marginBottom="@dimen/margin_base"
-    app:tint="?android:textColorPrimaryInverse"
-    app:srcCompat="@drawable/ic_plus"/>
+    android:text="@string/download_maps"
+    android:textColor="?accentButtonTextColor"
+    app:iconTint="?android:textColorPrimaryInverse"
+    app:icon="@drawable/ic_download"/>
 
   <app.organicmaps.widget.PlaceholderView
     android:id="@+id/placeholder"

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.MaterialComponents.LinearProgressIndicator"
+      style="@style/Widget.Material3.LinearProgressIndicator"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       app:indicatorColor="?colorSecondary"

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

@@ -580,8 +580,6 @@
     <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-af/types_strings.xml

@@ -169,6 +169,7 @@
     <string name="type.amenity.water_point">Waterpunt</string>
     <string name="type.amenity.water_point.drinking_water_no">Waterpunt</string>
     <string name="type.barrier">Versperring</string>
+    <string name="type.barrier.yes">Versperring</string>
     <string name="type.barrier.block">Blok</string>
     <string name="type.barrier.bollard">Bolder</string>
     <string name="type.barrier.border_control">Grensbeheer</string>

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

@@ -607,8 +607,6 @@
     <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-ar/types_strings.xml

@@ -185,6 +185,7 @@
     <string name="type.amenity.water_point">نقطة إعادة تعبة قنينة المياه</string>
     <string name="type.amenity.water_point.drinking_water_no">نقطة إعادة تعبة قنينة المياه</string>
     <string name="type.barrier">حاجز</string>
+    <string name="type.barrier.yes">حاجز</string>
     <string name="type.barrier.block">حاجز</string>
     <string name="type.barrier.bollard">حاجز سيارات</string>
     <string name="type.barrier.border_control">أمن الحدود</string>

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

@@ -598,8 +598,6 @@
     <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-az/types_strings.xml

@@ -177,6 +177,7 @@
     <string name="type.amenity.water_point">Karvanlar üçün su nöqtəsi</string>
     <string name="type.amenity.water_point.drinking_water_no">Karvanlar üçün su nöqtəsi</string>
     <string name="type.barrier">Maneə</string>
+    <string name="type.barrier.yes">Maneə</string>
     <string name="type.barrier.block">Blok</string>
     <string name="type.barrier.bollard">Birbaşa</string>
     <string name="type.barrier.border_control">Sərhəd Nəzarəti</string>

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

@@ -588,8 +588,6 @@
     <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,8 +551,6 @@
     <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-bg/types_strings.xml

@@ -603,6 +603,7 @@
     <string name="type.amenity.waste_disposal">Кофа</string>
     <string name="type.amenity.waste_basket">Кошче за отпадък</string>
     <string name="type.barrier">Бариера</string>
+    <string name="type.barrier.yes">Бариера</string>
     <string name="type.barrier.chain">Верига</string>
     <string name="type.amenity.place_of_worship.muslim">Джамия</string>
     <string name="type.amenity.post_box">Пощенска кутия</string>

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

@@ -595,8 +595,6 @@
     <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-ca/types_strings.xml

@@ -187,6 +187,7 @@
     <string name="type.amenity.water_point">Punt d’aigua</string>
     <string name="type.amenity.water_point.drinking_water_no">Punt d’aigua</string>
     <string name="type.barrier">Barrera</string>
+    <string name="type.barrier.yes">Barrera</string>
     <string name="type.barrier.block">Bloc</string>
     <string name="type.barrier.bollard">Bol·lard</string>
     <string name="type.barrier.border_control">Control fronterer</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">WiFi</string>
+    <string name="category_wifi">Wi-Fi</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í WiFi zpřesníte určení vaší polohy.</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_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,8 +570,6 @@
     <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>
@@ -912,4 +910,6 @@
     <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-cs/types_strings.xml

@@ -1193,6 +1193,7 @@
     <string name="type.amenity.vending_machine.fuel">Palivové čerpadlo</string>
     <string name="type.amenity.waste_transfer_station">Překladiště odpadu</string>
     <string name="type.barrier">Bariéra</string>
+    <string name="type.barrier.yes">Bariéra</string>
     <string name="type.barrier.cycle_barrier">Cyklistická bariéra</string>
     <string name="type.cuisine.bubble_tea">Bubble Tea</string>
     <string name="type.emergency">Nouzová stanice</string>

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

@@ -566,8 +566,6 @@
     <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-da/types_strings.xml

@@ -1201,6 +1201,7 @@
     <string name="type.amenity.vending_machine.fuel">Benzinautomat</string>
     <string name="type.amenity.waste_transfer_station">Affaldsplads</string>
     <string name="type.barrier">Barriere</string>
+    <string name="type.barrier.yes">Barriere</string>
     <string name="type.barrier.chain">Kæde</string>
     <string name="type.amenity.vending_machine.food">Madautomat</string>
     <string name="type.barrier.cycle_barrier">Cykelbarriere</string>

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

@@ -596,8 +596,6 @@
     <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>
@@ -921,4 +919,6 @@
     <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-de/types_strings.xml

@@ -182,6 +182,7 @@
     <string name="type.amenity.water_point">Wasseranschluss</string>
     <string name="type.amenity.water_point.drinking_water_no">Wasseranschluss</string>
     <string name="type.barrier">Barriere</string>
+    <string name="type.barrier.yes">Barriere</string>
     <string name="type.barrier.block">Block</string>
     <string name="type.barrier.bollard">Poller</string>
     <string name="type.barrier.border_control">Grenzkontrolle</string>

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

@@ -591,8 +591,6 @@
     <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-el/types_strings.xml

@@ -1230,6 +1230,7 @@
     <string name="type.barrier.wall">Τοίχος</string>
     <string name="type.recycling.cans">Κονσερβοκούτια</string>
     <string name="type.barrier">Εμπόδιο</string>
+    <string name="type.barrier.yes">Εμπόδιο</string>
     <string name="type.amenity.vending_machine.sweets">Διανεμητής γλυκών</string>
     <string name="type.barrier.cycle_barrier">Εμπόδιο ποδηλάτου</string>
     <string name="type.recycling.shoes">Παπούτσια</string>

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

@@ -60,8 +60,6 @@
     <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,13 +598,11 @@
     <string name="button_plan">Planificar</string>
     <string name="placepage_remove_stop">Eliminar parada</string>
     <string name="placepage_add_stop">Añadir parada</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <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="dialog_error_storage_title">Error 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ébalo ó escríbenos 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, introduzca el nombre correcto</string>
+    <string name="error_enter_correct_name">Por favor, introduce un nombre válido</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>
@@ -648,7 +646,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, toque un lugar en el mapa y después toque el icono de la estrella</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="category_desc_more">…más</string>
     <string name="export_file">Exportar KMZ</string>
     <string name="export_file_gpx">Exportar GPX</string>
@@ -731,10 +729,10 @@
     <string name="mountains">Montañas</string>
     <string name="animals">Animales</string>
     <string name="hotels">Hoteles</string>
-    <string name="buildings">Edificios</string>
+    <string name="buildings">Edificaciones</string>
     <string name="money">Dinero</string>
     <string name="shops">Tiendas</string>
-    <string name="parkings">Estacionamiento</string>
+    <string name="parkings">Aparcamiento</string>
     <string name="fuel_places">Gasolineras</string>
     <string name="medicine">Medicina</string>
     <string name="search_in_the_list">Buscar en la lista</string>
@@ -770,7 +768,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 tiene que desbloquear el dispositivo para ejecutar la aplicación.</string>
+    <string name="enable_show_on_lock_screen_description">Cuando se activa, no tienes 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 -->
@@ -784,27 +782,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 sus donaciones y apoyo, podemos crear los mejores mapas del mundo!</string>
+    <string name="app_tip_01">¡Con tus donaciones y apoyo, podemos crear los mejores mapas del mundo!</string>
     <!-- App tip #02 -->
-    <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>
+    <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>
     <!-- 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">Toque en cualquier lugar del mapa para seleccionar cualquier elemento. Mantenga pulsado para ocultar y volver a mostrar la interfaz.</string>
+    <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>
     <!-- App tip #05 -->
-    <string name="app_tip_05">¿Sabía que su ubicación actual en el mapa se puede seleccionar?</string>
+    <string name="app_tip_05">¿Sabías que tu ubicación actual en el mapa se puede seleccionar?</string>
     <!-- App tip #06 -->
-    <string name="app_tip_06">Puede ayudar a traducir nuestra aplicación a su idioma.</string>
+    <string name="app_tip_06">Puedes ayudar a traducir nuestra aplicación a tu 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">Puede arreglar y mejorar fácilmente los datos del mapa.</string>
+    <string name="app_tip_08">Puedes 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 le 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 te 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 usa CoMaps en la pantalla del teléfono</string>
+    <string name="car_used_on_the_phone_screen">Ahora estás usando 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 usa CoMaps en la pantalla del coche</string>
+    <string name="car_used_on_the_car_screen">Ahora estás usando 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 -->
@@ -812,9 +810,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, compruebe la notificación en el teléfono.</string>
+    <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>
     <!-- Notification title for permission request from AA. -->
-    <string name="aa_request_permission_notification">Esta aplicación necesita su permiso</string>
+    <string name="aa_request_permission_notification">Esta aplicación necesita tu 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. -->
@@ -825,7 +823,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 trayectos</string>
+    <string name="bookmarks_export">Exportar todos los marcadores y trazas</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. -->
@@ -926,4 +924,6 @@
     <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

@@ -188,6 +188,7 @@
     <string name="type.amenity.water_point">Fuente de agua para caravanas</string>
     <string name="type.amenity.water_point.drinking_water_no">Fuente de agua para caravanas</string>
     <string name="type.barrier">Barrera</string>
+    <string name="type.barrier.yes">Barrera</string>
     <string name="type.barrier.block">Bloque</string>
     <string name="type.barrier.bollard">Bolardo</string>
     <string name="type.barrier.border_control">Control fronterizo</string>
@@ -322,19 +323,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">Pastas</string>
+    <string name="type.cuisine.pasta">Pasta</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">Cocina regional</string>
+    <string name="type.cuisine.regional">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">Mariscos</string>
+    <string name="type.cuisine.seafood">del mar</string>
     <string name="type.cuisine.soba">Soba</string>
     <string name="type.cuisine.spanish">Española</string>
     <string name="type.cuisine.steak_house">Asador</string>
@@ -373,10 +374,10 @@
     <string name="type.healthcare.speech_therapist">Logopedia</string>
     <!-- SECTION: Types: Roads -->
     <string name="type.highway">Carretera</string>
-    <string name="type.highway.bridleway">Camino de caballos</string>
+    <string name="type.highway.bridleway">Camino ecuestre</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 de caballos</string>
+    <string name="type.highway.bridleway.permissive">Camino ecuestre</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 +385,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 autobús</string>
+    <string name="type.highway.bus_stop">Parada de bus</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 +441,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 de carretera principal</string>
+    <string name="type.highway.primary.tunnel">Túnel</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 +789,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 de energía de turbina de gas</string>
-    <string name="type.power.generator.hydro">Planta de energía hidroeléctrica</string>
+    <string name="type.power.generator.gas">Planta termoeléctrica de gas</string>
+    <string name="type.power.generator.hydro">Planta 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 de baja tensión</string>
-    <string name="type.power.plant">Planta de energía</string>
+    <string name="type.power.minor_line">Línea eléctrica menor</string>
+    <string name="type.power.plant">Planta eléctrica</string>
     <string name="type.power.plant.coal">Central eléctrica de carbón</string>
-    <string name="type.power.plant.gas">Planta de energía de turbina de gas</string>
-    <string name="type.power.plant.hydro">Planta de energía hidroeléctrica</string>
+    <string name="type.power.plant.gas">Planta termoeléctrica de gas</string>
+    <string name="type.power.plant.hydro">Planta 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 eléctrica</string>
+    <string name="type.power.substation">Subestación</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 +814,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">Monorraíl</string>
+    <string name="type.railway.monorail">Monorriel</string>
     <string name="type.railway.narrow_gauge">Vía férrea estrecha</string>
-    <string name="type.railway.platform">Plataforma de vía férrea</string>
+    <string name="type.railway.platform">Plataforma ferroviaria</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 +1148,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">Reparación de motos</string>
+    <string name="type.shop.motorcycle_repair">Taller 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 +1166,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">Artículos de deporte</string>
+    <string name="type.shop.sports">Tienda deportiva</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 +1363,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 monorraíl</string>
-    <string name="type.railway.monorail.tunnel">Túnel de monorraíl</string>
+    <string name="type.railway.monorail.bridge">Puente de monorriel</string>
+    <string name="type.railway.monorail.tunnel">Túnel de monorriel</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,8 +590,6 @@
     <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>
@@ -916,4 +914,6 @@
     <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-et/types_strings.xml

@@ -186,6 +186,7 @@
     <string name="type.amenity.water_point">Joogivee tankimispunkt</string>
     <string name="type.amenity.water_point.drinking_water_no">Joogivee tankimispunkt</string>
     <string name="type.barrier">Barjäär</string>
+    <string name="type.barrier.yes">Barjäär</string>
     <string name="type.barrier.block">Kiviplokk</string>
     <string name="type.barrier.bollard">Piirdetulp</string>
     <string name="type.barrier.border_control">Piirikontroll</string>

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 ibilbideak</string>
+    <string name="bookmarks_and_tracks">Markagailuak eta arrastoak</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">Arrasto</string>
+    <string name="tracks_title">Arrastoak</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">Ibilbidea grabatzea</string>
+    <string name="track_recording">Arrastoa grabatzea</string>
     <!-- For the first routing -->
     <string name="accept">Onartu</string>
     <!-- For the first routing -->
@@ -596,8 +596,6 @@
     <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>
@@ -613,7 +611,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 ibilbideak</string>
+    <string name="bookmarks_import">Inportatu markagailuak eta arrastoak</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>
@@ -631,8 +629,8 @@
     </plurals>
     <string name="restore">Berreskuratu</string>
     <plurals name="tracks">
-        <item quantity="one">%d arrasto</item>
-        <item quantity="other">%d arrastos</item>
+        <item quantity="one">arrasto %d</item>
+        <item quantity="other">%d arrasto</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Pribatutasuna</string>
@@ -816,7 +814,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 Laster-marka eta Pista guztiak</string>
+    <string name="bookmarks_export">Esportatu markagailu eta arrasto 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. -->
@@ -840,17 +838,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">Ibilbidearen grabaketa</string>
+    <string name="start_track_recording">Grabatu arrastoa</string>
     <!-- Prompt for stopping a track recording. -->
-    <string name="stop_track_recording">Gelditu ibilbidearen grabaketa</string>
+    <string name="stop_track_recording">Gelditu arrastoaren 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">Ibilbidearen grabaketa markagailuetan eta ibilbideetan gorde nahi duzu?</string>
+    <string name="track_recording_alert_title">Markagailu eta arrastoetan 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">Ibilbidea hutsik dago; ez dago ezer gordetzeko</string>
+    <string name="track_recording_toast_nothing_to_save">Arrastoa 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>
@@ -909,7 +907,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">Egin babeskopia zure gailuan automatikoki</string>
+    <string name="pref_backup_summary">Automatikoki egin babeskopia zure gailuan</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

@@ -181,6 +181,7 @@
     <string name="type.amenity.water_point">Ur iturria</string>
     <string name="type.amenity.water_point.drinking_water_no">Ur iturria</string>
     <string name="type.barrier">Hesia</string>
+    <string name="type.barrier.yes">Hesia</string>
     <string name="type.barrier.block">Blokea</string>
     <string name="type.barrier.bollard">Pibotea</string>
     <string name="type.barrier.border_control">Muga kontrola</string>
@@ -484,12 +485,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">Kalea</string>
-    <string name="type.highway.track.area">Kalea</string>
+    <string name="type.highway.track">Arrastoa</string>
+    <string name="type.highway.track.area">Arrastoa</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.track.bridge">Zubia</string>
-    <string name="type.highway.track.grade1">Kalea</string>
-    <string name="type.highway.track.no.access">Kalea</string>
+    <string name="type.highway.track.grade1">Arrastoa</string>
+    <string name="type.highway.track.no.access">Arrastoa</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 +522,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">Kalea</string>
+    <string name="type.area_highway.track">Arrastoa</string>
     <string name="type.area_highway.trunk">Kalea</string>
     <string name="type.area_highway.unclassified">Kalea</string>
     <!-- SECTION: Types: Historic -->
@@ -749,7 +750,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">Trenbide laguntzailea</string>
+    <string name="type.railway.rail.service">Zerbitzuko trenbidea</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 +1275,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">Pista</string>
-    <string name="type.leisure.track.area">Pista</string>
+    <string name="type.leisure.track">Arrastoa</string>
+    <string name="type.leisure.track.area">Arrastoa</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,8 +560,6 @@
     <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.even">آدرس/بلاک</string>
-    <string name="type.addr_interpolation.odd">آدرس/بلاک</string>
+    <string name="type.addr_interpolation">نشانی/بست</string>
+    <string name="type.addr_interpolation.even">نشانی/بست</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.helipad">پد فرود بالگرد</string>
-    <string name="type.amenity">زیر ساخت</string>
-    <string name="type.amenity.arts_centre">مرکز هنری</string>
+    <string name="type.aeroway.aerodrome.international">فرودگاه فرامرزی</string>
+    <string name="type.aeroway.helipad">بالگَردنشین</string>
+    <string name="type.amenity">امکانات آسایشی</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.bbq">منقل کباب</string>
-    <string name="type.amenity.bench">سَکو</string>
-    <string name="type.amenity.bicycle_parking">پارکینگ دوچرخه</string>
-    <string name="type.amenity.bicycle_rental">مکان اجاره دوچرخه</string>
+    <string name="type.amenity.bar">می‌کده</string>
+    <string name="type.amenity.bbq">اَدیشت کباب</string>
+    <string name="type.amenity.bench">نیمکت</string>
+    <string name="type.amenity.bicycle_parking">ایستگاه دوچرخه</string>
+    <string name="type.amenity.bicycle_rental">جایگاه کرایه دوچرخه</string>
     <string name="type.amenity.bicycle_repair_station">ایستگاه تعمیر دوچرخه</string>
     <string name="type.amenity.biergarten">غذا</string>
     <string name="type.amenity.brothel">فاحشه خانه</string>
@@ -1092,8 +1092,13 @@
     <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.station">ایستگاه راه هوایی</string>
-    <string name="type.aeroway">­زیرساخت هوا و فضا</string>
+    <string name="type.aerialway.cable_car">خودردو کابلی</string>
+    <string name="type.aerialway.station">ایستگاه راه‌هوایی</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,8 +600,6 @@
     <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>
@@ -921,4 +919,6 @@
     <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-fi/types_strings.xml

@@ -184,6 +184,7 @@
     <string name="type.amenity.water_point">Vesipiste</string>
     <string name="type.amenity.water_point.drinking_water_no">Vesipiste</string>
     <string name="type.barrier">Este</string>
+    <string name="type.barrier.yes">Este</string>
     <string name="type.barrier.block">Este</string>
     <string name="type.barrier.bollard">Tolppa</string>
     <string name="type.barrier.border_control">Rajavalvonta</string>

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

@@ -602,8 +602,6 @@
     <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>
@@ -927,4 +925,6 @@
     <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-fr/types_strings.xml

@@ -177,6 +177,7 @@
     <string name="type.amenity.water_point">Point d’eau</string>
     <string name="type.amenity.water_point.drinking_water_no">Point d’eau</string>
     <string name="type.barrier">Barrière</string>
+    <string name="type.barrier.yes">Barrière</string>
     <string name="type.barrier.block">Bloc</string>
     <string name="type.barrier.bollard">Poteau</string>
     <string name="type.barrier.border_control">Contrôle aux frontières</string>

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

@@ -402,7 +402,6 @@
     <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>
@@ -639,4 +638,6 @@
     <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-gl/types_strings.xml

@@ -189,6 +189,7 @@
     <string name="type.amenity.water_point">Fonte de auga para caravanas</string>
     <string name="type.amenity.water_point.drinking_water_no">Fonte de auga para caravanas</string>
     <string name="type.barrier">Barreira</string>
+    <string name="type.barrier.yes">Barreira</string>
     <string name="type.barrier.block">Bloque</string>
     <string name="type.barrier.bollard">Bolardo</string>
     <string name="type.barrier.border_control">Control fronteirizo</string>

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

@@ -81,7 +81,6 @@
     <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">
@@ -639,4 +638,6 @@
     <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-gsw/types_strings.xml

@@ -176,6 +176,7 @@
     <string name="type.amenity.waste_disposal">Müllcontainer</string>
     <string name="type.amenity.water_point">Wasseraaschluss</string>
     <string name="type.barrier">Barriere</string>
+    <string name="type.barrier.yes">Barriere</string>
     <string name="type.barrier.block">Block</string>
     <string name="type.barrier.bollard">Poller</string>
     <string name="type.barrier.border_control">Grenzkontrolle</string>

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

@@ -423,8 +423,6 @@
     <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,8 +576,6 @@
     <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-hu/types_strings.xml

@@ -1220,6 +1220,7 @@
     <string name="type.aerialway.chair_lift">Ülőlift</string>
     <string name="type.aerialway.gondola">Gondolakabinos felvonó</string>
     <string name="type.barrier">Akadály</string>
+    <string name="type.barrier.yes">Akadály</string>
     <string name="type.barrier.cycle_barrier">Kerékpárakadály</string>
     <string name="type.barrier.fence">Kerítés</string>
     <string name="type.barrier.hedge">Sövény</string>

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

@@ -565,8 +565,6 @@
     <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,7 +506,6 @@
     <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-is/types_strings.xml

@@ -620,6 +620,7 @@
     <string name="type.amenity.water_point">Vatnspóstur</string>
     <string name="type.amenity.water_point.drinking_water_no">Vatnspóstur</string>
     <string name="type.barrier">Hindrun</string>
+    <string name="type.barrier.yes">Hindrun</string>
     <string name="type.barrier.city_wall">Borgarmúr</string>
     <string name="type.barrier.cycle_barrier">Hjólahindrun</string>
     <string name="type.waterway.ditch">Drenskurður</string>

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

@@ -581,8 +581,6 @@
     <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-it/types_strings.xml

@@ -186,6 +186,7 @@
     <string name="type.amenity.water_point">Punto acqua</string>
     <string name="type.amenity.water_point.drinking_water_no">Punto acqua</string>
     <string name="type.barrier">Barriera</string>
+    <string name="type.barrier.yes">Barriera</string>
     <string name="type.barrier.block">Blocco</string>
     <string name="type.barrier.bollard">Pilastro</string>
     <string name="type.barrier.border_control">Controllo di frontiera</string>

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

@@ -587,8 +587,6 @@
     <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-iw/types_strings.xml

@@ -186,6 +186,7 @@
     <string name="type.amenity.water_point">נקודת מילוי מיכלי מים</string>
     <string name="type.amenity.water_point.drinking_water_no">נקודת מילוי מיכלי מים</string>
     <string name="type.barrier">מחסום</string>
+    <string name="type.barrier.yes">מחסום</string>
     <string name="type.barrier.block">חסימה</string>
     <string name="type.barrier.bollard">עמוד</string>
     <string name="type.barrier.border_control">ביקורת גבולות</string>

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

@@ -600,8 +600,6 @@
     <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-ja/types_strings.xml

@@ -170,6 +170,7 @@
     <string name="type.amenity.water_point">給水所</string>
     <string name="type.amenity.water_point.drinking_water_no">給水所</string>
     <string name="type.barrier">障害物</string>
+    <string name="type.barrier.yes">障害物</string>
     <string name="type.barrier.block">ブロック</string>
     <string name="type.barrier.bollard">柱</string>
     <string name="type.barrier.border_control">国境管理</string>

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

@@ -563,8 +563,6 @@
     <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,8 +587,6 @@
     <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,8 +590,6 @@
     <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,8 +562,6 @@
     <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-mr/types_strings.xml

@@ -163,6 +163,7 @@
     <string name="type.amenity.waste_disposal">कचऱ्याची मोठी पेटी</string>
     <string name="type.amenity.waste_transfer_station">कचरा हस्तांतरण केंद्र</string>
     <string name="type.barrier">अडथळा</string>
+    <string name="type.barrier.yes">अडथळा</string>
     <string name="type.barrier.block">अडथळा</string>
     <string name="type.barrier.bollard">खांब</string>
     <string name="type.barrier.border_control">सीमा नियंत्रण</string>

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

@@ -518,7 +518,6 @@
     <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,8 +598,6 @@
     <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

@@ -158,6 +158,7 @@
     <string name="type.amenity.water_point">Vannpunkt</string>
     <string name="type.amenity.water_point.drinking_water_no">Vannpunkt</string>
     <string name="type.barrier">Barriere</string>
+    <string name="type.barrier.yes">Barriere</string>
     <string name="type.barrier.block">Blokk</string>
     <string name="type.barrier.bollard">Pullert</string>
     <string name="type.barrier.border_control">Grensekontroll</string>
@@ -1193,4 +1194,5 @@
     <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,6 +1,7 @@
 <?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>