Fallback to previous Coastlines

Signed-off-by: zyphlar <zyphlar@gmail.com>

.gitignore

@@ -9,6 +9,7 @@ Makefile.Release
 object_script.*.Debug
 object_script.*.Release
 compile_commands.json
+*.local.*
 
 stxxl.errlog
 stxxl.log
@@ -27,10 +28,6 @@ data/edits.xml
 data/World.mwm
 data/WorldCoasts.mwm
 
-# generated when running tests. NOT the lowercase 'testing' which should be kept.
-Testing
-!testing
-
 # Compiled Python
 *.pyc
 

android/app/build.gradle

@@ -15,12 +15,6 @@ buildscript {
   }
 }
 
-repositories {
-  google()
-  mavenCentral()
-  maven { url 'https://www.jitpack.io' } // MPAndroidChart
-}
-
 apply plugin: 'com.android.application'
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'ru.cian.huawei-publish-gradle-plugin'
@@ -412,6 +406,8 @@ android {
 }
 
 dependencies {
+  implementation project(':sdk')
+
   coreLibraryDesugaring libs.android.tools.desugar
 
   // Google Play Location Services

android/app/src/google/play/listings/da-DK/full-description.txt

@@ -0,0 +1,36 @@
+En fællesskabsdrevet gratis og open source-kortapp baseret på OpenStreetMap-data og forstærket med en forpligtelse til gennemsigtighed, privatliv og non-profit.
+
+Bliv en del af fællesskabet og vær med til at skabe den bedste kortapp
+• Brug appen og fortæl andre om den
+• Giv feedback og rapporter problemer
+• Opdater kortdata i appen eller på OpenStreetMap-webstedet
+
+<i>Din feedback og 5-stjernede anmeldelser er den bedste støtte for os!</i>
+
+‣ <b>Enkel og poleret</b>: væsentlige, brugervenlige funktioner, der bare virker.
+‣ <b>Offline-focused</b>: Planlæg og naviger på din rejse i udlandet uden behov for mobilfordbindelse, søg efter rutepunkter, mens du er på en lang vandretur osv. Alle app-funktioner er designet til at fungere offline..
+‣ <b>Respekt for privatlivets fred</b>: Appen er designet med fokus på privatlivets fred – den identificerer ikke personer, sporer ikke og indsamler ikke personlige oplysninger. Annoncefri.
+‣ <b>Sparer på batteriet og plads</b>: Dræner ikke dit batteri som andre navigationsapps. Kompakte kort sparer værdifuld plads på din telefon.
+‣ <b>Gratis og udviklet af fællesskabet</b>: Folk som dig har været med til at udvikle appen ved at tilføje steder til OpenStreetMap, teste og give feedback på funktioner samt bidrage med deres udviklingskompetencer og penge.
+‣ <b>Åben og gennemsigtig beslutningstagning og økonomi, non-profit og fuldstændig open source.</b>
+
+<b>Vigtigste funktioner</b>:
+• Detaljerede kort med steder, der ikke er tilgængelige på Google Maps, kan downloades.
+• Udendørstilstand med fremhævede vandreruter, campingpladser, vandkilder, bjergtoppe, højdekurver osv.
+• Gang- og cykelstier
+• Interessepunkter som restauranter, tankstationer, hoteller, butikker, seværdigheder og meget mere
+• Søg efter navn, adresse eller efter interessepunkt-kategori
+• Navigation med stemmevejledning til gående, cyklende eller kørende
+• Bogmærk dine yndlingssteder med ét enkelt tryk
+• Offline Wikipedia-artikler
+• Lag med metrolinjer og rutevejledning
+• Sporoptagelse
+• Eksportér og importér bogmærker og ruter i KML, KMZ, GPX-formater
+• En mørk tilstand til brug om natten
+• Forbedr kortdata for alle ved hjælp af en simpel, indbygget redigeringsfunktion
+• Android Auto-understøttelse
+
+Rapportér app-problemer, kom med forslag og bliv en del af vores fællesskab på <b><i>comaps.app</i></b> webstedet.
+
+<b>Nu med frihed</b>
+Udforsk din rejse, og navigér i verden med fokus på privatliv og fællesskab!

android/app/src/google/play/listings/da-DK/title.txt

@@ -0,0 +1 @@
+CoMaps - Naviger med privatliv

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

@@ -1 +1 @@
-Navigation cartographique facile - Propulsé par la communauté
+Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté

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

@@ -141,7 +141,6 @@ import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE;
 import static app.organicmaps.sdk.util.PowerManagment.POWER_MANAGEMENT_TAG;
-import static app.organicmaps.sdk.util.concurrency.UiThread.runLater;
 
 
 public class MwmActivity extends BaseMwmFragmentActivity
@@ -2597,7 +2596,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
       items.add(new MenuBottomSheetItem(R.string.download_maps, R.drawable.ic_download, getDownloadMapsCounter(), this::onDownloadMapsOptionSelected));
 
-      if (!Config.getDonateUrl(getApplicationContext()).isEmpty())
+      mDonatesUrl = Config.getDonateUrl(getApplicationContext());
+      if (!mDonatesUrl.isEmpty())
         items.add(new MenuBottomSheetItem(R.string.donate, R.drawable.ic_donate, this::onDonateOptionSelected));
 
       if (!BUTTON_SETTINGS_CODE.equals(activeLeftButton))

android/app/src/main/java/app/organicmaps/backup/BackupUtils.java

@@ -4,7 +4,6 @@ import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_DEFAUL
 import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_KEY;
 import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.Uri;
@@ -17,11 +16,6 @@ import android.text.style.AbsoluteSizeSpan;
 import androidx.annotation.NonNull;
 import androidx.documentfile.provider.DocumentFile;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;

android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java

@@ -5,7 +5,6 @@ import static app.organicmaps.backup.BackupUtils.isBackupFolderAvailable;
 import static app.organicmaps.settings.BackupSettingsFragment.BACKUP_FOLDER_PATH_KEY;
 import static app.organicmaps.settings.BackupSettingsFragment.BACKUP_INTERVAL_KEY;
 import static app.organicmaps.settings.BackupSettingsFragment.LAST_BACKUP_TIME_KEY;
-import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
 
 import android.app.Activity;
 import android.content.SharedPreferences;

android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java

@@ -150,9 +150,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
 
     BookmarkCollectionAdapter adapter = new BookmarkCollectionAdapter(getCategoryOrThrow(),
                                                                       mCategoryItems);
-    adapter.setOnClickListener((v, item) -> {
-      BookmarkListActivity.startForResult(this, startBookmarkListForResult, item);
-    });
+    adapter.setOnClickListener((v, item) -> BookmarkListActivity.startForResult(this, startBookmarkListForResult, item));
 
     return adapter;
   }
@@ -855,15 +853,18 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
   @Nullable
   public ArrayList<MenuBottomSheetItem> getMenuBottomSheetItems(String id)
   {
-    if (id.equals(BOOKMARKS_MENU_ID))
-      return getBookmarkMenuItems();
-    if (id.equals(TRACK_MENU_ID))
-    {
-      final Track track = (Track) getBookmarkListAdapter().getItem(mSelectedPosition);
-      return getTrackMenuItems(track);
-    }
-    if (id.equals(OPTIONS_MENU_ID))
-      return getOptionsMenuItems();
-    return null;
+      switch (id) {
+          case BOOKMARKS_MENU_ID -> {
+              return getBookmarkMenuItems();
+          }
+          case TRACK_MENU_ID -> {
+              final Track track = (Track) getBookmarkListAdapter().getItem(mSelectedPosition);
+              return getTrackMenuItems(track);
+          }
+          case OPTIONS_MENU_ID -> {
+              return getOptionsMenuItems();
+          }
+      }
+      return null;
   }
 }

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

@@ -3,7 +3,6 @@ package app.organicmaps.car;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -16,8 +15,6 @@ import androidx.car.app.validation.HostValidator;
 import androidx.core.app.NotificationChannelCompat;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
-import androidx.lifecycle.DefaultLifecycleObserver;
-import androidx.lifecycle.LifecycleOwner;
 
 import app.organicmaps.BuildConfig;
 import app.organicmaps.R;

android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java

@@ -27,6 +27,7 @@ import app.organicmaps.sdk.search.SearchListener;
 import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.sdk.search.SearchRecents;
 import app.organicmaps.sdk.search.SearchResult;
+import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.Language;
 
 public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
@@ -114,7 +115,8 @@ public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
       }
 
       builder.setOnClickListener(() -> {
-        SearchRecents.add(title, getCarContext());
+        if (Config.isSearchHistoryEnabled())
+          SearchRecents.add(title, getCarContext());
         SearchEngine.INSTANCE.cancel();
         SearchEngine.INSTANCE.showResult(resultIndex);
       });

android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java

@@ -25,6 +25,7 @@ import app.organicmaps.sdk.search.SearchListener;
 import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.sdk.search.SearchRecents;
 import app.organicmaps.sdk.search.SearchResult;
+import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.Language;
 
 public class SearchScreen extends BaseMapScreen implements SearchTemplate.SearchCallback, SearchListener
@@ -147,7 +148,8 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
       if (!TextUtils.isEmpty(region))
         builder.addText(region);
       builder.setOnClickListener(() -> {
-        SearchRecents.add(title, getCarContext());
+        if (Config.isSearchHistoryEnabled())
+          SearchRecents.add(title, getCarContext());
         SearchEngine.INSTANCE.cancel();
         SearchEngine.INSTANCE.showResult(resultIndex);
       });

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

@@ -33,35 +33,17 @@ public final class RoutingHelpers
   public static LaneDirection createLaneDirection(@NonNull LaneWay laneWay, boolean isRecommended)
   {
     int shape = LaneDirection.SHAPE_UNKNOWN;
-    switch (laneWay)
-    {
-    case REVERSE:
-      shape = LaneDirection.SHAPE_U_TURN_LEFT;
-      break;
-    case SHARP_LEFT:
-      shape = LaneDirection.SHAPE_SHARP_LEFT;
-      break;
-    case LEFT:
-      shape = LaneDirection.SHAPE_NORMAL_LEFT;
-      break;
-    case SLIGHT_LEFT:
-    case MERGE_TO_LEFT:
-      shape = LaneDirection.SHAPE_SLIGHT_LEFT;
-      break;
-    case SLIGHT_RIGHT:
-    case MERGE_TO_RIGHT:
-      shape = LaneDirection.SHAPE_SLIGHT_RIGHT;
-      break;
-    case THROUGH:
-      shape = LaneDirection.SHAPE_STRAIGHT;
-      break;
-    case RIGHT:
-      shape = LaneDirection.SHAPE_NORMAL_RIGHT;
-      break;
-    case SHARP_RIGHT:
-      shape = LaneDirection.SHAPE_SHARP_RIGHT;
-      break;
-    }
+      shape = switch (laneWay) {
+          case REVERSE -> LaneDirection.SHAPE_U_TURN_LEFT;
+          case SHARP_LEFT -> LaneDirection.SHAPE_SHARP_LEFT;
+          case LEFT -> LaneDirection.SHAPE_NORMAL_LEFT;
+          case SLIGHT_LEFT, MERGE_TO_LEFT -> LaneDirection.SHAPE_SLIGHT_LEFT;
+          case SLIGHT_RIGHT, MERGE_TO_RIGHT -> LaneDirection.SHAPE_SLIGHT_RIGHT;
+          case THROUGH -> LaneDirection.SHAPE_STRAIGHT;
+          case RIGHT -> LaneDirection.SHAPE_NORMAL_RIGHT;
+          case SHARP_RIGHT -> LaneDirection.SHAPE_SHARP_RIGHT;
+          default -> shape;
+      };
 
     return LaneDirection.create(shape, isRecommended);
   }

