Move special cases for charing stations with implicit car tagging to generator

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>

.gitignore

@@ -31,10 +31,9 @@ data/types.txt*
 data/visibility.txt*
 data/colors.txt*
 data/patterns.txt*
-# TODO: designer is not used at the moment
-# data/symbols/*/design/
-# data/colors_design.txt
-# data/patterns_design.txt
+data/symbols/*/design/
+data/colors_design.txt
+data/patterns_design.txt
 
 # Auto-generated from data/categories-strings/* by tools/unix/generate_categories.sh
 data/categories.txt

CMakeLists.txt

@@ -104,7 +104,8 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
   add_definitions(-DRELEASE)
   if (NOT MSVC)
-    add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
+    add_compile_options(-O3)
+    set (CMAKE_INTERPROCEDURAL_OPTIMIZATION True)
   endif()
 else()
   message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})

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

@@ -0,0 +1 @@
+CoMaps- Navigasi Offline dengan Privasi

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

@@ -1,36 +1,36 @@
-Besplatna aplikacija otvorenog koda koju vodi zajednica i temelji se na podacima OpenStreetMap-a, usmjerana transparentnosti, privatnosti i neprofitnosti. 
+Besplatna aplikacija za karte otvorenog koda koju vodi zajednica, a temelji se na podacima OpenStreetMapa, a pojačana je predanošću transparentnosti, privatnosti i neprofitnosti.
 
-Pridružite se otvorenoj zajednici i pomozite izraditi najbolju aplikaciju za karte
-• Koristite aplikaciju i proširite glas o njoj
+Pridružite se zajednici i pomozite u izradi najbolje aplikacije za karte
+• Koristite aplikaciju i širite vijest o njoj
 • Dajte povratne informacije i prijavite probleme
-• Ažurirajte podatke na karti u aplikaciji ili na web stranici OpenStreetMap-a
+• Ažurirajte podatke karte u aplikaciji ili na web stranici OpenStreetMap
 
 <i>Vaše povratne informacije i recenzije s 5 zvjezdica najbolja su nam podrška!</i>
 
-‣ <b>Jednostavna i dotjerana</b>: aplikacija je trivijalna za korištenje i jednostavno radi.
-‣ <b>Fokusirana na Offline rad</b>: Planirajte i upravljajte svojim putovanjem u inozemstvo bez potrebe za mobilnom uslugom, tražite putne točke dok ste na udaljenom pješačenju itd. Sve funkcije aplikacije dizajnirane su za offline rad.
-‣ <b>Poštivanje privatnosti</b>: Aplikacija je dizajnirana imajući na umu privatnost - ne identificira ljude, ne prati i ne prikuplja osobne podatke. Bez reklama.
-‣ <b>Štedi vašu bateriju i prostor</b>: Ne troši bateriju kao druge navigacijske aplikacije. Kompaktne karte štede dragocjeni prostor na vašem telefonu.
-‣ <b>Otvorena i izrađena od strane zajednice</b>: Ljudi poput vas pomogli su izraditi aplikaciju dodavanjem lokacija na OpenStreetMap-u, testiranjem i davanjem povratnih informacija o aplikaciji te doprinoseći svojim razvojnim vještinama i novcem.
-‣ <b>Otvoreno i transparentno donošenje odluka i korištenja financija, Neprofitna i potpuno Otvorenog koda.</b>
+‣ <b>Jednostavno i dotjerano</b>: bitne značajke koje su jednostavne za korištenje i jednostavno rade.
+‣ <b>Usmjereno na rad izvan mreže</b>: Planirajte i upravljajte svojim putovanjem u inozemstvo bez potrebe za mobilnom mrežom, pretražujte točke puta tijekom udaljenog planinarenja itd. Sve funkcije aplikacije dizajnirane su za rad izvan mreže.
+‣ <b>Poštivanje privatnosti</b>: Aplikacija je dizajnirana imajući na umu privatnost - ne identificira ljude, ne prati i ne prikuplja osobne podatke. Bez oglasa.
+‣ <b>Štedi bateriju i prostor</b>: Ne prazni bateriju kao druge navigacijske aplikacije. Kompaktne karte štede dragocjeni prostor na vašem telefonu.
+‣ <b>Besplatno i izrađeno od strane zajednice</b>: Ljudi poput vas pomogli su u izgradnji aplikacije dodavanjem mjesta u OpenStreetMap, testiranjem i davanjem povratnih informacija o značajkama te doprinosom svojim razvojnim vještinama i novcem.
+‣ <b>Otvoreno i transparentno donošenje odluka i financije, neprofitno i potpuno otvorenog koda.</b>
 
 <b>Glavne značajke</b>:
-• Preuzimanje detaljnih karti s lokacijama koje nisu dostupne s Google kartama
-• Karte za izlete s istaknutim pješačkim stazama, kampovima, izvorima vode, planinskim vrhovima, konturnim linijama itd.
+• Detaljne karte za preuzimanje s mjestima koja nisu dostupna na Google kartama
+• Vanjski način rada s označenim planinarskim stazama, kampovima, izvorima vode, vrhovima, konturnim linijama itd.
 • Pješačke i biciklističke staze
-• Točke interesa kao što su restorani, benzinske crpke, hoteli, trgovine, vidikovci i još mnogo toga
-• Pretražujte po nazivu ili adresi ili po kategoriji interesa
-• Navigacija s glasovnim najavama za hodanje, vožnju biciklom ili automobilom
-• Obilježite svoja omiljena mjesta jednim dodirom
-• Offline članci Wikipedije
-• Tranzitni sloj podzemne željeznice sa navigacijom
-• Snimanje GPS tragova
-• Izvoz i uvoz oznaka i staza u KML, KMZ, i GPX formatima
+• Znamenitosti poput restorana, benzinskih postaja, hotela, trgovina, znamenitosti i mnogih drugih
+• Pretraživanje po imenu ili adresi ili po kategoriji znamenitosti
+• Navigacija s glasovnim najavama za hodanje, vožnju biciklom ili vožnju
+• Označavanje omiljenih mjesta jednim dodirom
+• Članci na Wikipediji izvan mreže
+• Sloj i upute za podzemnu željeznicu
+• Snimanje tragova
+• Izvoz i uvoz oznaka i tragova u KML, KMZ, GPX formatima
 • Tamni način rada za korištenje tijekom noći
-• Poboljšajte kartu za sve korisnike, koristeći osnovni ugrađeni uređivač karte
-• Android Auto podrška
+• Poboljšajte podatke karte za sve pomoću osnovnog ugrađenog uređivača
+• Podrška za Android Auto
 
 Prijavite probleme s aplikacijom, predložite ideje i pridružite se našoj zajednici na web stranici <b><i>comaps.app</i></b>.
 
 <b>Sloboda je ovdje</b>
-Otkrijte svoje putovanje, navigirajte svijetom s privatnošću i zajednicom na prvom mjestu!
+Otkrijte svoje putovanje, snađite se u svijetu s privatnošću i zajednicom u prvom planu!

android/app/src/main/AndroidManifest.xml

@@ -400,8 +400,14 @@
         android:name="app.organicmaps.settings.SettingsActivity"
         android:configChanges="orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"
+        android:exported="true"
         android:label="@string/settings"
-        android:parentActivityName="app.organicmaps.MwmActivity" />
+        android:parentActivityName="app.organicmaps.MwmActivity" >
+        <intent-filter>
+            <action android:name="android.intent.action.APPLICATION_PREFERENCES"/>
+            <category android:name="android.intent.category.DEFAULT"/>
+        </intent-filter>
+    </activity>
 
     <activity
         android:name="app.organicmaps.help.HelpActivity"
@@ -500,13 +506,6 @@
       android:stopWithTask="false"
       />
 
-    <service android:name=".location.LocationSharingService"
-      android:foregroundServiceType="location"
-      android:exported="false"
-      android:enabled="true"
-      android:stopWithTask="false"
-      />
-
     <service
         android:name=".downloader.DownloaderService"
         android:foregroundServiceType="dataSync"

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

@@ -424,32 +424,19 @@ public class MwmActivity extends BaseMwmFragmentActivity
   private void shareMyLocation()
   {
     final Location loc = MwmApplication.from(this).getLocationHelper().getSavedLocation();
-    if (loc == null)
+    if (loc != null)
     {
-      dismissLocationErrorDialog();
-      mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this)
-                                 .setMessage(R.string.unknown_current_position)
-                                 .setCancelable(true)
-                                 .setPositiveButton(R.string.ok, null)
-                                 .setOnDismissListener(dialog -> mLocationErrorDialog = null)
-                                 .show();
+      SharingUtils.shareLocation(this, loc);
       return;
     }
 
-    SharingUtils.shareLocation(this, loc);
-  }
-
-  public void onLocationSharingStateChanged(boolean isSharing)
-  {
-    mMapButtonsViewModel.setLocationSharingState(isSharing);
-    MapButtonsController mapButtonsController =
-        (MapButtonsController) getSupportFragmentManager().findFragmentById(R.id.map_buttons);
-    if (mapButtonsController != null)
-      mapButtonsController.updateMenuBadge();
-
-    // Update share location button color in navigation menu
-    if (mNavigationController != null)
-      mNavigationController.refreshShareLocationColor();
+    dismissLocationErrorDialog();
+    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this)
+                               .setMessage(R.string.unknown_current_position)
+                               .setCancelable(true)
+                               .setPositiveButton(R.string.ok, null)
+                               .setOnDismissListener(dialog -> mLocationErrorDialog = null)
+                               .show();
   }
 
   private void showDownloader(boolean openDownloaded)
@@ -1693,13 +1680,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mMapButtonsViewModel.setLayoutMode(MapButtonsController.LayoutMode.regular);
     refreshLightStatusBar();
     Utils.keepScreenOn(Config.isKeepScreenOnEnabled(), getWindow());
-
-    // Stop location sharing when navigation ends
-    if (app.organicmaps.location.LocationSharingManager.getInstance().isSharing())
-    {
-      app.organicmaps.location.LocationSharingManager.getInstance().stopSharing();
-      onLocationSharingStateChanged(false);
-    }
   }
 
   @Override

android/app/src/main/java/app/organicmaps/api/LocationSharingApiClient.java

@@ -1,200 +0,0 @@
-package app.organicmaps.api;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import app.organicmaps.sdk.util.log.Logger;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-/**
- * HTTP API client for location sharing server.
- * Sends encrypted location updates to the server.
- */
-public class LocationSharingApiClient
-{
-  private static final String TAG = LocationSharingApiClient.class.getSimpleName();
-
-  private static final int CONNECT_TIMEOUT_MS = 10000;
-  private static final int READ_TIMEOUT_MS = 10000;
-
-  private final String mServerBaseUrl;
-  private final String mSessionId;
-  private final Executor mExecutor;
-
-  public interface Callback
-  {
-    void onSuccess();
-    void onFailure(@NonNull String error);
-  }
-
-  public LocationSharingApiClient(@NonNull String serverBaseUrl, @NonNull String sessionId)
-  {
-    mServerBaseUrl = serverBaseUrl.endsWith("/") ? serverBaseUrl : serverBaseUrl + "/";
-    mSessionId = sessionId;
-    mExecutor = Executors.newSingleThreadExecutor();
-  }
-
-  /**
-   * Create a new session on the server.
-   * @param callback Result callback
-   */
-  public void createSession(@Nullable Callback callback)
-  {
-    mExecutor.execute(() -> {
-      try
-      {
-        String url = mServerBaseUrl + "api/v1/session";
-        String requestBody = "{\"sessionId\":\"" + mSessionId + "\"}";
-
-        int responseCode = postJson(url, requestBody);
-
-        if (responseCode >= 200 && responseCode < 300)
-        {
-          Logger.d(TAG, "Session created successfully: " + mSessionId);
-          if (callback != null)
-            callback.onSuccess();
-        }
-        else
-        {
-          String error = "Server returned error: " + responseCode;
-          Logger.w(TAG, error);
-          if (callback != null)
-            callback.onFailure(error);
-        }
-      }
-      catch (IOException e)
-      {
-        Logger.e(TAG, "Failed to create session", e);
-        if (callback != null)
-          callback.onFailure(e.getMessage());
-      }
-    });
-  }
-
-  /**
-   * Update location on the server with encrypted payload.
-   * @param encryptedPayloadJson Encrypted payload JSON (from native code)
-   * @param callback Result callback
-   */
-  public void updateLocation(@NonNull String encryptedPayloadJson, @Nullable Callback callback)
-  {
-    mExecutor.execute(() -> {
-      try
-      {
-        String url = mServerBaseUrl + "api/v1/location/" + mSessionId;
-
-        int responseCode = postJson(url, encryptedPayloadJson);
-
-        if (responseCode >= 200 && responseCode < 300)
-        {
-          Logger.d(TAG, "Location updated successfully");
-          if (callback != null)
-            callback.onSuccess();
-        }
-        else
-        {
-          String error = "Server returned error: " + responseCode;
-          Logger.w(TAG, error);
-          if (callback != null)
-            callback.onFailure(error);
-        }
-      }
-      catch (IOException e)
-      {
-        Logger.e(TAG, "Failed to update location", e);
-        if (callback != null)
-          callback.onFailure(e.getMessage());
-      }
-    });
-  }
-
-  /**
-   * End the session on the server.
-   */
-  public void endSession()
-  {
-    mExecutor.execute(() -> {
-      try
-      {
-        String url = mServerBaseUrl + "api/v1/session/" + mSessionId;
-        deleteRequest(url);
-        Logger.d(TAG, "Session ended: " + mSessionId);
-      }
-      catch (IOException e)
-      {
-        Logger.e(TAG, "Failed to end session", e);
-      }
-    });
-  }
-
-  /**
-   * Send a POST request with JSON body.
-   * @param urlString URL to send request to
-   * @param jsonBody JSON request body
-   * @return HTTP response code
-   * @throws IOException on network error
-   */
-  private int postJson(@NonNull String urlString, @NonNull String jsonBody) throws IOException
-  {
-    URL url = new URL(urlString);
-    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-
-    try
-    {
-      connection.setRequestMethod("POST");
-      connection.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
-      connection.setRequestProperty("Accept", "application/json");
-      connection.setConnectTimeout(CONNECT_TIMEOUT_MS);
-      connection.setReadTimeout(READ_TIMEOUT_MS);
-      connection.setDoOutput(true);
-
-      // Write body
-      byte[] bodyBytes = jsonBody.getBytes(StandardCharsets.UTF_8);
-      connection.setFixedLengthStreamingMode(bodyBytes.length);
-
-      try (OutputStream os = connection.getOutputStream())
-      {
-        os.write(bodyBytes);
-        os.flush();
-      }
-
-      return connection.getResponseCode();
-    }
-    finally
-    {
-      connection.disconnect();
-    }
-  }
-
-  /**
-   * Send a DELETE request.
-   * @param urlString URL to send request to
-   * @return HTTP response code
-   * @throws IOException on network error
-   */
-  private int deleteRequest(@NonNull String urlString) throws IOException
-  {
-    URL url = new URL(urlString);
-    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-
-    try
-    {
-      connection.setRequestMethod("DELETE");
-      connection.setConnectTimeout(CONNECT_TIMEOUT_MS);
-      connection.setReadTimeout(READ_TIMEOUT_MS);
-
-      return connection.getResponseCode();
-    }
-    finally
-    {
-      connection.disconnect();
-    }
-  }
-}

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

@@ -237,7 +237,7 @@ public class EditorHostFragment
     for (LocalizedName name : sNames)
       languages.add(name.lang);
     args.putStringArrayList(LanguagesFragment.EXISTING_LOCALIZED_NAMES, languages);
-    args.putBoolean(LanguagesFragment.INCLUDE_LOCAL_LANGUAGE, false);
+    args.putBoolean(LanguagesFragment.IS_MAP_LANGUAGE_SELECTION, false);
     editWithFragment(Mode.LANGUAGE, R.string.choose_language, args, LanguagesFragment.class, false);
   }
 

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

@@ -25,7 +25,7 @@ import java.util.Set;
 public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
 {
   final static String EXISTING_LOCALIZED_NAMES = "ExistingLocalizedNames";
-  final static String INCLUDE_LOCAL_LANGUAGE = "IncludeLocalLanguage";
+  final static String IS_MAP_LANGUAGE_SELECTION = "IsMapLanguageSelection";
 
   public interface Listener
   {
@@ -39,8 +39,8 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
   protected LanguagesAdapter createAdapter()
   {
     Bundle args = getArguments();
-    boolean includeLocalLanguage =
-        args != null ? args.getBoolean(INCLUDE_LOCAL_LANGUAGE) : true;
+    boolean isMapLanguageSelection =
+        args != null ? args.getBoolean(IS_MAP_LANGUAGE_SELECTION) : true;
     Set<String> existingLanguages =
         args != null ? new HashSet<>(args.getStringArrayList(EXISTING_LOCALIZED_NAMES)) : new HashSet<>();
 
@@ -52,8 +52,14 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
     for (int i = 0; i < systemLocales.size(); i++)
       systemLanguages.add(null);
 
-    for (Language lang : Editor.nativeGetSupportedLanguages(false))
+    // service languages are old_name, alt_name, ...
+    boolean includeServiceLangs = !isMapLanguageSelection;
+
+    for (Language lang : Editor.nativeGetSupportedLanguages(includeServiceLangs))
     {
+      if (existingLanguages.contains(lang.code))
+        continue;
+
       // Separately extract system languages
       for (int i = 0; i < systemLocales.size(); i++)
       {
@@ -65,7 +71,7 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
         }
       }
 
-      if (existingLanguages.contains(lang.code) || systemLanguages.contains(lang))
+      if (systemLanguages.contains(lang))
         continue;
 
       languages.add(lang);
@@ -75,7 +81,7 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
 
     languages.addAll(0, systemLanguages.stream().filter(Objects::nonNull).toList());
 
-    if (includeLocalLanguage) {
+    if (isMapLanguageSelection) {
       String localLanguageLabel = getString(R.string.pref_maplanguage_local);
       Language localLanguage = new Language(DEFAULT_LANG_CODE, localLanguageLabel);
       languages.add(0, localLanguage);

android/app/src/main/java/app/organicmaps/location/LocationCrypto.java

@@ -1,131 +0,0 @@
-package app.organicmaps.location;
-
-import android.util.Base64;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.nio.charset.StandardCharsets;
-import java.security.SecureRandom;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.GCMParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-/**
- * AES-256-GCM encryption/decryption for location data.
- */
-public class LocationCrypto
-{
-  private static final String ALGORITHM = "AES/GCM/NoPadding";
-  private static final int GCM_IV_LENGTH = 12; // 96 bits
-  private static final int GCM_TAG_LENGTH = 128; // 128 bits
-
-  /**
-   * Encrypt plaintext JSON using AES-256-GCM.
-   * @param base64Key Base64-encoded 256-bit key
-   * @param plaintextJson JSON string to encrypt
-   * @return JSON string with encrypted payload: {"iv":"...","ciphertext":"...","authTag":"..."}
-   */
-  @Nullable
-  public static String encrypt(@NonNull String base64Key, @NonNull String plaintextJson)
-  {
-    try
-    {
-      // Decode the base64 key
-      byte[] key = Base64.decode(base64Key, Base64.NO_WRAP);
-      if (key.length != 32) // 256 bits
-      {
-        android.util.Log.e("LocationCrypto", "Invalid key size: " + key.length);
-        return null;
-      }
-
-      // Generate random IV
-      byte[] iv = new byte[GCM_IV_LENGTH];
-      new SecureRandom().nextBytes(iv);
-
-      // Create cipher
-      Cipher cipher = Cipher.getInstance(ALGORITHM);
-      SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
-      GCMParameterSpec gcmSpec = new GCMParameterSpec(GCM_TAG_LENGTH, iv);
-      cipher.init(Cipher.ENCRYPT_MODE, keySpec, gcmSpec);
-
-      // Encrypt
-      byte[] plaintext = plaintextJson.getBytes(StandardCharsets.UTF_8);
-      byte[] ciphertextWithTag = cipher.doFinal(plaintext);
-
-      // Split ciphertext and auth tag
-      // In GCM mode, doFinal() returns ciphertext + tag
-      int ciphertextLength = ciphertextWithTag.length - (GCM_TAG_LENGTH / 8);
-      byte[] ciphertext = new byte[ciphertextLength];
-      byte[] authTag = new byte[GCM_TAG_LENGTH / 8];
-
-      System.arraycopy(ciphertextWithTag, 0, ciphertext, 0, ciphertextLength);
-      System.arraycopy(ciphertextWithTag, ciphertextLength, authTag, 0, authTag.length);
-
-      // Build JSON response
-      JSONObject result = new JSONObject();
-      result.put("iv", Base64.encodeToString(iv, Base64.NO_WRAP));
-      result.put("ciphertext", Base64.encodeToString(ciphertext, Base64.NO_WRAP));
-      result.put("authTag", Base64.encodeToString(authTag, Base64.NO_WRAP));
-
-      return result.toString();
-    }
-    catch (Exception e)
-    {
-      android.util.Log.e("LocationCrypto", "Encryption failed", e);
-      return null;
-    }
-  }
-
-  /**
-   * Decrypt encrypted payload using AES-256-GCM.
-   * @param base64Key Base64-encoded 256-bit key
-   * @param encryptedPayloadJson JSON string with format: {"iv":"...","ciphertext":"...","authTag":"..."}
-   * @return Decrypted plaintext JSON string
-   */
-  @Nullable
-  public static String decrypt(@NonNull String base64Key, @NonNull String encryptedPayloadJson)
-  {
-    try
-    {
-      // Parse encrypted payload
-      JSONObject payload = new JSONObject(encryptedPayloadJson);
-      byte[] iv = Base64.decode(payload.getString("iv"), Base64.NO_WRAP);
-      byte[] ciphertext = Base64.decode(payload.getString("ciphertext"), Base64.NO_WRAP);
-      byte[] authTag = Base64.decode(payload.getString("authTag"), Base64.NO_WRAP);
-
-      // Decode the base64 key
-      byte[] key = Base64.decode(base64Key, Base64.NO_WRAP);
-      if (key.length != 32) // 256 bits
-      {
-        android.util.Log.e("LocationCrypto", "Invalid key size: " + key.length);
-        return null;
-      }
-
-      // Combine ciphertext and auth tag for GCM decryption
-      byte[] ciphertextWithTag = new byte[ciphertext.length + authTag.length];
-      System.arraycopy(ciphertext, 0, ciphertextWithTag, 0, ciphertext.length);
-      System.arraycopy(authTag, 0, ciphertextWithTag, ciphertext.length, authTag.length);
-
-      // Create cipher
-      Cipher cipher = Cipher.getInstance(ALGORITHM);
-      SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
-      GCMParameterSpec gcmSpec = new GCMParameterSpec(GCM_TAG_LENGTH, iv);
-      cipher.init(Cipher.DECRYPT_MODE, keySpec, gcmSpec);
-
-      // Decrypt
-      byte[] plaintext = cipher.doFinal(ciphertextWithTag);
-
-      return new String(plaintext, StandardCharsets.UTF_8);
-    }
-    catch (Exception e)
-    {
-      android.util.Log.e("LocationCrypto", "Decryption failed", e);
-      return null;
-    }
-  }
-}

android/app/src/main/java/app/organicmaps/location/LocationSharingDialog.java

@@ -1,220 +0,0 @@
-package app.organicmaps.location;
-
-import android.app.Dialog;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentManager;
-
-import app.organicmaps.R;
-import app.organicmaps.util.SharingUtils;
-
-/**
- * Dialog for starting/stopping live location sharing and managing the share URL.
- */
-public class LocationSharingDialog extends DialogFragment
-{
-  private static final String TAG = LocationSharingDialog.class.getSimpleName();
-
-  @Nullable
-  private TextView mStatusText;
-  @Nullable
-  private TextView mShareUrlText;
-  @Nullable
-  private Button mStartStopButton;
-  @Nullable
-  private Button mCopyButton;
-  @Nullable
-  private Button mShareButton;
-
-  private LocationSharingManager mManager;
-
-  public static void show(@NonNull FragmentManager fragmentManager)
-  {
-    LocationSharingDialog dialog = new LocationSharingDialog();
-    dialog.show(fragmentManager, TAG);
-  }
-
-  @NonNull
-  @Override
-  public Dialog onCreateDialog(@Nullable Bundle savedInstanceState)
-  {
-    mManager = LocationSharingManager.getInstance();
-
-    AlertDialog.Builder builder = new AlertDialog.Builder(requireContext());
-    View view = LayoutInflater.from(getContext()).inflate(R.layout.dialog_location_sharing, null);
-
-    initViews(view);
-    updateUI();
-
-    builder.setView(view);
-    builder.setTitle(R.string.location_sharing_title);
-    builder.setNegativeButton(R.string.close, (dialog, which) -> dismiss());
-
-    return builder.create();
-  }
-
-  private void initViews(@NonNull View root)
-  {
-    mStatusText = root.findViewById(R.id.status_text);
-    mShareUrlText = root.findViewById(R.id.share_url_text);
-    mStartStopButton = root.findViewById(R.id.start_stop_button);
-    mCopyButton = root.findViewById(R.id.copy_button);
-    mShareButton = root.findViewById(R.id.share_button);
-
-    if (mStartStopButton != null)
-    {
-      mStartStopButton.setOnClickListener(v -> {
-        if (mManager.isSharing())
-          stopSharing();
-        else
-          startSharing();
-      });
-    }
-
-    if (mCopyButton != null)
-    {
-      mCopyButton.setOnClickListener(v -> copyUrl());
-    }
-
-    if (mShareButton != null)
-    {
-      mShareButton.setOnClickListener(v -> shareUrl());
-    }
-  }
-
-  private void updateUI()
-  {
-    boolean isSharing = mManager.isSharing();
-
-    if (mStatusText != null)
-    {
-      mStatusText.setText(isSharing
-          ? R.string.location_sharing_status_active
-          : R.string.location_sharing_status_inactive);
-    }
-
-    if (mShareUrlText != null)
-    {
-      String url = mManager.getShareUrl();
-      if (url != null && isSharing)
-      {
-        mShareUrlText.setText(url);
-        mShareUrlText.setVisibility(View.VISIBLE);
-      }
-      else
-      {
-        mShareUrlText.setVisibility(View.GONE);
-      }
-    }
-
-    if (mStartStopButton != null)
-    {
-      mStartStopButton.setText(isSharing
-          ? R.string.location_sharing_stop
-          : R.string.location_sharing_start);
-    }
-
-    // Show/hide copy and share buttons
-    int visibility = isSharing ? View.VISIBLE : View.GONE;
-    if (mCopyButton != null)
-      mCopyButton.setVisibility(visibility);
-    if (mShareButton != null)
-      mShareButton.setVisibility(visibility);
-  }
-
-  private void startSharing()
-  {
-    String shareUrl = mManager.startSharing();
-
-    if (shareUrl != null)
-    {
-      Toast.makeText(requireContext(),
-          R.string.location_sharing_started,
-          Toast.LENGTH_SHORT).show();
-
-      updateUI();
-
-      // Notify the activity
-      if (getActivity() instanceof app.organicmaps.MwmActivity)
-      {
-        ((app.organicmaps.MwmActivity) getActivity()).onLocationSharingStateChanged(true);
-      }
-
-      // Auto-copy URL to clipboard
-      copyUrlToClipboard(shareUrl);
-    }
-    else
-    {
-      Toast.makeText(requireContext(),
-          R.string.location_sharing_failed_to_start,
-          Toast.LENGTH_LONG).show();
-    }
-  }
-
-  private void stopSharing()
-  {
-    mManager.stopSharing();
-
-    Toast.makeText(requireContext(),
-        R.string.location_sharing_stopped,
-        Toast.LENGTH_SHORT).show();
-
-    updateUI();
-
-    // Notify the activity
-    if (getActivity() instanceof app.organicmaps.MwmActivity)
-    {
-      ((app.organicmaps.MwmActivity) getActivity()).onLocationSharingStateChanged(false);
-    }
-  }
-
-  private void copyUrl()
-  {
-    String url = mManager.getShareUrl();
-    if (url != null)
-    {
-      copyUrlToClipboard(url);
-    }
-  }
-
-  private void copyUrlToClipboard(@NonNull String url)
-  {
-    ClipboardManager clipboard = (ClipboardManager)
-        requireContext().getSystemService(Context.CLIPBOARD_SERVICE);
-
-    if (clipboard != null)
-    {
-      ClipData clip = ClipData.newPlainText("Location Share URL", url);
-      clipboard.setPrimaryClip(clip);
-
-      Toast.makeText(requireContext(),
-          R.string.location_sharing_url_copied,
-          Toast.LENGTH_SHORT).show();
-    }
-  }
-
-  private void shareUrl()
-  {
-    String url = mManager.getShareUrl();
-    if (url == null)
-      return;
-
-    Intent shareIntent = new Intent(Intent.ACTION_SEND);
-    shareIntent.setType("text/plain");
-    shareIntent.putExtra(Intent.EXTRA_TEXT, getString(R.string.location_sharing_share_message, url));
-    startActivity(Intent.createChooser(shareIntent, getString(R.string.location_sharing_share_url)));
-  }
-}

android/app/src/main/java/app/organicmaps/location/LocationSharingManager.java

@@ -1,205 +0,0 @@
-package app.organicmaps.location;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.BatteryManager;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import app.organicmaps.MwmApplication;
-import app.organicmaps.sdk.routing.RoutingController;
-import app.organicmaps.sdk.util.Config;
-import app.organicmaps.sdk.util.log.Logger;
-
-/**
- * Singleton manager for live location sharing functionality.
- * Coordinates between LocationHelper, RoutingController, and LocationSharingService.
- */
-public class LocationSharingManager
-{
-  private static final String TAG = LocationSharingManager.class.getSimpleName();
-
-  private static LocationSharingManager sInstance;
-
-  @Nullable
-  private String mSessionId;
-  @Nullable
-  private String mEncryptionKey;
-  @Nullable
-  private String mShareUrl;
-  private boolean mIsSharing = false;
-
-  private final Context mContext;
-
-  private LocationSharingManager()
-  {
-    mContext = MwmApplication.sInstance;
-  }
-
-  @NonNull
-  public static synchronized LocationSharingManager getInstance()
-  {
-    if (sInstance == null)
-      sInstance = new LocationSharingManager();
-    return sInstance;
-  }
-
-  /**
-   * Start live location sharing.
-   * @return Share URL that can be sent to others
-   */
-  @Nullable
-  public String startSharing()
-  {
-    if (mIsSharing)
-    {
-      Logger.w(TAG, "Location sharing already active");
-      return mShareUrl;
-    }
-
-    // Generate session credentials via native code
-    String[] credentials = nativeGenerateSessionCredentials();
-    if (credentials == null || credentials.length != 2)
-    {
-      Logger.e(TAG, "Failed to generate session credentials");
-      return null;
-    }
-
-    mSessionId = credentials[0];
-    mEncryptionKey = credentials[1];
-
-    // Generate share URL using configured server
-    String serverUrl = Config.LocationSharing.getServerUrl();
-    mShareUrl = nativeGenerateShareUrl(mSessionId, mEncryptionKey, serverUrl);
-    if (mShareUrl == null)
-    {
-      Logger.e(TAG, "Failed to generate share URL");
-      return null;
-    }
-
-    mIsSharing = true;
-
-    // Start foreground service
-    Intent intent = new Intent(mContext, LocationSharingService.class);
-    intent.putExtra(LocationSharingService.EXTRA_SESSION_ID, mSessionId);
-    intent.putExtra(LocationSharingService.EXTRA_ENCRYPTION_KEY, mEncryptionKey);
-    intent.putExtra(LocationSharingService.EXTRA_SERVER_URL, serverUrl);
-    intent.putExtra(LocationSharingService.EXTRA_UPDATE_INTERVAL, Config.LocationSharing.getUpdateInterval());
-
-    mContext.startForegroundService(intent);
-
-    Logger.i(TAG, "Location sharing started, session ID: " + mSessionId);
-
-    return mShareUrl;
-  }
-
-  /**
-   * Stop live location sharing.
-   */
-  public void stopSharing()
-  {
-    if (!mIsSharing)
-    {
-      Logger.w(TAG, "Location sharing not active");
-      return;
-    }
-
-    // Stop foreground service
-    Intent intent = new Intent(mContext, LocationSharingService.class);
-    mContext.stopService(intent);
-
-    mIsSharing = false;
-    mSessionId = null;
-    mEncryptionKey = null;
-    mShareUrl = null;
-
-    Logger.i(TAG, "Location sharing stopped");
-  }
-
-  public boolean isSharing()
-  {
-    return mIsSharing;
-  }
-
-  @Nullable
-  public String getShareUrl()
-  {
-    return mShareUrl;
-  }
-
-  @Nullable
-  public String getSessionId()
-  {
-    return mSessionId;
-  }
-
-  public void setUpdateIntervalSeconds(int seconds)
-  {
-    Config.LocationSharing.setUpdateInterval(seconds);
-  }
-
-  public int getUpdateIntervalSeconds()
-  {
-    return Config.LocationSharing.getUpdateInterval();
-  }
-
-  public void setServerBaseUrl(@NonNull String url)
-  {
-    Config.LocationSharing.setServerUrl(url);
-  }
-
-  @NonNull
-  public String getServerBaseUrl()
-  {
-    return Config.LocationSharing.getServerUrl();
-  }
-
-  /**
-   * Get current battery level (0-100).
-   */
-  public int getBatteryLevel()
-  {
-    BatteryManager bm = (BatteryManager) mContext.getSystemService(Context.BATTERY_SERVICE);
-    if (bm == null)
-      return 100;
-
-    return bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY);
-  }
-
-  /**
-   * Check if currently navigating with an active route.
-   */
-  public boolean isNavigating()
-  {
-    return RoutingController.get().isNavigating();
-  }
-
-  // Native methods (implemented in JNI)
-
-  /**
-   * Generate new session credentials (ID and encryption key).
-   * @return Array of [sessionId, encryptionKey]
-   */
-  @Nullable
-  private static native String[] nativeGenerateSessionCredentials();
-
-  /**
-   * Generate shareable URL from credentials.
-   * @param sessionId Session ID (UUID)
-   * @param encryptionKey Base64-encoded encryption key
-   * @param serverBaseUrl Server base URL
-   * @return Share URL
-   */
-  @Nullable
-  private static native String nativeGenerateShareUrl(String sessionId, String encryptionKey, String serverBaseUrl);
-
-  /**
-   * Encrypt location payload.
-   * @param encryptionKey Base64-encoded encryption key
-   * @param payloadJson JSON payload to encrypt
-   * @return Encrypted payload JSON (with iv, ciphertext, authTag) or null on failure
-   */
-  @Nullable
-  public static native String nativeEncryptPayload(String encryptionKey, String payloadJson);
-}

android/app/src/main/java/app/organicmaps/location/LocationSharingNotification.java

@@ -1,146 +0,0 @@
-package app.organicmaps.location;
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.location.Location;
-import android.os.Build;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
-
-import app.organicmaps.MwmActivity;
-import app.organicmaps.R;
-import app.organicmaps.sdk.routing.RoutingInfo;
-
-import java.util.Locale;
-
-/**
- * Helper for creating and updating location sharing notifications.
- */
-public class LocationSharingNotification
-{
-  public static final String CHANNEL_ID = "LOCATION_SHARING";
-  private static final String CHANNEL_NAME = "Live Location Sharing";
-
-  private final Context mContext;
-  private final NotificationManagerCompat mNotificationManager;
-
-  public LocationSharingNotification(@NonNull Context context)
-  {
-    mContext = context;
-    mNotificationManager = NotificationManagerCompat.from(context);
-    createNotificationChannel();
-  }
-
-  private void createNotificationChannel()
-  {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
-      return;
-
-    NotificationChannel channel = new NotificationChannel(
-        CHANNEL_ID,
-        CHANNEL_NAME,
-        NotificationManager.IMPORTANCE_LOW); // Low importance = no sound/vibration
-
-    channel.setDescription("Notifications for active live location sharing");
-    channel.setShowBadge(false);
-    channel.enableLights(false);
-    channel.enableVibration(false);
-
-    NotificationManager nm = mContext.getSystemService(NotificationManager.class);
-    if (nm != null)
-      nm.createNotificationChannel(channel);
-  }
-
-  /**
-   * Build notification for location sharing service.
-   * @param stopIntent PendingIntent to stop sharing
-   * @return Notification object
-   */
-  @NonNull
-  public Notification buildNotification(@NonNull PendingIntent stopIntent)
-  {
-    return buildNotification(stopIntent, null);
-  }
-
-  /**
-   * Build notification with copy URL action.
-   * @param stopIntent PendingIntent to stop sharing
-   * @param copyUrlIntent PendingIntent to copy URL (optional)
-   * @return Notification object
-   */
-  @NonNull
-  public Notification buildNotification(
-      @NonNull PendingIntent stopIntent,
-      @Nullable PendingIntent copyUrlIntent)
-  {
-    Intent notificationIntent = new Intent(mContext, MwmActivity.class);
-    PendingIntent pendingIntent = PendingIntent.getActivity(
-        mContext,
-        0,
-        notificationIntent,
-        PendingIntent.FLAG_IMMUTABLE);
-
-    NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext, CHANNEL_ID)
-        .setSmallIcon(R.drawable.ic_share)
-        .setContentIntent(pendingIntent)
-        .setOngoing(true)
-        .setPriority(NotificationCompat.PRIORITY_LOW)
-        .setCategory(NotificationCompat.CATEGORY_SERVICE)
-        .setShowWhen(false)
-        .setAutoCancel(false);
-
-    // Title
-    builder.setContentTitle(mContext.getString(R.string.location_sharing_active));
-
-    // No subtitle - keep it simple
-
-    // Copy URL action button (if provided)
-    if (copyUrlIntent != null)
-    {
-      builder.addAction(
-          R.drawable.ic_share,
-          mContext.getString(R.string.location_sharing_copy_url),
-          copyUrlIntent);
-    }
-
-    // Stop action button
-    builder.addAction(
-        R.drawable.ic_close,
-        mContext.getString(R.string.location_sharing_stop),
-        stopIntent);
-
-    // Set foreground service type for Android 10+
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-    {
-      builder.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE);
-    }
-
-    return builder.build();
-  }
-
-  /**
-   * Update existing notification.
-   * @param notificationId Notification ID
-   * @param notification Updated notification
-   */
-  public void updateNotification(int notificationId, @NonNull Notification notification)
-  {
-    mNotificationManager.notify(notificationId, notification);
-  }
-
-  /**
-   * Cancel notification.
-   * @param notificationId Notification ID
-   */
-  public void cancelNotification(int notificationId)
-  {
-    mNotificationManager.cancel(notificationId);
-  }
-}

android/app/src/main/java/app/organicmaps/location/LocationSharingService.java

@@ -1,366 +0,0 @@
-package app.organicmaps.location;
-
-import android.app.Notification;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.Intent;
-import android.location.Location;
-import android.os.BatteryManager;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Looper;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.NotificationCompat;
-
-import app.organicmaps.MwmActivity;
-import app.organicmaps.MwmApplication;
-import app.organicmaps.R;
-import app.organicmaps.api.LocationSharingApiClient;
-import app.organicmaps.sdk.location.LocationHelper;
-import app.organicmaps.sdk.location.LocationListener;
-import app.organicmaps.sdk.routing.RoutingController;
-import app.organicmaps.sdk.routing.RoutingInfo;
-import app.organicmaps.sdk.util.log.Logger;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.Locale;
-
-/**
- * Foreground service for live GPS location sharing.
- * Monitors location updates and posts encrypted data to server at regular intervals.
- */
-public class LocationSharingService extends Service implements LocationListener
-{
-  private static final String TAG = LocationSharingService.class.getSimpleName();
-  private static final int NOTIFICATION_ID = 0x1002; // Unique ID for location sharing
-
-  // Intent extras
-  public static final String EXTRA_SESSION_ID = "session_id";
-  public static final String EXTRA_ENCRYPTION_KEY = "encryption_key";
-  public static final String EXTRA_SERVER_URL = "server_url";
-  public static final String EXTRA_UPDATE_INTERVAL = "update_interval";
-
-  // Actions for notification buttons
-  private static final String ACTION_STOP = "app.organicmaps.ACTION_STOP_LOCATION_SHARING";
-  private static final String ACTION_COPY_URL = "app.organicmaps.ACTION_COPY_LOCATION_URL";
-
-  @Nullable
-  private String mSessionId;
-  @Nullable
-  private String mEncryptionKey;
-  @Nullable
-  private String mServerUrl;
-  private int mUpdateIntervalSeconds = 20;
-
-  @Nullable
-  private Location mLastLocation;
-  private long mLastUpdateTimestamp = 0;
-
-  private final Handler mHandler = new Handler(Looper.getMainLooper());
-  private final Runnable mUpdateTask = this::processLocationUpdate;
-
-  @Nullable
-  private LocationSharingApiClient mApiClient;
-  @Nullable
-  private LocationSharingNotification mNotificationHelper;
-
-  @Override
-  public void onCreate()
-  {
-    super.onCreate();
-    Logger.i(TAG, "Service created");
-
-    mNotificationHelper = new LocationSharingNotification(this);
-  }
-
-  @Override
-  public int onStartCommand(@Nullable Intent intent, int flags, int startId)
-  {
-    if (intent == null)
-    {
-      Logger.w(TAG, "Null intent, stopping service");
-      stopSelf();
-      return START_NOT_STICKY;
-    }
-
-    // Handle stop action from notification
-    if (ACTION_STOP.equals(intent.getAction()))
-    {
-      Logger.i(TAG, "Stop action received from notification");
-      LocationSharingManager.getInstance().stopSharing();
-      stopSelf();
-      return START_NOT_STICKY;
-    }
-
-    // Handle copy URL action from notification
-    if (ACTION_COPY_URL.equals(intent.getAction()))
-    {
-      Logger.i(TAG, "Copy URL action received from notification");
-      String shareUrl = LocationSharingManager.getInstance().getShareUrl();
-      if (shareUrl != null)
-      {
-        android.content.ClipboardManager clipboard = (android.content.ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-        android.content.ClipData clip = android.content.ClipData.newPlainText("Location Share URL", shareUrl);
-        clipboard.setPrimaryClip(clip);
-        android.widget.Toast.makeText(this, R.string.location_sharing_url_copied, android.widget.Toast.LENGTH_SHORT).show();
-      }
-      return START_STICKY;
-    }
-
-    // Extract session info
-    mSessionId = intent.getStringExtra(EXTRA_SESSION_ID);
-    mEncryptionKey = intent.getStringExtra(EXTRA_ENCRYPTION_KEY);
-    mServerUrl = intent.getStringExtra(EXTRA_SERVER_URL);
-    mUpdateIntervalSeconds = intent.getIntExtra(EXTRA_UPDATE_INTERVAL, 20);
-
-    if (mSessionId == null || mEncryptionKey == null || mServerUrl == null)
-    {
-      Logger.e(TAG, "Missing session info, stopping service");
-      stopSelf();
-      return START_NOT_STICKY;
-    }
-
-    // Initialize API client
-    mApiClient = new LocationSharingApiClient(mServerUrl, mSessionId);
-
-    // Create session on server
-    mApiClient.createSession(new LocationSharingApiClient.Callback()
-    {
-      @Override
-      public void onSuccess()
-      {
-        Logger.i(TAG, "Session created on server");
-      }
-
-      @Override
-      public void onFailure(@NonNull String error)
-      {
-        Logger.w(TAG, "Failed to create session on server: " + error);
-      }
-    });
-
-    // Start foreground with notification
-    Notification notification = mNotificationHelper != null
-        ? mNotificationHelper.buildNotification(getStopIntent(), getCopyUrlIntent())
-        : buildFallbackNotification();
-
-    startForeground(NOTIFICATION_ID, notification);
-
-    // Register for location updates
-    LocationHelper locationHelper = MwmApplication.sInstance.getLocationHelper();
-    locationHelper.addListener(this);
-
-    Logger.i(TAG, "Service started for session: " + mSessionId);
-
-    return START_STICKY;
-  }
-
-  @Override
-  public void onDestroy()
-  {
-    Logger.i(TAG, "Service destroyed");
-
-    // Unregister location listener
-    LocationHelper locationHelper = MwmApplication.sInstance.getLocationHelper();
-    locationHelper.removeListener(this);
-
-    // Cancel pending updates
-    mHandler.removeCallbacks(mUpdateTask);
-
-    // Send session end to server (optional)
-    if (mApiClient != null && mSessionId != null)
-      mApiClient.endSession();
-
-    super.onDestroy();
-  }
-
-  @Nullable
-  @Override
-  public IBinder onBind(Intent intent)
-  {
-    return null; // Not a bound service
-  }
-
-  // LocationHelper.LocationListener implementation
-
-  @Override
-  public void onLocationUpdated(@NonNull Location location)
-  {
-    mLastLocation = location;
-
-    // No need to update notification - it's simple and static now
-
-    // Schedule update if needed
-    scheduleUpdate();
-  }
-
-
-  // Private methods
-
-  private void scheduleUpdate()
-  {
-    long now = System.currentTimeMillis();
-    long timeSinceLastUpdate = (now - mLastUpdateTimestamp) / 1000; // Convert to seconds
-
-    if (timeSinceLastUpdate >= mUpdateIntervalSeconds)
-    {
-      // Remove any pending updates
-      mHandler.removeCallbacks(mUpdateTask);
-      // Execute immediately
-      mHandler.post(mUpdateTask);
-    }
-  }
-
-  private void processLocationUpdate()
-  {
-    if (mLastLocation == null || mEncryptionKey == null || mApiClient == null)
-      return;
-
-    // Check battery level
-    int batteryLevel = getBatteryLevel();
-    if (batteryLevel < 10)
-    {
-      Logger.w(TAG, "Battery level too low (" + batteryLevel + "%), stopping sharing");
-      LocationSharingManager.getInstance().stopSharing();
-      stopSelf();
-      return;
-    }
-
-    // Build payload JSON
-    JSONObject payload = buildPayloadJson(mLastLocation, batteryLevel);
-    if (payload == null)
-      return;
-
-    // Encrypt payload
-    String encryptedJson = LocationCrypto.encrypt(mEncryptionKey, payload.toString());
-    if (encryptedJson == null)
-    {
-      Logger.e(TAG, "Failed to encrypt payload");
-      return;
-    }
-
-    // Send to server
-    mApiClient.updateLocation(encryptedJson, new LocationSharingApiClient.Callback()
-    {
-      @Override
-      public void onSuccess()
-      {
-        Logger.d(TAG, "Location update sent successfully");
-        mLastUpdateTimestamp = System.currentTimeMillis();
-      }
-
-      @Override
-      public void onFailure(@NonNull String error)
-      {
-        Logger.w(TAG, "Failed to send location update: " + error);
-      }
-    });
-  }
-
-  @Nullable
-  private JSONObject buildPayloadJson(@NonNull Location location, int batteryLevel)
-  {
-    try
-    {
-      JSONObject json = new JSONObject();
-      json.put("timestamp", System.currentTimeMillis() / 1000); // Unix timestamp
-      json.put("lat", location.getLatitude());
-      json.put("lon", location.getLongitude());
-      json.put("accuracy", location.getAccuracy());
-
-      if (location.hasSpeed())
-        json.put("speed", location.getSpeed());
-
-      if (location.hasBearing())
-        json.put("bearing", location.getBearing());
-
-      // Check if navigating
-      RoutingInfo routingInfo = getNavigationInfo();
-      if (routingInfo != null && routingInfo.distToTarget != null)
-      {
-        json.put("mode", "navigation");
-
-        // Calculate ETA (current time + time remaining)
-        if (routingInfo.totalTimeInSeconds > 0)
-        {
-          long etaTimestamp = (System.currentTimeMillis() / 1000) + routingInfo.totalTimeInSeconds;
-          json.put("eta", etaTimestamp);
-        }
-
-        // Distance remaining in meters
-        if (routingInfo.distToTarget != null)
-        {
-          json.put("distanceRemaining", routingInfo.distToTarget.mDistance);
-        }
-      }
-      else
-      {
-        json.put("mode", "standalone");
-      }
-
-      json.put("batteryLevel", batteryLevel);
-
-      return json;
-    }
-    catch (JSONException e)
-    {
-      Logger.e(TAG, "Failed to build payload JSON", e);
-      return null;
-    }
-  }
-
-  @Nullable
-  private RoutingInfo getNavigationInfo()
-  {
-    if (!RoutingController.get().isNavigating())
-      return null;
-
-    return RoutingController.get().getCachedRoutingInfo();
-  }
-
-  private int getBatteryLevel()
-  {
-    BatteryManager bm = (BatteryManager) getSystemService(BATTERY_SERVICE);
-    if (bm == null)
-      return 100;
-
-    return bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY);
-  }
-
-  @NonNull
-  private PendingIntent getStopIntent()
-  {
-    Intent stopIntent = new Intent(this, LocationSharingService.class);
-    stopIntent.setAction(ACTION_STOP);
-    return PendingIntent.getService(this, 0, stopIntent,
-        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-  }
-
-  @NonNull
-  private PendingIntent getCopyUrlIntent()
-  {
-    Intent copyIntent = new Intent(this, LocationSharingService.class);
-    copyIntent.setAction(ACTION_COPY_URL);
-    return PendingIntent.getService(this, 1, copyIntent,
-        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-  }
-
-  @NonNull
-  private Notification buildFallbackNotification()
-  {
-    Intent notificationIntent = new Intent(this, MwmActivity.class);
-    PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent,
-        PendingIntent.FLAG_IMMUTABLE);
-
-    return new NotificationCompat.Builder(this, LocationSharingNotification.CHANNEL_ID)
-        .setContentTitle(getString(R.string.location_sharing_active))
-        .setSmallIcon(R.drawable.ic_share)
-        .setContentIntent(pendingIntent)
-        .setOngoing(true)
-        .build();
-  }
-}

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

@@ -322,8 +322,7 @@ public class MapButtonsController extends Fragment
     mBadgeDrawable.setVisible(count > 0);
     BadgeUtils.attachBadgeDrawable(mBadgeDrawable, menuButton);
 
-    final boolean isTrackRecording = TrackRecorder.nativeIsTrackRecordingEnabled();
-    updateMenuBadge(isTrackRecording);
+    updateMenuBadge(TrackRecorder.nativeIsTrackRecordingEnabled());
   }
 
   public void updateLayerButton()

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

@@ -16,7 +16,6 @@ public class MapButtonsViewModel extends ViewModel
   private final MutableLiveData<SearchWheel.SearchOption> mSearchOption = new MutableLiveData<>();
   private final MutableLiveData<Boolean> mTrackRecorderState =
       new MutableLiveData<>(TrackRecorder.nativeIsTrackRecordingEnabled());
-  private final MutableLiveData<Boolean> mLocationSharingState = new MutableLiveData<>(false);
 
   public MutableLiveData<Boolean> getButtonsHidden()
   {
@@ -87,14 +86,4 @@ public class MapButtonsViewModel extends ViewModel
   {
     return mTrackRecorderState;
   }
-
-  public void setLocationSharingState(boolean state)
-  {
-    mLocationSharingState.setValue(state);
-  }
-
-  public MutableLiveData<Boolean> getLocationSharingState()
-  {
-    return mLocationSharingState;
-  }
 }

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

@@ -210,11 +210,6 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mNavMenu.refreshTts();
   }
 
-  public void refreshShareLocationColor()
-  {
-    mNavMenu.updateShareLocationColor();
-  }
-
   @Override
   public void onEnabled()
   {

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

@@ -26,10 +26,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-import app.organicmaps.location.LocationSharingDialog;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.DistanceAndAzimut;
 import app.organicmaps.sdk.routing.RouteMarkData;
@@ -146,9 +144,6 @@ final class RoutingBottomMenuController implements View.OnClickListener
     mActionButton.setOnClickListener(this);
     View actionSearchButton = actionFrame.findViewById(R.id.btn__search_point);
     actionSearchButton.setOnClickListener(this);
-    View shareLocationButton = actionFrame.findViewById(R.id.btn__share_location);
-    if (shareLocationButton != null)
-      shareLocationButton.setOnClickListener(this);
     mActionIcon = mActionButton.findViewById(R.id.iv__icon);
     UiUtils.hide(mAltitudeChartFrame, mActionFrame);
     mListener = listener;
@@ -477,11 +472,6 @@ final class RoutingBottomMenuController implements View.OnClickListener
       final RouteMarkType pointType = (RouteMarkType) mActionMessage.getTag();
       mListener.onSearchRoutePoint(pointType);
     }
-    else if (id == R.id.btn__share_location)
-    {
-      if (mContext instanceof MwmActivity)
-        LocationSharingDialog.show(((MwmActivity) mContext).getSupportFragmentManager());
-    }
     else if (id == R.id.btn__manage_route)
       mListener.onManageRouteOpen();
     else if (id == R.id.btn__save)

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

@@ -11,7 +11,6 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.preference.EditTextPreference;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
@@ -83,7 +82,6 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     initShowOnLockScreenPrefsCallbacks();
     initLeftButtonPrefs();
     initCustomMapDownloadUrlPrefsCallbacks();
-    initLocationSharingPrefsCallbacks();
   }
 
   private void initLeftButtonPrefs()