android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java

@@ -142,9 +142,10 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
 
         if (progress)
         {
+          int roundedProgress = Math.round(mCurrentCountry.progress);
           mProgress.setPending(false);
-          mProgress.setProgress(Math.round(mCurrentCountry.progress));
-          sizeText = mActivity.getString(R.string.downloader_downloading) + " " + StringUtils.formatPercent(mCurrentCountry.progress / 100);
+          mProgress.setProgress(roundedProgress);
+          sizeText = mActivity.getString(R.string.downloader_downloading) + " " + StringUtils.formatPercent(roundedProgress / 100.0);
         }
         else
         {

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

@@ -12,12 +12,11 @@ import android.widget.ScrollView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
-import app.organicmaps.sdk.Framework;
+
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
 import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.sdk.util.Constants;
-import app.organicmaps.sdk.util.DateUtils;
 import app.organicmaps.util.InputUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -56,7 +55,6 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment
     MaterialButton registerButton = view.findViewById(R.id.register);
     registerButton.setOnClickListener((v) -> Utils.openUrl(requireActivity(), Constants.Url.OSM_REGISTER));
     mProgress = view.findViewById(R.id.osm_login_progress);
-    final String dataVersion = DateUtils.getShortDateFormatter().format(Framework.getDataVersion());
 
     // TODO(@pastk): remove unused flow with users entering credentials into app's form
     // Hide login and password inputs and Forgot password button
@@ -165,10 +163,7 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment
         // Finish OAuth2 auth flow and get username for UI.
         final String oauthToken = OsmOAuth.nativeAuthWithOAuth2Code(oauth2code);
         final String username = (oauthToken == null) ? null : OsmOAuth.nativeGetOsmUsername(oauthToken);
-        UiThread.run(() ->
-        {
-          processAuth(oauthToken, username);
-        });
+        UiThread.run(() -> processAuth(oauthToken, username));
       });
     }
   }

android/app/src/main/java/app/organicmaps/leftbutton/LeftButtonsHolder.java

@@ -10,7 +10,6 @@ import androidx.preference.PreferenceManager;
 import app.organicmaps.R;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 

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

@@ -399,15 +399,12 @@ public class MapButtonsController extends Fragment
       final View button = entry.getValue();
       if (button.getParent() == parent)
       {
-        int toleranceOffset = 0;
-        // Allow offset tolerance for zoom buttons
-        switch(entry.getKey())
-        {
-        case zoomIn: case zoomOut: case zoom:
-          toleranceOffset = -140;
-          break;
-        }
-        showButton(getViewTopOffset(translation, button) >= toleranceOffset, entry.getKey());
+        int toleranceOffset = switch (entry.getKey()) {
+            case zoomIn, zoomOut, zoom -> -140;
+            default -> 0;
+            // Allow offset tolerance for zoom buttons
+        };
+          showButton(getViewTopOffset(translation, button) >= toleranceOffset, entry.getKey());
       }
     }
   }

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

@@ -12,7 +12,6 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import app.organicmaps.sdk.Framework;
@@ -226,37 +225,34 @@ public class RoutingPlanController extends ToolbarController
   {
     UiUtils.invisible(mProgressVehicle, mProgressPedestrian, mProgressTransit,
                       mProgressBicycle, mProgressRuler);
-    WheelProgressView progressView;
-    switch (router)
-    {
-    case Vehicle:
-      mRouterTypes.check(R.id.vehicle);
-      progressView = mProgressVehicle;
-      break;
-    case Pedestrian:
-      mRouterTypes.check(R.id.pedestrian);
-      progressView = mProgressPedestrian;
-      break;
-    //case Taxi:
-    //    {
-    //      mRouterTypes.check(R.id.taxi);
-    //      progressView = mProgressTaxi;
-    //    }
-    case Transit:
-      mRouterTypes.check(R.id.transit);
-      progressView = mProgressTransit;
-      break;
-    case Bicycle:
-      mRouterTypes.check(R.id.bicycle);
-      progressView = mProgressBicycle;
-      break;
-    case Ruler:
-      mRouterTypes.check(R.id.ruler);
-      progressView = mProgressRuler;
-      break;
-    default:
-        throw new IllegalArgumentException("unknown router: " + router);
-    }
+    WheelProgressView progressView = switch (router) {
+        case Vehicle -> {
+            mRouterTypes.check(R.id.vehicle);
+            yield mProgressVehicle;
+        }
+        case Pedestrian -> {
+            mRouterTypes.check(R.id.pedestrian);
+            yield mProgressPedestrian;
+        }
+        //case Taxi:
+        //    {
+        //      mRouterTypes.check(R.id.taxi);
+        //      progressView = mProgressTaxi;
+        //    }
+        case Transit -> {
+            mRouterTypes.check(R.id.transit);
+            yield mProgressTransit;
+        }
+        case Bicycle -> {
+            mRouterTypes.check(R.id.bicycle);
+            yield mProgressBicycle;
+        }
+        case Ruler -> {
+            mRouterTypes.check(R.id.ruler);
+            yield mProgressRuler;
+        }
+        default -> throw new IllegalArgumentException("unknown router: " + router);
+    };
 
     RoutingToolbarButton button = mRouterTypes
         .findViewById(mRouterTypes.getCheckedRadioButtonId());

android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java

@@ -31,7 +31,6 @@ import androidx.annotation.NonNull;
 
 import app.organicmaps.downloader.Android7RootCertificateWorkaround;
 import app.organicmaps.sdk.util.log.Logger;
-import app.organicmaps.sdk.util.Utils;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;

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

@@ -5,7 +5,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -2,7 +2,6 @@ package app.organicmaps.settings;
 
 import static app.organicmaps.backup.BackupUtils.formatReadableFolderPath;
 import static app.organicmaps.backup.BackupUtils.getMaxBackups;
-import static app.organicmaps.backup.BackupUtils.isBackupFolderAvailable;
 import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
 
 import android.app.Activity;
@@ -355,13 +354,11 @@ public class BackupSettingsFragment
 
   private void showBackupErrorAlertDialog(String message)
   {
-    requireActivity().runOnUiThread(() -> {
-      new MaterialAlertDialogBuilder(requireActivity())
-          .setTitle(R.string.pref_backup_now_summary_failed)
-          .setMessage(message)
-          .setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss())
-          .show();
-    });
+    requireActivity().runOnUiThread(() -> new MaterialAlertDialogBuilder(requireActivity())
+        .setTitle(R.string.pref_backup_now_summary_failed)
+        .setMessage(message)
+        .setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss())
+        .show());
   }
 
   private void takePersistableUriPermission(Uri uri)

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

@@ -24,7 +24,6 @@ import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.editor.LanguagesFragment;
 import app.organicmaps.editor.ProfileActivity;
 import app.organicmaps.sdk.editor.data.Language;
-import app.organicmaps.help.HelpActivity;
 import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.location.LocationProviderFactory;
 import app.organicmaps.sdk.routing.RoutingOptions;
@@ -44,8 +43,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 

android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java

@@ -14,7 +14,6 @@ import com.google.android.material.textview.MaterialTextView;
 
 import app.organicmaps.R;
 import app.organicmaps.sdk.location.TrackRecorder;
-import app.organicmaps.sdk.util.Config;
 
 import java.util.ArrayList;
 

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/dl_done" />
+            <size
+                android:width="40dp"
+                android:height="40dp" />
+        </shape>
+    </item>
+
+    <item
+        android:left="8dp"
+        android:right="8dp"
+        android:bottom="8dp"
+        android:top="8dp">
+        <vector
+            android:width="20dp"
+            android:height="20dp"
+            android:viewportWidth="960"
+            android:viewportHeight="960">
+            <path
+                android:fillColor="#6c6c6c"
+                android:pathData="M382,606L721,267Q733,255 749.5,255Q766,255 778,267Q790,279 790,295.5Q790,312 778,324L410,692Q398,704 382,704Q366,704 354,692L182,520Q170,508 170.5,491.5Q171,475 183,463Q195,451 211.5,451Q228,451 240,463L382,606Z" />
+        </vector>
+    </item>
+</layer-list>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/dl_done_night" />
+            <size
+                android:width="40dp"
+                android:height="40dp" />
+        </shape>
+    </item>
+
+    <item
+        android:left="8dp"
+        android:right="8dp"
+        android:bottom="8dp"
+        android:top="8dp">
+        <vector
+            android:width="20dp"
+            android:height="20dp"
+            android:viewportWidth="960"
+            android:viewportHeight="960">
+            <path
+                android:fillColor="#cccdce"
+                android:pathData="M382,606L721,267Q733,255 749.5,255Q766,255 778,267Q790,279 790,295.5Q790,312 778,324L410,692Q398,704 382,704Q366,704 354,692L182,520Q170,508 170.5,491.5Q171,475 183,463Q195,451 211.5,451Q228,451 240,463L382,606Z" />
+        </vector>
+    </item>
+</layer-list>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/dl_download" />
+            <size
+                android:width="40dp"
+                android:height="40dp" />
+        </shape>
+    </item>
+
+    <item
+        android:bottom="8dp"
+        android:left="8dp"
+        android:right="8dp"
+        android:top="8dp">
+    <vector
+        android:width="20dp"
+        android:height="20dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+        <path
+            android:fillColor="#FFF"
+            android:pathData="M19,9h-4v-6h-6v6h-4l7,7 7,-7ZM5,18v2h14v-2h-14Z" />
+    </vector>
+    </item>
+</layer-list>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/dl_download_night" />
+            <size
+                android:width="40dp"
+                android:height="40dp" />
+        </shape>
+    </item>
+
+    <item
+        android:bottom="8dp"
+        android:left="8dp"
+        android:right="8dp"
+        android:top="8dp">
+        <vector
+            android:width="20dp"
+            android:height="20dp"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <path
+                android:fillColor="#756940"
+                android:pathData="M19,9h-4v-6h-6v6h-4l7,7 7,-7ZM5,18v2h14v-2h-14Z" />
+        </vector>
+    </item>
+</layer-list>

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

@@ -4,8 +4,16 @@
   <item>
     <shape android:shape="oval">
       <solid android:color="@color/base_red"/>
+      <size
+          android:width="40dp"
+          android:height="40dp" />
     </shape>
   </item>
 
-  <item android:drawable="@drawable/ic_downloader_retry"/>
+  <item
+      android:bottom="8dp"
+      android:drawable="@drawable/ic_downloader_retry"
+      android:left="8dp"
+      android:right="8dp"
+      android:top="8dp" />
 </layer-list>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/dl_download" />
+            <size
+                android:width="40dp"
+                android:height="40dp" />
+        </shape>
+    </item>
+
+    <item
+        android:bottom="8dp"
+        android:left="8dp"
+        android:right="8dp"
+        android:top="8dp">
+        <vector
+            android:width="20dp"
+            android:height="20dp"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <path
+                android:fillColor="#FFF"
+                android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
+        </vector>
+    </item>
+</layer-list>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/dl_done" />
+            <size
+                android:width="40dp"
+                android:height="40dp" />
+        </shape>
+    </item>
+
+    <item
+        android:bottom="8dp"
+        android:left="8dp"
+        android:right="8dp"
+        android:top="8dp">
+        <vector
+            android:width="20dp"
+            android:height="20dp"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <path
+                android:fillColor="#6c6c6c"
+                android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
+        </vector>
+    </item>
+</layer-list>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/dl_done_night" />
+            <size
+                android:width="40dp"
+                android:height="40dp" />
+        </shape>
+    </item>
+
+    <item
+        android:bottom="8dp"
+        android:left="8dp"
+        android:right="8dp"
+        android:top="8dp">
+        <vector
+            android:width="20dp"
+            android:height="20dp"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <path
+                android:fillColor="#cccdce"
+                android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
+        </vector>
+    </item>
+</layer-list>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/dl_download_night" />
+            <size
+                android:width="40dp"
+                android:height="40dp" />
+        </shape>
+    </item>
+
+    <item
+        android:bottom="8dp"
+        android:left="8dp"
+        android:right="8dp"
+        android:top="8dp">
+        <vector
+            android:width="20dp"
+            android:height="20dp"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <path
+                android:fillColor="#756940"
+                android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
+        </vector>
+    </item>
+</layer-list>

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

@@ -3,9 +3,17 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
   <item>
     <shape android:shape="oval">
-      <solid android:color="@color/base_yellow"/>
+      <solid android:color="@color/dl_update"/>
+      <size
+          android:width="40dp"
+          android:height="40dp" />
     </shape>
   </item>
 
-  <item android:drawable="@drawable/ic_downloader_update"/>
+  <item
+      android:bottom="8dp"
+      android:drawable="@drawable/ic_downloader_update"
+      android:left="8dp"
+      android:right="8dp"
+      android:top="8dp" />
 </layer-list>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M480,680q-17,0 -28.5,-11.5T440,640q0,-17 11.5,-28.5T480,600q17,0 28.5,11.5T520,640q0,17 -11.5,28.5T480,680ZM480,520q-17,0 -28.5,-11.5T440,480v-160q0,-17 11.5,-28.5T480,280q17,0 28.5,11.5T520,320v160q0,17 -11.5,28.5T480,520ZM200,480q0,54 21.5,99.5T280,658v-58q0,-17 11.5,-28.5T320,560q17,0 28.5,11.5T360,600v160q0,17 -11.5,28.5T320,800L160,800q-17,0 -28.5,-11.5T120,760q0,-17 11.5,-28.5T160,720h69q-51,-44 -80,-106t-29,-134q0,-94 49,-170t128,-116q14,-8 29.5,-1t20.5,23q5,16 -1.5,31T325,270q-56,31 -90.5,86.5T200,480ZM760,501q0,-54 -21.5,-99.5T680,323v58q0,17 -11.5,28.5T640,421q-17,0 -28.5,-11.5T600,381v-160q0,-17 11.5,-28.5T640,181h160q17,0 28.5,11.5T840,221q0,17 -11.5,28.5T800,261h-69q51,44 80,106t29,134q0,94 -49,170.5T663,788q-14,8 -29.5,0.5T613,765q-5,-16 1.5,-31t20.5,-23q56,-31 90.5,-86.5T760,501Z"
+      android:fillColor="#FFFFFF"/>
+</vector>

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

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="40dp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"
+      android:fillColor="#FFFFFF"/>
+</vector>

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

@@ -53,18 +53,18 @@
             app:layout_constraintTop_toTopOf="@id/version" />
         </LinearLayout>
 
-        <!--ImageView
+        <ImageView
           android:id="@+id/imageView3"
           android:layout_width="@dimen/about_logo"
           android:layout_height="@dimen/about_logo"
           android:contentDescription="@string/app_name"
-          app:srcCompat="@drawable/ic_launcher"
+          app:srcCompat="@drawable/ic_logo_monochrome"
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintEnd_toStartOf="@+id/linearLayout2"
           app:layout_constraintHorizontal_bias="0.5"
           app:layout_constraintStart_toEndOf="@+id/linearLayout1"
           app:layout_constraintTop_toTopOf="parent"
-          app:tint="?attr/colorLogo" /-->
+          app:tint="?attr/colorLogo" />
 
         <LinearLayout
           android:id="@+id/linearLayout2"

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

@@ -43,6 +43,7 @@
       android:layout_height="wrap_content"
       android:textAppearance="@style/MwmTextAppearance.Body4"
       android:maxLines="1"
+      android:textAlignment="viewStart"
       tools:text="Крымск"
       tools:background="#60FF00FF"/>
 
@@ -50,6 +51,7 @@
       android:id="@+id/name"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:textAlignment="viewStart"
       android:textAppearance="@style/MwmTextAppearance.Body1"
       tools:text="Донецкая область"
       tools:background="#40FF0000"/>
@@ -58,6 +60,7 @@
       android:id="@+id/subtitle"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:textAlignment="viewStart"
       android:textAppearance="@style/MwmTextAppearance.Body4"
       tools:text="Украина"
       tools:background="#60FFFF00"/>

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

@@ -21,5 +21,5 @@
     android:layout_height="match_parent"
     android:scaleType="center"
     android:background="?clickableBackground"
-    tools:src="@drawable/downloader_failed"/>
+    tools:src="@drawable/downloader_update"/>
 </FrameLayout>

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

@@ -33,6 +33,7 @@
         android:layout_height="wrap_content"
         android:hint="@string/name"
         android:padding="@dimen/margin_half_double_plus"
+        android:textAlignment="viewStart"
         android:inputType="textCapSentences"
         android:singleLine="true" />
     </com.google.android.material.textfield.TextInputLayout>
@@ -64,6 +65,7 @@
       android:paddingTop="@dimen/margin_quarter_plus"
       android:paddingBottom="@dimen/margin_half_plus"
       android:padding="@dimen/margin_half_double_plus"
+      android:textAlignment="viewStart"
       android:textAppearance="@style/MwmTextAppearance.Body1"
       app:drawableEndCompat="@drawable/ic_arrow_down" />
     <View
@@ -100,6 +102,7 @@
       android:layout_height="wrap_content"
       android:padding="@dimen/margin_half_double_plus"
       android:hint="@string/placepage_personal_notes_hint"
-      android:inputType="textMultiLine" />
+      android:inputType="textMultiLine"
+      android:textAlignment="viewStart" />
   </com.google.android.material.textfield.TextInputLayout>
 </RelativeLayout>

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

@@ -10,14 +10,16 @@
     android:id="@+id/checkbox"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_centerVertical="true"
-    android:layout_alignParentTop="true"
     android:layout_alignBottom="@id/bottom_line_container"
+    android:layout_alignParentStart="true"
+    android:layout_alignParentTop="true"
+    android:layout_centerVertical="true"
     android:layout_margin="@dimen/margin_half"
-    android:padding="@dimen/margin_half"
+    android:layout_marginStart="8dp"
     android:background="@null"
     android:button="@drawable/visibility_selector"
-    android:buttonTint="?accentColorSelector" />
+    android:buttonTint="?accentColorSelector"
+    android:padding="@dimen/margin_half" />
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/name"
     android:layout_width="wrap_content"
@@ -27,6 +29,7 @@
     android:layout_toEndOf="@id/checkbox"
     android:ellipsize="middle"
     android:singleLine="true"
+    android:textAlignment="viewStart"
     android:textAppearance="?fontBody1"
     tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
   <LinearLayout

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

@@ -29,6 +29,7 @@
       style="@style/MwmWidget.Editor.FieldLayout.EditText"
       tools:hint="Hint"
       android:padding="@dimen/margin_half_double_plus"
+      android:textAlignment="viewStart"
       tools:text="Input" />
   </com.google.android.material.textfield.TextInputLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -21,7 +21,8 @@
       android:hint="@string/editor_edit_place_name_hint"
       android:inputType="textCapSentences"
       android:padding="@dimen/margin_base"
-      android:singleLine="true" />
+      android:singleLine="true"
+      android:textAlignment="viewStart" />
   </com.google.android.material.textfield.TextInputLayout>
   <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/delete"

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

@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- TODO set attr  android:animateLayoutChanges="true"
-  when recyclerview-v7:23.2.1+ will be used.
-  RecyclerView of earlier versions doesn't have scrollTo method and hence crashes.-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/name"
@@ -9,7 +6,8 @@
   android:layout_height="wrap_content"
   android:orientation="vertical"
   android:paddingEnd="@dimen/margin_base"
-  android:paddingStart="@dimen/margin_base">
+  android:paddingStart="@dimen/margin_base"
+  android:animateLayoutChanges="true">
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/show_additional_names"

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

@@ -9,7 +9,7 @@
     <string name="delete">Smazat</string>
     <string name="download_maps">Stáhnout mapy</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Stahování selhalo, zkuste to znovu.</string>
+    <string name="download_has_failed">Stahování selhalo, klepnutím to zkusíte znovu</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Stahování…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -29,7 +29,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Omezená přesnost</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Chcete-li zajistit přesnou navigaci, povolte v nastavení možnost Přesná poloha.</string>
+    <string name="precise_location_is_disabled_long_text">Chcete-li zajistit přesnou navigaci, povolte v nastavení možnost Přesná poloha</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Ukázat na mapě</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -88,7 +88,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Ukládat mapy do</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Vyberte místo, kam mají být stahovány mapy.</string>
+    <string name="maps_storage_summary">Vyberte místo, kam mají být stahovány mapy</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Mapy</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -166,9 +166,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Vaše poloha zatím nebyla určena</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Omlouváme se, nastavení uložení map je dočasně nedostupné.</string>
+    <string name="cant_change_this_setting">Omlouváme se, nastavení úložiště map je dočasně nedostupné</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Právě probíhá stahování země.</string>
+    <string name="downloading_is_active">Právě probíhá stahování země</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Podívej se na mojí polohu v CoMaps! %1$s nebo %2$s Nemáš offline mapy? Stáhni si je zde: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -226,7 +226,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Otestovat hlasové pokyny (TTS, Text-To-Speech)</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Pokud nyní hlas neslyšíte, zkontrolujte nastavení hlasitosti nebo převodu textu na řeč v systému.</string>
+    <string name="pref_tts_playing_test_voice">Pokud nyní hlas neslyšíte, zkontrolujte nastavení hlasitosti nebo převodu textu na řeč v systému</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Není dostupná</string>
     <string name="pref_map_auto_zoom">Automatické zvětšení</string>