@@ -586,29 +584,6 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     category.removePreference(preference);
   }
 
-  private void initLocationSharingPrefsCallbacks()
-  {
-    // Server URL preference
-    final EditTextPreference serverUrlPref = getPreference(getString(R.string.pref_location_sharing_server_url));
-    serverUrlPref.setText(Config.LocationSharing.getServerUrl());
-    serverUrlPref.setSummary(Config.LocationSharing.getServerUrl());
-    serverUrlPref.setOnPreferenceChangeListener((preference, newValue) -> {
-      String url = (String) newValue;
-      Config.LocationSharing.setServerUrl(url);
-      serverUrlPref.setSummary(url);
-      return true;
-    });
-
-    // Update interval preference
-    final ListPreference intervalPref = getPreference(getString(R.string.pref_location_sharing_update_interval));
-    intervalPref.setValue(String.valueOf(Config.LocationSharing.getUpdateInterval()));
-    intervalPref.setOnPreferenceChangeListener((preference, newValue) -> {
-      int seconds = Integer.parseInt((String) newValue);
-      Config.LocationSharing.setUpdateInterval(seconds);
-      return true;
-    });
-  }
-
   @Override
   public void onLanguageSelected(Language language)
   {

android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java

@@ -5,7 +5,6 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import app.organicmaps.R;
-import app.organicmaps.location.LocationSharingDialog;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.sound.TtsPlayer;
 import app.organicmaps.sdk.util.DateUtils;
@@ -27,7 +26,6 @@ public class NavMenu
   private final View mHeaderFrame;
 
   private final ShapeableImageView mTts;
-  private final ShapeableImageView mShareLocation;
   private final MaterialTextView mEtaValue;
   private final MaterialTextView mEtaAmPm;
   private final MaterialTextView mTimeHourValue;
@@ -99,16 +97,12 @@ public class NavMenu
     mRouteProgress = bottomFrame.findViewById(R.id.navigation_progress);
 
     // Bottom frame buttons
-    mShareLocation = bottomFrame.findViewById(R.id.share_location);
-    mShareLocation.setOnClickListener(v -> onShareLocationClicked());
     ShapeableImageView mSettings = bottomFrame.findViewById(R.id.settings);
     mSettings.setOnClickListener(v -> onSettingsClicked());
     mTts = bottomFrame.findViewById(R.id.tts_volume);
     mTts.setOnClickListener(v -> onTtsClicked());
     MaterialButton stop = bottomFrame.findViewById(R.id.stop);
     stop.setOnClickListener(v -> onStopClicked());
-
-    updateShareLocationColor();
   }
 
   private void onStopClicked()
@@ -116,22 +110,6 @@ public class NavMenu
     mNavMenuListener.onStopClicked();
   }
 