@@ -272,7 +272,7 @@
     <string name="downloader_download_all_button">Stáhnout vše</string>
     <string name="downloader_downloading">Probíhá stahování:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Chcete-li odstranit mapu, pak prosím zastavte navigaci.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Chcete-li odstranit mapu, zastavte prosím navigaci</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Lze vytvářet jen takové trasy, které se nachází na území jediné mapy.</string>
     <!-- Context menu item for downloader. -->
@@ -344,18 +344,18 @@
     <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>
-    <string name="dialog_routing_cant_build_route">Trasu se nepodařilo vytvořit.</string>
+    <string name="dialog_routing_cant_build_route">Trasu se nepodařilo vytvořit</string>
     <string name="dialog_routing_change_start_or_end">Upravte výchozí nebo cílový bod.</string>
     <string name="dialog_routing_change_start">Upravte výchozí bod</string>
     <string name="dialog_routing_start_not_determined">Trasa nebyla vytvořena. Výchozí bod se nepodařilo najít.</string>
     <string name="dialog_routing_select_closer_start">Zvolte výchozí bod blíže k silnici.</string>
     <string name="dialog_routing_change_end">Upravit cíl</string>
     <string name="dialog_routing_end_not_determined">Trasa nebyla vytvořena. Cíl se nepodařilo najít.</string>
-    <string name="dialog_routing_select_closer_end">Vyberte cílový bod blíže k silnici.</string>
-    <string name="dialog_routing_change_intermediate">Nelze najít mezilehlý bod.</string>
-    <string name="dialog_routing_intermediate_not_determined">Upravte mezilehlý bod.</string>
+    <string name="dialog_routing_select_closer_end">Vyberte cílový bod blíže k silnici</string>
+    <string name="dialog_routing_change_intermediate">Nelze najít mezilehlý bod</string>
+    <string name="dialog_routing_intermediate_not_determined">Upravte mezilehlý bod</string>
     <string name="dialog_routing_system_error">Systémová chyba</string>
-    <string name="dialog_routing_application_error">Trasu se nepodařilo vytvořit z důvodu chyby aplikace.</string>
+    <string name="dialog_routing_application_error">Trasu se nepodařilo vytvořit z důvodu chyby aplikace</string>
     <string name="dialog_routing_try_again">Prosím, zkuste to znovu</string>
     <string name="not_now">Nyní ne</string>
     <string name="dialog_routing_download_and_build_cross_route">Chcete mapu stáhnout a vytvořit optimálnější trasu, která vede přes více než jednu mapu?</string>
@@ -369,17 +369,17 @@
     <string name="hide">Skrýt</string>
     <string name="categories">Kategorie</string>
     <string name="history">Historie</string>
-    <string name="search_not_found">Omlouváme se, nic nebylo nalezeno.</string>
+    <string name="search_not_found">Omlouváme se, nic nebylo nalezeno</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Stáhněte si oblast, ve které hledáte, nebo zkuste přidat název blízkého města/obce.</string>
     <string name="search_history_title">Historie vyhledávání</string>
-    <string name="search_history_text">Získejte rychlý přístup k hledaným výrazům.</string>
+    <string name="search_history_text">Zobrazit nedávná vyhledávání</string>
     <string name="clear_search">Vymazat historii vyhledávání</string>
     <string name="p2p_your_location">Vaše umístění</string>
     <string name="p2p_start">Start</string>
     <string name="p2p_from_here">Trasa z</string>
     <string name="p2p_to_here">Trasa do</string>
-    <string name="p2p_only_from_current">Navigovat lze pouze z současného umístění.</string>
+    <string name="p2p_only_from_current">Navigovat lze pouze ze současného umístění</string>
     <string name="p2p_reroute_from_current">Máme naplánovat trasu z vašeho současného umístění?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Další</string>
@@ -446,14 +446,14 @@
     <!-- login text field -->
     <string name="email_or_username">E-mail nebo uživatelské jméno</string>
     <string name="level">Podlaží</string>
-    <string name="downloader_delete_map_dialog">Zároveň s touto mapou budou odstraněny také všechny změny na této mapě.</string>
+    <string name="downloader_delete_map_dialog">Zároveň s touto mapou budou odstraněny také všechny změny na této mapě</string>
     <string name="downloader_update_maps">Aktualizujte mapy</string>
     <string name="downloader_mwm_migration_dialog">Chcete-li vytvořit trasu, pak musíte aktualizovat všechny mapy a poté trasu naplánovat znovu.</string>
     <string name="downloader_search_field_hint">Najít mapu</string>
-    <string name="common_check_internet_connection_dialog">Zkontrolujte prosím své nastavení a ujistěte se, že je vaše zařízení připojeno k internetu.</string>
+    <string name="common_check_internet_connection_dialog">Zkontrolujte prosím své nastavení a ujistěte se, že je vaše zařízení připojeno k internetu</string>
     <string name="downloader_no_space_title">Nedostatek místa</string>
     <string name="downloader_no_space_message">Odstraňte prosím nepotřebná data</string>
-    <string name="editor_login_error_dialog">Chyba při přihlašování.</string>
+    <string name="editor_login_error_dialog">Chyba při přihlašování</string>
     <string name="editor_profile_changes">Oveřené změny</string>
     <string name="editor_focus_map_on_location">Přetažením mapy umístěte křížek na místo, kde se nachází místo nebo podnik.</string>
     <string name="editor_edit_place_title">Probíhají úpravy</string>
@@ -470,11 +470,11 @@
     <string name="osm_presentation">Data OpenStreetMap vytvořená komunitou ke dni %s. Další informace o tom, jak upravovat a aktualizovat mapu, najdete na stránkách OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) je komunitní projekt, jehož cílem je vytvořit svobodnou a otevřenou mapu. Je hlavním zdrojem mapových dat v aplikaci CoMaps a funguje podobně jako Wikipedie. Můžete přidávat nebo upravovat místa a ta se pak stanou dostupná milionům uživatelů po celém světě. \nPřipojte se ke komunitě a pomozte vytvořit lepší mapu pro všechny!</string>
-    <string name="login_to_make_edits_visible">Vytvořte si účet OpenStreetMap nebo se přihlaste a zveřejněte své úpravy mapy celému světu.</string>
+    <string name="login_to_make_edits_visible">Vytvořte si účet OpenStreetMap nebo se přihlaste a zveřejněte své úpravy mapy celému světu</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d z %2$d</string>
     <string name="download_over_mobile_header">Stáhnout pomocí připojení přes mobilní síť?</string>
-    <string name="download_over_mobile_message">Toto by mohlo být s některými tarify nebo roamingem výrazně dražší.</string>
+    <string name="download_over_mobile_message">Toto by mohlo být s některými tarify nebo roamingem výrazně dražší</string>
     <string name="error_enter_correct_house_number">Zadejte správné číslo domu</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Opravte počet poschodí, max. %d</string>
@@ -497,8 +497,8 @@
     <string name="editor_category_unsuitable_title">Nemůžete najít vhodnou kategorii?</string>
     <string name="editor_category_unsuitable_text">CoMaps umožňují přidávat pouze jednoduché kategorie bodů, tedy žádná města, silnice, jezera, obrysy budov atd. Takové kategorie prosím přidávejte přímo na <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Podrobné pokyny krok za krokem najdete v našem <a href="https://www.comaps.app/support/advanced-map-editing/">průvodci</a>.</string>
     <string name="downloader_no_downloaded_maps_title">Nemáte stažené žádné mapy</string>
-    <string name="downloader_no_downloaded_maps_message">Stáhněte si mapy a hledejte cestu a její cíl, i když jste offline.</string>
-    <string name="current_location_unknown_error_title">Současná poloha nezjištěna.</string>
+    <string name="downloader_no_downloaded_maps_message">Stáhněte si mapy a hledejte cestu a její cíl, i když jste offline</string>
+    <string name="current_location_unknown_error_title">Aktuální poloha je neznámá</string>
     <!-- abbreviation for meters -->
     <string name="m">m</string>
     <!-- abbreviation for kilometers -->
@@ -530,8 +530,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Chcete změnu odeslat všem uživatelům?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Ujistěte se, že jste nezadali žádná osobní data.</string>
-    <string name="editor_share_to_all_dialog_message_2">Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy.</string>
+    <string name="editor_share_to_all_dialog_message_1">Ujistěte se, že jste nezadali žádná soukromá nebo osobní data</string>
+    <string name="editor_share_to_all_dialog_message_2">Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Záznam trasy</string>
     <!-- For the first routing -->
@@ -544,10 +544,10 @@
     <string name="mobile_data_option_not_today">Nepoužívat dnes</string>
     <string name="mobile_data">Mobilní data</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Pro zobrazení oznámení o aktualizacích map a nahrávání úprav je potřeba internet.</string>
+    <string name="mobile_data_description">Pro zobrazení oznámení o aktualizacích map a nahrávání úprav je potřeba internet</string>
     <string name="mobile_data_option_never">Nikdy nepoužívat</string>
     <string name="mobile_data_option_ask">Vždy se zeptat</string>
-    <string name="traffic_update_maps_text">Ke zobrazení údajů o provozu musí být aktualizovány mapy.</string>
+    <string name="traffic_update_maps_text">Ke zobrazení údajů o provozu musí být mapy aktuální</string>
     <string name="big_font">Zvětšit velikost písma na mapě</string>
     <string name="traffic_update_app">Aktualizujte CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -557,7 +557,7 @@
     <string name="feedback_general">Všeobecné připomínky</string>
     <string name="prefs_languages_information">Pro hlasové pokyny používáme systémovou službu TTS. Mnoho zařízení se systémem Android používá Google TTS, můžete si jej stáhnout nebo aktualizovat na Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">U některých jazyků je třeba nainstalovat jiný hlasový syntetizátor nebo další jazykové sady z obchodu s aplikacemi (Google Play, Galaxy Store, App Gallery, FDroid). \nOtevřete nastavení vašeho zařízení → Jazyky a zadávání → Hlasové zadávání → Převod textu na řeč. \nZde můžete spravovat nastavení pro syntézu řeči (například stáhnout jazykový balíček pro použití offline) a vybrat jiný modul převodu textu na řeč.</string>
-    <string name="prefs_languages_information_off_link">Více informací najdete v tomto návodu.</string>
+    <string name="prefs_languages_information_off_link">Více informací najdete v tomto návodu</string>
     <string name="transliteration_title">Přepis do latinky</string>
     <string name="learn_more">Zjistit více</string>
     <!-- Subway exits for public transport marks on the map -->
@@ -639,7 +639,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Nikdy neupozorňovat</string>
     <string name="power_managment_title">Režim spořiče baterie</string>
-    <string name="power_managment_description">Pokusit se snížit spotřebu energie na úkor některých funkcí.</string>
+    <string name="power_managment_description">Pokusit se snížit spotřebu energie na úkor některých funkcí</string>
     <string name="power_managment_setting_never">Nikdy</string>
     <string name="power_managment_setting_auto">Při vybité baterii</string>
     <string name="power_managment_setting_manual_max">Vždy</string>

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

@@ -1406,4 +1406,8 @@
     <string name="type.natural.wetland.mangrove">Mangrovy</string>
     <string name="type.natural.wetland.tidalflat">Wattové pobřeží</string>
     <string name="type.leisure.escape_game">Úniková hra</string>
+    <string name="type.post_office.post_partner">Poštovní partner</string>
+    <string name="type.amenity.bicycle_parking.covered">Kryté parkování kol</string>
+    <string name="type.amenity.luggage_locker">Úschovná skříňka</string>
+    <string name="type.amenity.ranger_station">Správci parku</string>
 </resources>

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

@@ -9,7 +9,7 @@
     <string name="delete">Slet</string>
     <string name="download_maps">Hent kort</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Hentning af kort mislykkedes. Tryk for at prøve igen.</string>
+    <string name="download_has_failed">Hentning af kort mislykkedes. Tryk for at prøve igen</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Henter…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -29,7 +29,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Begrænset nøjagtighed</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">For at sikre nøjagtig navigation skal du aktivere præcis placering i indstillinger.</string>
+    <string name="precise_location_is_disabled_long_text">For at sikre nøjagtig navigation skal du aktivere præcis placering i indstillinger</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Vis på kortet</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -88,7 +88,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Gem kort på</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Vælg den mappe, der skal downloades kort til.</string>
+    <string name="maps_storage_summary">Vælg den mappe, der skal downloades kort til</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Downloadede kort</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -166,9 +166,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Din placering er ikke blevet bestemt endnu</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Beklager, indstillingerne for kortlagring er i øjeblikket deaktiveret.</string>
+    <string name="cant_change_this_setting">Beklager, indstillingerne for kortlagring er i øjeblikket deaktiveret</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Download af kort er i gang nu.</string>
+    <string name="downloading_is_active">Download af kort er i gang nu</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Hey, tjek min nuværende placering på CoMaps! %1$s eller %2$s. Har du ikke offline kort? Download her: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -222,7 +222,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Test stemmeanvisninger (TTS, Text-To-Speech)</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Tjek lydstyrken eller systemets tekst-til-tale-indstillinger, hvis du ikke kan høre stemmen nu.</string>
+    <string name="pref_tts_playing_test_voice">Tjek lydstyrken eller systemets tekst-til-tale-indstillinger, hvis du ikke kan høre stemmen nu</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Ikke til rådighed</string>
     <string name="pref_map_auto_zoom">Auto-zoom</string>
@@ -268,7 +268,7 @@
     <string name="downloader_download_all_button">Download alle</string>
     <string name="downloader_downloading">Downloader:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">For at slette kortet skal du stoppe navigeringen.</string>
+    <string name="downloader_delete_map_while_routing_dialog">For at slette kortet skal du stoppe navigeringen</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Der kan kun oprettes ruter, der er fuldt ud indeholdt i et kort over en enkelt region.</string>
     <!-- Context menu item for downloader. -->
@@ -340,18 +340,18 @@
     <string name="dialog_routing_location_turn_on">Aktiver placeringstjenester</string>
     <string name="dialog_routing_location_unknown_turn_on">Det lykkedes ikke at finde de aktuelle GPS-koordinater. Slå placeringstjenester til for at beregne rute.</string>
     <string name="dialog_routing_unable_locate_route">Kan ikke finde rute</string>
-    <string name="dialog_routing_cant_build_route">Kan ikke oprette rute.</string>
+    <string name="dialog_routing_cant_build_route">Kan ikke oprette rute</string>
     <string name="dialog_routing_change_start_or_end">Prøv at angive et andet startpunkt eller en anden destination.</string>
     <string name="dialog_routing_change_start">Vælg et andet startpunkt</string>
     <string name="dialog_routing_start_not_determined">Rute blev ikke oprettet. Kunne ikke finde startpunktet.</string>
     <string name="dialog_routing_select_closer_start">Angiv et startpunkt, der ligger tættere på en vej.</string>
     <string name="dialog_routing_change_end">Vælg en anden destination</string>
     <string name="dialog_routing_end_not_determined">Rute blev ikke oprettet. Kunne ikke finde destinationen.</string>
-    <string name="dialog_routing_select_closer_end">Angiv en destination, der ligger tættere på en vej.</string>
-    <string name="dialog_routing_change_intermediate">Kunne ikke lokalisere mellemliggende punkt.</string>
-    <string name="dialog_routing_intermediate_not_determined">Rediger det mellemliggende punkt.</string>
+    <string name="dialog_routing_select_closer_end">Angiv en destination, der ligger tættere på en vej</string>
+    <string name="dialog_routing_change_intermediate">Kunne ikke lokalisere mellemliggende punkt</string>
+    <string name="dialog_routing_intermediate_not_determined">Rediger det mellemliggende punkt</string>
     <string name="dialog_routing_system_error">Systemfejl</string>
-    <string name="dialog_routing_application_error">Kan ikke oprette rute på grund af en applikationsfejl.</string>
+    <string name="dialog_routing_application_error">Kan ikke oprette rute på grund af en applikationsfejl</string>
     <string name="dialog_routing_try_again">Prøv venligst igen</string>
     <string name="not_now">Ikke nu</string>
     <string name="dialog_routing_download_and_build_cross_route">Ønsker du at downloade kortet og planlægge en mere optimal rute, der strækker sig over mere end ét kort?</string>
@@ -365,17 +365,17 @@
     <string name="hide">Skjul</string>
     <string name="categories">Kategorier</string>
     <string name="history">Historik</string>
-    <string name="search_not_found">Ups, ingen resultater fundet.</string>
+    <string name="search_not_found">Ups, ingen resultater fundet</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Download den region, hvor du søger i, eller prøv at tilføje et nærliggende bynavn.</string>
     <string name="search_history_title">Søgehistorik</string>
-    <string name="search_history_text">Se dine seneste søgninger.</string>
+    <string name="search_history_text">Se dine seneste søgninger</string>
     <string name="clear_search">Ryd søgehistorik</string>
     <string name="p2p_your_location">Din placering</string>
     <string name="p2p_start">Start</string>
     <string name="p2p_from_here">Rute fra</string>
     <string name="p2p_to_here">Rute til</string>
-    <string name="p2p_only_from_current">Navigation er kun tilgængelig fra din nuværende placering.</string>
+    <string name="p2p_only_from_current">Navigation er kun tilgængelig fra din nuværende placering</string>
     <string name="p2p_reroute_from_current">Ønsker du at planlægge en rute fra din nuværende placering?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Næste</string>
@@ -442,14 +442,14 @@
     <!-- login text field -->
     <string name="email_or_username">E-mail eller brugernavn</string>
     <string name="level">Etage</string>
-    <string name="downloader_delete_map_dialog">Alle dine kortændringer vil blive slettet sammen med kortet.</string>
+    <string name="downloader_delete_map_dialog">Alle dine kortændringer vil blive slettet sammen med kortet</string>
     <string name="downloader_update_maps">Opdatér kort</string>
     <string name="downloader_mwm_migration_dialog">For at oprette en rute skal du opdatere alle kort og så planlægge ruten igen.</string>
     <string name="downloader_search_field_hint">Find kort</string>
-    <string name="common_check_internet_connection_dialog">Tjek dine indstillinger og sørg for, din enhed er forbundet til internettet.</string>
+    <string name="common_check_internet_connection_dialog">Sørg for, din enhed er forbundet til internettet</string>
     <string name="downloader_no_space_title">Ikke nok plads</string>
     <string name="downloader_no_space_message">Slet unødvendig data</string>
-    <string name="editor_login_error_dialog">Login-fejl.</string>
+    <string name="editor_login_error_dialog">Login-fejl</string>
     <string name="editor_profile_changes">Bekræftede ændringer</string>
     <string name="editor_focus_map_on_location">Træk i kortet for at placere korset på stedet eller virksomheden.</string>
     <string name="editor_edit_place_title">Redigerer</string>
@@ -466,11 +466,11 @@
     <string name="osm_presentation">Fællesskabsskabte OpenStreetMap-data fra %s. Få mere at vide om, hvordan du redigerer og opdaterer kortet på OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) er et fællesskabsprojekt til opbygning af et gratis og åbent kort. Det er hovedkilden til kortdata i CoMaps og fungerer på samme måde som Wikipedia. Du kan tilføje eller redigere steder, og de bliver tilgængelige for millioner af brugere over hele verden. \nSlut dig til fællesskabet og vær med til at skabe et bedre kort for alle!</string>
-    <string name="login_to_make_edits_visible">Opret en OpenStreetMap-konto eller log ind for at offentliggøre dine kortredigeringer til hele verden.</string>
+    <string name="login_to_make_edits_visible">Opret en OpenStreetMap-konto eller log ind for at offentliggøre dine kortredigeringer for hele verden</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d af %2$d</string>
     <string name="download_over_mobile_header">Download ved brug af mobilnetværksforbindelse?</string>
-    <string name="download_over_mobile_message">Dette kan være meget dyrt med nogle abonnementer eller ved roaming.</string>
+    <string name="download_over_mobile_message">Dette kan være meget dyrt med nogle abonnementer eller ved roaming</string>
     <string name="error_enter_correct_house_number">Indtast et gyldigt bygningsnummer</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Antallet af etager må ikke overstige %d etager</string>
@@ -493,8 +493,8 @@
     <string name="editor_category_unsuitable_title">Kan du ikke finde en passende kategori?</string>
     <string name="editor_category_unsuitable_text">CoMaps giver kun mulighed for at tilføje simple punktkategorier, dvs. ingen byer, veje, søer, bygningsomrids osv. Tilføj sådanne kategorier direkte til <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Se vores <a href="https://www.comaps.app/support/advanced-map-editing/">guide</a> for detaljerede trin for trin-instruktioner.</string>
     <string name="downloader_no_downloaded_maps_title">Du har ikke downloadet nogen kort</string>
-    <string name="downloader_no_downloaded_maps_message">Download kort for at søge og navigere offline.</string>
-    <string name="current_location_unknown_error_title">Aktuel placering er ukendt.</string>
+    <string name="downloader_no_downloaded_maps_message">Download kort for at søge og navigere offline</string>
+    <string name="current_location_unknown_error_title">Aktuel placering er ukendt</string>
     <!-- abbreviation for meters -->
     <string name="m">m</string>
     <!-- abbreviation for kilometers -->
@@ -526,8 +526,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Ønsker du at sende det til alle brugere?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Sørg for at du ikke indtastede personlige oplysninger.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-redaktører vil tjekke ændringerne og kontakte dig, hvis de har spørgsmål.</string>
+    <string name="editor_share_to_all_dialog_message_1">Sørg for at du ikke indtastede personlige oplysninger</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-redaktører vil tjekke ændringerne og kontakte dig, hvis de har spørgsmål</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Optager sporet</string>
     <!-- For the first routing -->