-  private void onShareLocationClicked()
-  {
-    LocationSharingDialog.show(mActivity.getSupportFragmentManager());
-    // Update color after dialog is shown (in case state changes)
-    mShareLocation.postDelayed(this::updateShareLocationColor, 500);
-  }
-
-  public void updateShareLocationColor()
-  {
-    final boolean isLocationSharing = app.organicmaps.location.LocationSharingManager.getInstance().isSharing();
-    final int color = isLocationSharing
-        ? androidx.core.content.ContextCompat.getColor(mActivity, R.color.active_location_sharing)
-        : app.organicmaps.util.ThemeUtils.getColor(mActivity, R.attr.iconTint);
-    mShareLocation.setImageTintList(android.content.res.ColorStateList.valueOf(color));
-  }
-
   private void onSettingsClicked()
   {
     mNavMenuListener.onSettingsClicked();

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <!-- Location pin with share icon -->
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
-  <!-- Share arrows (smaller, overlaid) -->
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18,16l-3,3v-2H9v-2h6v-2z"
-      android:fillAlpha="0.8"/>
-</vector>

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:shape="rectangle">
-  <corners android:radius="12dp" />
-  <solid android:color="@color/active_location_sharing" />
-</shape>

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

@@ -3,12 +3,13 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  style="@style/Widget.Material3.CardView.Filled"
+  style="@style/Widget.Material3.CardView.Elevated"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:paddingBottom="@dimen/margin_half"
   app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
+  app:cardCornerRadius="28dp"
+  app:cardElevation="@dimen/m3_sys_elevation_level3">
 <LinearLayout
   android:orientation="vertical"
   android:layout_width="match_parent"

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

@@ -41,5 +41,5 @@
     android:layout_width="0dp"
     android:layout_height="0dp"
     android:layout_gravity="bottom|start"
-    android:background="?colorSurfaceContainerLow"/>
+    android:background="?appBackground"/>
 </FrameLayout>

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

@@ -8,7 +8,7 @@
     android:layout_margin="4dp"
     android:clickable="true"
     android:focusable="true"
-    app:cardBackgroundColor="?cardBackground"
+    app:cardBackgroundColor="?appBackground"
     app:cardCornerRadius="12dp"
     app:cardElevation="2dp"
     tools:showIn="@layout/item_charging_sockets">

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

@@ -5,9 +5,10 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  style="@style/Widget.Material3.CardView.Filled"
+  style="@style/Widget.Material3.CardView.Elevated"
   app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
+  app:cardCornerRadius="28dp"
+  app:cardElevation="@dimen/m3_sys_elevation_level3">
 <LinearLayout
   android:orientation="vertical"
   android:minWidth="@dimen/bookmark_purchase_img_width"

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

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-  <!-- Status Text -->
-  <TextView
-      android:id="@+id/status_text"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textSize="16sp"
-      android:textColor="?android:textColorPrimary"
-      android:paddingBottom="8dp"
-      tools:text="Location sharing is not active" />
-
-  <!-- Description -->
-  <TextView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:text="@string/location_sharing_description"
-      android:textSize="14sp"
-      android:textColor="?android:textColorSecondary"
-      android:paddingBottom="16dp" />
-
-  <!-- Share URL (visible only when sharing) -->
-  <TextView
-      android:id="@+id/share_url_text"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textSize="12sp"
-      android:textColor="?android:textColorPrimary"
-      android:fontFamily="monospace"
-      android:background="?android:selectableItemBackground"
-      android:padding="12dp"
-      android:textIsSelectable="true"
-      android:visibility="gone"
-      tools:visibility="visible"
-      tools:text="https://live.organicmaps.app/live/abc123def456" />
-
-  <!-- Button Row -->
-  <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      android:gravity="end"
-      android:paddingTop="16dp">
-
-    <!-- Copy Button -->
-    <Button
-        android:id="@+id/copy_button"
-        style="?android:attr/buttonBarButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/location_sharing_copy_url"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <!-- Share Button -->
-    <Button
-        android:id="@+id/share_button"
-        style="?android:attr/buttonBarButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/location_sharing_share_url"
-        android:visibility="gone"
-        android:layout_marginStart="8dp"
-        tools:visibility="visible" />
-
-    <!-- Start/Stop Button -->
-    <Button
-        android:id="@+id/start_stop_button"
-        style="?android:attr/buttonBarButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        tools:text="Start Sharing" />
-
-  </LinearLayout>
-
-</LinearLayout>

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

@@ -2,14 +2,15 @@
 <com.google.android.material.card.MaterialCardView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  style="@style/Widget.Material3.CardView.Filled"
+  style="@style/Widget.Material3.CardView.Elevated"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:layout_margin="@dimen/margin_double_and_half"
   android:minWidth="@dimen/dialog_min_width"
   android:minHeight="@dimen/dialog_min_height"
   app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
+  app:cardCornerRadius="28dp"
+  app:cardElevation="@dimen/m3_sys_elevation_level3">
 <LinearLayout
   android:layout_width="match_parent"
   android:layout_height="wrap_content"

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

@@ -3,12 +3,13 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  style="@style/Widget.Material3.CardView.Filled"
+  style="@style/Widget.Material3.CardView.Elevated"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:paddingBottom="@dimen/margin_half"
   app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
+  app:cardCornerRadius="28dp"
+  app:cardElevation="@dimen/m3_sys_elevation_level3">
 <LinearLayout
   android:orientation="vertical"
   android:layout_width="match_parent"

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

@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
+    android:background="@color/bg_editor"
     tools:context=".editor.EditorActivity">
   <LinearLayout
       android:layout_width="match_parent"
@@ -430,7 +431,6 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_marginBottom="@dimen/margin_quarter"
-        app:backgroundTint="?cardBackground"
         android:textColor="@color/base_red"
         app:strokeColor="@color/base_red"
         android:text="@string/editor_business_vacant_button"/>
@@ -441,7 +441,6 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_marginBottom="@dimen/margin_base"
-        app:backgroundTint="?cardBackground"
         android:textColor="@color/base_red"
         app:strokeColor="@color/base_red"
         tools:text="Reset my changes"/>

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

@@ -2,10 +2,9 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?windowBackgroundForced"
   android:orientation="vertical">
 
   <com.google.android.material.appbar.MaterialToolbar

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

@@ -10,13 +10,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/frameLayout"
-        android:background="?windowBackgroundForced">
+        android:background="@color/bg_editor"
+        android:layout_marginBottom="@dimen/margin_quarter">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/phones_recycler"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?cardBackground"
             android:scrollbars="vertical" />
 
     </FrameLayout>

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

@@ -9,7 +9,7 @@
     style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?windowBackgroundForced"
+    android:background="@color/bg_editor"
     android:layout_above="@+id/tv__mode_switch"
     android:layout_below="@id/toolbar"/>
 
@@ -19,14 +19,13 @@
     android:layout_height="wrap_content"
     android:layout_alignTop="@+id/tv__mode_switch"
     android:layout_alignParentBottom="true"
-    android:background="?cardBackground"/>
+    android:background="@color/bg_editor"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__mode_switch"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
-    android:background="?clickableBackground"
     android:gravity="center_vertical"
     android:padding="@dimen/margin_base"
     android:text="@string/editor_time_advanced"
@@ -35,7 +34,7 @@
     android:textColor="?colorSecondary" />
 
   <include
-    layout="@layout/shadow_bottom"
+    layout="@layout/item_divider"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_above="@id/tv__mode_switch"/>

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

@@ -5,7 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?windowBackgroundForced">
+  android:background="@color/bg_editor">
 
   <LinearLayout
     android:layout_width="match_parent"
@@ -17,8 +17,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_half"
-      style="@style/MwmWidget.M3.Editor.CardView"
-      app:cardBackgroundColor="?cardBackground">
+      style="@style/MwmWidget.M3.Editor.CardView">
 
       <LinearLayout
         android:id="@+id/examples"

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

@@ -4,7 +4,7 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?windowBackgroundForced"
+  android:background="@color/bg_editor"
   android:paddingStart="@dimen/margin_half"
   android:paddingEnd="@dimen/margin_half"
   android:scrollbars="vertical"/>

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

@@ -6,7 +6,7 @@
     android:layout_margin="4dp"
     android:clickable="true"
     android:focusable="true"
-    app:cardBackgroundColor="?cardBackground"
+    app:cardBackgroundColor="?appBackground"
     app:cardCornerRadius="12dp"
     app:cardElevation="2dp">
 

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

@@ -21,5 +21,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/edit_socket_info_tooltip"
-      android:textAppearance="?android:attr/textAppearanceSmall" />
+      android:textAppearance="?android:attr/textAppearanceSmall"
+      android:layout_marginBottom="@dimen/margin_quarter"/>
 </LinearLayout>

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

@@ -3,7 +3,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="wrap_content"
   android:layout_height="match_parent"
-  android:layout_marginTop="@dimen/margin_direction_big"
+  android:layout_marginTop="@dimen/margin_base_plus_quarter"
   android:orientation="vertical">
 
   <FrameLayout

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

@@ -40,5 +40,5 @@
     android:layout_width="0dp"
     android:layout_height="0dp"
     android:layout_gravity="bottom|center"
-    android:background="?colorSurfaceContainerLow"/>
+    android:background="?appBackground"/>
 </FrameLayout>

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

@@ -43,17 +43,6 @@
     android:paddingEnd="@dimen/nav_bottom_gap"
     tools:background="#300000FF">
 
-    <com.google.android.material.imageview.ShapeableImageView
-      android:id="@+id/share_location"
-      android:layout_width="0dp"
-      android:layout_height="@dimen/nav_icon_size"
-      android:layout_weight="0.2"
-      android:background="?selectableItemBackgroundBorderless"
-      android:scaleType="center"
-      android:contentDescription="@string/location_sharing_title"
-      app:srcCompat="@drawable/ic_share"
-      app:tint="?iconTint" />
-
     <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/tts_volume"
       android:layout_width="0dp"

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

@@ -7,6 +7,7 @@
   android:orientation="vertical"
   android:paddingEnd="@dimen/margin_base"
   android:paddingStart="@dimen/margin_base"
+  android:background="@color/fg_editor"
   android:animateLayoutChanges="true">
 
   <com.google.android.material.textview.MaterialTextView
@@ -20,7 +21,12 @@
     android:textAppearance="@style/MwmTextAppearance.Body3"
     tools:drawableEnd="@drawable/ic_expand_more" />
 
-  <include layout="@layout/recycler_default" />
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/fg_editor"
+    android:scrollbars="vertical"/>
 
   <com.google.android.material.button.MaterialButton
     android:id="@+id/more_names"

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

@@ -4,5 +4,5 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:scrollbars="vertical"/>

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

@@ -57,27 +57,4 @@
       app:srcCompat="@drawable/ic_location_crosshair"
       tools:tint="?colorSecondary"/>
   </LinearLayout>
-  <LinearLayout
-    android:id="@+id/btn__share_location"
-    android:orientation="horizontal"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical"
-    android:background="?clickableBackground"
-    tools:visibility="visible">
-    <View
-      android:layout_width="1dp"
-      android:layout_height="match_parent"
-      android:layout_marginBottom="@dimen/margin_half"
-      android:layout_marginTop="@dimen/margin_half"
-      android:background="?dividerHorizontal"/>
-    <com.google.android.material.imageview.ShapeableImageView
-      android:id="@+id/iv__share_location_icon"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_margin="@dimen/margin_base"
-      app:srcCompat="@drawable/ic_share"
-      app:tint="?colorSecondary"
-      android:contentDescription="@string/location_sharing_title"/>
-  </LinearLayout>
 </LinearLayout>

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

@@ -9,7 +9,7 @@
     <string name="delete">Изтриване</string>
     <string name="download_maps">Изтегляне на карти</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Изтеглянето се провали. Натиснете, за да опитате отново.</string>
+    <string name="download_has_failed">Изтеглянето се провали, затиснете, за да опитате отново</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Теглене…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -27,7 +27,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Ограничена точност</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">За да осигурите точна навигация, активирайте функцията \"Точно местоположение\" в настройките.</string>
+    <string name="precise_location_is_disabled_long_text">За да осигурите точна навигация, активирайте функцията \"Точно местоположение\" в настройките</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Показване на картата</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -66,11 +66,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Добавяне на нова група</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Име на група</string>
+    <string name="bookmark_set_name">Име на списък</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Отметки</string>
+    <string name="bookmarks">Места</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Отметки и пътеки</string>
+    <string name="bookmarks_and_tracks">Любими</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Име</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->

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

@@ -66,11 +66,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Afegeix una llista nova</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nom de la llista de marcadors</string>
+    <string name="bookmark_set_name">Nom de la llista</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Marcadors</string>
+    <string name="bookmarks">Llocs</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Marcadors i recorreguts</string>
+    <string name="bookmarks_and_tracks">Preferits</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nom</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -146,14 +146,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notes</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Marcadors d\'CoMaps compartits</string>
-    <string name="share_bookmarks_email_body">Hola! \n \nAdjunto els meus marcadors de l\'aplicació CoMaps. Obriu-los si teniu l\'CoMaps instal·lat. O, si no teniu l\'aplicació, baixeu-la per al vostre aparell iOS o Android seguint aquest enllaç: https://www.comaps.app/download/ \n \nGaudiu viatjant amb l\'CoMaps!</string>
+    <string name="share_bookmarks_email_subject">Els meus preferits de CoMaps</string>
+    <string name="share_bookmarks_email_body">Hola! \n \nAdjunto els meus marcadors de l\'aplicació CoMaps. Obriu-los si teniu l\'CoMaps instal·lat. O, si no teniu l\'aplicació, baixeu-la per al vostre dispositiu iOS o Android seguint aquest enllaç: https://www.comaps.app/download/ \n \nGaudiu viatjant amb l\'CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">S\'estan carregant els marcadors</string>
+    <string name="load_kmz_title">Carregant Preferits</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Els marcadors s’han carregat correctament. Els trobareu al mapa i a la pantalla de gestió de marcadors.</string>
+    <string name="load_kmz_successful">Els preferits s’han carregat correctament. Els trobareu al mapa i a la pantalla de gestió de preferits.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">No s\'ha pogut carregar els marcadors. El fitxer pot ser malmès o defectuós.</string>
+    <string name="load_kmz_failed">No s\'han pogut carregar els preferits. El fitxer pot estar corromput o ser defectuós.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">L\'aplicació no reconeix el tipus de fitxer: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -499,7 +499,7 @@
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Més</string>
-    <string name="placepage_edit_bookmark_button">Edita el marcador</string>
+    <string name="placepage_edit_bookmark_button">Edita el Lloc Desat</string>
     <string name="placepage_personal_notes_hint">Notes personals (text o html)</string>
     <string name="editor_reset_edits_message">Voleu descartar tots els canvis locals?</string>
     <string name="editor_reset_edits_button">Descartar canvis</string>
@@ -564,18 +564,18 @@
     <string name="dialog_error_storage_message">L\'emmagatzematg extern no és accessible. La targeta SD potser s\'ha retirat, malmès, o el sistema de fitxer és de només lectura. Comproveu la targeta SD o contacteu amb nosaltres a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emula un emmagatzematge malmès</string>
     <string name="error_enter_correct_name">Introduïu un nom correcte</string>
-    <string name="bookmark_lists">Llistes</string>
+    <string name="bookmark_lists">Llista de Preferits</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Amaga-ho tot</string>
     <string name="bookmark_lists_show_all">Mostra-ho tot</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d marcador</item>
-        <item quantity="many">%d marcadors</item>
-        <item quantity="other">%d marcadors</item>
+        <item quantity="one">%d lloc desat</item>
+        <item quantity="many">%d llocs desats</item>
+        <item quantity="other">%d llocs desats</item>
     </plurals>
     <string name="bookmarks_create_new_group">Crea una llista</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importa marcadors i recorreguts</string>
+    <string name="bookmarks_import">Importar preferits</string>
     <string name="bookmarks_error_message_share_general">No s\'ha pogut compartir a causa d\'un error de l\'aplicació</string>
     <string name="bookmarks_error_title_share_empty">Error al compartir</string>
     <string name="bookmarks_error_message_share_empty">No es pot compartir una llista buida</string>
@@ -606,7 +606,7 @@
     <string name="subway">Metro</string>
     <string name="layers_title">Estils i capes del mapa</string>
     <string name="bookmarks_empty_list_title">Aquesta llista és buida</string>
-    <string name="bookmarks_empty_list_message">Per a afegir un marcador, toqueu un lloc en el mapa i després toqueu la icona d\'estrella</string>
+    <string name="bookmarks_empty_list_message">Per a desar un lloc, toqueu-ne un en el mapa i després toqueu la icona d\'estrella</string>
     <string name="category_desc_more">…més</string>
     <string name="export_file">Exporta KMZ</string>
     <string name="export_file_gpx">Exporta GPX</string>
@@ -659,7 +659,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Ordena…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Ordena els marcadors</string>
+    <string name="sort_bookmarks">Ordenar preferits</string>
     <!-- Android -->
     <string name="by_default">Per defecte</string>
     <!-- Android -->
@@ -777,7 +777,7 @@
     <string name="browser_not_available">El navegador web no està disponible</string>
     <string name="volume">Volum</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exporta tots els marcadors i recorreguts</string>
+    <string name="bookmarks_export">Exporta tots els llocs i recorreguts</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Paràmetres de la síntesi de veu del sistema</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -809,7 +809,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Continuar enregistrant</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Voleu desar l’enregistrament a Marcadors i recorreguts?</string>
+    <string name="track_recording_alert_title">Desar en preferits?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">El recorregut està buit; no hi ha res a desar</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -839,11 +839,11 @@
     <string name="pref_left_button_disable">Desactivar</string>
     <string name="editor_level">Pis (0 és la planta baixa)</string>
     <string name="error_enter_correct_bluesky_page">Introdueix un nom d\'usuari o una adreça web de Bluesky vàlids</string>
-    <string name="pref_backup_title">Còpia de seguretat de marcadors i recorreguts</string>
+    <string name="pref_backup_title">Còpia de seguretat de preferits</string>
     <string name="pref_left_button_title">Configuració del botó esquerre</string>
     <string name="pref_backup_summary">Còpia de seguretat automàtica a un directori del teu dispositiu</string>
     <string name="pref_backup_now_summary_ok">Còpia de seguretat completada amb èxit</string>
-    <string name="pref_backup_now_summary_empty_lists">No hi ha marcadors o recorreguts per a fer una còpia de seguretat</string>
+    <string name="pref_backup_now_summary_empty_lists">No hi ha llocs o recorreguts per a fer una còpia de seguretat</string>
     <string name="pref_backup_now_summary_failed">Còpia de seguretat fallida</string>
     <string name="pref_backup_now_summary_folder_unavailable">El directori de la còpia de seguretat no està disponible</string>
     <string name="pref_backup_status_summary_success">Última còpia de seguretat amb èxit</string>
@@ -860,7 +860,7 @@
     <string name="pedestrian">A peu</string>
     <string name="bicycle">Bicicleta</string>
     <string name="ruler">Regle</string>
-    <string name="bookmark_color">Color del marcador</string>
+    <string name="bookmark_color">Color del preferit</string>
     <string name="about_help">Quant a i Ajuda</string>
     <string name="open_now">Obert ara</string>
     <string name="closed_now">Tancat ara</string>
@@ -925,4 +925,5 @@
     <string name="download_resources_custom_url_message">Sobreescriu el servidor de descàrrega de mapes per defecte. Deixa en blanc per a emprar el servidor per defecte de CoMaps.</string>
     <string name="download_resources_custom_url_summary_none">No establert</string>
     <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL que comence amb http:// o https://</string>
+    <string name="pref_maplanguage_local">Idioma Local</string>
 </resources>

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

@@ -892,7 +892,7 @@
     <string name="avoid_paved">Vyhnout se zpevněným cestám</string>
     <string name="opens_at">Otevírá v %s</string>
     <string name="closes_at">Zavírá v %s</string>
-    <string name="opens_day_at">Otevírá %1$s v %2$s</string>
+    <string name="opens_day_at">Otevírá v %1$s v %2$s</string>
     <string name="closes_day_at">Zavírá %1$s v %2$s</string>
     <string name="editor_business_vacant_button">Podnik je volný</string>
     <string name="editor_mark_business_vacant_title">Označit podnik jako volný</string>

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

@@ -68,11 +68,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Tilføj en ny liste</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Indstil navn for bogmærkeliste</string>
+    <string name="bookmark_set_name">Listenavn</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Bogmærker</string>
+    <string name="bookmarks">Steder</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bogmærker og spor</string>
+    <string name="bookmarks_and_tracks">Favoritter</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Navn</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -144,13 +144,13 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Noter</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps bogmærker er blevet delt med dig</string>
+    <string name="share_bookmarks_email_subject">Mine CoMaps-favoritter</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Indlæser bogmærker</string>
+    <string name="load_kmz_title">Indlæser favoritter</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bogmærker er indlæst! Du kan finde dem på kortet eller på skærmen for bogmærkehåndtering.</string>
+    <string name="load_kmz_successful">Favoritter er indlæst! Du kan finde dem på kortet eller på skærmen for favorithåndtering.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Bogmærkerne kunne ikke indlæses. Filen kan være skadet eller defekt.</string>
+    <string name="load_kmz_failed">Favoritter kunne ikke indlæses. Filen kan være skadet eller defekt.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Filtypen genkendes ikke af appen: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -486,7 +486,7 @@
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Mere</string>
-    <string name="placepage_edit_bookmark_button">Rediger bogmærke</string>
+    <string name="placepage_edit_bookmark_button">Rediger gemt sted</string>
     <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
     <string name="editor_reset_edits_message">Kassér alle lokale ændringer?</string>
     <string name="editor_reset_edits_button">Kassér ændringer</string>
@@ -543,17 +543,17 @@
     <string name="dialog_error_storage_message">Eksternt lager er ikke tilgængeligt. SD-kortet kan være blevet fjernet eller beskadiget, eller filsystemet er skrivebeskyttet. Kontroller dit SD-kort eller kontakt os på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulér beskadiget lager</string>
     <string name="error_enter_correct_name">Angiv et korrekt navn</string>
-    <string name="bookmark_lists">Lister</string>
+    <string name="bookmark_lists">Favoritlister</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Skjul alle</string>
     <string name="bookmark_lists_show_all">Vis alle</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d bogmærke</item>
-        <item quantity="other">%d bogmærker</item>
+        <item quantity="one">%d gemt sted</item>
+        <item quantity="other">%d gemte steder</item>
     </plurals>
     <string name="bookmarks_create_new_group">Opret ny liste</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importer bogmærker og spor</string>
+    <string name="bookmarks_import">Importer favoritter</string>
     <string name="bookmarks_error_message_share_general">Ikke i stand til at dele på grund af en applikationsfejl</string>
     <string name="bookmarks_error_title_share_empty">Delingsfejl</string>
     <string name="bookmarks_error_message_share_empty">Kan ikke dele en tom liste</string>
@@ -582,7 +582,7 @@
     <string name="subway">Undergrundsbane</string>
     <string name="layers_title">Kortstile og -lag</string>
     <string name="bookmarks_empty_list_title">Listen er tom</string>
-    <string name="bookmarks_empty_list_message">For at tilføje et bogmærke, så tryk et sted på kort og så på stjerneikonet</string>
+    <string name="bookmarks_empty_list_message">For at gemme et sted, så tryk et sted på kortet og dernæst på stjerneikonet</string>
     <string name="category_desc_more">…mere</string>
     <string name="export_file">Eksporter KMZ</string>
     <string name="export_file_gpx">Eksporter GPX</string>
@@ -635,7 +635,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Sorter…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Sorter bogmærker</string>
+    <string name="sort_bookmarks">Sorter favoritter</string>
     <!-- Android -->
     <string name="by_default">Som standard</string>
     <!-- Android -->
@@ -736,7 +736,7 @@
     <string name="browser_not_available">Webbrowser er ikke tilgængelig</string>
     <string name="volume">Lydstyrke</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Eksporter alle bogmærker og spor</string>
+    <string name="bookmarks_export">Eksporter alle steder og spor</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Indstillinger for talesyntese-system</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -768,7 +768,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Fortsæt optagelse</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Gem i bogmærker og spor?</string>
+    <string name="track_recording_alert_title">Gem i favoritter?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Sporet er tomt - der er ikke noget at gemme</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -787,7 +787,7 @@
     <string name="error_enter_correct_facebook_page">Indtast en gyldig Facebook-webadresse, -konto eller -sidenavn</string>
     <string name="connection_failure">Forbindelsesfejl</string>
     <string name="error_enter_correct_twitter_page">Indtast et gyldigt Twitter-brugernavn eller en webadresse</string>
-    <string name="share_bookmarks_email_body">Hej! \n \nVedhæftet er mine bogmærker; åbn dem venligst i CoMaps. Hvis du ikke har den installeret, kan du downloade den her: https://www.comaps.app/download/\n \nGod rejse med CoMaps!</string>
+    <string name="share_bookmarks_email_body">Hej! \n \nVedhæftet er mine favoritter; åbn dem i CoMaps. Hvis du ikke har den installeret, kan du downloade den her: https://www.comaps.app/download/\n \nGod rejse med CoMaps!</string>
     <string name="delete_place_empty_comment_error">Angiv begrundelsen for at slette stedet</string>
     <string name="disk_error_title">Diskfejl</string>
     <string name="error_enter_correct_instagram_page">Indtast et gyldigt Instagram-brugernavn eller en webadresse</string>
@@ -817,7 +817,7 @@
     <string name="error_enter_correct_bluesky_page">Indtast et gyldigt Bluesky-brugernavn eller en webadresse</string>
     <string name="editor_level">Etage (0 er stueetage)</string>
     <string name="pref_backup_now_summary_ok">Sikkerhedskopiering fuldført</string>
-    <string name="pref_backup_now_summary_empty_lists">Ingen bogmærker og spor at lave sikkerhedskopi af</string>
+    <string name="pref_backup_now_summary_empty_lists">Ingen steder og spor at lave sikkerhedskopi af</string>
     <string name="pref_backup_now_summary_failed">Sikkerhedskopiering mislykkedes</string>
     <string name="pref_backup_now_summary_folder_unavailable">Mappen til sikkerhedskopiering er ikke tilgængelig</string>
     <string name="pref_backup_status_summary_success">Sidste vellykkede sikkerhedskopiering</string>
@@ -832,7 +832,7 @@
     <string name="editor_building_levels">Etager (inkl. stueetage, ekskl. tag)</string>
     <string name="error_enter_correct_level">Indtast et gyldigt etagenummer</string>
     <string name="pref_left_button_title">Indstilling af venstre knap</string>
-    <string name="pref_backup_title">Sikkerhedskopi af bogmærker og spor</string>
+    <string name="pref_backup_title">Sikkerhedskopi af favoritter</string>
     <string name="pref_backup_now_title">Sikkerhedskopiér nu</string>
     <string name="pref_backup_now_summary">Opret en sikkerhedskopi straks</string>
     <string name="clear">Ryd</string>
@@ -841,7 +841,7 @@
     <string name="pedestrian">Fodgænger</string>
     <string name="bicycle">Cykel</string>
     <string name="ruler">Lineal</string>
-    <string name="bookmark_color">Bogmærkefarve</string>
+    <string name="bookmark_color">Favoritfarve</string>
     <string name="pref_backup_summary">Automatisk sikkerhedskopiering til en mappe på din enhed</string>
     <string name="pref_backup_now_summary_progress">Sikkerhedskopiering i gang…</string>
     <string name="pref_backup_location_title">Placering af sikkerhedskopi</string>
@@ -907,4 +907,5 @@
     <string name="download_resources_custom_url_message">Tilsidesæt den som standard anvendte server til download af kort. Lad feltet være tomt for at bruge CoMaps\' standardserver.</string>
     <string name="download_resources_custom_url_summary_none">Ikke indstillet</string>
     <string name="download_resources_custom_url_error_scheme">Indtast en URL, der starter med http:// eller https://</string>
+    <string name="pref_maplanguage_local">Lokalt sprog</string>
 </resources>

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

@@ -153,7 +153,7 @@
     <!-- message title of loading file -->
     <string name="load_kmz_title">Favoriten laden</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Lesezeichen erfolgreich geladen! Du kannst dieses nun auf deiner Karte oder im Lesezeichen-Manager anzeigen lassen.</string>
+    <string name="load_kmz_successful">Lesezeichen erfolgreich geladen! Du kannst diese auf deiner Karte oder im Lesezeichen-Manager anzeigen lassen.</string>
     <!-- Kml file loading failed -->
     <string name="load_kmz_failed">Laden der Lesezeichen fehlgeschlagen. Die Datei könnte beschädigt oder defekt sein.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
@@ -258,7 +258,7 @@
     <!-- Update all button text -->
     <string name="downloader_update_all_button">Alle Karten aktualisieren</string>
     <!-- Cancel all button text -->
-    <string name="downloader_cancel_all">Alle abbrechen</string>
+    <string name="downloader_cancel_all">Alles abbrechen</string>
     <!-- Downloaded maps list header -->
     <string name="downloader_downloaded_subtitle">Heruntergeladen</string>
     <!-- Country queued for download -->
@@ -281,7 +281,7 @@
     <!-- Item in context menu. -->
     <string name="downloader_update_map">Karte aktualisieren</string>
     <!-- Preference title -->
-    <string name="google_play_services">Google Fused-Standortdienste</string>
+    <string name="google_play_services">Google-Standortverknüpfungsdienst</string>
     <!-- Preference text -->
     <string name="pref_use_google_play">Ein proprietärer Dienst, der GPS, Wi-Fi, Mobilfunknetzwerke etc. kombiniert, um den Standort genauer zu bestimmen. Er kann sich mit Google-Servern verbinden.</string>
     <!-- Preference title -->
@@ -370,13 +370,13 @@
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Lade die Region herunter, in der du suchst, oder füge den Namen einer nahe gelegenen Stadt oder eines Dorfes hinzu.</string>
     <string name="search_history_title">Suchverlauf</string>
-    <string name="search_history_text">Ihre letzten Suchanfragen anzeigen</string>
+    <string name="search_history_text">Deine letzten Suchanfragen anzeigen</string>
     <string name="clear_search">Suchverlauf löschen</string>
     <string name="p2p_your_location">Dein Standort</string>
     <string name="p2p_start">Start</string>
     <string name="p2p_from_here">Route von</string>
     <string name="p2p_to_here">Route nach</string>
-    <string name="p2p_only_from_current">Die Navigation ist nur von Ihrem aktuellen Standort aus möglich</string>
+    <string name="p2p_only_from_current">Die Navigation ist nur von deinem aktuellen Standort aus möglich</string>
     <string name="p2p_reroute_from_current">Soll eine Route von deinem aktuellen Standort aus berechnet werden?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Weiter</string>
@@ -417,14 +417,14 @@
     <string name="edit_opening_hours">Öffnungszeiten bearbeiten</string>
     <string name="no_osm_account">Kein Konto bei OpenStreetMap?</string>
     <string name="register_at_openstreetmap">Bei OpenStreetMap registrieren</string>
-    <string name="login">Bei OpenStreetMap anmelden</string>
+    <string name="login">Anmelden</string>
     <!-- Status message indicating that user did not login to OSM profile yet. -->
     <string name="not_signed_in">Nicht angemeldet</string>
     <string name="login_osm">Bei OpenStreetMap anmelden</string>
     <string name="logout">Abmelden</string>
     <string name="edit_place">Eintrag bearbeiten</string>
     <string name="add_language">Eine Sprache hinzufügen</string>
-    <string name="street">Straße</string>
+    <string name="street">Innerortsstraße</string>
     <!-- Editable House Number text field (in address block). -->
     <string name="house_number">Hausnummer</string>
     <string name="details">Einzelheiten</string>
@@ -505,7 +505,7 @@
     <string name="editor_reset_edits_button">Änderungen verwerfen</string>
     <string name="editor_remove_place_message">Hinzugefügtes Objekt löschen?</string>
     <string name="editor_remove_place_button">Löschen</string>
-    <string name="editor_place_doesnt_exist">Dieser Ort existiert nicht</string>
+    <string name="editor_place_doesnt_exist">Ort existiert nicht</string>
     <!-- Error message for "Place doesn't exist" dialog when comment is empty -->
     <string name="delete_place_empty_comment_error">Gebe bitte den Grund für die Löschung an</string>
     <!-- Phone number error message -->
@@ -844,7 +844,7 @@
     <string name="pref_backup_summary">Backup automatisch in einem Ordner auf deinem Gerät erstellen</string>
     <string name="pref_backup_now_summary">Backup sofort erstellen</string>
     <string name="pref_backup_now_summary_ok">Backup erfolgreich abgeschlossen</string>
-    <string name="pref_backup_now_summary_empty_lists">Keine Orte und Tracks zum Sichern</string>
+    <string name="pref_backup_now_summary_empty_lists">Keine Orte und Tracks für ein Backup vorhanden</string>
     <string name="pref_backup_now_summary_failed">Backup fehlgeschlagen</string>
     <string name="pref_backup_now_summary_folder_unavailable">Der Backup-Ordner ist nicht verfügbar</string>
     <string name="pref_backup_location_summary_initial">Bitte wähle zuerst einen Ordner und erteile die Berechtigung</string>

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

@@ -68,9 +68,9 @@
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
     <string name="bookmark_set_name">Όνομα λίστας αγαπημένων</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Αγαπημένα</string>
+    <string name="bookmarks">Μέρη</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Αγαπημένα και διαδρομές</string>
+    <string name="bookmarks_and_tracks">Αγαπημένα</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Όνομα</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -146,10 +146,10 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Σημειώσεις</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Κοινοποιήθηκαν τα αγαπημένα από το CoMaps σε εσάς</string>
-    <string name="share_bookmarks_email_body">Γειa! \n \nΣου επισυνάπτω τα αγαπημένα μου. Παρακαλώ άνοιξέ τα με το CoMaps. Αν δεν το έχεις εγκαταστήσει, μπορείς να το κατεβάσεις από εδώ: https://www.comaps.app/download/ \n \nΚαλή διασκέδαση ταξιδεύοντας με το CoMaps!</string>
+    <string name="share_bookmarks_email_subject">Τα Αγαπημένα μου στο CoMaps</string>
+    <string name="share_bookmarks_email_body">Γειά σου! \n \nΣου επισυνάπτω τα αγαπημένα μου. Παρακαλώ άνοιξε τα με το CoMaps. Αν δεν το έχεις εγκατεστημένο, μπορείς να το κατεβάσεις από εδώ: https://www.comaps.app/download/ \n \nΚαλή διασκέδαση ταξιδεύοντας με το CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Φορτώνονται τα αγαπημένα</string>
+    <string name="load_kmz_title">Φορτώνονται τα Αγαπημένα</string>
     <!-- Kmz file successful loading -->
     <string name="load_kmz_successful">Τα αγαπημένα φορτώθηκαν με επιτυχία! Μπορείτε να τα βρείτε στο χάρτη ή στην οθόνη Διαχείρισης αγαπημένων.</string>
     <!-- Kml file loading failed -->
@@ -163,9 +163,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Η τοποθεσία σας δεν έχει προσδιοριστεί ακόμη</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Λυπούμαστε, οι ρυθμίσεις αποθήκευσης χαρτών είναι προς το παρόν απενεργοποιημένες.</string>
+    <string name="cant_change_this_setting">Λυπούμαστε, οι ρυθμίσεις αποθήκευσης χαρτών είναι προς το παρόν απενεργοποιημένες</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Λήψη χάρτη βρίσκεται σε εξέλιξη.</string>
+    <string name="downloading_is_active">Η λήψη χάρτη βρίσκεται σε εξέλιξη</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">Δες την τρέχουσα τοποθεσία μου στο CoMaps! %1$s ή %2$s Αν δεν έχεις τους χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -185,7 +185,7 @@
     <!-- Data version in «About» screen, %@ is replaced by a local, human readable date. -->
     <string name="data_version">Δεδομένα OpenStreetMap: %s</string>
     <!-- Title for tracks category in bookmarks manager -->
-    <string name="tracks_title">Διαδρομές</string>
+    <string name="tracks_title">Ίχνη</string>
     <!-- Length of track in cell that describes route -->
     <string name="length">Μήκος</string>
     <string name="share_my_location">Κοινοποίηση της τοποθεσίας μου</string>
@@ -269,7 +269,7 @@
     <string name="downloader_download_all_button">Λήψη όλων</string>
     <string name="downloader_downloading">Γίνεται λήψη:</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">Για να διαγράψετε το χάρτη, σταματήστε την πλοήγηση.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Για να διαγράψετε το χάρτη, σταματήστε την πλοήγηση</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Μπορούν να δημιουργηθούν μόνο διαδρομές που περιέχονται πλήρως μέσα σε ένα χάρτη σε μια ενιαία περιοχή.</string>
     <!-- Context menu item for downloader. -->
@@ -295,7 +295,7 @@
     <!-- location service disabled -->
     <string name="enable_location_services">Ενεργοποιήστε τις υπηρεσίες εντοπισμού τοποθεσίας</string>
     <string name="save">Αποθήκευση</string>
-    <string name="create">δημιουργήστε</string>
+    <string name="create">Δημιουργία</string>
     <!-- red color -->
     <string name="red">Κόκκινο</string>
     <!-- yellow color -->
@@ -341,18 +341,18 @@
     <string name="dialog_routing_location_turn_on">Ενεργοποιήστε τις υπηρεσίες εντοπισμού τοποθεσίας</string>
     <string name="dialog_routing_location_unknown_turn_on">Δεν είναι δυνατός ο εντοπισμός των τρεχουσών συντεταγμένων GPS. Ενεργοποιήστε τις υπηρεσίες εντοπισμού τοποθεσίας για τον υπολογισμό της διαδρομής.</string>
     <string name="dialog_routing_unable_locate_route">Δε μπορεί να εντοπιστεί η διαδρομή</string>
-    <string name="dialog_routing_cant_build_route">Δε μπορεί να δημιουργηθεί η διαδρομή.</string>
+    <string name="dialog_routing_cant_build_route">Δε μπορεί να δημιουργηθεί η διαδρομή</string>
     <string name="dialog_routing_change_start_or_end">Ρυθμίστε το σημείο εκκίνησης ή τον προορισμό σας.</string>
     <string name="dialog_routing_change_start">Ρυθμίστε το σημείο εκκίνησης</string>
     <string name="dialog_routing_start_not_determined">Η διαδρομή δεν δημιουργήθηκε. Δεν είναι δυνατός ο εντοπισμός του σημείου εκκίνησης.</string>
     <string name="dialog_routing_select_closer_start">Επιλέξτε σημείο εκκίνησης πιο κοντά σε κάποιο δρόμο.</string>
     <string name="dialog_routing_change_end">Ρύθμιση προορισμού</string>
     <string name="dialog_routing_end_not_determined">Η διαδρομή δεν δημιουργήθηκε. Δεν είναι δυνατός ο εντοπισμός του προορισμού.</string>
-    <string name="dialog_routing_select_closer_end">Επιλέξτε ένα σημείο προορισμού πιο κοντά σε κάποιο δρόμο.</string>
-    <string name="dialog_routing_change_intermediate">Δεν είναι δυνατός ο εντοπισμός ενδιάμεσου σημείου.</string>
-    <string name="dialog_routing_intermediate_not_determined">Ρυθμίστε το ενδιάμεσο σημείο.</string>
+    <string name="dialog_routing_select_closer_end">Επιλέξτε ένα σημείο προορισμού πιο κοντά σε κάποιο δρόμο</string>
+    <string name="dialog_routing_change_intermediate">Δεν είναι δυνατός ο εντοπισμός ενδιάμεσου σημείου</string>
+    <string name="dialog_routing_intermediate_not_determined">Προσαρμόστε το ενδιάμεσο σημείο</string>
     <string name="dialog_routing_system_error">Σφάλμα συστήματος</string>
-    <string name="dialog_routing_application_error">Δεν είναι δυνατή η δημιουργία διαδρομής λόγω σφάλματος της εφαρμογής.</string>
+    <string name="dialog_routing_application_error">Δεν είναι δυνατή η δημιουργία διαδρομής λόγω σφάλματος της εφαρμογής</string>
     <string name="dialog_routing_try_again">Προσπαθήστε ξανά</string>
     <string name="not_now">Όχι τώρα</string>
     <string name="dialog_routing_download_and_build_cross_route">Θέλετε να κατεβάσετε το χάρτη και να δημιουργήσετε μια πιο βέλτιστη διαδρομή που εκτείνεται σε περισσότερους από έναν χάρτες;</string>
@@ -366,11 +366,11 @@
     <string name="hide">Απόκρυψη</string>
     <string name="categories">Κατηγορίες</string>
     <string name="history">Ιστορικό</string>
-    <string name="search_not_found">Ωχ, δε βρέθηκαν αποτελέσματα.</string>
+    <string name="search_not_found">Ωχ, δε βρέθηκαν αποτελέσματα</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Κατεβάστε την περιοχή στην οποία ψάχνετε ή δοκιμάστε να προσθέσετε το όνομα μιας κοντινής πόλης/χωριού.</string>
     <string name="search_history_title">Ιστορικό αναζητήσεων</string>
-    <string name="search_history_text">Προβολή πρόσφατων αναζητήσεων.</string>
+    <string name="search_history_text">Προβολή πρόσφατων αναζητήσεων</string>
     <string name="clear_search">Εκκαθάριση ιστορικού αναζητήσεων</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Βικιπέδια</string>
@@ -378,7 +378,7 @@
     <string name="p2p_start">Έναρξη</string>
     <string name="p2p_from_here">Διαδρομή από</string>
     <string name="p2p_to_here">Διαδρομή προς</string>
-    <string name="p2p_only_from_current">Η πλοήγηση είναι διαθέσιμη μόνο από την τρέχουσα τοποθεσία σας.</string>
+    <string name="p2p_only_from_current">Η πλοήγηση είναι διαθέσιμη μόνο από την τρέχουσα τοποθεσία σας</string>
     <string name="p2p_reroute_from_current">Θέλετε να σχεδιαστεί μια διαδρομή από την τρέχουσα τοποθεσία σας;</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Επόμενο</string>
@@ -443,11 +443,11 @@
     <!-- login text field -->
     <string name="editor_add_phone">Προσθήκη Τηλεφώνου</string>
     <string name="level">Όροφος</string>
-    <string name="downloader_delete_map_dialog">Όλες οι αλλαγές που έχετε κάνει στο χάρτη θα διαγραφούν μαζί με το χάρτη.</string>
+    <string name="downloader_delete_map_dialog">Όλες οι αλλαγές που έχετε κάνει στο χάρτη θα διαγραφούν μαζί με το χάρτη</string>
     <string name="downloader_update_maps">Ενημέρωση χαρτών</string>
     <string name="downloader_mwm_migration_dialog">Για να δημιουργήσετε μια διαδρομή, πρέπει να ενημερώσετε όλους τους χάρτες και στη συνέχεια να σχεδιάσετε τη διαδρομή ξανά.</string>
     <string name="downloader_search_field_hint">Εύρεση χάρτη</string>
-    <string name="common_check_internet_connection_dialog">Βεβαιωθείτε ότι η συσκευή σας είναι συνδεδεμένη στο Internet.</string>
+    <string name="common_check_internet_connection_dialog">Βεβαιωθείτε ότι η συσκευή σας είναι συνδεδεμένη στο Διαδίκτυο</string>
     <string name="downloader_no_space_title">Δεν υπάρχει αρκετός χώρος</string>
     <string name="downloader_no_space_message">Διαγράψτε μη απαραίτητα δεδομένα</string>
     <string name="editor_login_error_dialog">Σφάλμα σύνδεσης</string>
@@ -492,11 +492,11 @@
     <string name="editor_category_unsuitable_text">Οι CoMaps επιτρέπουν την προσθήκη απλών κατηγοριών σημείων μόνο, δηλαδή όχι πόλεων, δρόμων, λιμνών, περιγραμμάτων κτιρίων κ.λπ. Παρακαλούμε προσθέστε τέτοιες κατηγορίες απευθείας στο <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Ελέγξτε τον <a href="https://www.comaps.app/support/advanced-map-editing/">οδηγό μας</a> για λεπτομερείς οδηγίες βήμα προς βήμα.</string>
     <string name="downloader_no_downloaded_maps_title">Δεν έχετε κατεβάσει χάρτες</string>
     <string name="downloader_no_downloaded_maps_message">Κατεβάστε χάρτες για να κάνετε αναζήτηση και να πλοηγηθείτε χωρίς σύνδεση</string>
-    <string name="current_location_unknown_error_title">Η τρέχουσα τοποθεσία είναι άγνωστη.</string>
+    <string name="current_location_unknown_error_title">Η τρέχουσα τοποθεσία είναι άγνωστη</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">χμ/ω</string>
     <string name="placepage_more_button">Περισσότερα</string>
-    <string name="placepage_edit_bookmark_button">Επεξεργασία αγαπημένου</string>
+    <string name="placepage_edit_bookmark_button">Επεξεργασία αγαπημένων μερών</string>
     <string name="placepage_personal_notes_hint">Προσωπικές σημειώσεις (κείμενο ή html)</string>
     <string name="editor_reset_edits_message">Απόρριψη όλων των τοπικών αλλαγών;</string>
     <string name="editor_reset_edits_button">Απόρριψη αλλαγών</string>
@@ -520,9 +520,9 @@
     <!-- Dialog before publishing the modifications to the public map. -->
     <string name="editor_share_to_all_dialog_message_1">Βεβαιωθείτε ότι δεν έχετε εισάγει προσωπικά δεδομένα.</string>
     <string name="editor_share_to_all_dialog_message_2">Οι συντάκτες του OpenStreetMap θα ελέγξουν τις αλλαγές και θα επικοινωνήσουν μαζί σας εάν έχουν απορίες.</string>
-    <string name="navigation_stop_button">τέλος</string>
+    <string name="navigation_stop_button">Τέλος</string>
     <!-- Shown as toast when starting the recent track recording -->
-    <string name="track_recording">Καταγραφή της διαδρομής</string>
+    <string name="track_recording">Καταγραφή του ίχνους</string>
     <!-- For the first routing -->
     <string name="accept">Συμφωνώ</string>
     <!-- For the first routing -->
@@ -530,13 +530,13 @@
     <string name="mobile_data_dialog">Θέλετε να χρησιμοποιήσετε το δίκτυο κινητής τηλεφωνίας για να εμφανίσετε αναλυτικές πληροφορίες;</string>
     <string name="mobile_data_option_always">Να χρησιμοποιείται πάντα</string>
     <string name="mobile_data_option_today">Μόνο σήμερα</string>
-    <string name="mobile_data_option_not_today">Να Μην χρησιμοποιηθεί σήμερα</string>
+    <string name="mobile_data_option_not_today">Να μην χρησιμοποιηθεί σήμερα</string>
     <string name="mobile_data">Ίντερνετ μέσω δικτύου κινητής</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
     <string name="mobile_data_description">Απαιτείται πρόσβαση στο ίντερνετ μέσω δικτύου κινητής για την εμφάνιση αναλυτικών πληροφοριών για τις τοποθεσίες, όπως φωτογραφίες, τιμές και κριτικές.</string>
     <string name="mobile_data_option_never">Να μην χρησιμοποιείται ποτέ</string>
     <string name="mobile_data_option_ask">Να γίνεται πάντα ερώτηση</string>
-    <string name="traffic_update_maps_text">Για να εμφανιστούν πληροφορίες για την κίνηση, πρέπει να ενημερωθούν οι χάρτες.</string>
+    <string name="traffic_update_maps_text">Για να εμφανιστούν πληροφορίες για την κίνηση, πρέπει να ενημερωθούν οι χάρτες</string>
     <string name="big_font">Αύξηση μεγέθους γραμματοσειράς στο χάρτη</string>
     <string name="traffic_update_app">Κάντε ενημέρωση του CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -546,7 +546,7 @@
     <string name="feedback_general">Αποστολή γνώμης</string>
     <string name="prefs_languages_information">Χρησιμοποιούμε το σύστημα TTS για τις φωνητικές οδηγίες. Αρκετές συσκευές Android χρησιμοποιούν το Google TTS, μπορείτε να το κατεβάσετε ή να το ενημερώσετε από το Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Για μερικές γλώσσες θα χρειαστεί να εγκαταστήσετε συνθεσάιζερ ομιλίας ή κάποιο συμπληρωματικό πακέτο γλώσσας από το app store (Google Play, Galaxy Store, App Gallery, FDroid). \nΑνοίξτε τις Ρυθμίσεις της συσκευής σας → Γλώσσα και εισαγωγή → Ομιλία → Μετατροπή κειμένου σε ομιλία. \nΕδώ μπορείτε να διαχειριστείτε τις ρυθμίσεις της σύνθεσης ομιλίας (για παράδειγμα, μπορείτε να κατεβάσετε πακέτο γλώσσας για χρήση εκτός σύνδεσης) και να επιλέξετε άλλη μηχανή μετατροπής κειμένου σε ομιλία.</string>
-    <string name="prefs_languages_information_off_link">Για περισσότερες πληροφορίες δείτε αυτό τον οδηγό.</string>
+    <string name="prefs_languages_information_off_link">Για περισσότερες πληροφορίες δείτε αυτό τον οδηγό</string>
     <string name="transliteration_title">Μεταγραφή στο λατινικό αλφάβητο</string>
     <string name="learn_more">Μάθετε περισσότερα</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
@@ -561,17 +561,17 @@
     <string name="dialog_error_storage_message">Ο εξωτερικός απθηκευτικός χώρος δεν είναι διαθέσιμος, πιθανότατα έχει αφαιρεθεί η κάρτα SD, είναι κατεστραμμένη ή το σύστημα αρχείων είναι μόνο για ανάγνωση. Ελέγξτε το και επικοινωνήστε μαζί μας στη διεύθυνση support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Εξομείωση κακού αποθηκευτικού χώρου</string>
     <string name="error_enter_correct_name">Εισάγετε ένα σωστό όνομα</string>
-    <string name="bookmark_lists">Λίστες</string>
+    <string name="bookmark_lists">Λίστες αγαπημένων</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Απόκρυψη όλων</string>
     <string name="bookmark_lists_show_all">Εμφάνιση όλων</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d αγαπημένο</item>
-        <item quantity="other">%d αγαπημένα</item>
+        <item quantity="one">%d αγαπημένο μέρος</item>
+        <item quantity="other">%d αγαπημένα μέρη</item>
     </plurals>
     <string name="bookmarks_create_new_group">Δημιουργία νέας λίστας</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Εισαγωγή σελιδοδεικτών και διαδρομών</string>
+    <string name="bookmarks_import">Εισαγωγή Αγαπημένων</string>
     <string name="bookmarks_error_message_share_general">Αδυναμία κοινοποίησης λόγω σφάλματος εφαρμογής</string>
     <string name="bookmarks_error_title_share_empty">Σφάλμα κατά την κοινοποίηση</string>
     <string name="bookmarks_error_message_share_empty">Δεν είναι δυνατή η κοινή χρήση μιας κενής λίστας</string>
@@ -589,8 +589,8 @@
     </plurals>
     <string name="restore">Επαναφορά</string>
     <plurals name="tracks">
-        <item quantity="one">%d διαδρομή</item>
-        <item quantity="other">%d διαδρομές</item>
+        <item quantity="one">%d ίχνος</item>
+        <item quantity="other">%d ίχνη</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Απόρρητο</string>
@@ -600,12 +600,12 @@
     <string name="subway">Μετρό</string>
     <string name="layers_title">Στυλ χάρτη και επίπεδα</string>
     <string name="bookmarks_empty_list_title">Η λίστα είναι άδεια</string>
-    <string name="bookmarks_empty_list_message">Για να προσθέσετε σελιδοδείκτη, πατήστε ένα μέρος στο χάρτη και μετά πατήστε το αστεράκι</string>
+    <string name="bookmarks_empty_list_message">Για να αποθηκεύσετε ένα μέρος, πατήστε μια τοποθεσία στο χάρτη και μετά πατήστε το αστεράκι</string>
     <string name="category_desc_more">…περισσότερα</string>
     <string name="export_file">Εξαγωγή KMZ</string>
     <string name="export_file_gpx">Εξαγωγή GPX</string>
     <string name="delete_list">Διαγραφή λίστας</string>
-    <string name="speedcams_alert_title">Κάμερες Ταχύτητας</string>
+    <string name="speedcams_alert_title">Κάμερες ταχύτητας</string>
     <string name="place_description_title">Περιγραφή μέρους</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
     <string name="notification_channel_downloader">Κατέβασμα χαρτών</string>
@@ -616,9 +616,9 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Να μην ειδοποιούμαι ποτέ</string>
     <string name="power_managment_title">Λειτουργία εξοικονόμησης ενέργειας</string>
-    <string name="power_managment_description">Θα γίνεται προσπάθεια εξοικονόμησης ενέργειας εις βάρος κάποιον λειτουργιών.</string>
+    <string name="power_managment_description">Θα γίνεται προσπάθεια εξοικονόμησης ενέργειας εις βάρος κάποιων λειτουργιών</string>
     <string name="power_managment_setting_never">Ποτέ</string>
-    <string name="power_managment_setting_auto">Αυτόματα</string>
+    <string name="power_managment_setting_auto">Όταν η μπαταρία είναι χαμηλή</string>
     <string name="power_managment_setting_manual_max">Πάντα</string>
     <string name="enable_logging_warning_message">Αυτή η λειτουργία είναι ενεργοποιημένη για την καταγραφή ενεργειών για διαγνωστικούς σκοπούς. Αυτό βοηθά την ομάδα να εντοπίζει προβλήματα με την εφαρμογή. Να ενεργοποιείτε τη λειτουργία μόνο κατόπιν αιτήματος της υποστήριξης του CoMaps.</string>
     <string name="driving_options_title">Ρυθμίσεις δρομολόγησης</string>
@@ -641,9 +641,9 @@
     <!-- A generic "No" button in dialogs -->
     <string name="no">Όχι</string>
     <!-- E.g. "WiFi:Yes" -->
-    <string name="yes_available">Ενεργ.</string>
+    <string name="yes_available">Ναι</string>
     <!-- E.g. "WiFi:No" -->
-    <string name="no_available">Απενεργ.</string>
+    <string name="no_available">Όχι</string>
     <!-- To indicate the capacity of car parkings, bicycle parkings, electric vehicle charging stations... -->
     <string name="capacity">Χωρητικότητα: %s</string>
     <!-- To indicate the network of ATMs, bicycle rentals, electric vehicle charging stations... -->
@@ -653,7 +653,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Ταξινόμηση…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Ταξινόμηση σελιδ/κτών</string>
+    <string name="sort_bookmarks">Ταξινόμηση αγαπημένων</string>
     <!-- Android -->
     <string name="by_default">Προεπιλογή</string>
     <!-- Android -->
@@ -769,7 +769,7 @@
     <string name="browser_not_available">Δεν είναι διαθέσιμος ο περιηγητής</string>
     <string name="volume">Ένταση ήχου</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Εξαγωγή όλων των σελιδοδεικτών και των διαδρομών</string>
+    <string name="bookmarks_export">Εξαγωγή όλων των Μερών και Ιχνών</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Ρυθμίσεις συστήματος σύνθεσης ομιλίας</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -793,21 +793,21 @@
     <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
     <string name="power_save_dialog_summary">Για την πιο ακριβή πλοήγηση, συνιστούμε να απενεργοποιήσετε τη λειτουργία εξοικονόμησης ενέργειας στις ρυθμίσεις μπαταρίας του τηλεφώνου.</string>
     <!-- Prompt to start recording a track. -->
-    <string name="start_track_recording">Εγγραφή διαδρομής</string>
+    <string name="start_track_recording">Εγγραφή ίχνους</string>
     <!-- Prompt for stopping a track recording. -->
-    <string name="stop_track_recording">Σταματήστε την εγγραφή διαδρομής</string>
+    <string name="stop_track_recording">Σταματήστε την εγγραφή ίχνους</string>
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="stop_without_saving">Σταματήστε χωρίς αποθήκευση</string>
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Συνέχεια εγγραφής</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Αποθήκευση στα Αγαπημένα και Διαδρομές;</string>
+    <string name="track_recording_alert_title">Αποθήκευση στα Αγαπημένα;</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
-    <string name="track_recording_toast_nothing_to_save">Η διαδρομή είναι άδεια - δεν υπάρχει τίποτα να αποθηκεύσετε</string>
+    <string name="track_recording_toast_nothing_to_save">Το ίχνος είναι άδειο - δεν υπάρχει τίποτα να αποθηκεύσετε</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
     <string name="error_no_file_manager_app">Δεν είναι δυνατή η εμφάνιση του διαλόγου επιλογής φακέλου επειδή δεν είναι εγκατεστημένη η κατάλληλη εφαρμογή στη συσκευή σας. Εγκαταστήστε μια εφαρμογή διαχείρισης αρχείων και δοκιμάστε ξανά.</string>
     <string name="choose_color">Επιλέξτε χρώμα</string>
-    <string name="edit_track">Επεξεργασία διαδρομής</string>
+    <string name="edit_track">Επεξεργασία ίχνους</string>
     <string name="uri_open_location_failed">Δεν υπάρχει εγκατεστημένη εφαρμογή που να μπορεί να ανοίξει την τοποθεσία</string>
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Αυτόματη πλοήγηση</string>
@@ -816,10 +816,10 @@
     <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
     <string name="level_value_generic">Όροφος: %s</string>
-    <string name="miles_per_hour">mph</string>
-    <string name="minute">λπτ</string>
-    <string name="day">Μέρα</string>
-    <string name="hour">Ωρα</string>
+    <string name="miles_per_hour">μλ/ώ</string>
+    <string name="minute">λεπ</string>
+    <string name="day">μέρ</string>
+    <string name="hour">ώ</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="panoramax">εικόνα Panoramax</string>
@@ -836,4 +836,38 @@
     <string name="hours_confirmed_time_ago">Επιβεβαιώθηκε %s</string>
     <string name="existence_confirmed_time_ago">Ύπαρξη επιβεβαιώθηκε %s</string>
     <string name="editor_building_levels">Όροφοι (με το ισόγειο, χωρίς την ταράτσα)</string>
+    <string name="about_headline">Ανοιχτό έργο με την υποστήριξη της κοινότητας</string>
+    <string name="offline_explanation_text">Χρειάζεται να ληφθεί ένας χάρτης για να δείτε και να πλοηγηθείτε την περιοχή.\nΚατεβάστε χάρτες για τις περιοχές που θέλετε να ταξιδέψετε.</string>
+    <string name="pref_left_button_disable">Απενεργοποίηση</string>
+    <string name="avoid_steps">Αποφυγή σκαλοπατιών</string>
+    <string name="avoid_paved">Αποφυγή στρωμένων δρόμων</string>
+    <string name="unknown_power_output">άγνωστο</string>
+    <string name="unknown_count">άγνωστο</string>
+    <string name="advanced">Προχωρημένο</string>
+    <string name="charge_socket_count">Πλήθος</string>
+    <string name="ruler">Χάρακας</string>
+    <string name="clear">Εκκαθάριση</string>
+    <string name="route_type">Είδος διαδρομής</string>
+    <string name="vehicle">Όχημα</string>
+    <string name="pedestrian">Πεζός</string>
+    <string name="bicycle">Ποδήλατο</string>
+    <string name="bookmark_color">Χρώμα για Αγαπημένο</string>
+    <string name="about_help">Σχετικά &amp; Βοήθεια</string>
+    <string name="open_now">Ανοιχτό τώρα</string>
+    <string name="closed_now">Κλειστό τώρα</string>
+    <string name="at">στις %s</string>
+    <string name="share_track">Κοινοποίηση Ίχνους</string>
+    <string name="delete_track_dialog_title">Διαγραφή %s;</string>
+    <string name="place_page_app_too_old_description">Τα τρέχοντα δεδομένα χάρτη σας είναι πολύ παλιά, παρακαλούμε ενημερώστε την εφαρμογή CoMaps.</string>
+    <string name="editor_level">Όροφος (το 0 είναι το ισόγειο)</string>
+    <string name="error_enter_correct_level">Εισάγετε έναν έγκυρο αριθμό ορόφου</string>
+    <string name="editor_business_vacant_button">Η επιχείρηση είναι κενή</string>
+    <string name="editor_mark_business_vacant_title">Σήμανση επιχείρησης ως κενή</string>
+    <string name="place_page_update_too_old_map">Ενημέρωση χάρτη περιοχής</string>
+    <string name="place_page_too_old_to_edit">Η επεξεργασία του OpenStreetMap είναι απενεργοποιημένη επειδή τα δεδομένα χάρτη είναι πολύ παλιά.</string>
+    <string name="osm_note_hint">Ή, εναλλακτικά, αφήστε μια σημείωση στην κοινότητα του OpenStreetMap ώστε κάποιος άλλος να προσθέσει ή να διορθώσει την τοποθεσία εδώ.</string>
+    <string name="osm_note_toast">Η σημείωση θα αποσταλεί στο OpenStreetMap</string>
+    <string name="error_enter_correct_fediverse_page">Εισάγετε ένα έγκυρο όνομα χρήστη ή διεύθυνση Mastodon</string>
+    <string name="error_enter_correct_bluesky_page">Εισάγετε ένα έγκυρο όνομα χρήστη ή διεύθυνση Bluesky</string>
+    <string name="power_management">Διαχείριση ενέργειας</string>
 </resources>

android/app/src/main/res/values-en-rCA/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="search">Search</string>
+    <string name="bookmarks_and_tracks">Favourites</string>
+</resources>

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

@@ -68,9 +68,9 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Agregar una lista nueva</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nombre de la lista de marcadores</string>
+    <string name="bookmark_set_name">Nombre de la lista</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Marcadores</string>
+    <string name="bookmarks">Lugares</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Favoritos</string>
     <!-- Add bookmark dialog - bookmark name -->
@@ -103,11 +103,11 @@
     <!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! -->
     <string name="category_eat">Dónde comer</string>
     <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
-    <string name="category_food">Tienda de comestibles</string>
+    <string name="category_food">Provisiones</string>
     <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
     <string name="category_transport">Transporte</string>
     <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
-    <string name="category_fuel">Estación de Servicio</string>
+    <string name="category_fuel">Estación de servicio</string>
     <!-- Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! -->
     <string name="category_parking">Aparcamiento</string>
     <!-- Search category for malls/clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @category_shopping! -->
@@ -524,7 +524,7 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">¿Quieres enviarlo a todos los usuarios?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Asegúrate de que no has introducido ningún dato privado o personal</string>
+    <string name="editor_share_to_all_dialog_message_1">Asegúrate de que no has introducido ningún dato privado o personal.</string>
     <string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta.</string>
     <string name="navigation_stop_button">Detener</string>
     <!-- Shown as toast when starting the recent track recording -->
@@ -578,7 +578,7 @@
     </plurals>
     <string name="bookmarks_create_new_group">Crear nueva lista</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importar marcadores y trazas</string>
+    <string name="bookmarks_import">Importar favoritos</string>
     <string name="bookmarks_error_message_share_general">No se puede compartir debido a un error de la aplicación</string>
     <string name="bookmarks_error_title_share_empty">Error al compartir</string>
     <string name="bookmarks_error_message_share_empty">No se puede compartir una lista vacía</string>
@@ -662,7 +662,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Ordenar…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Ordenar marcadores</string>
+    <string name="sort_bookmarks">Exportar favoritos</string>
     <!-- Android -->
     <string name="by_default">Por defecto</string>
     <!-- Android -->
@@ -814,7 +814,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Continuar grabación</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">¿Guardar en Marcadores y trayectos?</string>
+    <string name="track_recording_alert_title">¿Guardar en Favoritos?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">El trayecto está vacío; no hay nada que guardar</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -845,14 +845,14 @@
     <string name="about_help">Acerca de y Ayuda</string>
     <string name="clear">Limpiar</string>
     <string name="ruler">Regla</string>
-    <string name="bookmark_color">Color del marcador</string>
-    <string name="pref_backup_title">Copia de seguridad de marcadores y trayectos</string>
+    <string name="bookmark_color">Color del favorito</string>
+    <string name="pref_backup_title">Respaldar favoritos</string>
     <string name="pref_backup_summary">Copia de seguridad automática a una carpeta de tu dispositivo</string>
-    <string name="pref_backup_now_title">Realizar copia de seguridad ahora</string>
+    <string name="pref_backup_now_title">Crear respaldo ahora</string>
     <string name="pref_backup_now_summary">Crear copia de seguridad inmediatamente</string>
     <string name="pref_backup_now_summary_progress">Copia de seguridad en progreso…</string>
     <string name="pref_backup_now_summary_ok">Copia de seguridad completada con éxito</string>
-    <string name="pref_backup_now_summary_empty_lists">No hay marcadores ni trayectos para hacer una copia de seguridad</string>
+    <string name="pref_backup_now_summary_empty_lists">No hay marcadores ni trayectos para hacer un respaldo</string>
     <string name="pref_backup_now_summary_failed">Copia de seguridad fallida</string>
     <string name="pref_backup_now_summary_folder_unavailable">La carpeta de copia de seguridad no está disponible</string>
     <string name="pref_backup_location_summary_initial">Selecciona por favor primero una carpeta y concede permiso</string>
@@ -927,4 +927,5 @@
     <string name="download_resources_custom_url_message">Sobreescribe el servidor de mapas por defecto. Déjalo en blanco para usar el servidor de CoMaps por defecto.</string>
     <string name="download_resources_custom_url_summary_none">No establecido</string>
     <string name="download_resources_custom_url_error_scheme">Por favor introduce un URL empezando con http:// o https://</string>
+    <string name="pref_maplanguage_local">Idioma local</string>
 </resources>

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

@@ -68,11 +68,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Créer une nouvelle liste</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nom du groupe de signets</string>
+    <string name="bookmark_set_name">Nom de la liste</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Signets</string>
+    <string name="bookmarks">Lieux</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Signets et traces</string>
+    <string name="bookmarks_and_tracks">Favoris</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nom</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -148,14 +148,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 avec vous</string>
-    <string name="share_bookmarks_email_body">Bonjour !\n \nVous trouverez ci-joint mes signets de l’appli CoMaps, à ouvrir dans l’application CoMaps. Si vous ne l’avez pas, téléchargez-la en suivant ce lien : https://www.comaps.app/download/ \n \nBon voyage avec CoMaps !</string>
+    <string name="share_bookmarks_email_subject">Mes favoris CoMaps.</string>
+    <string name="share_bookmarks_email_body">Bonjour,\n \nVous trouverez ci-joint mes favoris, veuillez les ouvrir dans l’application CoMaps. Si vous ne l’avez pas encore installée, téléchargez l\'application depuis : 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>
+    <string name="load_kmz_title">Chargement des Favoris</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>
+    <string name="load_kmz_successful">Les favoris ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l’écran du Gestionnaire des Favoris.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Échec lors du chargement des signets. Le fichier pourrait être corrompu ou défectueux.</string>
+    <string name="load_kmz_failed">Erreur lors du chargement des Favoris. 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. -->
@@ -503,7 +503,7 @@
     <string name="minute">min</string>
     <string name="day">j</string>
     <string name="placepage_more_button">Plus</string>
-    <string name="placepage_edit_bookmark_button">Modifier le signet</string>
+    <string name="placepage_edit_bookmark_button">Modifier l\'emplacement enregistré</string>
     <string name="placepage_personal_notes_hint">Notes personnelles (texte ou html)</string>
     <string name="editor_reset_edits_message">Abandonner toutes les modifications locales ?</string>
     <string name="editor_reset_edits_button">Annuler les modifications</string>
@@ -567,18 +567,18 @@
     <string name="dialog_error_storage_message">Le stockage externe n’est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier votre carte SD ou nous contacter via support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Émuler le mauvais stockage</string>
     <string name="error_enter_correct_name">Veuillez saisir un nom correct</string>
-    <string name="bookmark_lists">Listes</string>
+    <string name="bookmark_lists">Listes de favoris</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Tout masquer</string>
     <string name="bookmark_lists_show_all">Tout afficher</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d signet</item>
-        <item quantity="many">%d signets</item>
-        <item quantity="other">%d signets</item>
+        <item quantity="one">%d emplacement enregistré</item>
+        <item quantity="many">%d emplacements enregistrés</item>
+        <item quantity="other">%d emplacements enregistrés</item>
     </plurals>
     <string name="bookmarks_create_new_group">Créer une nouvelle liste</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importer des signets et des parcours</string>
+    <string name="bookmarks_import">Importer des favoris</string>
     <string name="bookmarks_error_message_share_general">Impossible de partager en raison d’une erreur d’application</string>
     <string name="bookmarks_error_title_share_empty">Erreur de partage</string>
     <string name="bookmarks_error_message_share_empty">Impossible de partager une liste vide</string>
@@ -609,7 +609,7 @@
     <string name="subway">Métro</string>
     <string name="layers_title">Styles et couches de cartes</string>
     <string name="bookmarks_empty_list_title">Cette liste est vide</string>
-    <string name="bookmarks_empty_list_message">Pour ajouter un signet, appuyez sur un lieu sur la carte, puis appuyez sur l’icône étoile</string>
+    <string name="bookmarks_empty_list_message">Pour enregistrer un lieu, appuyez sur un lieu sur la carte, puis sur l\'icône en forme d\'étoile</string>
     <string name="category_desc_more">…plus</string>
     <string name="export_file">Exporter en KMZ</string>
     <string name="export_file_gpx">Exporter en GPX</string>
@@ -662,7 +662,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Trier…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Trier les signets</string>
+    <string name="sort_bookmarks">Trier les favoris</string>
     <!-- Android -->
     <string name="by_default">Par défaut</string>
     <!-- Android -->
@@ -780,7 +780,7 @@
     <string name="browser_not_available">Le navigateur Web n’est pas disponible</string>
     <string name="volume">Volume</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exporter tous les signets et toutes les traces</string>
+    <string name="bookmarks_export">Exporter tous les lieux et toutes les traces</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Paramètres du système de synthèse vocale</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -812,7 +812,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Continuer l’enregistrement</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Enregistrer dans les signets et traces ?</string>
+    <string name="track_recording_alert_title">Enregistrer dans les favoris ?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">L’itinéraire est vide - il n’y a rien à enregistrer</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -843,7 +843,7 @@
     <string name="pedestrian">À pied</string>
     <string name="bicycle">À vélo</string>
     <string name="ruler">Règle</string>
-    <string name="bookmark_color">Couleur du marque-page</string>
+    <string name="bookmark_color">Couleur des Favoris</string>
     <string name="panoramax">Image Panoramax</string>
     <string name="pref_backup_now_title">Enregistrer maintenant</string>
     <string name="backup_interval_every_day">Quotidien</string>
@@ -854,13 +854,13 @@
     <string name="backup_interval_every_week">Hebdomadaire</string>
     <string name="pref_backup_location_title">Emplacement des enregistrements</string>
     <string name="pref_backup_location_summary_initial">Veuillez d’abord sélectionner un dossier puis accorder l’autorisation</string>
-    <string name="pref_backup_now_summary_empty_lists">Ni signet ni trace à enregistrer</string>
+    <string name="pref_backup_now_summary_empty_lists">Aucun lieu ni piste à sauvegarder</string>
     <string name="pref_backup_interval_title">Enregistrement automatique</string>
     <string name="pref_backup_status_summary_success">Dernier enregistrement réussi</string>
     <string name="pref_backup_now_summary_ok">L’enregistrement s’est déroulé avec succès</string>
     <string name="pref_backup_history_title">Nombre d’enregistrements à conserver</string>
     <string name="pref_backup_now_summary_folder_unavailable">L’emplacement pour enregistrer n’est pas disponible</string>
-    <string name="pref_backup_title">Enregistrement des signets et des traces</string>
+    <string name="pref_backup_title">Sauvegarder les favoris</string>
     <string name="backup_interval_manual_only">Désactivé (manuel uniquement)</string>
     <string name="pref_backup_summary">Enregistrement automatique dans un dossier de votre appareil</string>
     <string name="about_help">À propos &amp; aide</string>
@@ -926,4 +926,5 @@
     <string name="download_resources_custom_url_title">Serveur de cartes personnalisé</string>
     <string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète commençant par http:// ou https://</string>
     <string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string>
+    <string name="pref_maplanguage_local">Langue locale</string>
 </resources>

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

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>

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

@@ -15,7 +15,7 @@
     <string name="zoom_to_country">Prikaži na karti</string>
     <string name="country_status_download_failed">Preuzimanje neuspješno</string>
     <string name="try_again">Pokušaj ponovo</string>
-    <string name="about_proposition_2">• Fokusiran na privatnost i bez reklama</string>
+    <string name="about_proposition_2">• Usmjereno na privatnost i bez oglasa</string>
     <string name="close">Zatvori</string>
     <string name="download">Preuzmi</string>
     <string name="download_resources_continue">Prikaži kartu</string>
@@ -65,7 +65,7 @@
     <string name="downloader_retry">Pokušaj ponovno</string>
     <string name="red">Crvena</string>
     <string name="name">Naziv</string>
-    <string name="category_post">Pošta</string>
+    <string name="category_post">Poštanski ured</string>
     <string name="email">E-mail</string>
     <string name="done">Gotovo</string>
     <string name="rate_the_app">Ocijeni aplikaciju</string>
@@ -73,7 +73,7 @@
     <string name="search_history_title">Povijest pretraživanja</string>
     <string name="not_now">Ne sada</string>
     <string name="pref_map_style_title">Noćni način</string>
-    <string name="create">Napravi</string>
+    <string name="create">Kreiraj</string>
     <string name="editor_time_close">Zatvoreno</string>
     <string name="p2p_start">Početak</string>
     <string name="editor_time_to">Do</string>
@@ -115,9 +115,9 @@
     <string name="sort">Sortiraj…</string>
     <string name="money">Novac</string>
     <string name="app_site_url">https://comaps.app/hr/</string>
-    <string name="location_is_disabled_long_text">Trenutno su vam onemogućene sve usluge lokacije za ovaj uređaj ili aplikaciju. Molim omogućite ih u Postavkama.</string>
-    <string name="precise_location_is_disabled_long_text">Za točnu navigaciju omogućite Preciznu lokaciju u postavkama</string>
-    <string name="about_menu_title">O CoMaps aplikaciji</string>
+    <string name="location_is_disabled_long_text">Trenutno su vam sve lokacijske usluge onemogućene za ovaj uređaj ili aplikaciju. Omogućite ih u Postavkama.</string>
+    <string name="precise_location_is_disabled_long_text">Kako biste osigurali točnu navigaciju, uključite Preciznu lokaciju u postavkama</string>
+    <string name="about_menu_title">O CoMapsu</string>
     <string name="about_headline">Otvoreni projekt kojeg pokreće zajednica</string>
     <string name="about_proposition_1">• Jednostavan za korištenje i dotjeran</string>
     <string name="about_proposition_3">• Izvanmrežno, brz i kompaktan</string>
@@ -160,7 +160,7 @@
     <string name="category_eat">Gdje jesti</string>
     <string name="category_food">Namirnice</string>
     <string name="category_transport">Prijevoz</string>
-    <string name="category_fuel">Benzinske stanice</string>
+    <string name="category_fuel">Benzin</string>
     <string name="category_shopping">Kupovina</string>
     <string name="category_secondhand">Rabljena roba</string>
     <string name="category_tourism">Znamenitosti</string>
@@ -199,21 +199,21 @@
         <item quantity="few">%d rute</item>
         <item quantity="other">%d ruta</item>
     </plurals>
-    <string name="bookmarks_export">Izvoz svih Oznaka i Ruta</string>
+    <string name="bookmarks_export">Izvoz svih Mjesta i Ruta</string>
     <string name="start_track_recording">Snimi Rutu</string>
     <string name="stop_track_recording">Zaustavi snimanje Rute</string>
-    <string name="track_recording_alert_title">Spremi u Oznake i Rute?</string>
+    <string name="track_recording_alert_title">Spremi u favorite?</string>
     <string name="track_recording_toast_nothing_to_save">Ruta je prazna - nema ništa za spremiti</string>
     <string name="edit_track">Izmijeni Rutu</string>
-    <string name="pref_backup_title">Sigurnosna kopija Oznaka i Ruta</string>
-    <string name="pref_backup_now_summary_empty_lists">Nema Oznaka i Ruta za izradu sigurnosne kopije</string>
+    <string name="pref_backup_title">Sigurnosna kopija favorita</string>
+    <string name="pref_backup_now_summary_empty_lists">Nema Mjesta i Ruta za izradu sigurnosne kopije</string>
     <string name="share_track">Podijeli Rutu</string>
     <string name="placepage_edit_bookmark_button">Uredi spremljeno mjesto</string>
     <string name="bookmark_lists_hide_all">Sakrij sve</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d Oznaka</item>
-        <item quantity="few">%d Oznake</item>
-        <item quantity="other">%d Oznaka</item>
+        <item quantity="one">%d spremljeno mjesto</item>
+        <item quantity="few">%d spremljena mjesta</item>
+        <item quantity="other">%d spremljenih mjesta</item>
     </plurals>
     <string name="bookmarks_create_new_group">Kreiraj novu Listu</string>
     <string name="bookmarks_error_message_share_general">Nije moguće podijeliti zbog greške u aplikaciji</string>
@@ -225,8 +225,8 @@
     <string name="bookmarks_error_message_list_name_already_taken">Molimo odaberite drugi naziv</string>
     <string name="bookmarks_empty_list_title">Ova Lista je prazna</string>
     <string name="bookmarks_empty_list_message">Za spremanje mjesta dodirnite mjesto na karti, a zatim dodirnite ikonu zvjezdice</string>
-    <string name="sort_bookmarks">Sortiraj Oznake</string>
-    <string name="bookmark_color">Boja Oznake</string>
+    <string name="sort_bookmarks">Sortiraj favorite</string>
+    <string name="bookmark_color">Boja Favorita</string>
     <string name="share_my_location">Podijeli moju lokaciju</string>
     <string name="pref_zoom_title">Gumbi za zumiranje</string>
     <string name="pref_map_3d_title">Pogled iz perspektive</string>
@@ -361,7 +361,7 @@
     <string name="editor_business_vacant_button">Objekt više ne posluje</string>
     <string name="editor_mark_business_vacant_title">Označi da nema aktivnog poslovanja</string>
     <string name="editor_mark_business_vacant_description">Koristite ovo ako se tvrtka iselila, a prostor je prazan i spreman za novog najmoprimca.</string>
-    <string name="editor_submit">Pošalji</string>
+    <string name="editor_submit">Predaj</string>
     <string name="error_enter_correct_phone">Unesite važeći telefonski broj</string>
     <string name="error_enter_correct_web">Unesite valjanu web-adresu</string>
     <string name="error_enter_correct_email">Unesite važeću e-adresu</string>
@@ -401,7 +401,7 @@
     <string name="enable_logging">Omogući zapisivanje</string>
     <string name="feedback_general">Opće povratne informacije</string>
     <string name="prefs_languages_information">Za glasovne upute koristimo sistemski TTS. Mnogi Android uređaji koriste Google TTS, možete ga preuzeti ili ažurirati s Google Playa (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
-    <string name="prefs_languages_information_off">Za neke jezike morat ćete instalirati sintetizator govora ili dodatni jezični paket iz trgovine aplikacija (Google Play, Galaxy Store, App Gallery, FDroid). \nOtvorite postavke uređaja → Jezik i unos → Govor → Izlaz teksta u govor. Ovdje možete upravljati postavkama za sintezu govora (na primjer, preuzeti jezični paket za izvanmrežnu upotrebu) i odabrati drugi program za pretvaranje teksta u govor.</string>
+    <string name="prefs_languages_information_off">Za neke jezike morat ćete instalirati sintetizator govora ili dodatni jezični paket iz trgovine aplikacija (Google Play, Galaxy Store, App Gallery, FDroid). . \nOtvorite postavke uređaja → Jezik i unos → Govor → Izlaz teksta u govor. \nOvdje možete upravljati postavkama za sintezu govora (na primjer, preuzeti jezični paket za izvanmrežnu upotrebu) i odabrati drugi program za pretvaranje teksta u govor.</string>
     <string name="prefs_languages_information_off_link">Za više informacija molimo provjerite ovaj vodič</string>
     <string name="prefs_speed_cameras_information">Upozorenja na kamere za nadzor brzine onemogućena su u državama u kojima su takva upozorenja zabranjena lokalnim zakonima.</string>
     <string name="transliteration_title">Prikaži u latinici</string>
@@ -552,4 +552,111 @@
     <string name="aa_grant_permissions">Dodijeli dopuštenja</string>
     <string name="button_layer_outdoor">Na otvorenom</string>
     <string name="browser_not_available">Web preglednik nije dostupan</string>
+    <string name="hours_confirmed_time_ago">Potvrđeno %s</string>
+    <string name="existence_confirmed_time_ago">Postojanje potvrđeno %s</string>
+    <string name="edit_opening_hours">Uredi radno vrijeme</string>
+    <string name="no_osm_account">Nemate OpenStreetMap račun?</string>
+    <string name="register_at_openstreetmap">Registrirajte se na OpenStreetMap-u</string>
+    <string name="not_signed_in">Niste prijavljeni</string>
+    <string name="login_osm">Prijava na OpenStreetMap</string>
+    <string name="edit_place">Uredi mjesto</string>
+    <string name="add_language">Dodaj jezik</string>
+    <string name="street">Ulica</string>
+    <string name="house_number">Broj zgrade</string>
+    <string name="building">Zgrada</string>
+    <string name="add_street">Dodaj ulicu</string>
+    <string name="empty_street_name_error">Unesite naziv ulice</string>
+    <string name="choose_language">Odaberite jezik</string>
+    <string name="choose_street">Odaberite ulicu</string>
+    <string name="cuisine">Kuhinja</string>
+    <string name="select_cuisine">Odaberite kuhinju</string>
+    <string name="editor_add_phone">Dodaj telefon</string>
+    <string name="level">Kat</string>
+    <string name="level_value_generic">Razina: %s</string>
+    <string name="volume">Volumen</string>
+    <string name="pref_tts_open_system_settings">Postavke sustava za sintezu govora</string>
+    <string name="pref_tts_no_system_tts">Postavke sinteze govora nisu pronađene, jeste li sigurni da vaš uređaj to podržava?</string>
+    <string name="drive_through">Prolaz za automobile</string>
+    <string name="clear_the_search">Obriši pretragu</string>
+    <string name="website_menu">Poveznica na Jelovnik</string>
+    <string name="view_menu">Pogledaj Jelovnik</string>
+    <string name="open_in_app">Otvori u drugoj aplikaciji</string>
+    <string name="select_option">Odaberite opciju</string>
+    <string name="outdoor_seating">Vanjski prostor za sjedenje</string>
+    <string name="power_save_dialog_summary">Za najtočniju navigaciju preporučujemo isključivanje načina uštede energije u postavkama baterije telefona.</string>
+    <string name="stop_without_saving">Zaustavi bez spremanja</string>
+    <string name="continue_recording">Nastavi snimanje</string>
+    <string name="error_no_file_manager_app">Dijalog za odabir mape nije moguće prikazati jer na vašem uređaju nije instalirana odgovarajuća aplikacija. Instalirajte aplikaciju za upravljanje datotekama i pokušajte ponovno.</string>
+    <string name="choose_color">Odaberi boju</string>
+    <string name="uri_open_location_failed">Nije instalirana aplikacija koja može otvoriti lokaciju</string>
+    <string name="nav_auto">Automatska tema u navigaciji</string>
+    <string name="pref_left_button_title">Postavke lijevog gumba</string>
+    <string name="pref_left_button_disable">Onemogući</string>
+    <string name="pref_backup_summary">Automatsko sigurnosno kopiranje u mapu na vašem uređaju</string>
+    <string name="pref_backup_now_title">Sigurnosno kopiraj sada</string>
+    <string name="pref_backup_now_summary">Odmah stvorite sigurnosnu kopiju</string>
+    <string name="pref_backup_now_summary_progress">Sigurnosno kopiranje u tijeku…</string>
+    <string name="pref_backup_now_summary_ok">Sigurnosna kopija uspješno dovršena</string>
+    <string name="pref_backup_now_summary_failed">Sigurnosna kopija nije uspjela</string>
+    <string name="pref_backup_now_summary_folder_unavailable">Mapa za sigurnosnu kopiju nije dostupna</string>
+    <string name="pref_backup_status_summary_success">Posljednja uspješna sigurnosna kopija</string>
+    <string name="pref_backup_location_title">Lokacija sigurnosne kopije</string>
+    <string name="pref_backup_location_summary_initial">Najprije odaberite mapu i dodijelite dopuštenje</string>
+    <string name="pref_backup_history_title">Broj sigurnosnih kopija koje treba čuvati</string>
+    <string name="pref_backup_interval_title">Automatsko sigurnosno kopiranje</string>
+    <string name="backup_interval_every_day">Dnevno</string>
+    <string name="backup_interval_every_week">Tjedno</string>
+    <string name="backup_interval_manual_only">Isključeno (samo ručno)</string>
+    <string name="dialog_report_error_missing_folder">Odabrana lokacija za sigurnosnu kopiju nije dostupna ili na nju nije moguće zapisivati. Odaberite drugu lokaciju.</string>
+    <string name="dialog_report_error_with_logs">Molimo vas da nam pošaljete izvješće o pogrešci:\n- \"Omogući zapisivanje\" u postavkama\n- reproducirajte problem\n- na zaslonu \"O nama i pomoć\" pritisnite gumb \"Prijavi grešku\" i pošaljite putem e-pošte ili chata\n- onemogućite zapisivanje</string>
+    <string name="clear">Očisti</string>
+    <string name="route_type">Vrsta rute</string>
+    <string name="vehicle">Vozilo</string>
+    <string name="pedestrian">Pješak</string>
+    <string name="bicycle">Bicikla</string>
+    <string name="ruler">Ravnalo</string>
+    <string name="about_help">O nama &amp; Pomoć</string>
+    <string name="open_now">Otvoreno sada</string>
+    <string name="closed_now">Zatvoreno sada</string>
+    <string name="at">u %s</string>
+    <string name="delete_track_dialog_title">Izbrisati %s?</string>
+    <string name="pref_tts_no_system_tts_short">Nije pronađen program za pretvaranje teksta u govor, provjerite postavke aplikacije</string>
+    <string name="navigation_start_tts_message">"Pokretanje navigacije, jezik glasovnih uputa: "</string>
+    <string name="navigation_start_tts_disabled_message">Glasovne upute onemogućene: TTS mehanizam nije dostupan</string>
+    <string name="unknown_power_output">nepoznato</string>
+    <string name="charge_socket_type2">Tip 2 (bez kabela)</string>
+    <string name="charge_socket_type2_cable">Tip 2 (s kabelom)</string>
+    <string name="charge_socket_type2_combo">Tip 2 kombinacija</string>
+    <string name="charge_socket_type1">Tip 1</string>
+    <string name="charge_socket_nacs">NACS</string>
+    <string name="charge_socket_chademo">CHAdeMO priključak</string>
+    <string name="charge_socket_schuko">Domaći EU</string>
+    <string name="unknown_socket_type">nepoznata utičnica</string>
+    <string name="edit_socket_info_tooltip">Izradite nove utičnice ili uredite postojeće.</string>
+    <string name="charging_station_available_sockets">Dostupne utičnice</string>
+    <string name="charge_socket_unknown_other">Drugo ili nepoznato</string>
+    <string name="charge_socket_count">Broj</string>
+    <string name="charge_socket_power">Snaga (kW)</string>
+    <string name="editor_socket">Uredi utičnicu</string>
+    <string name="unknown_count">nepoznato</string>
+    <string name="error_value_must_be_positive">Vrijednost mora biti pozitivna</string>
+    <string name="error_invalid_number">Nevažeći broj</string>
+    <string name="offline_explanation_title">Izvanmrežne karte</string>
+    <string name="offline_explanation_text">Za prikaz i navigaciju područjem potrebno je preuzeti kartu.\nPreuzmite karte za područja u koja želite putovati.</string>
+    <string name="list_description_empty">Uredite popis kako biste dodali opis</string>
+    <string name="advanced">Napredno</string>
+    <string name="download_resources_custom_url_title">Prilagođeni poslužitelj karata</string>
+    <string name="download_resources_custom_url_message">Zamijenite zadani poslužitelj za preuzimanje karata. Ostavite prazno za korištenje CoMaps zadanog poslužitelja.</string>
+    <string name="download_resources_custom_url_summary_none">Nije postavljeno</string>
+    <string name="download_resources_custom_url_error_scheme">Molimo unesite URL koji počinje s http:// ili https://</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d minuta</item>
+        <item quantity="few">%d minute</item>
+        <item quantity="other">%d minuta</item>
+    </plurals>
+    <plurals name="bookmarks_detect_message">
+        <item quantity="one">Pronađena je %d datoteka. Možete je vidjeti nakon pretvorbe.</item>
+        <item quantity="few">Pronađeno je %d datoteka. Možete ih vidjeti nakon pretvorbe.</item>
+        <item quantity="other">Pronađeno je %d datoteka. Možete ih vidjeti nakon pretvorbe.</item>
+    </plurals>
 </resources>

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

@@ -144,7 +144,7 @@
     <!-- Email Subject when sharing bookmark list -->
     <string name="share_bookmarks_email_subject">Bagikan penanda CoMaps</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Memuat Penanda</string>
+    <string name="load_kmz_title">Memuat Tempat Favorit</string>
     <!-- Kmz file successful loading -->
     <string name="load_kmz_successful">Penanda berhasil dimuat! Anda dapat menemukannya pada peta atau pada layar Pengelola Penanda Lokasi.</string>
     <!-- Kml file loading failed -->
@@ -525,7 +525,7 @@
     <string name="feedback_general">Umpan Balik Umum</string>
     <string name="prefs_languages_information">Kami menggunakan TTS sistem untuk petunjuk suara. Banyak perangkat Android menggunakan Google TTS, Anda dapat mengunduhnya dari Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Untuk beberapa bahasa, Anda perlu menginstal synthesizer suara atau paket bahasa tambahan dari toko aplikasi (Google Play, Galaxy Store, App Gallery, FDroid). \nBuka pengaturan perangkat Anda → Language and input (Bahasa dan input) → Speech (Suara) → Text to speech (Teks ke suara). \nDi sini, Anda dapat mengelola pengaturan untuk sintesis suara (contohnya, mengunduh paket bahasa untuk penggunaan tanpa internet) dan memilih mesin tekske suara lain.</string>
-    <string name="prefs_languages_information_off_link">Untuk informasi selengkapnya, bacalah panduan ini.</string>
+    <string name="prefs_languages_information_off_link">Untuk informasi selengkapnya, bacalah panduan ini</string>
     <string name="transliteration_title">Transliterasi ke dalam bahasa Latin</string>
     <string name="learn_more">Pelajari selengkapnya</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->

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

@@ -72,7 +72,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Luoghi preferiti</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Luoghi preferiti e tracce</string>
+    <string name="bookmarks_and_tracks">Preferiti</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nome</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -144,7 +144,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Informazioni</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Questi sono i miei luoghi preferiti su CoMaps</string>
+    <string name="share_bookmarks_email_subject">I miei luoghi preferiti su CoMaps</string>
     <string name="share_bookmarks_email_body">Ciao!\n\nIn allegato ci sono i miei luoghi preferiti. Aprili se hai installato CoMaps. Oppure, se non ce l\'hai, scarica l\'app per iOS o Android seguendo questo link: https://www.comaps.app/\n\nDivertiti a viaggiare con CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Caricamento luoghi preferiti</string>
@@ -803,7 +803,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Continua a registrare</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Salvare in Luoghi preferiti e tracce?</string>
+    <string name="track_recording_alert_title">Salvare in Preferiti?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">La traccia è vuota - non c\'è nulla da salvare</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->

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

@@ -332,7 +332,7 @@
     <string name="zoom_in">Moghhe</string>
     <string name="zoom_out">Lehe</string>
     <string name="website_menu">Kevren Rol Voos</string>
-    <string name="view_menu">Vu Rol Voos</string>
+    <string name="view_menu">Gweles Rol Voos</string>
     <string name="open_in_app">Ygeri yn Aral App</string>
     <string name="select_option">Dewis dewis</string>
     <string name="outdoor_seating">Esedhow yn-mes</string>

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

@@ -140,14 +140,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Pastabos</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Su jumis bendrinamas „CoMaps“ žymių sąrašas</string>
-    <string name="share_bookmarks_email_body">Labas! \n \nČia prisegtas mano žymių sąrašas iš „CoMaps“ programėlės. Jei jos neturi, gali ją parsisiųsti iš https://www.comaps.app/download/ \n \nSmagių kelionių su „CoMaps“!</string>
+    <string name="share_bookmarks_email_subject">Mano „CoMaps“ žymės</string>
+    <string name="share_bookmarks_email_body">Labas! \n \nČia prisegtas mano „CoMaps“ programėlės žymių failas. Jei jos neturi, gali ją parsisiųsti iš https://www.comaps.app/download/ \n \nSmagių kelionių su „CoMaps“!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Žymių sąrašas įkeliamas</string>
+    <string name="load_kmz_title">Žymės įkeliamos</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Žymių sąrašas įkeltas! Galite rasti jį žemėlapyje arba žymių tvarkytuvės ekrane.</string>
+    <string name="load_kmz_successful">Žymės įkeltos! Galite jas rasti žemėlapyje arba žymių tvarkytuvės ekrane.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Žymių sąrašo nepavyko įkelti. Gali būti, kad failas sugadintas.</string>
+    <string name="load_kmz_failed">Žymių įkelti nepavyko. Gali būti, kad failas sugadintas.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Programėlė neatpažįsta failo tipo: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -553,13 +553,13 @@
     <string name="dialog_error_storage_message">Išorinė saugykla yra nepasiekiama. SD kortelė galimai yra pašalinta, pažeista, arba failų sistema joje yra nustatyta tik skaitymui. Patikrinkite SD kortelę arba susisiekite su mumis adresu support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuliuoti blogą saugyklą</string>
     <string name="error_enter_correct_name">Įveskite teisingą pavadinimą</string>
-    <string name="bookmark_lists">Sąrašai</string>
+    <string name="bookmark_lists">Žymių sąrašai</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Nerodyti visų</string>
     <string name="bookmark_lists_show_all">Rodyti visus</string>
     <string name="bookmarks_create_new_group">Kurti naują sąrašą</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importuoti žymes ir trasas</string>
+    <string name="bookmarks_import">Importuoti žymes</string>
     <string name="bookmarks_error_message_share_general">Nepavyko bendrinti dėl programinės klaidos</string>
     <string name="bookmarks_error_title_share_empty">Klaida bendrinant</string>
     <string name="bookmarks_error_message_share_empty">Negalima bendrinti tuščio sąrašo</string>
@@ -580,7 +580,7 @@
     <string name="subway">Metro</string>
     <string name="layers_title">Žemėlapio stiliai ir sluoksniai</string>
     <string name="bookmarks_empty_list_title">Sąrašas tuščias</string>
-    <string name="bookmarks_empty_list_message">Jeigu norite pridėti žymę, bakstelėkite vietą žemėlapyje, o tada – žvaigždutės piktogramą</string>
+    <string name="bookmarks_empty_list_message">Jeigu norite pasižymėti, bakstelėkite ją žemėlapyje, o tada – bakstelėkite žvaigždutės piktogramą</string>
     <string name="category_desc_more">…daugiau</string>
     <string name="export_file">Eksportuoti KMZ</string>
     <string name="export_file_gpx">Eksportuoti GPX</string>
@@ -711,7 +711,7 @@
     <string name="browser_not_available">Saityno naršyklė nepasiekiama</string>
     <string name="volume">Garsumas</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Eksportuoti visas žymes ir trasas</string>
+    <string name="bookmarks_export">Eksportuoti pasižymėtas žymes ir trasas</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Šnekos sintezės sistemos nustatymai</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -743,7 +743,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Tęsti įrašymą</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Įrašyti į žymių ir trasų sąrašą?</string>
+    <string name="track_recording_alert_title">Pridėti žymę?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Trasa tuščia – nėra ką įrašyti</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -753,7 +753,7 @@
     <string name="uri_open_location_failed">Neįdiegta programėlė, galinti atverti vietą</string>
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Automatinė naviguojant</string>
-    <string name="bookmarks_and_tracks">Žymės ir trasos</string>
+    <string name="bookmarks_and_tracks">Žymės</string>
     <string name="location_settings">Vietos nustatymai</string>
     <string name="maps_storage_summary">Pasirinkite aplanką atsiųstiems žemėlapiams įrašyti</string>
     <string name="category_secondhand">Naudotos prekės</string>
@@ -780,9 +780,10 @@
     <string name="car_used_on_the_phone_screen">Dabar naudojatės „CoMaps“ telefono ekrane</string>
     <string name="car_used_on_the_car_screen">Dabar naudojatės „CoMaps“ automobilio ekrane</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d žymė</item>
-        <item quantity="few">%d žymės</item>
-        <item quantity="other">%d žymių</item>
+        <item quantity="one">%d pasižymėta vieta</item>
+        <item quantity="few">%d pasižymėtos vietos</item>
+        <item quantity="many">%d pasižymėtų vietų</item>
+        <item quantity="other">%d pasižymėtų vietų</item>
     </plurals>
     <string name="app_tip_01">Su jūsų parama ir palaikymu mes galime sukurti geriausius žemėlapius pasaulyje!</string>
     <string name="enable_keep_screen_on_description">Įgalinus šią parinktį, ekranas visada liks įjungtas, kol rodomas žemėlapis.</string>
@@ -807,12 +808,12 @@
     <string name="saved">Įrašyta</string>
     <string name="ruler">Liniuotė</string>
     <string name="pref_left_button_title">Kairiojo mygtuko funkcija</string>
-    <string name="pref_backup_now_summary_empty_lists">Neturite jokių žymių ar trasų atsarginei kopijai sudaryti</string>
+    <string name="pref_backup_now_summary_empty_lists">Nėra pasižymėtų vietų ar trasų atsarginei kopijai sudaryti</string>
     <string name="pref_backup_interval_title">Automatinis atsarginis kopijavimas</string>
     <string name="dialog_report_error_missing_folder">Pasirinktas atsarginių kopijų aplankas nepasiekiamas, bent jau rašymui. Pasirinkite kitą aplanką.</string>
     <string name="dialog_report_error_with_logs">Būsime dėkingi, jei atsiųsti klaidos pranešimą:\n - programos nustatymuose pažymėkite „Įgalinti derinimo žurnalą“\n - atkartokite problemą\n - „Žinyno ir pagalbos“ ekrane bakstelėkite mygtuką „Pranešti apie klaidą“ ir išsiųskite pranešimą el. paštu ar per pokalbių programėlę\n - išjunkite derinimo žurnalą</string>
     <string name="bicycle">Dviračiu</string>
-    <string name="pref_backup_title">Žymių ir trasų atsarginis kopijavimas</string>
+    <string name="pref_backup_title">Žymių atsarginis kopijavimas</string>
     <string name="editor_building_levels">Aukštų skaičius (skaičiuojant pirmą aukštą, neskaičiuojant stogo)</string>
     <string name="editor_level">Aukštas (0 reiškia pirmą aukštą)</string>
     <string name="error_enter_correct_level">Įveskite leistiną aukšto numerį</string>
@@ -901,4 +902,5 @@
     <string name="download_resources_custom_url_message">Žemėlapiams parsisiųsti galite nurodyti kitą, nei numatytasis, serverį. Palikite lauką tuščią, jei norite naudoti numatytąjį „CoMaps“ serverį.</string>
     <string name="download_resources_custom_url_summary_none">Nenurodytas</string>
     <string name="download_resources_custom_url_error_scheme">Įveskite URL adresą, prasidedantį „http://“ arba „https://“</string>
+    <string name="pref_maplanguage_local">Vietos kalba</string>
 </resources>

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

@@ -516,10 +516,10 @@
     <string name="error_enter_correct_line_page">Ierakstiet LINE vietnes adresi vai LINE ID</string>
     <string name="placepage_add_place_button">Pievienot vietu „OpenStreetMap“</string>
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
-    <string name="editor_share_to_all_dialog_title">Vai vēlaties to nosūtīt visiem lietotājiem?</string>
+    <string name="editor_share_to_all_dialog_title">Vai nosūtīt to visiem lietotājiem?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.</string>
+    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka nav ievadīti nekādi privāti vai personīgi dati.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.</string>
     <string name="navigation_stop_button">Apturēt</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Maršruta reģistrēšana</string>
@@ -862,4 +862,25 @@
         <item quantity="other">%d min.</item>
     </plurals>
     <string name="pref_maplanguage_local">Vietējā valoda</string>
+    <string name="opens_day_at">Atver %1$s plkst. %2$s</string>
+    <string name="closes_at">Slēdz %s</string>
+    <string name="opens_at">Atver %s</string>
+    <string name="closes_day_at">Slēdz %1$s plkst. %2$s</string>
+    <string name="osm_note_toast">Piezīme tiks nosūtīta “OpenStreetMap”</string>
+    <string name="pref_backup_now_summary_ok">Rezerves kopēšana sekmīgi pabeigta</string>
+    <string name="pref_backup_now_summary_empty_lists">Nav vietu un ceļu, kam veikt rezerves kopēšanu</string>
+    <string name="pref_backup_now_summary_failed">Rezerves kopēšana neizdevās</string>
+    <string name="pref_backup_now_summary_folder_unavailable">Rezerves kopiju mape nav pieejama</string>
+    <string name="pref_backup_status_summary_success">Pēdējā sekmīgā rezerves kopēšana</string>
+    <string name="pref_backup_location_title">Rezerves kopiju atrašanās vieta</string>
+    <string name="pref_backup_location_summary_initial">Lūgums vispirms atlasīt mapi un nodrošināt atļauju</string>
+    <string name="pref_backup_history_title">Paturamo rezerves kopiju daudzums</string>
+    <string name="pref_backup_interval_title">Automātiskā rezerves kopēšana</string>
+    <string name="pref_backup_title">Izveidot izlases rezerves kopiju</string>
+    <string name="pref_backup_summary">Automātiski veikt rezerves kopēšanu ierīces mapē</string>
+    <string name="pref_backup_now_title">Veikt rezerves kopēšanu tagad</string>
+    <string name="pref_backup_now_summary">Nekavējoties izveidot rezerves kopiju</string>
+    <string name="pref_backup_now_summary_progress">Notiek rezerves kopēšana…</string>
+    <string name="pedestrian">Kājāmgājēju</string>
+    <string name="bicycle">Divriteņu</string>
 </resources>

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

@@ -16,6 +16,8 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#FF588157</color>
   <color name="bg_app">#10140F</color>
+  <color name="bg_editor">#161b14</color>
+  <color name="fg_editor">#282e25</color>
 
   <color name="bg_menu">#CC2D3237</color>
 

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

@@ -151,7 +151,7 @@
     <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
     <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
 
-    <item name="appBackground">?android:attr/colorBackground</item>
+    <item name="appBackground">@color/bg_app</item>
   </style>
 
   <style name="MwmTheme" parent="MwmTheme.Base"/>

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

@@ -21,30 +21,30 @@
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
     <string name="search">Zoeken</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
-    <string name="search_map">Zoeken op de kaart</string>
+    <string name="search_map">Zoeken op kaart</string>
     <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">U heeft momenteel alle locatieservices voor dit apparaat of deze app uitgeschakeld. Schakel ze in bij Instellingen.</string>
+    <string name="location_is_disabled_long_text">U heeft momenteel alle locatiediensten voor dit apparaat of deze app uitgeschakeld. Schakel ze in bij Instellingen.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Beperkte nauwkeurigheid</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie moet Nauwkeurige Locatie worden ingesteld bij Instellingen</string>
+    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie moet Nauwkeurige Locatie worden ingesteld in de instellingen</string>
     <!-- View and button titles for accessibility -->
-    <string name="zoom_to_country">Weergeven op de kaart</string>
+    <string name="zoom_to_country">Weergeven op kaart</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
     <string name="country_status_download_failed">Downloaden is mislukt</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Opnieuw proberen</string>
     <string name="about_menu_title">Over CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Open project, gemaakt door de community</string>
+    <string name="about_headline">Open project gedreven door de community</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• Gebruiksvriendelijk en gestroomlijnd</string>
+    <string name="about_proposition_1">• Gebruiksvriendelijk en afgewerkt</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Privacygericht en vrij van advertenties</string>
     <!-- Text in About screen -->
     <string name="about_proposition_3">• Offline, snel en compact</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Volledig open source, non-profit, transparante besluitvorming en financiering.</string>
+    <string name="about_developed_by_enthusiasts">Volledige open source, non-profit, transparante besluitvorming en financiering.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">Locatie-instellingen</string>
     <string name="close">Sluiten</string>
@@ -55,7 +55,7 @@
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Maak eerst ruimte vrij op de SD-kaart/USB-opslag om de app te gebruiken</string>
     <string name="download_resources">Laten we, voor de eerste start, de algemene wereldkaart downloaden. \nDeze gebruikt %s aan opslag.</string>
-    <string name="download_resources_continue">Ga naar de kaart</string>
+    <string name="download_resources_continue">Ga naar kaart</string>
     <string name="downloading_country_can_proceed">%1$s (%2$s) downloaden. U kunt nu \ndoorgaan naar de kaart.</string>
     <string name="download_country_ask">%1$s downloaden? (%2$s)</string>
     <string name="update_country_ask">%1$s bijwerken? (%2$s)</string>
@@ -66,7 +66,7 @@
     <!-- Show popup notification on top of the map when country download has failed. -->
     <string name="download_country_failed">%s download is mislukt</string>
     <!-- "Add new bookmark list" dialog title -->
-    <string name="add_new_set">Nieuwe groep toevoegen</string>
+    <string name="add_new_set">Nieuwe lijst toevoegen</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
     <string name="bookmark_set_name">Naam van lijst</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
@@ -96,7 +96,7 @@
     <!-- Ask user to wait several minutes (some long process in modal dialog). -->
     <string name="wait_several_minutes">Dit kan enkele minuten duren. \nEven geduld…</string>
     <!-- Measurement units title in settings activity -->
-    <string name="measurement_units">Afstandseenheid</string>
+    <string name="measurement_units">Eenheid van afstand</string>
     <!-- Detailed description of Measurement Units settings button -->
     <string name="measurement_units_summary">Kies tussen mijlen en kilometers</string>
     <!-- SECTION: Search categories -->
@@ -143,7 +143,7 @@
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
     <string name="category_water">Water</string>
     <!-- Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! -->
-    <string name="category_rv">Caravanfaciliteiten</string>
+    <string name="category_rv">Camperfaciliteiten</string>
     <!-- SECTION: Other translations -->
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notities</string>
@@ -159,7 +159,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Het bestandstype wordt niet herkend door de app: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
-    <string name="failed_to_open_file">Bestand openen mislukt %1$s \n \n%2$s</string>
+    <string name="failed_to_open_file">Bestand openen is mislukt %1$s \n \n%2$s</string>
     <!-- resource for context menu -->
     <string name="edit">Bewerken</string>
     <!-- Warning message when doing search around current position -->
@@ -841,21 +841,21 @@
     <string name="bookmark_color">Kleur voor favoriet</string>
     <string name="backup_interval_every_day">Dagelijks</string>
     <string name="backup_interval_manual_only">Uit (alleen handmatig)</string>
-    <string name="pref_backup_title">Back-up van favorieten</string>
+    <string name="pref_backup_title">Back-up maken van favorieten</string>
     <string name="pref_backup_summary">Automatisch back-up maken naar een map op je apparaat</string>
-    <string name="pref_backup_now_title">Nu back-uppen</string>
-    <string name="pref_backup_now_summary">Maak onmiddellijk een back-up</string>
-    <string name="pref_backup_now_summary_progress">Bezig met het maken van back-up…</string>
-    <string name="pref_backup_now_summary_ok">Back-up succesvol voltooid</string>
+    <string name="pref_backup_now_title">Nu back-up maken</string>
+    <string name="pref_backup_now_summary">Onmiddellijk een back-up maken</string>
+    <string name="pref_backup_now_summary_progress">Bezig met back-up maken…</string>
+    <string name="pref_backup_now_summary_ok">Back-up met succes voltooid</string>
     <string name="pref_backup_now_summary_empty_lists">Geen plaatsen en sporen voor een back-up</string>
     <string name="pref_backup_status_summary_success">Laatste succesvolle back-up</string>
     <string name="pref_backup_interval_title">Automatische back-up</string>
-    <string name="pref_backup_location_title">Back-up locatie</string>
-    <string name="pref_backup_now_summary_failed">Backup mislukt</string>
+    <string name="pref_backup_location_title">Back-uplocatie</string>
+    <string name="pref_backup_now_summary_failed">Backup is mislukt</string>
     <string name="pref_backup_history_title">Aantal back-ups om te bewaren</string>
     <string name="dialog_report_error_missing_folder">De geselecteerde back-uplocatie is niet beschikbaar of niet beschrijfbaar. Kies een andere locatie.</string>
     <string name="backup_interval_every_week">Wekelijks</string>
-    <string name="pref_backup_now_summary_folder_unavailable">De back-up map is niet beschikbaar</string>
+    <string name="pref_backup_now_summary_folder_unavailable">De back-upmap is niet beschikbaar</string>
     <string name="panoramax">Panoramax-afbeelding</string>
     <string name="pref_backup_location_summary_initial">Selecteer eerst een map en geef toestemming</string>
     <string name="pref_left_button_title">Linkerknop configuratie</string>

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

@@ -68,11 +68,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Adicionar conjunto novo</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nome do conjunto de favoritos</string>
+    <string name="bookmark_set_name">Nome da Lista</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Favoritos</string>
+    <string name="bookmarks">Lugares</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Favoritos e trajetos</string>
+    <string name="bookmarks_and_tracks">Favoritos</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nome</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -144,10 +144,10 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notas</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Os favoritos do CoMaps foram partilhados consigo</string>
-    <string name="share_bookmarks_email_body">Olá! \n \nSegue em anexo os meus favoritos da aplicação CoMaps. Por favor abra-os se tiver o CoMaps instalado. Caso não tenha, descarregue a aplicação para o seu dispositivo iOS ou Android com a hiperligação https://www.comaps.app/download/ \n \nDivirta-se a viajar com o CoMaps!</string>
+    <string name="share_bookmarks_email_subject">Os meus Favoritos do CoMaps</string>
+    <string name="share_bookmarks_email_body">Olá! \n \nSegue em anexo os meus favoritos; por favor abra-os com o CoMaps. Caso não tenha, descarregue a aplicação aqui: https://www.comaps.app/download/ \n \nDivirta-se a viajar com o CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">A carregar favoritos</string>
+    <string name="load_kmz_title">Carregando Favoritos</string>
     <!-- Kmz file successful loading -->
     <string name="load_kmz_successful">Os favoritos foram carregados com sucesso! Pode encontrá-los no mapa ou no ecrã de gestão dos favoritos.</string>
     <!-- Kml file loading failed -->

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

@@ -54,12 +54,12 @@
     <string name="maps_storage_free_size">%1$s prosto od %2$s</string>
     <string name="move_maps">Premaknem zemljevide?</string>
     <string name="move_maps_error">Napaka med premikanjem datotek zemljevidov</string>
-    <string name="wait_several_minutes">To lahko traja nekaj minut. \nProsimo, počakajte …</string>
+    <string name="wait_several_minutes">To lahko traja nekaj minut. \nPočakajte …</string>
     <string name="measurement_units">Merske enote</string>
     <string name="measurement_units_summary">Izberite med miljami in kilometri</string>
     <string name="category_eat">Kje jesti</string>
     <string name="category_food">Špecerija</string>
-    <string name="category_transport">Javni prevoz</string>
+    <string name="category_transport">Prevoz</string>
     <string name="category_fuel">Gorivo</string>
     <string name="category_parking">Parkiranje</string>
     <string name="category_shopping">Nakupovanje</string>
@@ -80,7 +80,7 @@
     <string name="category_water">Voda</string>
     <string name="category_rv">Prostori za avtodome</string>
     <string name="description">Pripis</string>
-    <string name="share_bookmarks_email_subject">Nekdo je z vami delil zaznamke CoMaps</string>
+    <string name="share_bookmarks_email_subject">Moji zaznamki na CoMaps</string>
     <string name="share_bookmarks_email_body">Živjo! \n \nV priponki so moji zaznamki. Prosim, odpri jih v orodju CoMaps. Če ga še nisi namestil, ga lahko preneseš tukaj: https://www.comaps.app/download/ \n \nUživaj v potovanju s CoMaps!</string>
     <string name="load_kmz_title">Nalagam zaznamke</string>
     <string name="load_kmz_successful">Zaznamki so uspešno naloženi! Najdete jih lahko na zemljevidu ali v upravitelju zaznamkov.</string>
@@ -239,7 +239,7 @@
     <string name="editor_example_values">Primeri vrednosti</string>
     <string name="editor_correct_mistake">Popravi napako</string>
     <string name="editor_add_select_location">Izberi lokacijo</string>
-    <string name="editor_report_problem_desription_1">Prosimo, podrobno opišite težavo, da jo lahko skupnost OpenStreetMap odpravi.</string>
+    <string name="editor_report_problem_desription_1">Podrobno opišite težavo, da jo lahko skupnost OpenStreetMap odpravi.</string>
     <string name="editor_report_problem_desription_2">Ali pa jo popravite sami na https://www.openstreetmap.org/</string>
     <string name="editor_report_problem_send_button">Pošlji</string>
     <string name="editor_report_problem_title">Težava</string>
@@ -271,7 +271,7 @@
     <string name="social_media">Družbena omrežja</string>
     <string name="building">Stavba</string>
     <string name="add_street">Dodaj ulico</string>
-    <string name="empty_street_name_error">Prosimo, vnesite ime ulice</string>
+    <string name="empty_street_name_error">Vnesite ime ulice</string>
     <string name="choose_language">Izberite jezik</string>
     <string name="choose_street">Izberite ulico</string>
     <string name="cuisine">Kuhinja</string>
@@ -285,7 +285,7 @@
     <string name="downloader_search_field_hint">Najdi zemljevid</string>
     <string name="common_check_internet_connection_dialog">Preverite, da je vaša naprava povezana na internet</string>
     <string name="downloader_no_space_title">Ni dovolj prostora</string>
-    <string name="downloader_no_space_message">Prosimo, izbrišite vse nepotrebne podatke</string>
+    <string name="downloader_no_space_message">Izbrišite vse nepotrebne podatke</string>
     <string name="editor_login_error_dialog">Napaka pri prijavi</string>
     <string name="editor_profile_changes">Potrjene spremembe</string>
     <string name="editor_focus_map_on_location">Povlecite zemljevid tako, da bo križ na lokaciji kraja ali podjetja.</string>
@@ -308,7 +308,7 @@
     <string name="error_enter_correct_zip_code">Vnesite veljavno poštno številko</string>
     <string name="editor_other_info">Komentar za prostovoljce na OpenStreetMap (neobvezno)</string>
     <string name="editor_note_hint">Opišite napake na zemljevidu ali stvari, ki jih ni mogoče urediti prek CoMaps</string>
-    <string name="editor_about_osm">Vaša urejanja se naložijo v javno podatkovno bazo <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Prosimo, da ne dodajate osebnih ali avtorsko zaščitenih podatkov.</string>
+    <string name="editor_about_osm">Vaša urejanja se naložijo v javno podatkovno bazo <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Ne dodajajte osebnih ali avtorsko zaščitenih podatkov.</string>
     <string name="editor_more_about_osm">Več o OpenStreetMap</string>
     <string name="editor_osm_history">Vaša zgodovina urejanja</string>
     <string name="editor_osm_notes">Vaši komentarji za zemljevid</string>
@@ -365,7 +365,7 @@
     <string name="mobile_data_option_ask">Vedno vprašaj</string>
     <string name="traffic_update_maps_text">Za prikazovanje podatkov o prometu je treba posodobiti zemljevide</string>
     <string name="big_font">Povečajte velikost oznak na zemljevidu</string>
-    <string name="traffic_update_app">Prosimo, posodobite CoMaps</string>
+    <string name="traffic_update_app">Posodobite CoMaps</string>
     <string name="traffic_data_unavailable">Prometni podatki niso na voljo</string>
     <string name="enable_logging">Omogoči dnevniške zapise</string>
     <string name="feedback_general">Splošne povratne informacije</string>
@@ -384,7 +384,7 @@
     <string name="dialog_error_storage_message">Zunanja shramba ni dostopna. SD kartica je bila morda odstranjena, je poškodovana ali pa datotečni sistem ne podpira zapisovanja. Preverite svojo SD kartico ali stopite v stik z nami prek support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuliraj pokvarjeno shrambo</string>
     <string name="error_enter_correct_name">Vnesite pravilno ime</string>
-    <string name="bookmark_lists">Seznami</string>
+    <string name="bookmark_lists">Seznam priljubljenih</string>
     <string name="bookmark_lists_hide_all">Skrij vse</string>
     <string name="bookmark_lists_show_all">Pokaži vse</string>
     <plurals name="bookmarks_places">
@@ -394,7 +394,7 @@
         <item quantity="other">%d zaznamkov</item>
     </plurals>
     <string name="bookmarks_create_new_group">Ustvarite nov seznam</string>
-    <string name="bookmarks_import">Uvozi zaznamke in poti</string>
+    <string name="bookmarks_import">Uvozi zaznamke</string>
     <string name="bookmarks_error_message_share_general">Ni bilo mogoče deliti zaradi aplikacijske napake</string>
     <string name="bookmarks_error_title_share_empty">Napaka pri deljenju</string>
     <string name="bookmarks_error_message_share_empty">Ni mogoče deliti praznega seznama</string>
@@ -448,7 +448,7 @@
     <string name="avoid_ferry">Brez trajektov</string>
     <string name="avoid_motorways">Brez avtocest</string>
     <string name="unable_to_calc_alert_title">Ne morem izračunati poti</string>
-    <string name="unable_to_calc_alert_subtitle">Ni bilo mogoče najti relacije. Mogoče so krive vaše zahteve za pot ali pa nepopolni podatki OpenStreetMap. Prosimo, spremenite možnosti relacije in poskusite ponovno.</string>
+    <string name="unable_to_calc_alert_subtitle">Ni bilo mogoče najti povezave. Mogoče so krive vaše zahteve za pot ali pa nepopolni podatki OpenStreetMapa. Spremenite možnosti iskanja povezave in poskusite ponovno.</string>
     <string name="define_to_avoid_btn">Definirajte, katerim cestam naj se izognemo</string>
     <string name="change_driving_options_btn">Možnosti relacije so omogočene</string>
     <string name="toll_road">Cesta s cestnino</string>
@@ -524,7 +524,7 @@
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="app_tip_00">Hvala, ker uporabljate naše javno narejene zemljevide!</string>
     <string name="app_tip_01">Z vašo podporo lahko ustvarimo najboljše zemljevide na svetu!</string>
-    <string name="app_tip_02">Ali vam je naša aplikacija všeč? Vabimo vas, da finančno podprete njen razvoj! Ali niste zadovoljni z njo? Prosimo, da nam sporočite, zakaj, in jo bomo popravili!</string>
+    <string name="app_tip_02">Ali vam je naša aplikacija všeč? Vabimo vas, da finančno podprete njen razvoj! Ali niste zadovoljni z njo? Prosimo, da nam sporočite zakaj, in jo bomo popravili!</string>
     <string name="app_tip_03">Če poznate kakega_o razvijalca_ko programske opreme, ga_jo lahko prosite, da implementira funkcionalnost, ki jo potrebujete.</string>
     <string name="app_tip_04">S kratkim pritiskom na zemljevid lahko izberete kateri koli element. Z dolgim pritiskom lahko skrijete ali pokažete vmesnik.</string>
     <string name="app_tip_05">Ali ste vedeli, da lahko na zemljevidu izberete svojo trenutno lokacijo?</string>
@@ -571,7 +571,7 @@
     <string name="stop_track_recording">Ustavi snemanje sledi</string>
     <string name="stop_without_saving">Ustavi brez shranjevanja</string>
     <string name="continue_recording">Nadaljuj snemanje</string>
-    <string name="track_recording_alert_title">Shrani med Zaznamke in sledi?</string>
+    <string name="track_recording_alert_title">Shrani med zaznamke?</string>
     <string name="track_recording_toast_nothing_to_save">Sled je prazna – ničesar ni za shraniti</string>
     <string name="error_no_file_manager_app">Pogovornega okna za izbiro mape ni mogoče prikazati, ker na vaši napravi ni nameščenega ustreznega orodja. Namestite upravitelja datotek in poskusite znova.</string>
     <string name="choose_color">Izberi barvo</string>
@@ -581,7 +581,7 @@
     <string name="zoom_in">Približaj</string>
     <string name="zoom_out">Oddalji</string>
     <string name="pref_left_button_title">Nastavitev levega gumba</string>
-    <string name="pref_backup_title">Varnostno kopiranje zaznamkov in sledi</string>
+    <string name="pref_backup_title">Varnostno kopiranje priljubljenih</string>
     <string name="pref_backup_summary">Samodejno varnostno kopiraj v mapo na vaši napravi</string>
     <string name="pref_backup_now_title">Ustvari varnostno kopijo zdaj</string>
     <string name="pref_left_button_disable">Onemogoči</string>
@@ -593,14 +593,14 @@
     <string name="pref_backup_now_summary_folder_unavailable">Mapa za varnostno kopijo ni na voljo</string>
     <string name="pref_backup_status_summary_success">Zadnje uspešno kopiranje</string>
     <string name="pref_backup_location_title">Mesto varnostne kopije</string>
-    <string name="pref_backup_location_summary_initial">Prosimo, najprej izberite mapo in podelite dovoljenja</string>
+    <string name="pref_backup_location_summary_initial">Najprej izberite mapo in dodelite dovoljenja</string>
     <string name="pref_backup_history_title">Število varnostnih kopij, ki jih je treba hraniti</string>
     <string name="pref_backup_interval_title">Samodejno varnostno kopiranje</string>
     <string name="backup_interval_manual_only">Izklopljeno (samo ročno)</string>
     <string name="dialog_report_error_missing_folder">Izbrano mesto za varnostno kopijo ni na voljo ali vanjo ni mogoče pisati. Izberite drugo mesto.</string>
     <string name="backup_interval_every_day">Dnevno</string>
     <string name="backup_interval_every_week">Tedensko</string>
-    <string name="dialog_report_error_with_logs">Prosimo, pošljite nam poročilo o napaki:\n - \"Omogoči beleženje\" v nastavitvah\n - poustvarite težavo\n - na zaslonu »O programu in Pomoč« pritisnite gumb »Prijavi napako« in jo pošljite po e-pošti ali klepetu\n - onemogoči beleženje</string>
+    <string name="dialog_report_error_with_logs">Pošljite nam poročilo o napaki:\n - \"Omogoči beleženje\" v nastavitvah\n - poustvarite težavo\n - na zaslonu »O programu in Pomoč« pritisnite gumb »Prijavi napako« in jo pošljite po e-pošti ali klepetu\n - onemogočite beleženje</string>
     <string name="route_type">Vrsta poti</string>
     <string name="vehicle">Vozilo</string>
     <string name="pedestrian">Za pešce</string>
@@ -646,8 +646,8 @@
     <string name="editor_mark_business_vacant_description">To uporabite, če se je podjetje izselilo in so prostori prazni in pripravljeni za novega zakupnika.</string>
     <string name="editor_submit">Potrdi</string>
     <string name="place_page_map_too_old_title">Podatki zemljevida so zastareli</string>
-    <string name="place_page_map_too_old_description">Vaši trenutni podatki zemljevida so zelo stari; prosimo, posodobite zemljevid.</string>
-    <string name="place_page_app_too_old_description">Vaši trenutni podatki zemljevida so zelo stari; prosimo, posodobite orodje CoMaps.</string>
+    <string name="place_page_map_too_old_description">Vaši trenutni podatki zemljevida so zelo stari, posodobite zemljevid.</string>
+    <string name="place_page_app_too_old_description">Vaši trenutni podatki zemljevida so zelo stari, posodobite orodje CoMaps.</string>
     <string name="place_page_update_too_old_map">Posodobi področje zemljevida</string>
     <string name="place_page_too_old_to_edit">Urejanje OpenStreetMap je onemogočeno, ker so podatki zemljevida prestari.</string>
     <string name="prefs_speed_cameras_information">Opozorila o merilnikih hitrosti so onemogočena v državah, kjer so prepovedana s tamkajšnjimi zakoni.</string>
@@ -661,5 +661,6 @@
     <string name="download_resources_custom_url_title">Strežnik zemljevida po meri</string>
     <string name="download_resources_custom_url_message">Prepiši privzeti strežnik za prenos zemljevidov, ki se uporablja za prenos zemljevidov. Pustite prazno, če želite uporabiti privzeti strežnik CoMaps.</string>
     <string name="download_resources_custom_url_summary_none">Ni nastavljeno</string>
-    <string name="download_resources_custom_url_error_scheme">Prosimo, vnesite polni URL, ki se začne z https:// in konča z /</string>
+    <string name="download_resources_custom_url_error_scheme">Vnesite polni URL, ki se začne z http:// ali https://</string>
+    <string name="pref_maplanguage_local">Krajevni jezik</string>
 </resources>

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

@@ -66,11 +66,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Lägg till ny samling</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Bokmärkessamlingens namn</string>
+    <string name="bookmark_set_name">Listans namn</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Bokmärken</string>
+    <string name="bookmarks">Platser</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bokmärken och rutter</string>
+    <string name="bookmarks_and_tracks">Favoriter</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Namn</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -142,13 +142,13 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Anteckningar</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps bokmärken har delats med dig</string>
+    <string name="share_bookmarks_email_subject">Mina CoMaps-favoriter</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Läser in bokmärken</string>
+    <string name="load_kmz_title">Läser in favoriter</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bokmärkena lästes in! Du kan hitta dem på kartan eller i Bokmärkeshanteraren.</string>
+    <string name="load_kmz_successful">Favoriterna lästes in! Du kan hitta dem på kartan eller i favorithanteraren.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Inläsningen av bokmärkena misslyckades. Filen kan vara skadad eller defekt.</string>
+    <string name="load_kmz_failed">Inläsningen av favoriterna misslyckades. Filen kan vara skadad eller defekt.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Filtypen känns inte igen av appen: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -210,7 +210,7 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Röstspråk</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Testa röstinstruktioner (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Testa röstinstruktioner</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Kontrollera volymen eller systemets text-till-tal-inställningar om du inte hör rösten nu</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -793,7 +793,7 @@
     <string name="connection_failure">Anslutningen bröts</string>
     <string name="disk_error_title">Diskfel</string>
     <string name="enable_show_on_lock_screen">Visa på låsskärmen</string>
-    <string name="share_bookmarks_email_body">Hej! \n \nJag bifogar mina bokmärken, öppna gärna dem med CoMaps. Om du inte redan har appen installerad, kan du ladda ner den här: https://www.comaps.app/download/ \n \nTrevlig resa med CoMaps!</string>
+    <string name="share_bookmarks_email_body">Hej! \n \nJag bifogar mina favoriter, öppna gärna dem med CoMaps. Om du inte redan har appen installerad, kan du ladda ner den här: https://www.comaps.app/download/ \n \nTrevlig resa med CoMaps!</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Sv:Om_OpenStreetMap</string>
@@ -850,4 +850,5 @@
     <string name="bicycle">Cykel</string>
     <string name="pedestrian">Gående</string>
     <string name="error_enter_correct_line_page">Ange en giltig webbadress</string>
+    <string name="move_maps_error">Kunde inte flytta kartfiler</string>
 </resources>

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

@@ -51,21 +51,4 @@
     <item>8</item>
     <item>10</item>
   </string-array>
-
-  <!-- Location Sharing Update Intervals -->
-  <string-array name="location_sharing_intervals">
-    <item>5 seconds</item>
-    <item>10 seconds</item>
-    <item>20 seconds</item>
-    <item>30 seconds</item>
-    <item>60 seconds</item>
-  </string-array>
-
-  <string-array name="location_sharing_interval_values">
-    <item>5</item>
-    <item>10</item>
-    <item>20</item>
-    <item>30</item>
-    <item>60</item>
-  </string-array>
 </resources>

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

@@ -65,6 +65,8 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
   <color name="bg_app">@android:color/white</color>
+  <color name="bg_editor">#ebefe4</color>
+  <color name="fg_editor">#f9faf2</color>
 
   <color name="bg_dialog_translucent">#BB000000</color>
   <color name="bg_text_translucent">#99FFFFFF</color>
@@ -125,7 +127,6 @@
   <color name="elevation_profile">@color/base_accent</color>
 
   <color name="active_track_recording">#FFFF0000</color>
-  <color name="active_location_sharing">#FF9500</color>
 
   <color name="material_calendar_surface_dark">#929292</color>
   <color name="notification_warning">#FFC22219</color>

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

@@ -210,9 +210,6 @@
     <!-- Length of track in cell that describes route -->
     <string name="length">Length</string>
     <string name="share_my_location">Share My Location</string>
-    <string name="stop_sharing_my_location">Stop Sharing My Location</string>
-    <string name="share_location_coordinates">Share Current Coordinates</string>
-    <string name="share_location_live">Start Live Location Sharing</string>
     <!-- Settings general group in settings screen -->
     <string name="prefs_group_general">General settings</string>
     <!-- Settings information group in settings screen -->

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

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!-- Location Sharing -->
-  <string name="location_sharing_title">Live Location Sharing</string>
-  <string name="location_sharing_start">Start Sharing</string>
-  <string name="location_sharing_stop">Stop Sharing</string>
-  <string name="location_sharing_active">Sharing live location</string>
-  <string name="location_sharing_status_active">Your location is being shared</string>
-  <string name="location_sharing_status_inactive">Location sharing is not active</string>
-
-  <!-- Notification -->
-  <string name="location_sharing_notification_text">Your live location is being shared</string>
-  <string name="location_sharing_tap_to_view">Tap to view in app</string>
-  <string name="location_sharing_eta">ETA: %s</string>
-  <string name="location_sharing_remaining">remaining</string>
-  <string name="location_sharing_accuracy">Accuracy: %s</string>
-  <string name="location_sharing_accuracy_high">high</string>
-  <string name="location_sharing_accuracy_medium">medium</string>
-  <string name="location_sharing_accuracy_low">low</string>
-  <string name="location_sharing_waiting_for_location">Waiting for location…</string>
-
-  <!-- Messages -->
-  <string name="location_sharing_started">Location sharing started</string>
-  <string name="location_sharing_stopped">Location sharing stopped</string>
-  <string name="location_sharing_failed_to_start">Failed to start location sharing</string>
-  <string name="location_sharing_url_copied">Share URL copied to clipboard</string>
-  <string name="location_sharing_share_message">Follow my live location: %s</string>
-
-  <!-- Dialog -->
-  <string name="location_sharing_description">Share your real-time location with end-to-end encryption. Only people with the link can view your location.</string>
-  <string name="location_sharing_copy_url">Copy Link</string>
-  <string name="location_sharing_share_url">Share Link</string>
-  <!-- Using existing close string from main strings.xml -->
-
-  <!-- Settings -->
-  <string name="pref_location_sharing_category">Live Location Sharing</string>
-  <string name="pref_location_sharing_update_interval">Update interval</string>
-  <string name="pref_location_sharing_update_interval_summary">How often to send location updates</string>
-  <string name="pref_location_sharing_server_url">Server URL</string>
-  <string name="pref_location_sharing_server_url_summary">Location sharing server endpoint</string>
-</resources>

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

@@ -89,8 +89,16 @@
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginBottom">@dimen/margin_half</item>
-    <item name="cardBackgroundColor">?cardBackground</item>
+    <item name="cardBackgroundColor">@color/fg_editor</item>
     <item name="android:padding">@dimen/margin_base</item>
     <item name="cardPreventCornerOverlap">false</item>
   </style>
+    <style name="MwmWidget.M3.CardView" parent="Widget.Material3.CardView.Elevated">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/margin_half</item>
+        <item name="cardBackgroundColor">?appBackground</item>
+        <item name="android:padding">@dimen/margin_base</item>
+        <item name="cardPreventCornerOverlap">false</item>
+    </style>
 </resources>

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

@@ -239,10 +239,6 @@
     <item name="android:foreground">@drawable/shadow_top</item>
   </style>
 
-  <style name="MwmWidget.FrameLayout.BookmarkCategories">
-    <item name="android:background">?windowBackgroundForced</item>
-  </style>
-
   <style name="MwmWidget.Counter">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
@@ -287,13 +283,13 @@
   </style>
 
   <style name="MwmWidget.BottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
-    <item name="backgroundTint">?colorSurfaceContainerLow</item>
+    <item name="backgroundTint">?appBackground</item>
     <item name="elevationOverlayEnabled">false</item>
     <item name="shapeAppearance">@style/ShapeAppearance.Material3.LargeComponent</item>
   </style>
 
   <style name="MwmWidget.BottomSheet" parent="MwmWidget.BottomSheetDialog">
-    <item name="android:background">?colorSurfaceContainerLow</item>
+    <item name="android:background">?appBackground</item>
     <item name="behavior_hideable">false</item>
   </style>
 

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

@@ -278,15 +278,21 @@
   <style name="MwmTheme.Navigation">
     <item name="iconTint">@color/white_primary</item>
   </style>
-
-  <style name="PopupMenu" parent="ThemeOverlay.Material3">
-    <item name="android:popupBackground">?windowBackgroundForced</item>
-  </style>
     <!-- Theme required to apply M3 dialog style on preference screen -->
     <style name="MwmTheme.M3.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="dialogCornerRadius">28dp</item>
         <item name="cornerFamily">rounded</item>
         <item name="android:colorBackground">?attr/colorSurfaceContainerHigh</item>
         <item name="android:layout">@layout/m3_alert_dialog</item>
+        <item name="buttonBarPositiveButtonStyle">@style/MwmTheme.M3.AlertDialog.Button</item>
+        <item name="buttonBarNegativeButtonStyle">@style/MwmTheme.M3.AlertDialog.Button</item>
+        <item name="buttonBarNeutralButtonStyle">@style/MwmTheme.M3.AlertDialog.Button.Neutral</item>
     </style>
+
+  <style name="MwmTheme.M3.AlertDialog.Button" parent="@style/Widget.Material3.Button.TextButton.Dialog">
+       <item name="android:textColor">?colorSecondary</item>
+  </style>
+  <style name="MwmTheme.M3.AlertDialog.Button.Neutral" parent="@style/Widget.Material3.Button.TextButton.Dialog.Flush">
+       <item name="android:textColor">?colorSecondary</item>
+  </style>
 </resources>

android/app/src/main/res/xml/prefs_main.xml

@@ -193,27 +193,6 @@
         android:order="5"/>
   </PreferenceCategory>
 
-  <androidx.preference.PreferenceCategory
-    android:key="@string/pref_location_sharing_category"
-    android:title="@string/location_sharing_title"
-    android:order="5">
-    <EditTextPreference
-      android:key="@string/pref_location_sharing_server_url"
-      android:title="@string/pref_location_sharing_server_url"
-      app:singleLineTitle="false"
-      android:summary="@string/pref_location_sharing_server_url_summary"
-      android:defaultValue="https://live.organicmaps.app"
-      android:order="1"/>
-    <ListPreference
-      android:key="@string/pref_location_sharing_update_interval"
-      android:title="@string/pref_location_sharing_update_interval"
-      app:singleLineTitle="false"
-      android:summary="@string/pref_location_sharing_update_interval_summary"
-      android:entries="@array/location_sharing_intervals"
-      android:entryValues="@array/location_sharing_interval_values"
-      android:defaultValue="20"
-      android:order="2"/>
-  </androidx.preference.PreferenceCategory>
   <androidx.preference.PreferenceCategory
     android:key="@string/pref_privacy"
     android:title="@string/privacy"

android/sdk/build.gradle

@@ -131,6 +131,12 @@ dependencies {
   testImplementation libs.junit
 }
 
+android {
+  androidResources {
+    ignoreAssetsPatterns.add("!design")
+  }
+}
+
 // TODO: Running lint task triggers native build. Find a better solution.
 project.afterEvaluate {
   boolean isLintRun = project.gradle.startParameter.taskNames.any { it.toLowerCase().contains('lint') }

android/sdk/src/main/assets/subtypes.csv

@@ -0,0 +1 @@
+../../../../../data/subtypes.csv

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

@@ -53,7 +53,6 @@ set(SRC
   app/organicmaps/sdk/editor/OpeningHours.cpp
   app/organicmaps/sdk/editor/OsmOAuth.cpp
   app/organicmaps/sdk/Framework.cpp
-  app/organicmaps/location/LocationSharingJni.cpp
   app/organicmaps/sdk/isolines/IsolinesManager.cpp
   app/organicmaps/sdk/LocationState.cpp
   app/organicmaps/sdk/Map.cpp
@@ -95,7 +94,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE .)
 target_link_libraries(${PROJECT_NAME}
   # CoMaps libs
   map
-  location_sharing
   # ge0
   # tracking
   # routing

android/sdk/src/main/cpp/app/organicmaps/location/LocationSharingJni.cpp

@@ -1,76 +0,0 @@
-#include "app/organicmaps/sdk/core/jni_helper.hpp"
-
-#include "location_sharing/location_sharing_types.hpp"
-#include "location_sharing/crypto_util.hpp"
-
-#include "base/logging.hpp"
-
-#include <jni.h>
-
-using namespace location_sharing;
-
-extern "C"
-{
-
-// Generate session credentials
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_location_LocationSharingManager_nativeGenerateSessionCredentials(
-    JNIEnv * env, jclass)
-{
-  SessionCredentials creds = SessionCredentials::Generate();
-
-  // Create String array [sessionId, encryptionKey]
-  jobjectArray result = env->NewObjectArray(2, env->FindClass("java/lang/String"), nullptr);
-  if (!result)
-  {
-    LOG(LERROR, ("Failed to create result array"));
-    return nullptr;
-  }
-
-  jstring sessionId = jni::ToJavaString(env, creds.sessionId);
-  jstring encryptionKey = jni::ToJavaString(env, creds.encryptionKey);
-
-  env->SetObjectArrayElement(result, 0, sessionId);
-  env->SetObjectArrayElement(result, 1, encryptionKey);
-
-  env->DeleteLocalRef(sessionId);
-  env->DeleteLocalRef(encryptionKey);
-
-  return result;
-}
-
-// Generate share URL
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_location_LocationSharingManager_nativeGenerateShareUrl(
-    JNIEnv * env, jclass, jstring jSessionId, jstring jEncryptionKey, jstring jServerBaseUrl)
-{
-  std::string sessionId = jni::ToNativeString(env, jSessionId);
-  std::string encryptionKey = jni::ToNativeString(env, jEncryptionKey);
-  std::string serverBaseUrl = jni::ToNativeString(env, jServerBaseUrl);
-
-  SessionCredentials creds(sessionId, encryptionKey);
-  std::string shareUrl = creds.GenerateShareUrl(serverBaseUrl);
-
-  return jni::ToJavaString(env, shareUrl);
-}
-
-// Encrypt payload
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_location_LocationSharingManager_nativeEncryptPayload(
-    JNIEnv * env, jclass, jstring jEncryptionKey, jstring jPayloadJson)
-{
-  std::string encryptionKey = jni::ToNativeString(env, jEncryptionKey);
-  std::string payloadJson = jni::ToNativeString(env, jPayloadJson);
-
-  auto encryptedOpt = crypto::EncryptAes256Gcm(encryptionKey, payloadJson);
-  if (!encryptedOpt.has_value())
-  {
-    LOG(LERROR, ("Encryption failed"));
-    return nullptr;
-  }
-
-  std::string resultJson = encryptedOpt->ToJson();
-  return jni::ToJavaString(env, resultJson);
-}
-
-}  // extern "C"

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

@@ -520,46 +520,6 @@ public final class Config
     }
   }
 
-  public static class LocationSharing
-  {
-    interface Keys
-    {
-      String SERVER_URL = "LocationSharingServerUrl";
-      String UPDATE_INTERVAL = "LocationSharingUpdateInterval";
-    }
-
-    public interface Defaults
-    {
-      String SERVER_URL = "https://live.organicmaps.app";
-      int UPDATE_INTERVAL = 20;  // seconds
-      int UPDATE_INTERVAL_MIN = 5;
-      int UPDATE_INTERVAL_MAX = 60;
-    }
-
-    @NonNull
-    public static String getServerUrl()
-    {
-      return getString(Keys.SERVER_URL, Defaults.SERVER_URL);
-    }
-
-    public static void setServerUrl(@NonNull String url)
-    {
-      setString(Keys.SERVER_URL, url);
-    }
-
-    public static int getUpdateInterval()
-    {
-      return getInt(Keys.UPDATE_INTERVAL, Defaults.UPDATE_INTERVAL);
-    }
-
-    public static void setUpdateInterval(int seconds)
-    {
-      if (seconds < Defaults.UPDATE_INTERVAL_MIN || seconds > Defaults.UPDATE_INTERVAL_MAX)
-        seconds = Defaults.UPDATE_INTERVAL;
-      setInt(Keys.UPDATE_INTERVAL, seconds);
-    }
-  }
-
   private static native boolean nativeHasConfigValue(String name);
   private static native boolean nativeDeleteConfigValue(String name);
   private static native boolean nativeGetBoolean(String name, boolean defaultValue);

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

@@ -52,8 +52,8 @@
     <string name="type.leisure.adult_gaming_centre">Centar za igru odraslih</string>
     <string name="type.leisure.amusement_arcade">Igraonica za odrasle</string>
     <string name="type.amenity.charging_station">Stanica za punjenje EV</string>
-    <string name="type.amenity.charging_station.bicycle">Stanica za punjenje bicikala</string>
-    <string name="type.amenity.charging_station.motorcar">Stanica za punjenje automobila</string>
+    <string name="type.amenity.charging_station.bicycle">Bicikli</string>
+    <string name="type.amenity.charging_station.motorcar">Auta</string>
     <string name="type.amenity.childcare">Vrtić</string>
     <string name="type.amenity.cinema">Bioskop</string>
     <string name="type.amenity.studio">Medijski studio</string>
@@ -335,7 +335,7 @@
     <string name="type.cuisine.noodles">Nudle</string>
     <string name="type.cuisine.oriental">Orijentalna</string>
     <string name="type.cuisine.pancake">Palačinke</string>
-    <string name="type.cuisine.pasta">Pasta</string>
+    <string name="type.cuisine.pasta">Testenine</string>
     <string name="type.cuisine.persian">Persijska</string>
     <string name="type.cuisine.peruvian">Peruanska</string>
     <string name="type.cuisine.pizza">Pica</string>
@@ -1411,4 +1411,8 @@
     <string name="type.xmas.tree">Božićna jelka</string>
     <string name="type.railway.disused.bridge">Napušteni železnički most</string>
     <string name="type.railway.disused.tunnel">Napušteni železnički tunel</string>
+    <string name="type.amenity.charging_station.motorcycle">Motocikli</string>
+    <string name="type.amenity.charging_station.small">Ograničen kapacitet</string>
+    <string name="type.emergency.disaster_help_point">Tačka za pomoć u hitnim slučajevima</string>
+    <string name="type.emergency.access_point.address">Adresa za hitno spašavanje</string>
 </resources>

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

@@ -34,4 +34,11 @@
     <string name="today">Днес</string>
     <string name="maps_storage_internal">Вътрешно частно хранилище</string>
     <string name="yesterday">Вчера</string>
+    <string name="week_ago">преди %s седмица</string>
+    <string name="days_ago">преди %s дни</string>
+    <string name="weeks_ago">преди %s седмици</string>
+    <string name="month_ago">преди %s месец</string>
+    <string name="months_ago">преди %s месеца</string>
+    <string name="year_ago">преди %s година</string>
+    <string name="years_ago">преди %s години</string>
 </resources>

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

@@ -1374,4 +1374,5 @@
     <string name="type.amenity.animal_shelter">Приют за животни</string>
     <string name="type.internet_access">Интернет</string>
     <string name="type.internet_access.wlan">Интернет</string>
+    <string name="type.man_made.telescope">Телескоп</string>
 </resources>

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

@@ -9,7 +9,7 @@
     <string name="maps_storage_external">বহিরাগত শেয়ার্ড স্টোরেজ</string>
     <string name="category_wifi">ওয়াইফাই</string>
     <string name="maps_storage_shared">অভ্যন্তরীণ শেয়ার্ড স্টোরেজ</string>
-    <string name="postal_code">ডাক কোড</string>
+    <string name="postal_code">ডাক কোড|পিন কোড</string>
     <string name="today">আজকে</string>
     <string name="km">কিমি</string>
     <string name="yesterday">গতকাল</string>

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

@@ -6,34 +6,34 @@
     <string name="type.building.guardhouse">সিকিউরিটি বুথ</string>
     <string name="type.power.portal">পাওয়ার পোর্টাল</string>
     <string name="type.amenity.ferry_terminal">ফেরি</string>
-    <string name="type.amenity.fire_station">দমকল স্টেশন</string>
+    <string name="type.amenity.fire_station">4দমকল স্টেশন</string>
     <string name="type.amenity.food_court">ফুড কোর্ট</string>
-    <string name="type.amenity.fountain">ফাউন্টেন</string>
-    <string name="type.amenity.fuel">গ্যাস স্টেশন</string>
+    <string name="type.amenity.fountain">ফাউন্টেন|ফোয়ারা</string>
+    <string name="type.amenity.fuel">গ্যাস স্টেশন|5পেট্রোল পাম্প</string>
     <string name="type.amenity.grave_yard">কবরস্থান</string>
     <string name="type.amenity.grave_yard.christian">খ্রিস্টান কবরস্থান</string>
     <string name="type.amenity.hospital">হাসপাতাল</string>
     <string name="type.amenity.ice_cream">আইসক্রিম</string>
     <string name="type.amenity.internet_cafe">ইন্টারনেট ক্যাফে</string>
     <string name="type.amenity.kindergarten">কিন্ডারগার্টেন</string>
-    <string name="type.amenity.library">গ্রন্থাগার</string>
-    <string name="type.amenity.marketplace">বাজার</string>
-    <string name="type.amenity.motorcycle_parking">বাইক পার্কিং</string>
+    <string name="type.amenity.library">গ্রন্থাগার|লাইব্রেরি</string>
+    <string name="type.amenity.marketplace">বাজার|মার্কেট</string>
+    <string name="type.amenity.motorcycle_parking">বাইক পার্কিং|9মোটরসাইকেল পার্কিং</string>
     <string name="type.amenity.nightclub">নাইটক্লাব</string>
     <string name="type.amenity.nursing_home">নার্সিংহোম</string>
     <string name="type.amenity.parking">পার্কিং</string>
     <string name="type.amenity.parking.fee">পার্কিং</string>
     <string name="type.amenity.parking.multi.storey">বহুতল পার্কিং</string>
     <string name="type.amenity.parking.multi.storey.fee">বহুতল পার্কিং</string>
-    <string name="type.amenity.parking.no.access">ব্যক্তিগত পার্কিং</string>
-    <string name="type.amenity.parking.permissive">প্রাইভেট পার্কিং</string>
-    <string name="type.amenity.parking.private">প্রাইভেট পার্কিং</string>
-    <string name="type.amenity.parking.underground">আন্ডারগ্রাউন্ড পার্কিং</string>
-    <string name="type.amenity.parking.underground.fee">আন্ডারগ্রাউন্ড পার্কিং</string>
+    <string name="type.amenity.parking.no.access">ব্যক্তিগত পার্কিং|প্রাইভেট পার্কিং</string>
+    <string name="type.amenity.parking.permissive">ব্যক্তিগত পার্কিং|প্রাইভেট পার্কিং</string>
+    <string name="type.amenity.parking.private">ব্যক্তিগত পার্কিং|প্রাইভেট পার্কিং</string>
+    <string name="type.amenity.parking.underground">আন্ডারগ্রাউন্ড পার্কিং|ভূগর্ভস্থ পার্কিং</string>
+    <string name="type.amenity.parking.underground.fee">আন্ডারগ্রাউন্ড পার্কিং|ভূগর্ভস্থ পার্কিং</string>
     <string name="type.amenity.parking.street_side">রোড-পার্শ্ববর্তী পার্কিং</string>
     <string name="type.amenity.parking.street_side.private">ব্যক্তিগত সড়ক-পার্শ্ববর্তী পার্কিং</string>
     <string name="type.amenity.parking.lane">লেন পার্কিং</string>
-    <string name="type.amenity.parking.underground.private">ব্যক্তিগত আন্ডারগ্রাউন্ড পার্কিং</string>
+    <string name="type.amenity.parking.underground.private">ব্যক্তিগত আন্ডারগ্রাউন্ড পার্কিং|প্রাইভেট আন্ডারগ্রাউন্ড পার্কিং|ব্যক্তিগত ভূগর্ভস্থ পার্কিং|প্রাইভেট ভূগর্ভস্থ পার্কিং</string>
     <string name="type.aeroway.aerodrome">বিমানবন্দর</string>
     <string name="type.aeroway.aerodrome.international">আন্তর্জাতিক বিমানবন্দর</string>
     <string name="type.amenity.drinking_water">পানীয় জল</string>
@@ -44,10 +44,10 @@
     <string name="type.natural.volcano">আগ্নেয়গিরি</string>
     <string name="type.natural.desert">মরুভূমি</string>
     <string name="type.natural.coastline">উপকূলরেখা</string>
-    <string name="type.amenity.college">কলেজ</string>
+    <string name="type.amenity.college">কলেজ|মহাবিদ্যালয়</string>
     <string name="type.amenity.music_school">গানের স্কুল</string>
     <string name="type.amenity.place_of_worship.muslim">মসজিদ</string>
-    <string name="type.amenity.place_of_worship.hindu">হিন্দু মন্দির</string>
+    <string name="type.amenity.place_of_worship.hindu">হিন্দু মন্দির|মন্দির</string>
     <string name="type.amenity.prison">কারাগার</string>
     <string name="type.barrier.fence">বেড়া</string>
     <string name="type.waterway.waterfall">ঝর্ণা</string>
@@ -75,7 +75,7 @@
     <string name="type.sport.chess">দাবা</string>
     <string name="type.sport.basketball">বাস্কেটবল</string>
     <string name="type.sport.badminton">ব্যাডমিন্টন</string>
-    <string name="type.sport">ক্রীড়া</string>
+    <string name="type.sport">ক্রীড়া|স্পোর্টস</string>
     <string name="type.sport.multi">বিভিন্ন ক্রীড়া</string>
     <string name="type.amenity.toilets">শৌচালয়</string>
     <string name="type.shop.watches">ঘড়ির দোকান</string>
@@ -86,13 +86,13 @@
     <string name="type.man_made.water_tower">জলের ট্যাঙ্ক</string>
     <string name="type.amenity.bench">বেঞ্চ</string>
     <string name="type.amenity.bus_station">বাস স্টেশন</string>
-    <string name="type.amenity.courthouse">আদালত</string>
+    <string name="type.amenity.courthouse">আদালত|কোর্ট</string>
     <string name="type.amenity.dentist">দাঁতের ডাক্তার</string>
-    <string name="type.amenity.doctors">ডাক্তার</string>
-    <string name="type.amenity.pharmacy">ওষুধ দোকান</string>
-    <string name="type.amenity.place_of_worship.christian">গির্জা</string>
+    <string name="type.amenity.doctors">ডাক্তার|4চিকিৎসক</string>
+    <string name="type.amenity.pharmacy">4ওষুধ দোকান|ফার্মেসি</string>
+    <string name="type.amenity.place_of_worship.christian">গির্জা|চার্চ</string>
     <string name="type.amenity.school">স্কুল</string>
-    <string name="type.amenity.telephone">টেলিফোন</string>
+    <string name="type.amenity.telephone">টেলিফোন|ফোন</string>
     <string name="type.amenity.university">বিশ্ববিদ্যালয়</string>
     <string name="type.amenity.vending_machine.fuel">পেট্রোল পাম্প</string>
     <string name="type.barrier">বাঁধা</string>
@@ -111,7 +111,7 @@
     <string name="type.natural">প্রকৃতি</string>
     <string name="type.amenity.atm">এটিএম</string>
     <string name="type.amenity.bank">ব্যাঙ্ক</string>
-    <string name="type.amenity.police">পুলিশ</string>
+    <string name="type.amenity.police">পুলিশ|থানা</string>
     <string name="type.building">বিল্ডিং</string>
     <string name="type.building.address">ঠিকানা</string>
     <string name="type.cuisine.croatian">ক্রোয়েসীয়</string>
@@ -148,7 +148,7 @@
     <string name="type.amenity.bicycle_parking.covered">আচ্ছাদিত সাইকেল পার্কিং</string>
     <string name="type.amenity.boat_rental">নৌকা ভাড়া</string>
     <string name="type.amenity.bicycle_rental">সাইকেল ভাড়া</string>
-    <string name="type.man_made.telescope">দূরবিক্ষণ</string>
+    <string name="type.man_made.telescope">দূরবিক্ষণ|দূরবীণ</string>
     <string name="type.man_made.telescope.optical">দূরবিক্ষণ (আলোক রশ্মি)</string>
     <string name="type.man_made.telescope.radio">দূরবিক্ষণ (রেডিও রশ্মি)</string>
     <string name="type.man_made.telescope.gamma">দূরবিক্ষণ (গামা রশ্মি)</string>
@@ -157,7 +157,7 @@
     <string name="type.amenity.motorcycle_rental">মোটরসাইকেল ভাড়া</string>
     <string name="type.amenity.cinema">সিনেমা</string>
     <string name="type.amenity.shelter.public_transport">আশ্রয়</string>
-    <string name="type.amenity.post_office">পোস্ট অফিস</string>
+    <string name="type.amenity.post_office">পোস্ট অফিস|ডাক ঘর</string>
     <string name="type.amenity.restaurant">রেস্টুরেন্ট</string>
     <string name="type.amenity.taxi">ট্যাক্সি স্ট্যান্ড</string>
     <string name="type.shop.mobile_phone">মোবাইল ফোনের দোকান</string>
@@ -174,4 +174,64 @@
     <string name="type.waterway.drain">ড্রেন</string>
     <string name="type.amenity.bar">বার</string>
     <string name="type.amenity.bicycle_parking">সাইকেল পার্কিং</string>
+    <string name="type.amenity.post_box">মেল বাক্স|ডাক বাক্স</string>
+    <string name="type.recycling.batteries">ব্যাটারি</string>
+    <string name="type.recycling.clothes">4জামাকাপড়</string>
+    <string name="type.recycling.glass_bottles">কাঁচের বোতল</string>
+    <string name="type.recycling.paper">কাগজ</string>
+    <string name="type.recycling.plastic">প্লাস্টিক</string>
+    <string name="type.recycling.plastic_bottles">প্লাস্টিক বোতল</string>
+    <string name="type.recycling.small_appliances">ইলেকট্রনিক বর্জ্য</string>
+    <string name="type.recycling.cardboard">কার্ডবোর্ড</string>
+    <string name="type.recycling.cans">ক্যান</string>
+    <string name="type.recycling.shoes">জুতো</string>
+    <string name="type.recycling.green_waste">5আনাজ খোলা</string>
+    <string name="type.recycling.cartons">কার্টন|কার্ডবোর্ডের বাক্স</string>
+    <string name="type.toilets.yes">শৌচালয়</string>
+    <string name="type.amenity.vehicle_inspection">ধোঁয়া পরীক্ষা</string>
+    <string name="type.amenity.veterinary">গরুর ডাক্তার|পশুচিকিৎসক</string>
+    <string name="type.barrier.chain">চেন</string>
+    <string name="type.barrier.toll_booth">টোল বুথ</string>
+    <string name="type.barrier.wall">দেয়াল</string>
+    <string name="type.boundary">4সীমান্ত</string>
+    <string name="type.boundary.administrative">প্রশাসনিক সীমান্ত</string>
+    <string name="type.boundary.administrative.2">জাতীয় সীমান্ত</string>
+    <string name="type.boundary.administrative.3">আঞ্চলিক সীমান্ত</string>
+    <string name="type.boundary.administrative.4">আঞ্চলিক সীমান্ত</string>
+    <string name="type.boundary.national_park">জাতীয় উদ্যান</string>
+    <string name="type.boundary.aboriginal_lands">আদিবাসী ভূমি</string>
+    <string name="type.boundary.protected_area">সংরক্ষিত এলাকা</string>
+    <string name="type.boundary.protected_area.1">সংরক্ষিত এলাকা</string>
+    <string name="type.boundary.protected_area.2">সংরক্ষিত এলাকা</string>
+    <string name="type.boundary.protected_area.3">সংরক্ষিত এলাকা</string>
+    <string name="type.boundary.protected_area.4">সংরক্ষিত এলাকা</string>
+    <string name="type.boundary.protected_area.5">সংরক্ষিত এলাকা</string>
+    <string name="type.boundary.protected_area.6">সংরক্ষিত এলাকা</string>
+    <string name="type.cemetery.grave">কবর</string>
+    <string name="type.craft.blacksmith">কামার</string>
+    <string name="type.craft.carpenter">কাঠমিস্ত্রি</string>
+    <string name="type.craft.confectionery">ময়ড়া</string>
+    <string name="type.craft.electrician">ইলেকট্রিক মিস্ত্রি</string>
+    <string name="type.craft.gardener">মালী</string>
+    <string name="type.craft.painter">রংমিস্ত্রি</string>
+    <string name="type.craft.photographer">ফটোগ্রাফার</string>
+    <string name="type.shop.camera">ক্যামেরার দোকান</string>
+    <string name="type.craft.plumber">কলের মিস্ত্রি</string>
+    <string name="type.cuisine.american">মার্কিন|আমেরিকান</string>
+    <string name="type.cuisine.cake">কেক</string>
+    <string name="type.cuisine.chicken">চিকেন|মুরগি</string>
+    <string name="type.cuisine.burger">বার্গার</string>
+    <string name="type.cuisine.fish">মাছ</string>
+    <string name="type.cuisine.coffee_shop">কফি</string>
+    <string name="type.cuisine.chinese">চীনা|চাইনিজ</string>
+    <string name="type.cuisine.indian">ভারতীয়</string>
+    <string name="type.cuisine.international">আন্তর্জাতিক</string>
+    <string name="type.cuisine.local">স্থানীয়|লোকাল</string>
+    <string name="type.cuisine.pizza">পিজ্জা</string>
+    <string name="type.cuisine.regional">আঞ্চলিক</string>
+    <string name="type.amenity.parking.lane.private">প্রাইভেট লেন পার্কিং</string>
+    <string name="type.building.has_parts">বিল্ডিং</string>
+    <string name="type.building_part">বিল্ডিং</string>
+    <string name="type.cuisine.spanish">স্পেনীয়</string>
+    <string name="type.cuisine.vietnamese">ভিয়েতনামীয়</string>
 </resources>

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

@@ -29,8 +29,8 @@
     <string name="type.leisure.adult_gaming_centre">Herní centrum pro dospělé</string>
     <string name="type.leisure.amusement_arcade">Pasáž</string>
     <string name="type.amenity.charging_station">Nabíjecí stanice</string>
-    <string name="type.amenity.charging_station.bicycle">Nabíjecí stanice pro jízdní kola</string>
-    <string name="type.amenity.charging_station.motorcar">Nabíjecí stanice pro automobily</string>
+    <string name="type.amenity.charging_station.bicycle">Jízdní kola</string>
+    <string name="type.amenity.charging_station.motorcar">Auta</string>
     <string name="type.amenity.childcare">Jesle</string>
     <string name="type.amenity.cinema">Kino</string>
     <string name="type.leisure.bowling_alley">Bowlingová dráha</string>
@@ -1393,7 +1393,7 @@
     <string name="type.office.security">Strážnice</string>
     <string name="type.building.guardhouse">Vrátnice</string>
     <string name="type.shop.lighting">Obchod s osvětlením</string>
-    <string name="type.amenity.bench.backless">Lavička bez opěradla</string>
+    <string name="type.amenity.bench.backless">Bez opěradla</string>
     <string name="type.leisure.bandstand">Otevřený altán</string>
     <string name="type.leisure.sports_centre.sport.multi">Sportovní centrum</string>
     <string name="type.leisure.sports_centre.sport.american_football">Sportovní centrum</string>
@@ -1502,4 +1502,8 @@
     <string name="type.railway.turntable">Železniční točna</string>
     <string name="type.railway.disused.bridge">Nepoužívaný železniční most</string>
     <string name="type.railway.disused.tunnel">Nepoužívaný železniční tunel</string>
+    <string name="type.amenity.charging_station.motorcycle">Motocykly</string>
+    <string name="type.amenity.charging_station.small">Omezená kapacita</string>
+    <string name="type.emergency.disaster_help_point">Nouzové centrum pomoci při katastrofách</string>
+    <string name="type.emergency.access_point.address">Nouzová adresa záchrany</string>
 </resources>

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

@@ -25,7 +25,7 @@
     <string name="type.amenity.bank">Bankfiliale</string>
     <string name="type.amenity.bbq">Grillstelle</string>
     <string name="type.amenity.bench">Sitzbank</string>
-    <string name="type.amenity.bench.backless">Sitzbank ohne Rückenlehne</string>
+    <string name="type.amenity.bench.backless">Ohne Rückenlehne</string>
     <string name="type.amenity.bicycle_parking">Fahrradständer</string>
     <string name="type.amenity.boat_rental">Bootsverleih</string>
     <string name="type.amenity.bicycle_rental">Fahrradverleih</string>
@@ -339,7 +339,9 @@
     <string name="type.cuisine.vietnamese">Vietnamesisch</string>
     <string name="type.emergency">Notfall</string>
     <string name="type.emergency.access_point">Rettungspunkt</string>
+    <string name="type.emergency.access_point.address">Rettungsadresse</string>
     <string name="type.emergency.assembly_point">Notfall-Sammelpunkt</string>
+    <string name="type.emergency.disaster_help_point">Notfall-Treffpunkt</string>
     <string name="type.emergency.life_ring">Rettungsring</string>
     <string name="type.emergency.defibrillator">Defibrillator</string>
     <string name="type.emergency.fire_hydrant">Hydrant</string>
@@ -433,11 +435,11 @@
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.footway.tunnel">Fußgängertunnel</string>
     <string name="type.highway.ford">Furt</string>
-    <string name="type.highway.living_street">Spielstraße</string>
+    <string name="type.highway.living_street">Verkehrsberuhigter Bereich</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.living_street.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.living_street.tunnel">Spielstraßentunnel</string>
+    <string name="type.highway.living_street.tunnel">Tunnel</string>
     <string name="type.highway.motorway">Autobahn</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.motorway.bridge">Autobahnbrücke</string>
@@ -486,23 +488,23 @@
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.residential.tunnel">Wohnstraßentunnel</string>
     <string name="type.highway.rest_area">Rastplatz</string>
-    <string name="type.highway.road">Straße</string>
+    <string name="type.highway.road">Landstraße</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.road.bridge">Brücke</string>
     <!-- A bridge structure outline. -->
     <string name="type.man_made.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.road.tunnel">Tunnel</string>
-    <string name="type.highway.secondary">Straße</string>
+    <string name="type.highway.secondary">Überregionale Verbindungsstraße</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.secondary.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.secondary.tunnel">Straßentunnel</string>
-    <string name="type.highway.secondary_link">Straße</string>
+    <string name="type.highway.secondary.tunnel">Tunnel</string>
+    <string name="type.highway.secondary_link">Überregionale Verbindungsstraßenauffahrt</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.secondary_link.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.secondary_link.tunnel">Straßentunnel</string>
+    <string name="type.highway.secondary_link.tunnel">Tunnel</string>
     <string name="type.highway.service">Zufahrtsweg</string>
     <string name="type.highway.service.area">Zufahrtsweg</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
@@ -518,12 +520,12 @@
     <string name="type.highway.steps.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.steps.tunnel">Tunnel</string>
-    <string name="type.highway.tertiary">Straße</string>
+    <string name="type.highway.tertiary">Verbindungsstraße</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.tertiary.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.tertiary.tunnel">Straßentunnel</string>
-    <string name="type.highway.tertiary_link">Straße</string>
+    <string name="type.highway.tertiary_link">Verbindungsstraßenauffahrt</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.tertiary_link.bridge">Brücke</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
@@ -555,15 +557,15 @@
     <string name="type.highway.unclassified.tunnel">Straßentunnel</string>
     <string name="type.area_highway.cycleway">Radweg</string>
     <string name="type.area_highway.footway">Fußweg</string>
-    <string name="type.area_highway.living_street">Spielstraße</string>
+    <string name="type.area_highway.living_street">Verkehrsberuhigter Bereich</string>
     <string name="type.area_highway.motorway">Autobahn</string>
     <string name="type.area_highway.path">Pfad</string>
     <string name="type.area_highway.pedestrian">Fußgängerzone</string>
     <string name="type.area_highway.primary">Hauptstraße</string>
     <string name="type.area_highway.residential">Wohnstraße</string>
-    <string name="type.area_highway.secondary">Straße</string>
+    <string name="type.area_highway.secondary">Landstraße</string>
     <string name="type.area_highway.service">Zufahrtsweg</string>
-    <string name="type.area_highway.tertiary">Straße</string>
+    <string name="type.area_highway.tertiary">Verbindungsstraße</string>
     <string name="type.area_highway.steps">Treppe</string>
     <string name="type.area_highway.track">Forst-/Feldweg</string>
     <string name="type.area_highway.trunk">Schnellstraße</string>

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

@@ -12,16 +12,16 @@
     <string name="type.aerialway.mixed_lift">Τελεφερίκ</string>
     <string name="type.aerialway.station">Σταθμός τελεφερίκ</string>
     <string name="type.aeroway.aerodrome">Αεροδρόμιο</string>
-    <string name="type.aeroway.aerodrome.international">Αεροδρόμιο</string>
+    <string name="type.aeroway.aerodrome.international">Διεθνές αεροδρόμιο</string>
     <string name="type.aeroway.helipad">Ελικοδρόμιο</string>
-    <string name="type.amenity">Εγκαταστάσεις υποδομής</string>
+    <string name="type.amenity">Υποδομές</string>
     <string name="type.amenity.arts_centre">Κέντρο καλών τεχνών</string>
     <string name="type.amenity.bank">Τράπεζα</string>
     <string name="type.amenity.bar">Μπαρ</string>
     <string name="type.amenity.bbq">Ψησταριά μπάρμπεκιου</string>
     <string name="type.amenity.bench">Παγκάκι</string>
     <string name="type.amenity.bicycle_parking">Χώρος στάθμευσης ποδηλάτων</string>
-    <string name="type.amenity.bicycle_rental">Ενοικιάσεις ποδηλάτων</string>
+    <string name="type.amenity.bicycle_rental">Ενοικίαση ποδηλάτων</string>
     <string name="type.amenity.biergarten">Μπυραρία</string>
     <string name="type.amenity.brothel">Πορνείο</string>
     <string name="type.amenity.bureau_de_change">Συνάλλαγμα</string>
@@ -30,14 +30,14 @@
     <string name="type.amenity.car_rental">Ενοικίαση αυτοκινήτου</string>
     <string name="type.amenity.motorcycle_rental">Ενοικίαση μοτοσικλέτας</string>
     <string name="type.amenity.car_sharing">Παραχώρηση αυτοκινήτου</string>
-    <string name="type.amenity.car_wash">Καθαρισμός αυτοκινήτων</string>
+    <string name="type.amenity.car_wash">Πλύσιμο αυτοκινήτου</string>
     <string name="type.amenity.casino">Καζίνο</string>
-    <string name="type.amenity.gambling">ΤΥΧΕΡΑ ΠΑΙΧΝΙΔΙΑ</string>
+    <string name="type.amenity.gambling">Τυχερά παιχνίδια</string>
     <string name="type.leisure.adult_gaming_centre">Κέντρο παιχνιδιών ενηλίκων</string>
-    <string name="type.leisure.amusement_arcade">Στοά</string>
+    <string name="type.leisure.amusement_arcade">Ηλεκτρονικά παιχνίδια</string>
     <string name="type.amenity.charging_station">Σταθμός φόρτισης</string>
-    <string name="type.amenity.charging_station.bicycle">Σταθμός φόρτισης ποδηλάτων</string>
-    <string name="type.amenity.charging_station.motorcar">Σταθμός φόρτισης αυτοκινήτων</string>
+    <string name="type.amenity.charging_station.bicycle">Ποδήλατα</string>
+    <string name="type.amenity.charging_station.motorcar">Αυτοκίνητα</string>
     <string name="type.amenity.childcare">Βρεφικός σταθμός</string>
     <string name="type.amenity.cinema">Κινηματογράφος</string>
     <string name="type.leisure.bowling_alley">Αίθουσα σφαιρίσεως</string>
@@ -65,11 +65,11 @@
     <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
     <string name="type.amenity.grave_yard">Νεκροταφείο</string>
     <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
-    <string name="type.amenity.grave_yard.christian">Νεκροταφείο</string>
+    <string name="type.amenity.grave_yard.christian">Χριστιανικό νεκροταφείο</string>
     <string name="type.amenity.hospital">Νοσοκομείο</string>
     <string name="type.amenity.hunting_stand">Βάση σκόπευσης</string>
     <string name="type.amenity.ice_cream">Παγωτατζίδικο</string>
-    <string name="type.amenity.internet_cafe">Καφετέρια με Ίντερνετ</string>
+    <string name="type.amenity.internet_cafe">Ίντερνετ καφέ</string>
     <string name="type.amenity.kindergarten">Νηπιαγωγείο</string>
     <string name="type.amenity.library">Βιβλιοθήκη</string>
     <string name="type.amenity.loading_dock">Αποβάθρα φόρτωσης</string>
@@ -117,7 +117,7 @@
     <string name="type.amenity.police">Αστυνομία</string>
     <string name="type.amenity.post_box">Ταχυδρομική θυρίδα</string>
     <string name="type.amenity.post_office">Ταχυδρομείο</string>
-    <string name="type.amenity.prison">φυλακή</string>
+    <string name="type.amenity.prison">Φυλακή</string>
     <string name="type.amenity.pub">Παμπ</string>
     <string name="type.amenity.public_bookcase">Ανταλλαγή βιβλίων</string>
     <!-- SECTION: Types: Recycling -->
@@ -125,10 +125,10 @@
     <string name="type.amenity.recycling">Κάδος ανακύκλωσης</string>
     <string name="type.amenity.recycling.container">Κάδος ανακύκλωσης</string>
     <string name="type.recycling.batteries">Μπαταρίες</string>
-    <string name="type.recycling.clothes">Παλιά ρούχα</string>
+    <string name="type.recycling.clothes">Ρούχα</string>
     <string name="type.recycling.glass_bottles">Γυάλινα μπουκάλια</string>
-    <string name="type.recycling.paper">Απορρίμματα χαρτιού</string>
-    <string name="type.recycling.plastic">Πλαστικά απορρίμματα</string>
+    <string name="type.recycling.paper">Χαρτί</string>
+    <string name="type.recycling.plastic">Πλαστικό</string>
     <string name="type.recycling.plastic_bottles">Πλαστικά μπουκάλια</string>
     <string name="type.recycling.scrap_metal">Παλιοσίδερα</string>
     <string name="type.recycling.small_appliances">Ηλεκτρονικά απορρίμματα</string>
@@ -153,7 +153,7 @@
     <string name="type.amenity.vending_machine.cigarettes">Αυτόματος πωλητής τσιγάρων</string>
     <string name="type.amenity.vending_machine.drinks">Αυτόματος πωλητής ποτών</string>
     <string name="type.amenity.vending_machine.parking_tickets">Εισιτήρια στάθμευσης</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Μηχάνημα αυτόματης πώλησης εισιτηρίων για τα μέσα μαζικής μεταφοράς</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Μηχάνημα αυτόματης πώλησης εισιτηρίων για δημόσια συγκοινωνία</string>
     <string name="type.amenity.vehicle_inspection">Έλεγχος οχήματος</string>
     <string name="type.amenity.veterinary">Κτηνίατρος</string>
     <string name="type.amenity.waste_basket">Κάδος απορριμμάτων</string>
@@ -314,7 +314,7 @@
     <string name="type.entrance">Είσοδος</string>
     <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
     <string name="type.entrance.main">Κύρια είσοδος</string>
-    <string name="type.entrance.exit">Έξοδος</string>
+    <string name="type.entrance.exit">Έξοδος (μόνο)</string>
     <string name="type.fee.no">Δωρεάν</string>
     <string name="type.healthcare.laboratory">Ιατρικό Εργαστήριο</string>
     <string name="type.healthcare.physiotherapist">Φυσικοθεραπευτής</string>
@@ -367,7 +367,7 @@
     <string name="type.highway.motorway_link.bridge">Γέφυρα</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.motorway_link.tunnel">Σήραγγα</string>
-    <string name="type.highway.path">Διαδρομή</string>
+    <string name="type.highway.path">Μονοπάτι</string>
     <!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
     <string name="type.highway.path.difficult">Δύσκολη ή ελάχιστα ορατή διαδρομή</string>
     <!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
@@ -379,20 +379,19 @@
     <string name="type.highway.path.horse">Διαδρομή</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.path.tunnel">Σήραγγα</string>
-    <string name="type.highway.pedestrian">Οδός</string>
+    <string name="type.highway.pedestrian">Πεζόδρομος</string>
     <string name="type.highway.pedestrian.area">Οδός</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Γέφυρα</string>
-
     <string name="type.highway.pedestrian.square">Πλατεία</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Σήραγγα</string>
-    <string name="type.highway.primary">Οδός</string>
+    <string name="type.highway.primary">Πρωτεύων δρόμος</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.primary.bridge">Γέφυρα</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.primary.tunnel">Σήραγγα</string>
-    <string name="type.highway.primary_link">Οδός</string>
+    <string name="type.highway.primary_link">Ράμπα πρωτεύοντος δρόμου</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.primary_link.bridge">Γέφυρα</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
@@ -412,36 +411,36 @@
     <string name="type.man_made.bridge">Γέφυρα</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.road.tunnel">Σήραγγα</string>
-    <string name="type.highway.secondary">Οδός</string>
+    <string name="type.highway.secondary">Δευτερεύων δρόμος</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.secondary.bridge">Γέφυρα</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.secondary.tunnel">Σήραγγα</string>
-    <string name="type.highway.secondary_link">Οδός</string>
+    <string name="type.highway.secondary_link">Ράμπα δευτερεύοντος δρόμου</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.secondary_link.bridge">Γέφυρα</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.secondary_link.tunnel">Σήραγγα</string>
-    <string name="type.highway.service">Οδός</string>
-    <string name="type.highway.service.area">Οδός</string>
+    <string name="type.highway.service">Δρόμος υπηρεσίας</string>
+    <string name="type.highway.service.area">Δρόμος υπηρεσίας</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.service.bridge">Γέφυρα</string>
     <string name="type.highway.service.driveway">Οδός</string>
-    <string name="type.highway.service.parking_aisle">Οδός</string>
+    <string name="type.highway.service.parking_aisle">Διάδρομος πάρκινγκ</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.service.tunnel">Σήραγγα</string>
     <string name="type.highway.speed_camera">Κάμερα ταχύτητας</string>
-    <string name="type.highway.steps">Διαδρομή</string>
+    <string name="type.highway.steps">Σκαλοπάτια</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.steps.bridge">Γέφυρα</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.steps.tunnel">Σήραγγα</string>
-    <string name="type.highway.tertiary">Οδός</string>
+    <string name="type.highway.tertiary">Τριτεύων δρόμος</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.tertiary.bridge">Γέφυρα</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.tertiary.tunnel">Σήραγγα</string>
-    <string name="type.highway.tertiary_link">Οδός</string>
+    <string name="type.highway.tertiary_link">Ράμπα τριτεύοντος δρόμου</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.tertiary_link.bridge">Γέφυρα</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
@@ -471,26 +470,26 @@
     <string name="type.highway.unclassified.bridge">Γέφυρα</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.unclassified.tunnel">Σήραγγα</string>
-    <string name="type.area_highway.footway">Διαδρομή</string>
+    <string name="type.area_highway.footway">Μονοπάτι πεζών</string>
     <string name="type.area_highway.living_street">Οδός</string>
     <string name="type.area_highway.motorway">Οδός</string>
-    <string name="type.area_highway.path">Διαδρομή</string>
-    <string name="type.area_highway.pedestrian">Οδός</string>
-    <string name="type.area_highway.primary">Οδός</string>
+    <string name="type.area_highway.path">Μονοπάτι</string>
+    <string name="type.area_highway.pedestrian">Πεζόδρομος</string>
+    <string name="type.area_highway.primary">Πρωτεύων δρόμος</string>
     <string name="type.area_highway.residential">Οδός</string>
-    <string name="type.area_highway.secondary">Οδός</string>
-    <string name="type.area_highway.service">Οδός</string>
-    <string name="type.area_highway.tertiary">Οδός</string>
-    <string name="type.area_highway.steps">Διαδρομή</string>
+    <string name="type.area_highway.secondary">Δευτερεύων δρόμος</string>
+    <string name="type.area_highway.service">Δρόμος υπηρεσίας</string>
+    <string name="type.area_highway.tertiary">Τριτεύων δρόμος</string>
+    <string name="type.area_highway.steps">Σκαλοπάτια</string>
     <string name="type.area_highway.track">Οδός</string>
     <string name="type.area_highway.trunk">Οδός</string>
     <string name="type.area_highway.unclassified">Οδός</string>
     <!-- SECTION: Types: Historic -->
     <string name="type.historic">Ιστορικό αντικείμενο</string>
     <string name="type.historic.aircraft">Ιστορικό αεροσκάφος</string>
-    <string name="type.historic.anchor">Ιστορική Άγκυρα</string>
+    <string name="type.historic.anchor">Ιστορική άγκυρα</string>
     <string name="type.historic.archaeological_site">Αρχαιολογικός χώρος</string>
-    <string name="type.historic.battlefield">Πεδίο μάχης</string>
+    <string name="type.historic.battlefield">Ιστορικό πεδίο μάχης</string>
     <string name="type.historic.boundary_stone">Οριακή πέτρα</string>
     <string name="type.historic.cannon">Κανόνι</string>
     <string name="type.historic.castle">Κάστρο</string>
@@ -557,17 +556,17 @@
     <string name="type.leisure.nature_reserve">Φυσικό απόθεμα</string>
     <string name="type.leisure.outdoor_seating">Καθίσματα εξωτερικού χώρου</string>
     <string name="type.leisure.park">Πάρκο</string>
-    <string name="type.leisure.park.no.access">Πάρκο</string>
+    <string name="type.leisure.park.no.access">Ιδιωτικό πάρκο</string>
     <string name="type.leisure.park.permissive">Πάρκο</string>
-    <string name="type.leisure.park.private">Πάρκο</string>
+    <string name="type.leisure.park.private">Ιδιωτικό πάρκο</string>
     <string name="type.leisure.picnic_table">Τραπέζι πικ-νικ</string>
-    <string name="type.leisure.pitch">Γήπεδο αθλοπαιδιών</string>
+    <string name="type.leisure.pitch">Γήπεδο άθλησης</string>
     <string name="type.leisure.playground">Παιδική χαρά</string>
     <string name="type.leisure.sauna">Σάουνα</string>
     <string name="type.leisure.sports_centre">Αθλητικό κέντρο</string>
-    <string name="type.sport.climbing">Κέντρο αναρρίχησης</string>
-    <string name="type.sport.yoga">Στούντιο γιόγκα</string>
-    <string name="type.leisure.stadium">Γήπεδο</string>
+    <string name="type.sport.climbing">Αναρρίχηση</string>
+    <string name="type.sport.yoga">Γιόγκα</string>
+    <string name="type.leisure.stadium">Στάδιο</string>
     <string name="type.leisure.swimming_pool">Πισίνα</string>
     <string name="type.leisure.swimming_pool.private">Πισίνα</string>
     <string name="type.leisure.water_park">Υδάτινο πάρκο</string>
@@ -1104,7 +1103,7 @@
     <string name="type.sport.volleyball">Πετοσφαίριση</string>
     <string name="type.sport.10pin">Μπόουλινγκ</string>
     <string name="type.sport.9pin">Μπόουλινγκ</string>
-    <string name="type.sport.padel">Padel</string>
+    <string name="type.sport.padel">Πάντελ</string>
     <string name="type.sport.futsal">Futsal</string>
     <string name="type.sport.ice_hockey">Χόκεϊ στον παγο</string>
     <string name="type.sport.field_hockey">Χόκεϊ επί χόρτου</string>
@@ -1181,7 +1180,7 @@
     <string name="type.self_service.partially">Μερική αυτοεξυπηρέτηση</string>
     <string name="type.self_service.no">Δεν υπάρχει αυτοεξυπηρέτηση</string>
     <!-- https://wiki.openstreetmap.org/wiki/Key:social_facility -->
-    <string name="type.amenity.social_facility">Κοινωνική διευκόλυνση</string>
+    <string name="type.amenity.social_facility">Κοινωνική δομή</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
     <string name="type.emergency.emergency_ward_entrance">Είσοδος θαλάμου έκτακτης ανάγκης</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->
@@ -1201,7 +1200,7 @@
     <string name="type.man_made.utility_pole">Πόλος κοινής ωφέλειας</string>
     <string name="type.railway.narrow_gauge.bridge">Σιδηροδρομική γέφυρα στενού εύρους</string>
     <string name="type.aeroway">Υποδομή εναέριου χώρου</string>
-    <string name="type.aeroway.apron">Ποδιά</string>
+    <string name="type.aeroway.apron">Χώρος στάθμευσης αεροσκαφών</string>
     <string name="type.aeroway.runway">Αεροδιάδρομος</string>
     <string name="type.aeroway.taxiway">Τροχόδρομος</string>
     <string name="type.aeroway.terminal">Τερματικός σταθμός</string>
@@ -1246,7 +1245,7 @@
     <string name="type.boundary.administrative.3">Περιφερειακά όρια</string>
     <string name="type.boundary.administrative.4">Περιφερειακά όρια</string>
     <string name="type.building.warehouse">Αποθήκη</string>
-    <string name="type.area_highway.cycleway">Ποδηλατόδρομος</string>
+    <string name="type.area_highway.cycleway">Μονοπάτι ποδηλάτων</string>
     <string name="type.aeroway.gate">Πύλη</string>
     <string name="type.amenity.atm">ATM</string>
     <string name="type.railway.platform">Σιδηροδρομική πλατφόρμα</string>
@@ -1263,4 +1262,61 @@
     <string name="type.attraction.bumper_car">Συγκρουόμενα</string>
     <string name="type.landuse">Χρήσης γης</string>
     <string name="type.junction.roundabout">Κυκλικός κόμβος</string>
+    <string name="type.amenity.animal_shelter">Καταφύγιο ζώων</string>
+    <string name="type.cardinal.east">Ανατολή</string>
+    <string name="type.cardinal.north">Βορράς</string>
+    <string name="type.cardinal.south">Νότος</string>
+    <string name="type.cardinal.west">Δύση</string>
+    <string name="type.entrance.entry">Είσοδος (μόνο)</string>
+    <string name="type.entrance.emergency">Έξοδος κινδύνου</string>
+    <string name="type.fee.yes">€</string>
+    <string name="type.entrance.house">Είσοδος σπιτιού</string>
+    <string name="type.entrance.garage">Είσοδος γκαράζ</string>
+    <string name="type.entrance.service">Είσοδος υπηρεσίας</string>
+    <string name="type.disusedbusiness">Κενή επιχείρηση</string>
+    <string name="type.shop.lighting">Κατάστημα φωτιστικών</string>
+    <string name="type.xmas.tree">Χριστουγεννιάτικο δέντρο</string>
+    <string name="type.leisure.track">Πίστα</string>
+    <string name="type.leisure.track.area">Πίστα</string>
+    <string name="type.leisure.sports_centre.sport.multi">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.american_football">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.archery">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.athletics">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.australian_football">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.badminton">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.baseball">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.basketball">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.beachvolleyball">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.bowls">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.climbing">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.cricket">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.curling">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.equestrian">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.field_hockey">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.futsal">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.golf">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.gymnastics">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.handball">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.ice_hockey">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.padel">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.pelota">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.scuba_diving">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.shooting">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.skateboard">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.skiing">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.soccer">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.swimming">Κέντρο κολύμβησης</string>
+    <string name="type.leisure.sports_centre.sport.table_tennis">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.tennis">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.volleyball">Αθλητικό κέντρο</string>
+    <string name="type.leisure.sports_centre.sport.yoga">Αθλητικό κέντρο</string>
+    <string name="type.leisure.fitness_centre.sport.yoga">Στούντιο γιόγκα</string>
+    <string name="type.leisure.hackerspace">Hackerspace</string>
+    <string name="type.leisure">Αναψυχή</string>
+    <string name="type.leisure.common">Δημόσια γη</string>
+    <string name="type.landuse.military">Στρατιωτική περιοχή</string>
+    <string name="type.landuse.industrial">Βιομηχανική περιοχή</string>
+    <string name="type.amenity.bench.backless">Παγκάκι χωρίς πλάτη</string>
+    <string name="type.amenity.boat_rental">Ενοικίαση σκαφών</string>
+    <string name="type.amenity.flight_school">Σχολή πιλότων</string>
 </resources>

android/sdk/src/main/res/values-en-rAU/types_strings.xml

@@ -49,4 +49,5 @@
     <string name="type.shop.lottery">Lotto</string>
     <string name="type.sport.australian_football">AFL</string>
     <string name="type.sport.table_tennis">Ping Pong</string>
+    <string name="type.amenity.ice_cream">Ice Cream Shop</string>
 </resources>

android/sdk/src/main/res/values-en-rCA/strings.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>

android/sdk/src/main/res/values-en-rCA/types_strings.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="type.amenity.arts_centre">Arts Centre</string>
+    <string name="type.amenity.conference_centre">Conference Centre</string>
+    <string name="type.amenity.exhibition_centre">Exhibition Centre</string>
+    <string name="type.amenity.recycling.centre">Recycling Centre</string>
+    <string name="type.amenity.toilets">Washroom</string>
+    <string name="type.barrier.guard_rail">Guardrail</string>
+    <string name="type.highway.motorway">Freeway</string>
+    <string name="type.highway.motorway.bridge">Freeway Bridge</string>
+    <string name="type.highway.motorway.tunnel">Freeway Tunnel</string>
+    <string name="type.highway.motorway_link">Freeway Ramp</string>
+    <string name="type.leisure.sports_centre">Sports Centre</string>
+    <string name="type.shop.tyres">Tire Shop</string>
+    <string name="type.traffic_calming.bump">Road Bump</string>
+    <string name="type.traffic_calming.hump">Road Bump</string>
+</resources>

android/sdk/src/main/res/values-en-rUS/types_strings.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>

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

@@ -20,7 +20,7 @@
     <string name="type.aeroway.runway">Pista de despegue</string>
     <string name="type.aeroway.taxiway">Pista de rodaje</string>
     <string name="type.aeroway.terminal">Terminal</string>
-    <string name="type.amenity">Instalación</string>
+    <string name="type.amenity">Establecimiento</string>
     <string name="type.amenity.arts_centre">Centro de arte</string>
     <string name="type.amenity.atm">Cajero automático</string>
     <string name="type.amenity.bank">Banco</string>
@@ -37,15 +37,15 @@
     <string name="type.amenity.cafe">Café</string>
     <string name="type.amenity.car_rental">Alquiler de coches</string>
     <string name="type.amenity.motorcycle_rental">Alquiler de motocicletas</string>
-    <string name="type.amenity.car_sharing">Car Sharing</string>
+    <string name="type.amenity.car_sharing">Estación de uso temporal de vehículos</string>
     <string name="type.amenity.car_wash">Lavado de coches</string>
     <string name="type.amenity.casino">Casino</string>
     <string name="type.amenity.gambling">Apuestas</string>
     <string name="type.leisure.adult_gaming_centre">Centro de juegos para adultos</string>
     <string name="type.leisure.amusement_arcade">Sala de juegos arcade</string>
     <string name="type.amenity.charging_station">Estación de carga</string>
-    <string name="type.amenity.charging_station.bicycle">Estación de carga de bicicletas</string>
-    <string name="type.amenity.charging_station.motorcar">Estación de carga de automóviles</string>
+    <string name="type.amenity.charging_station.bicycle">Bicicletas</string>
+    <string name="type.amenity.charging_station.motorcar">Automóviles</string>
     <string name="type.amenity.childcare">Guardería</string>
     <string name="type.amenity.cinema">Cine</string>
     <string name="type.leisure.bowling_alley">Bolera</string>
@@ -68,9 +68,9 @@
     <string name="type.amenity.fast_food">Comida rápida</string>
     <string name="type.amenity.ferry_terminal">Transbordador de ferry</string>
     <string name="type.amenity.fire_station">Estación de bomberos</string>
-    <string name="type.amenity.food_court">Zona de comidas</string>
+    <string name="type.amenity.food_court">Plaza de comidas</string>
     <string name="type.amenity.fountain">Fuente</string>
-    <string name="type.amenity.fuel">Gasolinera</string>
+    <string name="type.amenity.fuel">Estación de servicio</string>
     <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
     <string name="type.amenity.grave_yard">Cementerio</string>
     <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
@@ -79,7 +79,7 @@
     <string name="type.amenity.hunting_stand">Puesto de caza</string>
     <string name="type.amenity.ice_cream">Heladería</string>
     <string name="type.amenity.internet_cafe">Cibercafé</string>
-    <string name="type.amenity.kindergarten">Guardería</string>
+    <string name="type.amenity.kindergarten">Jardín de infantes</string>
     <string name="type.amenity.library">Biblioteca</string>
     <string name="type.amenity.loading_dock">Muelle de carga</string>
     <string name="type.amenity.marketplace">Mercado</string>
@@ -88,7 +88,7 @@
     <string name="type.amenity.nursing_home">Residencia de ancianos</string>
     <string name="type.amenity.parking">Aparcamiento</string>
     <string name="type.amenity.parking.fee">Aparcamiento</string>
-    <string name="type.amenity.parking.multi.storey">Edificio de aparcamiento</string>
+    <string name="type.amenity.parking.multi.storey">Aparcamiento multinivel</string>
     <string name="type.amenity.parking.multi.storey.fee">Edificio de aparcamiento</string>
     <string name="type.amenity.parking.no.access">Aparcamiento privado</string>
     <string name="type.amenity.parking.permissive">Aparcamiento privado</string>
@@ -163,21 +163,21 @@
     <string name="type.amenity.taxi">Parada de taxis</string>
     <string name="type.amenity.telephone">Teléfono</string>
     <string name="type.amenity.theatre">Teatro</string>
-    <string name="type.amenity.toilets">WC</string>
-    <string name="type.toilets.yes">WC</string>
+    <string name="type.amenity.toilets">Baño</string>
+    <string name="type.toilets.yes">Baños</string>
     <string name="type.amenity.townhall">Ayuntamiento</string>
     <string name="type.amenity.university">Universidad</string>
     <string name="type.amenity.vending_machine">Máquina expendedora</string>
-    <string name="type.amenity.vending_machine.cigarettes">Máquina expendedora de tabaco</string>
-    <string name="type.amenity.vending_machine.coffee">Máquina expendedora de café</string>
-    <string name="type.amenity.vending_machine.condoms">Máquina expendedora de condones</string>
-    <string name="type.amenity.vending_machine.drinks">Máquina expendedora de bebidas</string>
-    <string name="type.amenity.vending_machine.food">Máquina expendedora de comida</string>
-    <string name="type.amenity.vending_machine.newspapers">Máquina expendedora de periódicos</string>
+    <string name="type.amenity.vending_machine.cigarettes">Expendedora de tabaco</string>
+    <string name="type.amenity.vending_machine.coffee">Expendedora de café</string>
+    <string name="type.amenity.vending_machine.condoms">Expendedora de condones</string>
+    <string name="type.amenity.vending_machine.drinks">Expendedora de bebidas</string>
+    <string name="type.amenity.vending_machine.food">Expendedora de comida</string>
+    <string name="type.amenity.vending_machine.newspapers">Expendedora de periódicos</string>
     <string name="type.amenity.vending_machine.parking_tickets">Parquímetro</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Máquina expendedora de billetes de transporte público</string>
-    <string name="type.amenity.vending_machine.sweets">Máquina expendedora de dulces</string>
-    <string name="type.amenity.vending_machine.excrement_bags">Maquina expendedora de bolsas para excrementos</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Expendedora de billetes de transporte público</string>
+    <string name="type.amenity.vending_machine.sweets">Expendedora de dulces</string>
+    <string name="type.amenity.vending_machine.excrement_bags">Dispensador de bolsas para excrementos</string>
     <string name="type.amenity.parcel_locker">Taquilla de paquetes</string>
     <string name="type.amenity.vehicle_inspection">Inspección de vehículos</string>
     <string name="type.amenity.vending_machine.fuel">Surtidor de combustible</string>
@@ -200,9 +200,9 @@
     <string name="type.natural.water.wastewater">Aguas residuales</string>
     <string name="type.barrier.entrance">Entrada</string>
     <string name="type.barrier.fence">Valla</string>
-    <string name="type.barrier.gate">Verja</string>
+    <string name="type.barrier.gate">Portón</string>
     <string name="type.barrier.hedge">Seto</string>
-    <string name="type.barrier.kissing_gate">Puerta peatonal</string>
+    <string name="type.barrier.kissing_gate">Tranquera</string>
     <string name="type.barrier.lift_gate">Barrera levadiza</string>
     <string name="type.barrier.retaining_wall">Muro de contención</string>
     <string name="type.barrier.stile">Escalón</string>
@@ -257,7 +257,7 @@
     <string name="type.craft.photographer">Fotógrafo</string>
     <string name="type.shop.camera">Tienda de fotografía</string>
     <string name="type.craft.plumber">Fontanero</string>
-    <string name="type.craft.sawmill">Serrería</string>
+    <string name="type.craft.sawmill">Aserradero</string>
     <string name="type.craft.shoemaker">Zapatero</string>
     <string name="type.craft.winery">Bodega vinícola</string>
     <string name="type.craft.tailor">Sastre</string>
@@ -335,7 +335,7 @@
     <string name="type.cuisine.sandwich">Sándwiches</string>
     <string name="type.cuisine.sausage">Salchichas</string>
     <string name="type.cuisine.savory_pancakes">Tortitas saladas</string>
-    <string name="type.cuisine.seafood">del mar</string>
+    <string name="type.cuisine.seafood">Marina</string>
     <string name="type.cuisine.soba">Soba</string>
     <string name="type.cuisine.spanish">Española</string>
     <string name="type.cuisine.steak_house">Asador</string>
@@ -350,7 +350,7 @@
     <string name="type.emergency">Emergencia</string>
     <string name="type.emergency.assembly_point">Punto de reunión de emergencia</string>
     <string name="type.emergency.defibrillator">Desfibrilador</string>
-    <string name="type.emergency.fire_hydrant">Boca de incendio</string>
+    <string name="type.emergency.fire_hydrant">Hidrante de incendio</string>
     <string name="type.amenity.hydrant">Boca de riego</string>
     <string name="type.emergency.phone">Teléfono de emergencias</string>
     <!-- A place where a lifeguard is on duty. -->
@@ -499,12 +499,12 @@
     <string name="type.highway.tertiary_link.bridge">Puente</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.tertiary_link.tunnel">Túnel</string>
-    <string name="type.highway.track">Pista</string>
-    <string name="type.highway.track.area">Pista</string>
+    <string name="type.highway.track">Camino</string>
+    <string name="type.highway.track.area">Camino</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.track.bridge">Puente</string>
-    <string name="type.highway.track.grade1">Pista</string>
-    <string name="type.highway.track.no.access">Pista</string>
+    <string name="type.highway.track.grade1">Camino</string>
+    <string name="type.highway.track.no.access">Camino</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.track.tunnel">Túnel</string>
     <string name="type.highway.traffic_signals">Semáforo</string>
@@ -536,7 +536,7 @@
     <string name="type.area_highway.service">Vía de servicio</string>
     <string name="type.area_highway.tertiary">Carretera terciaria</string>
     <string name="type.area_highway.steps">Escaleras</string>
-    <string name="type.area_highway.track">Pista</string>
+    <string name="type.area_highway.track">Camino</string>
     <string name="type.area_highway.trunk">Vía troncal</string>
     <string name="type.area_highway.unclassified">Carretera menor</string>
     <!-- SECTION: Types: Historic -->
@@ -557,8 +557,8 @@
     <string name="type.historic.castle.manor">Casa solariega</string>
     <string name="type.historic.castle.palace">Palacio</string>
     <string name="type.historic.castle.shiro">Castillo japonés</string>
-    <string name="type.historic.castle.stately">Castillo</string>
-    <string name="type.historic.city_gate">Portón de la ciudad</string>
+    <string name="type.historic.castle.stately">Castillo señorial</string>
+    <string name="type.historic.city_gate">Puerta de ciudad</string>
     <string name="type.historic.citywalls">Muralla</string>
     <string name="type.historic.fort">Fuerte</string>
     <string name="type.historic.gallows">Horca</string>
@@ -597,7 +597,7 @@
     <string name="type.landuse.cemetery">Cementerio</string>
     <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
     <string name="type.landuse.cemetery.christian">Cementerio cristiano</string>
-    <string name="type.landuse.commercial">Zona comercial</string>
+    <string name="type.landuse.commercial">Área de servicios comerciales</string>
     <string name="type.landuse.construction">Construcción</string>
     <string name="type.landuse.education">Instalaciones educativas</string>
     <string name="type.landuse.farmland">Tierras agrícolas</string>
@@ -621,15 +621,15 @@
     <string name="type.landuse.recreation_ground">Área recreativa</string>
     <string name="type.landuse.reservoir">Embalse</string>
     <string name="type.landuse.residential">Zona residencial</string>
-    <string name="type.landuse.retail">Zona comercial</string>
+    <string name="type.landuse.retail">Área de tiendas comerciales</string>
     <string name="type.landuse.salt_pond">Salina</string>
-    <string name="type.landuse.village_green">Espacio verde</string>
+    <string name="type.landuse.village_green">Espacio verde común</string>
     <string name="type.landuse.vineyard">Viñedo</string>
     <string name="type.leisure">Ocio</string>
-    <string name="type.leisure.common">Zona pública</string>
+    <string name="type.leisure.common">Terreno comunal</string>
     <string name="type.leisure.dog_park">Parque canino</string>
     <string name="type.leisure.fitness_centre">Centro de fitnes</string>
-    <string name="type.leisure.fitness_station">Parque de fitnes</string>
+    <string name="type.leisure.fitness_station">Parque de gimnasia</string>
     <string name="type.leisure.dance">Salón de baile</string>
     <string name="type.leisure.garden">Jardín</string>
     <string name="type.leisure.garden.residential">Jardín residencial</string>
@@ -637,7 +637,7 @@
     <string name="type.leisure.miniature_golf">Minigolf</string>
     <string name="type.leisure.hackerspace">Espacio para hackers</string>
     <string name="type.leisure.ice_rink">Pisa de patinaje</string>
-    <string name="type.leisure.marina">Puerto o amarradero</string>
+    <string name="type.leisure.marina">Marina</string>
     <string name="type.leisure.nature_reserve">Reserva natural</string>
     <string name="type.leisure.outdoor_seating">Asientos al aire libre</string>
     <string name="type.leisure.park">Parque</string>
@@ -646,7 +646,7 @@
     <string name="type.leisure.park.private">Parque privado</string>
     <string name="type.leisure.picnic_table">Mesa de picnic</string>
     <string name="type.leisure.pitch">Cancha</string>
-    <string name="type.leisure.playground">Patio de recreo</string>
+    <string name="type.leisure.playground">Parque infantil</string>
     <string name="type.leisure.recreation_ground">Zona recreativa</string>
     <string name="type.leisure.sauna">Sauna</string>
     <string name="type.leisure.slipway">Rampa de barcos</string>
@@ -671,7 +671,7 @@
     <string name="type.man_made.mast">Mástil</string>
     <string name="type.man_made.pier">Muelle</string>
     <string name="type.man_made.pipeline">Ducto</string>
-    <string name="type.man_made.pipeline.overground">Ducto a cielo abierto</string>
+    <string name="type.man_made.pipeline.overground">Ducto exterior</string>
     <string name="type.man_made.silo">Silo</string>
     <string name="type.man_made.storage_tank">Cisterna</string>
     <string name="type.man_made.surveillance">Cámara de vigilancia</string>
@@ -694,10 +694,10 @@
     <string name="type.man_made.works">Fábrica</string>
     <string name="type.military">Militar</string>
     <string name="type.military.bunker">Búnker</string>
-    <string name="type.mountain_pass">Puerto de montaña</string>
+    <string name="type.mountain_pass">Paso de montaña</string>
     <string name="type.natural">Naturaleza</string>
     <!-- A rocky land cover. -->
-    <string name="type.natural.bare_rock">Roca desnuda</string>
+    <string name="type.natural.bare_rock">Lecho rocoso</string>
     <!-- A land cover consisting of rounded rock fragments (pebbles) on a beach or riverbed. -->
     <string name="type.natural.shingle">Guijarros</string>
     <!-- A loose surface consisting of angular, sharp stones. Usually on a mountain slope and prone to landslides. -->
@@ -709,7 +709,7 @@
     <string name="type.natural.cape">Cabo</string>
     <string name="type.natural.cave_entrance">Entrada de cueva</string>
     <string name="type.natural.cliff">Acantilado</string>
-    <string name="type.natural.earth_bank">Talud de tierra</string>
+    <string name="type.natural.earth_bank">Talud de tierra escarpado</string>
     <string name="type.man_made.embankment">Terraplén</string>
     <string name="type.natural.coastline">Costa</string>
     <string name="type.natural.desert">Desierto</string>
@@ -737,7 +737,7 @@
     <string name="type.natural.tree_row">Fila de árboles</string>
     <string name="type.natural.vineyard">Viña</string>
     <string name="type.natural.volcano">Volcán</string>
-    <string name="type.natural.water">Cuerpo de agua</string>
+    <string name="type.natural.water">Agua</string>
     <string name="type.natural.wetland">Terreno pantanoso</string>
     <string name="type.natural.wetland.bog">Turbera</string>
     <string name="type.natural.wetland.marsh">Ciénaga</string>
@@ -791,7 +791,7 @@
     <string name="type.power.generator">Generador</string>
     <string name="type.power.generator.solar">Generador solar</string>
     <string name="type.power.generator.wind">Aerogenerador</string>
-    <string name="type.power.generator.gas">Planta termoeléctrica de gas</string>
+    <string name="type.power.generator.gas">Planta termoeléctrica a gas</string>
     <string name="type.power.generator.hydro">Planta hidroeléctrica</string>
     <string name="type.power.line">Línea eléctrica</string>
     <string name="type.power.line.underground">Línea eléctrica subterránea</string>
@@ -1107,7 +1107,7 @@
     <string name="type.shop.car_repair.tyres">Reparación de neumáticos</string>
     <string name="type.shop.caravan">Concesionario de caravanas</string>
     <string name="type.shop.carpet">Tienda de alfombras</string>
-    <string name="type.shop.chemist">Droguería</string>
+    <string name="type.shop.chemist">Parafarmacia</string>
     <string name="type.shop.chocolate">Chocolatería</string>
     <string name="type.shop.clothes">Tienda de ropa</string>
     <string name="type.shop.coffee">Tienda de café</string>
@@ -1129,7 +1129,7 @@
     <string name="type.shop.florist">Floristería</string>
     <string name="type.shop.funeral_directors">Funeraria</string>
     <string name="type.shop.furniture">Tienda de muebles</string>
-    <string name="type.shop.garden_centre">Vivero</string>
+    <string name="type.shop.garden_centre">Centro de jardinería</string>
     <string name="type.shop.gas">Tienda de gas</string>
     <string name="type.shop.gift">Tienda de regalos</string>
     <string name="type.shop.greengrocer">Frutería</string>
@@ -1186,15 +1186,15 @@
     <string name="type.shop.appliance">Tienda de electrodomésticos</string>
     <!-- maybe change to Art Gallery for en-US when supported -->
     <string name="type.shop.art">Tienda de arte</string>
-    <string name="type.shop.baby_goods">Tienda de niños</string>
+    <string name="type.shop.baby_goods">Tienda de artículos para bebés</string>
     <string name="type.shop.bag">Tienda de bolsos</string>
     <string name="type.shop.bed">Tienda de camas</string>
     <string name="type.shop.boutique">Boutique</string>
     <string name="type.shop.charity">Tienda de caridad</string>
     <string name="type.shop.cheese">Tienda de quesos</string>
-    <string name="type.shop.craft">Artes y manualidades</string>
+    <string name="type.shop.craft">Tienda de materiales para manualidades</string>
     <string name="type.shop.dairy">Productos lácteos</string>
-    <string name="type.shop.electrical">Tienda de electricidad</string>
+    <string name="type.shop.electrical">Tienda de suministros eléctricos</string>
     <string name="type.shop.fishing">Tienda de pesca</string>
     <string name="type.shop.interior_decoration">Decoración de interiores</string>
     <string name="type.shop.lottery">Boletos de lotería</string>
@@ -1264,17 +1264,17 @@
     <string name="type.attraction.roller_coaster">Montaña rusa</string>
     <string name="type.attraction.water_slide">Tobogán acuático</string>
     <string name="type.tourism.attraction.specified">Atracción turística</string>
-    <string name="type.tourism.camp_site">Paraje de campamento</string>
+    <string name="type.tourism.camp_site">Paraje de acampada</string>
     <string name="type.tourism.caravan_site">Zona de autocaravanas</string>
     <!-- A rentable countryside vacation house. -->
-    <string name="type.tourism.chalet">Casa de vacaciones</string>
+    <string name="type.tourism.chalet">Cabaña vacacional</string>
     <string name="type.tourism.gallery">Galería</string>
     <string name="type.tourism.guest_house">Casa de huéspedes</string>
     <string name="type.tourism.hostel">Albergue juvenil</string>
     <string name="type.tourism.hotel">Hotel</string>
     <string name="type.tourism.information">Información turística</string>
     <string name="type.tourism.information.board">Tablón de información</string>
-    <string name="type.tourism.information.guidepost">Poste indicador</string>
+    <string name="type.tourism.information.guidepost">Poste guía</string>
     <string name="type.tourism.information.map">Mapa turístico</string>
     <string name="type.tourism.information.office">Oficina de turismo</string>
     <string name="type.tourism.information.visitor_centre">Centro de visitantes</string>
@@ -1285,7 +1285,7 @@
     <string name="type.tourism.theme_park">Parque temático</string>
     <string name="type.tourism.viewpoint">Mirador</string>
     <!-- Typically more basic, not staffed and free (compared to alpine_hut). -->
-    <string name="type.tourism.wilderness_hut">Cabaña</string>
+    <string name="type.tourism.wilderness_hut">Refugio de paraje natural</string>
     <string name="type.tourism.zoo">Zoológico</string>
     <string name="type.tourism.zoo.petting">Zoológico interactivo</string>
     <string name="type.traffic_calming">Pacificación del tráfico</string>
@@ -1296,13 +1296,13 @@
     <string name="type.waterway.canal.tunnel">Túnel de canal</string>
     <string name="type.waterway.fish_pass">Escalera de peces</string>
     <string name="type.waterway.dam">Presa</string>
-    <string name="type.barrier.ditch">Zanja</string>
+    <string name="type.barrier.ditch">Acequia</string>
     <string name="type.natural.water.ditch">Zanja de drenaje</string>
-    <string name="type.waterway.ditch.tunnel">Obra de drenaje</string>
-    <string name="type.waterway.dock">Muelle</string>
+    <string name="type.waterway.ditch.tunnel">Alcantarilla</string>
+    <string name="type.waterway.dock">Dique seco</string>
     <string name="type.waterway.drain">Desagüe</string>
     <string name="type.natural.water.drain">Desagüe</string>
-    <string name="type.waterway.drain.tunnel">Obra de drenaje</string>
+    <string name="type.waterway.drain.tunnel">Alcantarilla</string>
     <string name="type.waterway.lock_gate">Compuerta</string>
     <string name="type.waterway.river">Río</string>
     <string name="type.waterway.river.tunnel">Río</string>
@@ -1319,21 +1319,21 @@
     <string name="type.aerialway.j.bar">Telesilla barra en J</string>
     <string name="type.aerialway.magic_carpet">Alfombra mágica</string>
     <string name="type.aerialway.platter">Telesilla de disco</string>
-    <string name="type.aerialway.rope_tow">Telesilla de cuerda</string>
-    <string name="type.aerialway.t.bar">Telesilla barra en T</string>
+    <string name="type.aerialway.rope_tow">Remolque de cuerda</string>
+    <string name="type.aerialway.t.bar">Ascensor de barra en T</string>
     <string name="type.piste_type.downhill">Pista de esquí alpino</string>
     <string name="type.piste_type.downhill.area">Pista de esquí alpino</string>
-    <string name="type.piste_type.downhill.advanced">Pista de esquí alpino</string>
-    <string name="type.piste_type.downhill.advanced.area">Pista de esquí alpino</string>
-    <string name="type.piste_type.downhill.easy">Pista de esquí alpino</string>
-    <string name="type.piste_type.downhill.easy.area">Pista de esquí alpino</string>
-    <string name="type.piste_type.downhill.expert">Pista de esquí alpino</string>
-    <string name="type.piste_type.downhill.expert.area">Pista de esquí alpino</string>
-    <string name="type.piste_type.downhill.freeride">Pista de esquí alpino</string>
-    <string name="type.piste_type.downhill.intermediate">Pista de esquí alpino</string>
-    <string name="type.piste_type.downhill.intermediate.area">Pista de esquí alpino</string>
-    <string name="type.piste_type.downhill.novice">Pista de esquí alpino</string>
-    <string name="type.piste_type.downhill.novice.area">Pista de esquí alpino</string>
+    <string name="type.piste_type.downhill.advanced">Pista de esquí alpino nivel avanzado</string>
+    <string name="type.piste_type.downhill.advanced.area">Pista de esquí alpino nivel avanzado</string>
+    <string name="type.piste_type.downhill.easy">Pista de esquí alpino nivel fácil</string>
+    <string name="type.piste_type.downhill.easy.area">Pista de esquí alpino nivel fácil</string>
+    <string name="type.piste_type.downhill.expert">Pista de esquí alpino nivel experto</string>
+    <string name="type.piste_type.downhill.expert.area">Pista de esquí alpino nivel experto</string>
+    <string name="type.piste_type.downhill.freeride">Zona de esquí alpino fuera de pista</string>
+    <string name="type.piste_type.downhill.intermediate">Pista de esquí alpino nivel intermedio</string>
+    <string name="type.piste_type.downhill.intermediate.area">Pista de esquí alpino nivel intermedio</string>
+    <string name="type.piste_type.downhill.novice">Pista de esquí alpino nivel principiante</string>
+    <string name="type.piste_type.downhill.novice.area">Pista de esquí alpino nivel principiante</string>
     <string name="type.piste_type.nordic">Pista de esquí nórdico</string>
     <string name="type.piste_type.sled">Pista para trineos</string>
     <string name="type.piste_type.sled.area">Pista para trineos</string>
@@ -1370,7 +1370,7 @@
     <string name="type.fee.yes">$</string>
     <string name="type.railway.narrow_gauge.tunnel">Túnel de vía férrea estrecha</string>
     <string name="type.railway.light_rail.bridge">Puente de tren ligero</string>
-    <string name="type.highway.ladder">Escalera</string>
+    <string name="type.highway.ladder">Escalerilla</string>
     <string name="type.amenity.studio">Estudio multimedia</string>
     <string name="type.landuse.plant_nursery">Vivero de plantas</string>
     <string name="type.barrier.guard_rail">Guardarraíl</string>
@@ -1380,14 +1380,14 @@
     <string name="type.man_made.crane">Grúa</string>
     <string name="type.amenity.bicycle_parking.covered">Parking de bici cubierto</string>
     <string name="type.post_office.post_partner">Asociado de Correo</string>
-    <string name="type.natural.wetland.tidalflat">Llanura de marea</string>
+    <string name="type.natural.wetland.tidalflat">Llanura mareal</string>
     <string name="type.natural.wetland.swamp">Pantano</string>
     <string name="type.amenity.ranger_station">Estación de guardabosques</string>
-    <string name="type.amenity.luggage_locker">Casillero de maletas</string>
+    <string name="type.amenity.luggage_locker">Consigna de equipaje</string>
     <string name="type.natural.wetland.mangrove">Manglares</string>
     <string name="type.landuse.religious">Terrenos religiosos</string>
     <string name="type.natural.wetland.saltmarsh">Marisma salina</string>
-    <string name="type.natural.wetland.saltmarsh.tidal">Marisma Salina de Marea</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Marisma salina mareal</string>
     <string name="type.natural.wetland.fen">Tollo</string>
     <string name="type.natural.wetland.reedbed">Juncal</string>
     <string name="type.railway.station.subway.qingdao">Estación de Metro</string>
@@ -1410,7 +1410,7 @@
     <string name="type.leisure.sports_centre.sport.basketball">Centro deportivo</string>
     <string name="type.leisure.sports_centre.sport.beachvolleyball">Centro deportivo</string>
     <string name="type.leisure.sports_centre.sport.bowls">Centro deportivo</string>
-    <string name="type.leisure.sports_centre.sport.climbing">Centro deportivo</string>
+    <string name="type.leisure.sports_centre.sport.climbing">Rocódromo</string>
     <string name="type.leisure.sports_centre.sport.cricket">Centro deportivo</string>
     <string name="type.leisure.sports_centre.sport.curling">Centro deportivo</string>
     <string name="type.leisure.sports_centre.sport.equestrian">Centro deportivo</string>
@@ -1451,7 +1451,7 @@
     <string name="type.leisure.indoor_play">Centro de actividades en interior</string>
     <string name="type.social_facility.soup_kitchen">Comedor social</string>
     <string name="type.amenity.food_sharing">Alimentos compartidos</string>
-    <string name="type.amenity.give_box">Give Box</string>
+    <string name="type.amenity.give_box">Caja libre</string>
     <string name="type.amenity.sailing_school">Escuela de vela</string>
     <string name="type.amenity.flight_school">Escuela de aviación</string>
     <string name="type.amenity.prep_school">Escuela de tutoría</string>
@@ -1499,4 +1499,14 @@
     <string name="type.xmas.tree">Árbol de Navidad</string>
     <string name="type.man_made.mast.communication">Mástil de telecomunicaciones</string>
     <string name="type.shop.beauty.nails">Salón de manicura</string>
+    <string name="type.amenity.charging_station.motorcycle">Motocicletas</string>
+    <string name="type.amenity.charging_station.small">Capacidad limitada</string>
+    <string name="type.railway.disused.bridge">Puente ferroviario en desuso</string>
+    <string name="type.railway.disused.tunnel">Túnel ferroviario en desuso</string>
+    <string name="type.railway.miniature">Ferrocarril miniatura</string>
+    <string name="type.railway.miniature.bridge">Puente de ferrocarril miniatura</string>
+    <string name="type.railway.miniature.tunnel">Túnel de ferrocarril miniatura</string>
+    <string name="type.railway.turntable">Plataforma giratoria ferroviaria</string>
+    <string name="type.tourism.information.tactile_map">Mapa táctil</string>
+    <string name="type.emergency.disaster_help_point">Punto de ayuda para emergencias y desastres</string>
 </resources>

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

@@ -44,8 +44,8 @@
     <string name="type.leisure.adult_gaming_centre">Hasartmängusaal</string>
     <string name="type.leisure.amusement_arcade">Videomängusaal</string>
     <string name="type.amenity.charging_station">Laadimisjaam</string>
-    <string name="type.amenity.charging_station.bicycle">Jalgratta laadimisjaam</string>
-    <string name="type.amenity.charging_station.motorcar">Autode laadimisjaam</string>
+    <string name="type.amenity.charging_station.bicycle">Jalgrattad</string>
+    <string name="type.amenity.charging_station.motorcar">Autod</string>
     <string name="type.amenity.childcare">Lastehoid</string>
     <string name="type.amenity.cinema">Kino</string>
     <string name="type.leisure.bowling_alley">Bowlingusaal</string>
@@ -1505,4 +1505,7 @@
     <string name="type.tourism.information.tactile_map">Kombatav kaart</string>
     <string name="type.railway.disused.bridge">Kasutuselt eemaldatud raudteesild</string>
     <string name="type.railway.disused.tunnel">Kasutuselt eemaldatud raudteetunnel</string>
+    <string name="type.amenity.charging_station.motorcycle">Mootorrattad</string>
+    <string name="type.amenity.charging_station.small">Väike laadimisjaam</string>
+    <string name="type.emergency.disaster_help_point">Katastroofiabi teenused</string>
 </resources>

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

@@ -41,8 +41,8 @@
     <string name="type.leisure.adult_gaming_centre">Centre de jeux pour adultes</string>
     <string name="type.leisure.amusement_arcade">Salle de jeux d’arcade</string>
     <string name="type.amenity.charging_station">Borne de recharge</string>
-    <string name="type.amenity.charging_station.bicycle">Borne de recharge pour vélo</string>
-    <string name="type.amenity.charging_station.motorcar">Borne de recharge pour voiture</string>
+    <string name="type.amenity.charging_station.bicycle">Vélos</string>
+    <string name="type.amenity.charging_station.motorcar">Voitures</string>
     <string name="type.amenity.childcare">Garderie</string>
     <string name="type.amenity.cinema">Cinéma</string>
     <string name="type.leisure.bowling_alley">Salle de bowling</string>
@@ -1191,7 +1191,7 @@
     <string name="type.sport.handball">Handball</string>
     <string name="type.sport.multi">Sports multiples</string>
     <!-- Used to tag a scuba diving site. -->
-    <string name="type.sport.scuba_diving">Site de plongée sous-marine</string>
+    <string name="type.sport.scuba_diving">Plongée sous-marine</string>
     <string name="type.sport.shooting">Tir sportif</string>
     <string name="type.sport.skateboard">Skateboard</string>
     <string name="type.sport.skiing">Ski</string>
@@ -1484,8 +1484,8 @@
     <string name="type.spherical_buoy.special_purpose">Bouée sphérique, marque spéciale</string>
     <string name="type.lateral.port">Bâbord</string>
     <string name="type.lateral.starboard">Tribord</string>
-    <string name="type.cardinal.east">Est</string>
-    <string name="type.cardinal.north">Nord</string>
+    <string name="type.cardinal.east">Est :</string>
+    <string name="type.cardinal.north">Nord :</string>
     <string name="type.cardinal.south">Sud</string>
     <string name="type.cardinal.west">Ouest</string>
     <string name="type.entrance.house">Entrée de la maison</string>
@@ -1498,4 +1498,15 @@
     <string name="type.natural.sand">Sable</string>
     <string name="type.man_made.mast.communication">Antenne de télécommunications</string>
     <string name="type.shop.beauty.nails">Salon de manucure</string>
+    <string name="type.amenity.charging_station.motorcycle">Motos</string>
+    <string name="type.amenity.charging_station.small">Capacité limitée</string>
+    <string name="type.railway.disused.bridge">Pont de chemin de fer désaffecté</string>
+    <string name="type.railway.disused.tunnel">Tunnel de chemin de fer désaffecté</string>
+    <string name="type.railway.miniature.bridge">Pont de chemin de fer miniature</string>
+    <string name="type.railway.miniature.tunnel">Tunnel de chemin de fer miniature</string>
+    <string name="type.tourism.information.tactile_map">Carte tactile</string>
+    <string name="type.railway.miniature">Chemin de fer miniature</string>
+    <string name="type.railway.turntable">Rotonde de chemin de fer</string>
+    <string name="type.emergency.access_point.address">Adresse de secours en cas d\'urgence</string>
+    <string name="type.emergency.disaster_help_point">Point d\'assistance d\'urgence en cas de catastrophe</string>
 </resources>

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

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>

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

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>

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

@@ -18,7 +18,7 @@
     <string name="core_placepage_unknown_place">Točka na karti</string>
     <string name="mi">mi</string>
     <string name="ft">ft</string>
-    <string name="core_entrance">Ulaz</string>
+    <string name="core_entrance">Glavni Ulaz</string>
     <string name="subway_data_unavailable">Karta podzemne željeznice nije dostupna</string>
     <string name="public_access">Javni pristup</string>
     <string name="limited_access">Ograničen pristup</string>

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

@@ -4,6 +4,254 @@
     <string name="type.man_made.silo">Silo</string>
     <string name="type.addr_interpolation.even">adresa/blok</string>
     <string name="type.addr_interpolation.odd">adresa/blok</string>
-    <string name="type.aerialway">Žičara</string>
+    <string name="type.aerialway">Vučnica</string>
     <string name="type.addr_interpolation">adresa/blok</string>
+    <string name="type.aerialway.cable_car">Žičara</string>
+    <string name="type.aerialway.chair_lift">Sjedežnica</string>
+    <string name="type.aerialway.drag_lift">Vućnica</string>
+    <string name="type.aerialway.gondola">Gondola</string>
+    <string name="type.aerialway.mixed_lift">Mješovita žičara</string>
+    <string name="type.aerialway.station">Stanica žičare</string>
+    <string name="type.aeroway">Infrastruktura zračnog prostora</string>
+    <string name="type.aeroway.aerodrome">Zračna luka</string>
+    <string name="type.aeroway.aerodrome.international">Međunarodna zračna lika</string>
+    <string name="type.aeroway.apron">Stajanka</string>
+    <string name="type.aeroway.gate">Izlaz</string>
+    <string name="type.aeroway.helipad">Heliodrom</string>
+    <string name="type.aeroway.runway">Pista</string>
+    <string name="type.aeroway.taxiway">Rulna staza</string>
+    <string name="type.aeroway.terminal">Terminal</string>
+    <string name="type.amenity">Pogodnosti</string>
+    <string name="type.amenity.arts_centre">Umjetnički centar</string>
+    <string name="type.amenity.atm">ATM</string>
+    <string name="type.amenity.bank">Banka</string>
+    <string name="type.amenity.bar">Bar</string>
+    <string name="type.amenity.bbq">Roštilj</string>
+    <string name="type.amenity.bench">Klupa</string>
+    <string name="type.amenity.bench.backless">Klupa bez naslona</string>
+    <string name="type.amenity.bicycle_parking">Parkiralište za bicikle</string>
+    <string name="type.amenity.bicycle_parking.covered">Natkriveno parkiralište za bicikle</string>
+    <string name="type.amenity.boat_rental">Najam brodova</string>
+    <string name="type.amenity.bicycle_rental">Najam bicikala</string>
+    <string name="type.amenity.bicycle_repair_station">Stanica za popravak bicikala</string>
+    <string name="type.amenity.biergarten">Pivski vrt</string>
+    <string name="type.amenity.brothel">Bordel</string>
+    <string name="type.amenity.love_hotel">Hotel za kratki boravak</string>
+    <string name="type.amenity.bureau_de_change">Mjenjačnica</string>
+    <string name="type.amenity.bus_station">Autobusna stanica</string>
+    <string name="type.amenity.cafe">Kafić</string>
+    <string name="type.amenity.car_rental">Najam automobila</string>
+    <string name="type.amenity.motorcycle_rental">Najam motocikala</string>
+    <string name="type.amenity.car_sharing">Dijeljenje automobila</string>
+    <string name="type.amenity.car_wash">Autopraonica</string>
+    <string name="type.man_made.telescope">Teleskop</string>
+    <string name="type.man_made.telescope.optical">Teleskop (optički)</string>
+    <string name="type.man_made.telescope.radio">Teleskop (radio)</string>
+    <string name="type.man_made.telescope.gamma">Teleskop (Gama)</string>
+    <string name="type.man_made.observatory">Zvjezdarnica</string>
+    <string name="type.amenity.casino">Kasino</string>
+    <string name="type.amenity.gambling">Kockanje</string>
+    <string name="type.leisure.adult_gaming_centre">Centar za igre za odrasle</string>
+    <string name="type.leisure.amusement_arcade">Arkada</string>
+    <string name="type.amenity.charging_station">Stanica za punjenje</string>
+    <string name="type.amenity.charging_station.bicycle">Stanica za punjenje bicikala</string>
+    <string name="type.amenity.charging_station.motorcar">Stanica za punjenje automobila</string>
+    <string name="type.amenity.childcare">Rasadnik</string>
+    <string name="type.amenity.cinema">Kino</string>
+    <string name="type.amenity.studio">Medijski studio</string>
+    <string name="type.leisure.bowling_alley">Kuglana</string>
+    <string name="type.amenity.clinic">Klinika</string>
+    <string name="type.amenity.college">Koledž</string>
+    <string name="type.amenity.community_centre">Društveni centar</string>
+    <string name="type.amenity.compressed_air">Komprimirani zrak</string>
+    <string name="type.amenity.conference_centre">Konferencijski centar</string>
+    <string name="type.amenity.courthouse">Sudnica</string>
+    <string name="type.amenity.dentist">Zubar</string>
+    <string name="type.amenity.doctors">Liječnik</string>
+    <string name="type.amenity.drinking_water">Voda za piće</string>
+    <string name="type.amenity.driving_school">Autoškola</string>
+    <string name="type.amenity.exhibition_centre">Izložbeni centar</string>
+    <string name="type.amenity.money_transfer">Prijenos novca</string>
+    <string name="type.amenity.music_school">Muzička škola</string>
+    <string name="type.amenity.sailing_school">Škola jedrenja</string>
+    <string name="type.amenity.flight_school">Škola letenja</string>
+    <string name="type.amenity.prep_school">Škola za podučavanje</string>
+    <string name="type.amenity.language_school">Škola stranih jezika</string>
+    <string name="type.office.diplomatic">Veleposlanstvo</string>
+    <string name="type.office.security">Ured zaštitara</string>
+    <string name="type.building.guardhouse">Zaštitarska kabina</string>
+    <string name="type.drinking_water.yes">Pitka voda</string>
+    <string name="type.power.portal">Portalni stup (elektroenergetski)</string>
+    <string name="type.amenity.fast_food">Brza hrana</string>
+    <string name="type.amenity.ferry_terminal">Trajekt</string>
+    <string name="type.amenity.fire_station">Vatrogasna postaja</string>
+    <string name="type.amenity.food_court">Gastro zona</string>
+    <string name="type.amenity.fountain">Fontana</string>
+    <string name="type.amenity.fuel">Benzinska postaja</string>
+    <string name="type.amenity.grave_yard">Malo groblje</string>
+    <string name="type.amenity.grave_yard.christian">Kršćansko groblje</string>
+    <string name="type.amenity.hospital">Bolnica</string>
+    <string name="type.amenity.hunting_stand">Lovna čeka</string>
+    <string name="type.amenity.ice_cream">Sladoled</string>
+    <string name="type.amenity.internet_cafe">Internet kafić</string>
+    <string name="type.amenity.kindergarten">Dječji vrtić</string>
+    <string name="type.amenity.library">Knjižnica</string>
+    <string name="type.amenity.loading_dock">Utovarno pristanište</string>
+    <string name="type.amenity.lounger">Ležaljka</string>
+    <string name="type.amenity.luggage_locker">Ormar za prtljagu</string>
+    <string name="type.amenity.mobile_money_agent">Agent za mobilno plaćanje</string>
+    <string name="type.amenity.marketplace">Tržnica</string>
+    <string name="type.amenity.motorcycle_parking">Parkiralište za motocikle</string>
+    <string name="type.amenity.nightclub">Noćni klub</string>
+    <string name="type.amenity.nursing_home">Starački dom</string>
+    <string name="type.amenity.parking">Parkiralište</string>
+    <string name="type.amenity.parking.fee">Parkiralište</string>
+    <string name="type.amenity.parking.multi.storey">Višekatna garaža</string>
+    <string name="type.amenity.parking.multi.storey.fee">Višekatna garaža</string>
+    <string name="type.amenity.parking.no.access">Privatno parkiralište</string>
+    <string name="type.amenity.parking.permissive">Privatno parkiralište</string>
+    <string name="type.amenity.parking.private">Privatno parkiralište</string>
+    <string name="type.amenity.parking.park_and_ride">Park &amp; Ride parkiralište</string>
+    <string name="type.amenity.parking.underground">Podzemna garaža</string>
+    <string name="type.amenity.parking.underground.fee">Podzemna garaža</string>
+    <string name="type.amenity.parking.underground.private">Privatna podzemna garaža</string>
+    <string name="type.amenity.parking.street_side">Parkiranje uz ulicu</string>
+    <string name="type.amenity.parking.street_side.fee">Parkiranje uz ulicu</string>
+    <string name="type.amenity.parking.street_side.private">Privatno parkiranje uz ulicu</string>
+    <string name="type.amenity.parking.lane">Parkiranje uz traku</string>
+    <string name="type.amenity.parking.lane.fee">Parkiranje uz traku</string>
+    <string name="type.amenity.parking.lane.private">Privatno parkiranje uz traku</string>
+    <string name="type.amenity.parking_entrance">Ulaz u parkiralište</string>
+    <string name="type.amenity.parking_entrance.private">Ulaz u privatno parkiralište</string>
+    <string name="type.amenity.parking_entrance.permissive">Ulaz u parkiralište</string>
+    <string name="type.amenity.parking_space">Parkirno mjesto</string>
+    <string name="type.amenity.parking_space.permissive">Parkirno mjesto</string>
+    <string name="type.amenity.parking_space.private">Parkirno mjesto</string>
+    <string name="type.amenity.parking_space.underground">Parkirno mjesto</string>
+    <string name="type.amenity.parking_space.disabled">Parkirno mjesto za osobe s invaliditetom</string>
+    <string name="type.amenity.car_pooling">Zajednička vožnja automobilom</string>
+    <string name="type.amenity.payment_centre">Centar za plaćanja</string>
+    <string name="type.amenity.payment_terminal">Platni terminal</string>
+    <string name="type.amenity.pharmacy">Ljekarna</string>
+    <string name="type.amenity.place_of_worship">Vjerski objekt</string>
+    <string name="type.amenity.place_of_worship.buddhist">Budistički hram</string>
+    <string name="type.amenity.place_of_worship.christian">Crkva</string>
+    <string name="type.amenity.place_of_worship.christian.mormon">Crkva Isusa Krista svetaca posljednjih dana</string>
+    <string name="type.amenity.place_of_worship.christian.jehovahs_witness">Dvorana Kraljevstva Jehovinih svjedoka</string>
+    <string name="type.amenity.place_of_worship.hindu">Hinduistički hram</string>
+    <string name="type.amenity.place_of_worship.jewish">Sinagoga</string>
+    <string name="type.amenity.place_of_worship.muslim">Džamija</string>
+    <string name="type.amenity.place_of_worship.shinto">Šintoističko svetište</string>
+    <string name="type.amenity.place_of_worship.taoist">Taoistički hram</string>
+    <string name="type.amenity.police">Policija</string>
+    <string name="type.amenity.post_box">Poštanski sandučić</string>
+    <string name="type.amenity.post_office">Pošta</string>
+    <string name="type.post_office.post_partner">Poštanski partner</string>
+    <string name="type.amenity.prison">Zatvor</string>
+    <string name="type.amenity.pub">Pub</string>
+    <string name="type.amenity.public_bookcase">Razmjena knjiga</string>
+    <string name="type.amenity.recycling.centre">Centar za recikliranje</string>
+    <string name="type.amenity.recycling">Kontejner za recikliranje</string>
+    <string name="type.amenity.recycling.container">Kontejner za recikliranje</string>
+    <string name="type.recycling.batteries">Baterije</string>
+    <string name="type.recycling.clothes">Odjeća</string>
+    <string name="type.recycling.glass_bottles">Staklene boce</string>
+    <string name="type.recycling.paper">Papir</string>
+    <string name="type.recycling.plastic">Plastika</string>
+    <string name="type.recycling.plastic_bottles">Plastične boce</string>
+    <string name="type.recycling.scrap_metal">Metalni otpad</string>
+    <string name="type.recycling.small_appliances">Elektronički otpad</string>
+    <string name="type.recycling.cardboard">Karton</string>
+    <string name="type.recycling.cans">Limenke</string>
+    <string name="type.recycling.shoes">Obuća</string>
+    <string name="type.recycling.green_waste">Zeleni/organski otpad</string>
+    <string name="type.recycling.cartons">Kartonska ambalaža</string>
+    <string name="type.amenity.sanitary_dump_station">Stanica za pražnjenje otpadnih voda</string>
+    <string name="type.amenity.school">Škola</string>
+    <string name="type.amenity.shelter.basic_hut">Bivak sklonište</string>
+    <string name="type.amenity.shelter.lean_to">Lean‑to sklonište za spavanje</string>
+    <string name="type.amenity.public_bath">Javno kupalište - kupka</string>
+    <string name="type.amenity.shower">Tuš</string>
+    <string name="type.amenity.stripclub">Striptiz klub</string>
+    <string name="type.amenity.taxi">Taksi stajalište</string>
+    <string name="type.amenity.telephone">Telefon</string>
+    <string name="type.amenity.theatre">Kazalište</string>
+    <string name="type.amenity.toilets">WC</string>
+    <string name="type.toilets.yes">WC</string>
+    <string name="type.amenity.townhall">Gradska vijećnica</string>
+    <string name="type.amenity.university">Sveučilište</string>
+    <string name="type.amenity.vending_machine">Automat za prodaju</string>
+    <string name="type.amenity.vending_machine.cigarettes">Automat za cigarete</string>
+    <string name="type.amenity.vending_machine.coffee">Automat za kavu</string>
+    <string name="type.amenity.vending_machine.condoms">Automat za kondome</string>
+    <string name="type.amenity.vending_machine.drinks">Automat za piće</string>
+    <string name="type.amenity.vending_machine.food">Automat za hranu</string>
+    <string name="type.amenity.vending_machine.newspapers">Automat za novine</string>
+    <string name="type.amenity.vending_machine.parking_tickets">Parkirni automat</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Automat za karte za javni prijevoz</string>
+    <string name="type.amenity.vending_machine.sweets">Automat za slatkiše</string>
+    <string name="type.amenity.vending_machine.excrement_bags">Vrećice za pseći izmet (dispenzer)</string>
+    <string name="type.amenity.parcel_locker">Ormarić za pakete</string>
+    <string name="type.amenity.vehicle_inspection">Centar za tehnički pregled vozila</string>
+    <string name="type.amenity.vending_machine.fuel">Pumpa za gorivo</string>
+    <string name="type.amenity.veterinary">Veterinar</string>
+    <string name="type.amenity.animal_shelter">Azil za životinje</string>
+    <string name="type.amenity.waste_basket">Kanta za smeće</string>
+    <string name="type.amenity.waste_disposal">Veliki kontejner za otpad</string>
+    <string name="type.amenity.restaurant">Restoran</string>
+    <string name="type.amenity.shelter">Sklonište</string>
+    <string name="type.amenity.shelter.public_transport">Sklonište</string>
+    <string name="type.amenity.waste_transfer_station">Stanica za pretovar otpada</string>
+    <string name="type.amenity.water_point">Točka za dopunu spremnika vodom</string>
+    <string name="type.amenity.water_point.drinking_water_no">Točka za dopunu spremnika vodom</string>
+    <string name="type.barrier">Barijera</string>
+    <string name="type.barrier.yes">Barijera</string>
+    <string name="type.barrier.bollard">Stupić</string>
+    <string name="type.barrier.border_control">Granična kontrola</string>
+    <string name="type.barrier.chain">Lančana barijera</string>
+    <string name="type.barrier.city_wall">Gradske zidine</string>
+    <string name="type.barrier.cycle_barrier">Biciklistička barijera</string>
+    <string name="type.waterway.ditch">Odvodni jarak</string>
+    <string name="type.natural.water.moat">Opkop</string>
+    <string name="type.natural.water.wastewater">Otpadne vode</string>
+    <string name="type.barrier.entrance">Ulaz</string>
+    <string name="type.barrier.fence">Ograda</string>
+    <string name="type.barrier.guard_rail">Zaštitna ograda</string>
+    <string name="type.barrier.gate">Vrata</string>
+    <string name="type.barrier.hedge">Živica</string>
+    <string name="type.barrier.kissing_gate">Zakretna pješačka vrata</string>
+    <string name="type.barrier.lift_gate">Podizna rampa</string>
+    <string name="type.barrier.retaining_wall">Potporni zid</string>
+    <string name="type.barrier.stile">Pješački prijelaz preko ograde</string>
+    <string name="type.barrier.turnstile">Okretna vrata</string>
+    <string name="type.barrier.wicket_gate">Mala pješačka vrata</string>
+    <string name="type.barrier.swing_gate">Zakretna vrata</string>
+    <string name="type.barrier.toll_booth">Naplatna kućica</string>
+    <string name="type.barrier.wall">Zid</string>
+    <string name="type.boundary">Granica</string>
+    <string name="type.boundary.administrative">Administrativna granica</string>
+    <string name="type.boundary.administrative.2">Državna granica</string>
+    <string name="type.boundary.administrative.3">Granica regije</string>
+    <string name="type.boundary.administrative.4">Granica regije</string>
+    <string name="type.boundary.national_park">Nacionalni park</string>
+    <string name="type.boundary.aboriginal_lands">Autohtona područja</string>
+    <string name="type.boundary.protected_area">Zaštićeno područje</string>
+    <string name="type.boundary.protected_area.1">Zaštićeno područje</string>
+    <string name="type.boundary.protected_area.2">Zaštićeno područje</string>
+    <string name="type.boundary.protected_area.3">Zaštićeno područje</string>
+    <string name="type.boundary.protected_area.4">Zaštićeno područje</string>
+    <string name="type.boundary.protected_area.5">Zaštićeno područje</string>
+    <string name="type.boundary.protected_area.6">Zaštićeno područje</string>
+    <string name="type.building">Zgrada</string>
+    <string name="type.building.has_parts">Zgrada</string>
+    <string name="type.building_part">Zgrada</string>
+    <string name="type.building.garage">Garaža</string>
+    <string name="type.building.train_station">Zgrada kolodvora</string>
+    <string name="type.building.warehouse">Skladište</string>
+    <string name="type.cemetery.grave">Grob</string>
+    <string name="type.craft">Obrt</string>
+    <string name="type.craft.beekeeper">Pčelar</string>
+    <string name="type.craft.blacksmith">Kovač</string>
+    <string name="type.craft.brewery">Craft pivovara</string>
+    <string name="type.building.address">Adresa</string>
 </resources>

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

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>

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

@@ -1181,4 +1181,6 @@
     <string name="type.man_made.observatory">Observatorium</string>
     <string name="type.aeroway.runway">Landasan Pacu</string>
     <string name="type.emergency">Darurat</string>
+    <string name="type.office.security">Kantor Satpam</string>
+    <string name="type.building.guardhouse">Pos Satpam</string>
 </resources>

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

@@ -44,8 +44,8 @@
     <string name="type.leisure.adult_gaming_centre">Centro giochi per adulti</string>
     <string name="type.leisure.amusement_arcade">Sala giochi</string>
     <string name="type.amenity.charging_station">Stazione di ricarica</string>
-    <string name="type.amenity.charging_station.bicycle">Stazione di ricarica per biciclette</string>
-    <string name="type.amenity.charging_station.motorcar">Stazione di ricarica per autoveicoli</string>
+    <string name="type.amenity.charging_station.bicycle">Biciclette</string>
+    <string name="type.amenity.charging_station.motorcar">Automobili</string>
     <string name="type.amenity.childcare">Asilo</string>
     <string name="type.amenity.cinema">Cinema</string>
     <string name="type.leisure.bowling_alley">Sala da bowling</string>