@@ -540,10 +540,10 @@
     <string name="mobile_data_option_not_today">Brug ikke i dag</string>
     <string name="mobile_data">Mobilt internet</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Mobilt internet er nødvendigt for at få besked om kortopdateringer og uploade ændringer.</string>
+    <string name="mobile_data_description">Mobilt internet er nødvendigt for at få besked om kortopdateringer og uploade ændringer</string>
     <string name="mobile_data_option_never">Brug aldrig</string>
     <string name="mobile_data_option_ask">Spørg altid</string>
-    <string name="traffic_update_maps_text">Kort skal opdateres for at vise trafikdata.</string>
+    <string name="traffic_update_maps_text">Kort skal opdateres for at vise trafikdata</string>
     <string name="big_font">Forøg størrelsen på kortetiketter</string>
     <string name="traffic_update_app">Opdater CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -553,7 +553,7 @@
     <string name="feedback_general">Generel feedback</string>
     <string name="prefs_languages_information">Vi bruger systemets TTS til stemmevejledning. Mange Android-enheder bruger Google TTS, du kan hente eller opdatere det via Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">For nogle sprog skal du installere en anden talesyntese eller en yderligere sprogpakke fra appbutiken (Google Play, Galaxy Store, App Gallery, FDroid). \nÅbn enhedens indstillinger → Sprog og input → Tale → Tekst til tale. \nHer kan du administrere indstillingerne for talesyntese (f.eks. downloade en sprogpakke til brug offline) og vælge et andet tekst-til-tale program.</string>
-    <string name="prefs_languages_information_off_link">Se denne vejledning for flere oplysninger.</string>
+    <string name="prefs_languages_information_off_link">Se denne vejledning for flere oplysninger</string>
     <string name="transliteration_title">Translitterer til det latinske alfabet</string>
     <string name="learn_more">Flere oplysninger</string>
     <!-- Subway exits for public transport marks on the map -->
@@ -632,7 +632,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Advar aldrig</string>
     <string name="power_managment_title">Strømsparetilstand</string>
-    <string name="power_managment_description">Prøv at reducere strømforbruget på bekostning af nogle funktioner.</string>
+    <string name="power_managment_description">Prøv at reducere strømforbruget på bekostning af nogle funktioner</string>
     <string name="power_managment_setting_never">Aldrig</string>
     <string name="power_managment_setting_auto">Når batteriniveauet er lavt</string>
     <string name="power_managment_setting_manual_max">Altid</string>

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

@@ -9,7 +9,7 @@
     <string name="delete">Löschen</string>
     <string name="download_maps">Karten herunterladen</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Herunterladen fehlgeschlagen. Antippen für einen neuen Versuch.</string>
+    <string name="download_has_failed">Das Herunterladen ist fehlgeschlagen, Antippen für einen neuen Versuch</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Wird heruntergeladen …</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -29,7 +29,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Begrenzte Genauigkeit</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Um eine genaue Navigation zu gewährleisten, aktivieren Sie in den Einstellungen die Option \"Genauen Standort verwenden\".</string>
+    <string name="precise_location_is_disabled_long_text">Um eine präzise Navigation zu gewährleisten, aktivieren Sie „Genauer Standort“ in den Einstellungen</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Auf der Karte anzeigen</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -88,7 +88,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Karten speichern auf</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Wählen Sie den Speicherort für die heruntergeladenen Karten.</string>
+    <string name="maps_storage_summary">Wählen Sie den Speicherort für die herunterzuladenden Karten</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Heruntergeladene Karten</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -179,9 +179,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Ihr Standort konnte noch nicht ermittelt werden</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Leider sind die Einstellungen für die Kartenspeicherung aktuell deaktiviert.</string>
+    <string name="cant_change_this_setting">Entschuldige, die Einstellungen für die Kartenspeicherung sind aktuell deaktiviert</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Die Karte wird heruntergeladen.</string>
+    <string name="downloading_is_active">Die Karte wird heruntergeladen</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -239,7 +239,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Teste Sprachanweisungen (TTS, Text-To-Speech)</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Überprüfe die Lautstärke oder die Text-to-speech-Einstellungen des Systems, wenn du die Stimme jetzt nicht hörst.</string>
+    <string name="pref_tts_playing_test_voice">Überprüfe die Lautstärke oder die Text-to-speech-Einstellungen des Systems, wenn du die Stimme jetzt nicht hören kannst</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Nicht verfügbar</string>
     <string name="pref_map_auto_zoom">Auto-Zoom</string>
@@ -285,7 +285,7 @@
     <string name="downloader_download_all_button">Alle herunterladen</string>
     <string name="downloader_downloading">Wird heruntergeladen:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Zum Löschen der Karte bitte die Navigation unterbrechen.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Zum Löschen der Karte bitte die Navigation unterbrechen</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Es können nur Routen erstellt werden, die vollständig in einer einzigen Karte enthalten sind.</string>
     <!-- Context menu item for downloader. -->
@@ -357,7 +357,7 @@
     <string name="dialog_routing_location_turn_on">Standortdienste aktivieren</string>
     <string name="dialog_routing_location_unknown_turn_on">Aktuelle GPS-Koordinaten können nicht ermittelt werden. Aktivieren Sie Standortdienste, um die Route zu berechnen.</string>
     <string name="dialog_routing_unable_locate_route">Route kann nicht ermittelt werden</string>
-    <string name="dialog_routing_cant_build_route">Route kann nicht erstellt werden.</string>
+    <string name="dialog_routing_cant_build_route">Route kann nicht erstellt werden</string>
     <string name="dialog_routing_change_start_or_end">Bitte passen Sie Ihren Startpunkt oder Ihr Ziel an.</string>
     <string name="dialog_routing_change_start">Startpunkt anpassen</string>
     <string name="dialog_routing_start_not_determined">Route wurde nicht erstellt. Startpunkt kann nicht gefunden werden.</string>

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

@@ -77,7 +77,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Signets</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Signets et parcours</string>
+    <string name="bookmarks_and_tracks">Signets et traces</string>
     <!-- Default bookmark list name -->
     <string name="core_my_places">Mes endroits</string>
     <!-- Add bookmark dialog - bookmark name -->
@@ -91,7 +91,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Enregistrer les cartes dans</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Sélectionner l\'emplacement où les cartes seront téléchargées</string>
+    <string name="maps_storage_summary">Sélectionnez le dossier dans lequel télécharger les cartes</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Cartes téléchargées</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -118,7 +118,7 @@
     <!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! -->
     <string name="category_eat">Un endroit pour manger</string>
     <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
-    <string name="category_food">Epiceries</string>
+    <string name="category_food">Épiceries</string>
     <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
     <string name="category_transport">Transport</string>
     <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
@@ -165,14 +165,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notes</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Signets CoMaps partagés</string>
+    <string name="share_bookmarks_email_subject">Signets CoMaps partagés avec vous</string>
     <string name="share_bookmarks_email_body">Bonjour ! \n \nVous trouverez ci-joint mes signets de l\'appli CoMaps. Veuillez les ouvrir si vous avez installé CoMaps. Si vous ne l\'avez pas, téléchargez l\'application pour votre appareil iOS ou Android en suivant ce lien : https://www.comaps.app/download/ \n \nBon voyage avec CoMaps !</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Chargement des signets</string>
     <!-- Kmz file successful loading -->
     <string name="load_kmz_successful">Les signets ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l\'écran du Gestionnaire de signets.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Échec lors du chargement des signets. Le fichier peut être corrompu ou défectueux.</string>
+    <string name="load_kmz_failed">Échec lors du chargement des signets. Le fichier pourrait être corrompu ou défectueux.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Le type de fichier n\'est pas reconnu par l\'appli : \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -182,11 +182,11 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Votre position n\'a pas encore été déterminée</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Désolé, les paramètres de stockage des cartes sont présentement désactivés.</string>
+    <string name="cant_change_this_setting">Désolé, les paramètres de stockage de carte sont actuellement désactivés.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Le téléchargement de la carte est en cours</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Hé, regardez ma position actuelle sur CoMaps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://www.comaps.app/download/</string>
+    <string name="my_position_share_sms">Hé, regardez ma position actuelle sur CoMaps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Téléchargez-les ici : https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
     <string name="bookmark_share_email_subject">Hé, regardez mon signet sur la carte CoMaps !</string>
     <!-- Subject for emailed position -->
@@ -206,7 +206,7 @@
     <!-- Confirmation for OpenStreetMap log out. -->
     <string name="osm_log_out_confirmation">Êtes-vous sûr de vouloir vous déconnecter de votre compte OpenStreetMap ?</string>
     <!-- Title for tracks category in bookmarks manager -->
-    <string name="tracks_title">Parcours</string>
+    <string name="tracks_title">Traces</string>
     <!-- Length of track in cell that describes route -->
     <string name="length">Longueur</string>
     <string name="share_my_location">Partager ma position</string>
@@ -216,7 +216,7 @@
     <string name="prefs_group_information">Information</string>
     <string name="prefs_group_route">Navigation</string>
     <string name="pref_zoom_title">Boutons de zoom</string>
-    <string name="pref_zoom_summary">Afficher à l\'écran</string>
+    <string name="pref_zoom_summary">Afficher sur la carte</string>
     <!-- Settings «Map» category: «Night style» title -->
     <string name="pref_map_style_title">Mode nuit</string>
     <!-- Generic «Off» string -->
@@ -236,13 +236,13 @@
     <!-- Settings «Route» category: «Tts announce street names» title -->
     <string name="pref_tts_street_names_title">Annoncer les noms de rue</string>
     <!-- Settings «Route» category: «Tts announce street names» description -->
-    <string name="pref_tts_street_names_description">Lorsqu\'il est activé, le nom de la rue ou de la sortie vers laquelle tourner sera prononcé à haute voix.</string>
+    <string name="pref_tts_street_names_description">Quand activé, le nom de la rue ou de la sortie à prendre sera prononcé à haute voix.</string>
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Langue vocale</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Teste les instructions vocales (TTS, Text-To-Speech)</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Vérifie le volume ou les paramètres de synthèse vocale du système si tu n\'entends pas la voix maintenant</string>
+    <string name="pref_tts_playing_test_voice">Vérifiez le volume ou les paramètres de synthèse vocale du système si vous n\'entendez pas la voix maintenant</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Non disponible</string>
     <string name="pref_map_auto_zoom">Zoom automatique</string>
@@ -275,7 +275,7 @@
     <!-- Toast text when compass calibration may improve the correctness of the current position arrow -->
     <string name="compass_calibration_required">Déplacez le téléphone en huit pour calibrer la boussole et fixer la direction de la flèche sur la carte.</string>
     <!-- Toast text when user hides UI with a long tap anywhere on the map -->
-    <string name="long_tap_toast">Appuie à nouveau longuement sur la carte pour voir l\'interface</string>
+    <string name="long_tap_toast">Appuyez à nouveau longuement sur la carte pour voir l\'interface</string>
     <!-- Update all button text -->
     <string name="downloader_update_all_button">Tout mettre à jour</string>
     <!-- Cancel all button text -->
@@ -334,7 +334,7 @@
     <!-- pink color -->
     <string name="pink">Rose</string>
     <!-- deep purple color -->
-    <string name="deep_purple">Pourpre foncé</string>
+    <string name="deep_purple">Violet foncé</string>
     <!-- light blue color -->
     <string name="light_blue">Bleu ciel</string>
     <!-- cyan color -->
@@ -355,15 +355,15 @@
     <string name="dialog_routing_disclaimer_precision">— La carte peut être imprécise et l\'itinéraire proposé n\'est pas forcément le plus direct pour arriver à destination ;</string>
     <string name="dialog_routing_disclaimer_recommendations">— L\'itinéraire proposé doit être considéré comme une simple recommandation ;</string>
     <string name="dialog_routing_disclaimer_borders">— Faites attention aux itinéraires traversant des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir des frontières étatiques dans des zones interdites ;</string>
-    <string name="dialog_routing_disclaimer_beware">Restez vigilant et soyez prudent sur la route !</string>
+    <string name="dialog_routing_disclaimer_beware">Restez vigilants et soyez prudents sur la route !</string>
     <string name="dialog_routing_check_gps">Vérifiez le signal GPS</string>
-    <string name="dialog_routing_error_location_not_found">Impossible de créer l\'itinéraire. Les coordonnées GPS actuelles n\'ont pas pu être identifiées.</string>
+    <string name="dialog_routing_error_location_not_found">Impossible de créer l\'itinéraire. Les coordonnées GPS actuelles n\'ont pas pu être déterminées.</string>
     <string name="dialog_routing_location_turn_wifi">Vérifiez le signal GPS. Activez le Wi-Fi pour améliorer la précision de votre localisation.</string>
     <string name="dialog_routing_location_turn_on">Activez les services de localisation</string>
-    <string name="dialog_routing_location_unknown_turn_on">Impossible d\'identifier les coordonnées GPS actuelles. Activez les services de localisation pour calculer l\'itinéraire.</string>
+    <string name="dialog_routing_location_unknown_turn_on">Impossible de déterminer les coordonnées GPS actuelles. Activez les services de localisation pour calculer l\'itinéraire.</string>
     <string name="dialog_routing_unable_locate_route">Impossible de localiser l\'itinéraire</string>
     <string name="dialog_routing_cant_build_route">Impossible de créer l\'itinéraire</string>
-    <string name="dialog_routing_change_start_or_end">Modifiez votre point de départ ou votre destination</string>
+    <string name="dialog_routing_change_start_or_end">Veuillez ajuster votre point de départ ou votre destination</string>
     <string name="dialog_routing_change_start">Modifiez votre point de départ</string>
     <string name="dialog_routing_start_not_determined">Impossible de localiser le point de départ. L\'itinéraire n\'a pas pu être créé.</string>
     <string name="dialog_routing_select_closer_start">Choisissez un point de départ à proximité d\'une route</string>
@@ -371,13 +371,13 @@
     <string name="dialog_routing_end_not_determined">Impossible de localiser la destination. L\'itinéraire n\'a pas pu être créé.</string>
     <string name="dialog_routing_select_closer_end">Choisissez un lieu de destination à proximité d\'une route</string>
     <string name="dialog_routing_change_intermediate">Impossible de localiser le point intermédiaire</string>
-    <string name="dialog_routing_intermediate_not_determined">Veuillez modifier votre point intermédiaire</string>
+    <string name="dialog_routing_intermediate_not_determined">Veuillez ajuster votre point intermédiaire</string>
     <string name="dialog_routing_system_error">Erreur système</string>
     <string name="dialog_routing_application_error">Impossible de créer l\'itinéraire à cause d\'une erreur dans l\'application</string>
     <string name="dialog_routing_try_again">Veuillez réessayer</string>
     <string name="not_now">Pas maintenant</string>
     <string name="dialog_routing_download_and_build_cross_route">Voulez-vous télécharger la carte et créer un itinéraire plus direct s\'étendant sur plus d\'une carte ?</string>
-    <string name="dialog_routing_download_cross_route">Téléchargez des cartes pour créer un itinéraire plus direct sortant des limites de cette carte.</string>
+    <string name="dialog_routing_download_cross_route">Téléchargez des cartes supplémentaires pour créer un itinéraire plus direct sortant des limites de cette carte.</string>
     <!-- SECTION: Strings for downloading map from search -->
     <string name="search_without_internet_advertisement">Pour commencer à rechercher et à créer des itinéraires, veuillez télécharger la carte. Après cela, vous n\'aurez plus besoin d\'une connexion Internet.</string>
     <string name="search_select_map">Sélectionner la carte</string>
@@ -387,11 +387,11 @@
     <string name="hide">Masquer</string>
     <string name="categories">Catégories</string>
     <string name="history">Historique</string>
-    <string name="search_not_found">Désolé, je n\'ai rien trouvé</string>
+    <string name="search_not_found">Oups, aucun résultat trouvé</string>
     <!-- The message when user did not find anything in the search. -->
-    <string name="search_not_found_query">Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche.</string>
+    <string name="search_not_found_query">Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche</string>
     <string name="search_history_title">Historique de recherche</string>
-    <string name="search_history_text">Accédez rapidement aux dernières recherches</string>
+    <string name="search_history_text">Accédez à vos dernières recherches</string>
     <string name="clear_search">Effacer l\'historique de recherche</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Wikipédia</string>
@@ -399,8 +399,8 @@
     <string name="p2p_start">Démarrer</string>
     <string name="p2p_from_here">Depuis</string>
     <string name="p2p_to_here">Itinéraire vers</string>
-    <string name="p2p_only_from_current">La navigation est uniquement disponible à partir de votre emplacement actuel</string>
-    <string name="p2p_reroute_from_current">Souhaitez-vous que nous planifiions un itinéraire à partir de votre emplacement actuel ?</string>
+    <string name="p2p_only_from_current">La navigation est disponible uniquement à partir de votre emplacement actuel</string>
+    <string name="p2p_reroute_from_current">Souhaitez-vous planifier un itinéraire à partir de votre emplacement actuel ?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Suivant</string>
     <!-- Tab title in the Edit Opening Hours time picker -->
@@ -420,15 +420,15 @@
     <string name="editor_hours_closed">Heures de fermeture</string>
     <string name="editor_example_values">Exemple de valeurs</string>
     <string name="editor_correct_mistake">Corriger l\'erreur</string>
-    <string name="editor_add_select_location">Sélectionnez un lieu</string>
-    <string name="editor_report_problem_desription_1">Veuillez décrire le problème en détail pour permettre à la communauté OpenStreetMap de réparer l\'erreur.</string>
+    <string name="editor_add_select_location">Sélectionnez un emplacement</string>
+    <string name="editor_report_problem_desription_1">Veuillez décrire le problème en détail pour permettre à la communauté OpenStreetMap de le résoudre.</string>
     <string name="editor_report_problem_desription_2">Ou faites-le vous-même sur https://www.openstreetmap.org/</string>
     <string name="editor_report_problem_send_button">Envoyer</string>
     <string name="editor_report_problem_title">Problème</string>
-    <string name="editor_report_problem_no_place_title">Le lieu n\'existe pas</string>
+    <string name="editor_report_problem_no_place_title">Ce lieu n\'existe pas</string>
     <string name="editor_report_problem_under_construction_title">Fermé pour cause de maintenance</string>
     <string name="editor_report_problem_duplicate_place_title">Lieu en doublon</string>
-    <string name="autodownload">Téléchargement automatique</string>
+    <string name="autodownload">Téléchargement automatique des cartes</string>
     <!-- Place Page opening hours text -->
     <string name="daily">Quotidien</string>
     <string name="twentyfour_seven">24/24 et 7/7</string>
@@ -436,7 +436,7 @@
     <string name="day_off">Fermé</string>
     <string name="today">Aujourd\'hui</string>
     <string name="opens_in">Ouvert dans %s</string>
-    <string name="closes_in">Fermé dans %s</string>
+    <string name="closes_in">Ferme dans %s</string>
     <string name="closed">Fermé</string>
     <string name="edit_opening_hours">Modifier les heures d\'ouverture</string>
     <string name="no_osm_account">Vous n\'avez pas de compte sur OpenStreetMap ?</string>
@@ -452,7 +452,7 @@
     <string name="add_language">Ajouter une langue</string>
     <string name="street">Rue</string>
     <!-- Editable House Number text field (in address block). -->
-    <string name="house_number">Numéro de la maison</string>
+    <string name="house_number">Numéro du bâtiment</string>
     <string name="details">Détails</string>
     <string name="social_media">Réseaux sociaux</string>
     <string name="building">Bâtiment</string>
@@ -464,7 +464,7 @@
     <string name="choose_street">Choisir une rue</string>
     <string name="postal_code">Code postal</string>
     <string name="cuisine">Cuisine</string>
-    <string name="select_cuisine">Sélectionner une cuisine</string>
+    <string name="select_cuisine">Sélectionner un type de cuisine</string>
     <!-- login text field -->
     <string name="email_or_username">Email ou nom d\'utilisateur</string>
     <string name="editor_add_phone">Ajouter un numéro de téléphone</string>
@@ -474,43 +474,43 @@
     <string name="downloader_delete_map_dialog">Toutes vos modifications de la carte seront supprimées avec elle</string>
     <string name="downloader_update_maps">Mettre à jour les cartes</string>
     <string name="downloader_mwm_migration_dialog">Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis reprogrammer l\'itinéraire.</string>
-    <string name="downloader_search_field_hint">Trouver la carte</string>
-    <string name="common_check_internet_connection_dialog">Veuillez vérifier vos paramètres et vous assurer que votre appareil est bien connecté à Internet.</string>
+    <string name="downloader_search_field_hint">Trouver une carte</string>
+    <string name="common_check_internet_connection_dialog">Veuillez vous assurer que votre appareil est connecté à Internet</string>
     <string name="downloader_no_space_title">Espace insuffisant</string>
     <string name="downloader_no_space_message">Veuillez supprimer les données inutiles</string>
     <string name="editor_login_error_dialog">Erreur de connexion</string>
     <string name="editor_profile_changes">Modifications vérifiées</string>
-    <string name="editor_focus_map_on_location">Déplacer la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise</string>
+    <string name="editor_focus_map_on_location">Déplacez la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise</string>
     <string name="editor_edit_place_title">Modification</string>
     <string name="editor_add_place_title">Ajout</string>
     <string name="editor_edit_place_name_hint">Nom du lieu</string>
     <!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
-    <string name="editor_default_language_hint">Comme c\'est écrit dans la langue locale</string>
+    <string name="editor_default_language_hint">Comme écrit dans la langue locale</string>
     <string name="editor_edit_place_category_title">Catégorie</string>
     <string name="detailed_problem_description">Description détaillée du problème</string>
     <string name="editor_report_problem_other_title">Autre problème</string>
     <string name="placepage_add_business_button">Ajouter une entreprise</string>
     <string name="message_invalid_feature_position">Aucun objet ne peut être localisé ici</string>
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
-    <string name="osm_presentation">Données OpenStreetMap créées par la communauté en date du %s. Pour en savoir plus sur la façon de modifier et de mettre à jour la carte, consulte le site OpenStreetMap.org.</string>
+    <string name="osm_presentation">Données OpenStreetMap créées par la communauté en date du %s. Pour en savoir plus sur la façon de modifier et de mettre à jour la carte, consultez le site OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) est un projet communautaire visant à créer une carte libre et ouverte. C\'est la principale source de données cartographiques de CoMaps et son fonctionnement est similaire à celui de Wikipédia. Vous pouvez ajouter ou modifier des lieux et ils deviennent accessibles à des millions d\'utilisateurs dans le monde entier. \nRejoignez la communauté et aidez-nous à créer une meilleure carte pour tout le monde !</string>
-    <string name="login_to_make_edits_visible">Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de cartes dans le monde entier.</string>
+    <string name="login_to_make_edits_visible">Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de carte dans le monde entier.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d de %2$d</string>
-    <string name="download_over_mobile_header">Téléchargement avec une connexion réseau cellulaire ?</string>
-    <string name="download_over_mobile_message">Cela pourrait être très cher avec certains abonnements ou si vous êtes en déplacement</string>
-    <string name="error_enter_correct_house_number">Saisir un numéro de maison correct</string>
+    <string name="download_over_mobile_header">Télécharger avec une connexion réseau cellulaire ?</string>
+    <string name="download_over_mobile_message">Cela pourrait coûter cher avec certains abonnements ou si vous êtes en déplacement</string>
+    <string name="error_enter_correct_house_number">Saisir un numéro de bâtiment valide</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Le nombre d\'étages ne doit pas dépasser %d</string>
     <string name="editor_zip_code">Code postal</string>
-    <string name="error_enter_correct_zip_code">Entrer un code postal correct</string>
+    <string name="error_enter_correct_zip_code">Entrer un code postal valide</string>
     <!-- Place Page title for long tap -->
     <string name="core_placepage_unknown_place">Point sur la carte</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Note aux volontaires OpenStreetMap (facultatif)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Décrivez les erreurs sur la carte ou les éléments qui ne peuvent pas être modifiés avec CoMaps.</string>
+    <string name="editor_note_hint">Décrivez les erreurs sur la carte ou les éléments qui ne peuvent pas être modifiés avec CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Vos modifications sont téléchargées dans la base de données publique <a href="https://wiki.openstreetmap.org/wiki/FR:À_propos_d’OpenStreetMap">OpenStreetMap</a>. Veuillez ne pas ajouter d\'informations personnelles ou protégées par le droit d\'auteur.</string>
     <string name="editor_more_about_osm">En savoir plus sur OpenStreetMap</string>
@@ -519,8 +519,8 @@
     <string name="editor_operator">Opérateur</string>
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Opérateur : %s</string>
-    <string name="editor_category_unsuitable_title">Tu ne trouves pas de catégorie appropriée ?</string>
-    <string name="editor_category_unsuitable_text">CoMaps ne permet d\'ajouter que des catégories de points simples, c\'est-à-dire pas de villes, de routes, de lacs, de contours de bâtiments, etc. Merci d\'ajouter ces catégories directement sur <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte notre <a href="https://www.comaps.app/support/advanced-map-editing/">guide</a> pour obtenir des instructions détaillées étape par étape.</string>
+    <string name="editor_category_unsuitable_title">Vous ne trouvez pas de catégorie appropriée ?</string>
+    <string name="editor_category_unsuitable_text">CoMaps ne permet d\'ajouter que des catégories de points simples, c\'est-à-dire pas de villes, de routes, de lacs, de contours de bâtiments, etc. Merci d\'ajouter ces catégories directement sur <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consultez notre <a href="https://www.comaps.app/support/advanced-map-editing/">guide</a> pour obtenir des instructions détaillées étape par étape.</string>
     <string name="downloader_no_downloaded_maps_title">Vous n\'avez téléchargé aucune carte</string>
     <string name="downloader_no_downloaded_maps_message">Téléchargez des cartes pour rechercher un lieu et utiliser la navigation hors ligne</string>
     <string name="current_location_unknown_error_title">L\'emplacement actuel est inconnu</string>
@@ -540,7 +540,7 @@
     <string name="day">j</string>
     <string name="placepage_more_button">Plus</string>
     <string name="placepage_edit_bookmark_button">Éditer le signet</string>
-    <string name="placepage_personal_notes_hint">Remarques personnelles (texte ou html)</string>
+    <string name="placepage_personal_notes_hint">Notes personnelles (texte ou html)</string>
     <string name="editor_comment_hint">Commentaire…</string>
     <string name="editor_reset_edits_message">Abandonner toutes les modifications locales ?</string>
     <string name="editor_reset_edits_button">Réinitialiser</string>
@@ -576,10 +576,10 @@
     <string name="mobile_data_option_not_today">Ne pas utiliser aujourd\'hui</string>
     <string name="mobile_data">Internet mobile</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">L\'Internet mobile est nécessaire pour afficher des informations détaillées sur les lieux, telles que les photos, les prix et les avis.</string>
+    <string name="mobile_data_description">L\'Internet mobile est requis pour les notifications de mise à jour de carte et le téléchargement des modifications.</string>
     <string name="mobile_data_option_never">Ne jamais utiliser</string>
     <string name="mobile_data_option_ask">Toujours demander</string>
-    <string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être actualisées.</string>
+    <string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être mises à jour.</string>
     <string name="big_font">Augmenter la taille de police sur la carte</string>
     <string name="traffic_update_app">Veuillez mettre à jour CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -671,7 +671,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Jamais avertir</string>
     <string name="power_managment_title">Mode économie d\'énergie</string>
-    <string name="power_managment_description">Si le mode d\'économie d\'énergie est activé, l\'application désactive les fonctions consommant de l\'énergie en fonction de la charge actuelle du téléphone</string>
+    <string name="power_managment_description">Essayez de réduire la consommation d’énergie au détriment de certaines fonctionnalités</string>
     <string name="power_managment_setting_never">Jamais</string>
     <string name="power_managment_setting_auto">Automatique</string>
     <string name="power_managment_setting_manual_max">Économie d\'énergie maximale</string>

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

@@ -1408,4 +1408,9 @@
     <string name="type.natural.wetland.tidalflat">Estran</string>
     <string name="type.natural.wetland.reedbed">Roselière</string>
     <string name="type.natural.wetland.saltmarsh">Marais salant</string>
+    <string name="type.amenity.bicycle_parking.covered">Parking vélo couvert</string>
+    <string name="type.amenity.luggage_locker">Casier à bagages</string>
+    <string name="type.post_office.post_partner">Partenaire de publication</string>
+    <string name="type.amenity.ranger_station">Poste de garde forestier</string>
+    <string name="type.leisure.escape_game">Escape Room</string>
 </resources>

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

@@ -1409,4 +1409,6 @@
     <string name="type.natural.wetland.reedbed">Caniçal</string>
     <string name="type.natural.wetland.swamp">Pântano</string>
     <string name="type.natural.wetland.mangrove">Mangal</string>
+    <string name="type.amenity.bicycle_parking.covered">Estacionamento de Bicicletas Coberto</string>
+    <string name="type.amenity.luggage_locker">Depósito de Bagagem</string>
 </resources>

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

@@ -262,7 +262,7 @@
     <!-- In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" -->
     <string name="downloader_status_maps">Kartor</string>
     <string name="downloader_download_all_button">Ladda ned alla</string>
-    <string name="downloader_downloading">Ladda ner:</string>
+    <string name="downloader_downloading">Laddar ner:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
     <string name="downloader_delete_map_while_routing_dialog">Avsluta navigering för att radera kartan.</string>
     <!-- PointsInDifferentMWM -->
@@ -278,7 +278,7 @@
     <!-- Preference title -->
     <string name="google_play_services">Google Play platstjänster</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Fastställ snabbt din ungefärliga position via Bluetooth, WiFi eller mobilnät</string>
+    <string name="pref_use_google_play">En proprietär tjänst som kombinerar GPS, Wi-Fi, mobilnätverk, etc. för att fastställa din position mer exakt. Den kan ansluta till Googles servrar.</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -873,4 +873,6 @@
     <string name="open_now">Öppet nu</string>
     <string name="closed_now">Stängt nu</string>
     <string name="at">kl. %s</string>
+    <string name="enable_show_on_lock_screen_description">Vid aktivering kommer appen fungera på låsskärmen även när enheten är låst.</string>
+    <string name="about_help">Om &amp; Hjälp</string>
 </resources>

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

@@ -1392,4 +1392,26 @@
     <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
     <string name="type.route.shuttle_train">route-shuttle_train</string>
     <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.amenity.studio">Студія</string>
+    <string name="type.amenity.luggage_locker">Камера схову</string>
+    <string name="type.man_made.crane">Кран</string>
+    <string name="type.landuse.plant_nursery">Розсадник</string>
+    <string name="type.amenity.ranger_station">Лісництво</string>
+    <string name="type.amenity.bicycle_parking.covered">Критий велосипедний паркінг</string>
+    <string name="type.post_office.post_partner">Поштовий партнер</string>
+    <string name="type.highway.ladder">Драбина</string>
+    <string name="type.leisure.firepit">Вогнище</string>
+    <string name="type.sport.diving">Стрибки у воду з висоти</string>
+    <string name="type.amenity.love_hotel">Любовний готель</string>
+    <string name="type.barrier.guard_rail">Відбійник</string>
+    <string name="type.landuse.religious">Релігійна територія</string>
+    <string name="type.natural.wetland.reedbed">Очеретяні зарості</string>
+    <string name="type.natural.wetland.swamp">Болото</string>
+    <string name="type.natural.wetland.saltmarsh">Солоне болото</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Припливне солоне болото</string>
+    <string name="type.natural.wetland.fen">Низинне болото</string>
+    <string name="type.natural.wetland.mangrove">Мангровий ліс</string>
+    <string name="type.natural.wetland.tidalflat">Припливна мілина</string>
+    <string name="type.railway.station.subway.qingdao">Станція метро</string>
+    <string name="type.leisure.escape_game">Квест-кімната</string>
 </resources>

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

@@ -1401,4 +1401,6 @@
     <string name="type.traffic_calming.hump">減速丘</string>
     <string name="type.sport.diving">高台跳水</string>
     <string name="type.railway.station.subway.qingdao">地下鐵站</string>
+    <string name="type.natural.wetland.mangrove">Мангровий ліс</string>
+    <string name="type.natural.wetland.tidalflat">Припливна мілина</string>
 </resources>

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

@@ -143,4 +143,11 @@
 
   <color name="material_calendar_surface_dark">#929292</color>
   <color name="notification_warning">#FFC22219</color>
+  
+  <!-- Downloader -->
+  <color name="dl_done">#ebebeb</color>
+  <color name="dl_done_night">#54575b</color>
+  <color name="dl_download">#FF37653F</color>
+  <color name="dl_download_night">#ffe68c</color>
+  <color name="dl_update">#ffc30a</color>
 </resources>