Merge branch 'master' into android_auto

2022-07-15 00:00:12 +05:30 · 2022-07-15 00:00:12 +05:30 · e8d316a8b3
commit e8d316a8b3
parent 12c540682a e4315cadb3
492 changed files with 59002 additions and 46895 deletions
--- a/.github/workflows/android-release-metadata.yaml
+++ b/.github/workflows/android-release-metadata.yaml
@ -27,7 +27,10 @@ jobs:
      # Linter complains about an invalid symlink (we don't check out screenshots for FDroid).
      - name: Create symlink for GP screenshots
        shell: bash
-        run: ln -sf ../../../../../../screenshots/android/en-US/graphics android/src/google/play/listings/en-US/graphic
+        run: |
+          for locale in en-US tr-TR; do
+             ln -sf ../../../../../../screenshots/android/${locale}/graphics android/src/google/play/listings/${locale}/graphics
+          done

      - name: Checkout private keys
        uses: actions/checkout@v2
--- a/.github/workflows/ios-beta.yaml
+++ b/.github/workflows/ios-beta.yaml
@ -27,9 +27,9 @@ on:
 jobs:
  ios-beta:
    name: Apple TestFlight
-    runs-on: macos-11
+    runs-on: macos-12
    env:
-      DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_13.4.1.app/Contents/Developer
      LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
      LANGUAGE: en_US.UTF-8
      LC_ALL: en_US.UTF-8
--- a/.gitignore
+++ b/.gitignore
@ -178,4 +178,4 @@ tools/python/routing/etc/*.ini

 # Screenshots
 screenshots
-android/src/google/play/listings/??-??/graphics/*
+android/src/google/play/listings/??-??/graphics
--- a/3party/opening_hours/CMakeLists.txt
+++ b/3party/opening_hours/CMakeLists.txt
@ -21,9 +21,7 @@ omim_add_library(${PROJECT_NAME} ${SRC})

 target_include_directories(${PROJECT_NAME} INTERFACE .)

-if (NOT PLATFORM_ANDROID)
-  target_compile_options(${PROJECT_NAME} PRIVATE -Wno-deprecated-copy)
-endif()
+target_compile_options(${PROJECT_NAME} PRIVATE -Wno-deprecated-copy)

 omim_add_test_subdirectory(opening_hours_tests)
 omim_add_test_subdirectory(opening_hours_integration_tests)
--- a/3party/opening_hours/opening_hours.cpp
+++ b/3party/opening_hours/opening_hours.cpp
@ -899,6 +899,26 @@ bool OpeningHours::IsUnknown(time_t const dateTime) const
  return osmoh::IsUnknown(m_rule, dateTime);
 }

+OpeningHours::InfoT OpeningHours::GetInfo(time_t const dateTime) const
+{
+  InfoT info;
+  info.state = GetState(m_rule, dateTime);
+  if (info.state != RuleState::Unknown)
+  {
+   if (info.state == RuleState::Open)
+      info.nextTimeOpen = dateTime;
+    else
+      info.nextTimeOpen = osmoh::GetNextTimeState(m_rule, dateTime, RuleState::Open);
+
+    if (info.state == RuleState::Closed)
+      info.nextTimeClosed = dateTime;
+    else
+      info.nextTimeClosed = osmoh::GetNextTimeState(m_rule, dateTime, RuleState::Closed);
+  }
+
+  return info;
+}
+
 bool OpeningHours::IsValid() const
 {
  return m_valid;
--- a/3party/opening_hours/opening_hours.hpp
+++ b/3party/opening_hours/opening_hours.hpp
@ -693,6 +693,13 @@ std::ostream & operator<<(std::ostream & ost, RuleSequence::Modifier const modif
 std::ostream & operator<<(std::ostream & ost, RuleSequence const & sequence);
 std::ostream & operator<<(std::ostream & ost, TRuleSequences const & sequences);

+enum class RuleState
+{
+  Open,
+  Closed,
+  Unknown
+};
+
 class OpeningHours
 {
 public:
@ -704,6 +711,16 @@ public:
  bool IsClosed(time_t const dateTime) const;
  bool IsUnknown(time_t const dateTime) const;

+  struct InfoT
+  {
+    RuleState state;
+    /// Calculated only if state != RuleState::Unknown.
+    time_t nextTimeOpen;
+    time_t nextTimeClosed;
+  };
+
+  InfoT GetInfo(time_t const dateTime) const;
+
  bool IsValid() const;

  bool IsTwentyFourHours() const;
--- a/3party/opening_hours/opening_hours_integration_tests/CMakeLists.txt
+++ b/3party/opening_hours/opening_hours_integration_tests/CMakeLists.txt
@ -6,7 +6,14 @@ omim_add_executable(${PROJECT_NAME} ${SRC})

 target_link_libraries(${PROJECT_NAME} opening_hours)

+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") 
+  set(COPY_CMD cp -u)
+else()
+  set(COPY_CMD rsync -a)
+endif()
+
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-  COMMAND rsync -a "${CMAKE_CURRENT_SOURCE_DIR}/opening-count.lst" "${CMAKE_BINARY_DIR}/"
+  COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/opening-count.lst" "${CMAKE_BINARY_DIR}/"
  COMMENT "Copying opening-count.lst file for testing"
 )
--- a/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp
+++ b/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp
@ -112,11 +112,37 @@ bool IsOpen(osmoh::TRuleSequences const & rules, std::string const & dateTime)
  return GetRulesState(rules, dateTime) == osmoh::RuleState::Open;
 }

+std::string GetNextTimeOpen(osmoh::TRuleSequences const & rules, char const * fmt, std::string const & dateTime)
+{
+  std::tm time = {};
+  BOOST_CHECK(GetTimeTuple(dateTime, fmt, time));
+
+  time_t openingTime = osmoh::GetNextTimeOpen(rules, mktime(&time));
+  tm openingTime_tm = *localtime(&openingTime);
+  char buffer[30];
+  std::strftime(buffer, sizeof(buffer)/sizeof(buffer[0]), fmt, &openingTime_tm);
+
+  return std::string(buffer);
+}
+
 bool IsClosed(osmoh::TRuleSequences const & rules, std::string const & dateTime)
 {
  return GetRulesState(rules, dateTime) == osmoh::RuleState::Closed;
 }

+std::string GetNextTimeClosed(osmoh::TRuleSequences const & rules, char const * fmt, std::string const & dateTime)
+{
+  std::tm time = {};
+  BOOST_CHECK(GetTimeTuple(dateTime, fmt, time));
+
+  time_t openingTime = osmoh::GetNextTimeClosed(rules, mktime(&time));
+  tm openingTime_tm = *localtime(&openingTime);
+  char buffer[30];
+  std::strftime(buffer, sizeof(buffer)/sizeof(buffer[0]), fmt, &openingTime_tm);
+
+  return std::string(buffer);
+}
+
 bool IsUnknown(osmoh::TRuleSequences const & rules, std::string const & dateTime)
 {
  return GetRulesState(rules, dateTime) == osmoh::RuleState::Unknown;
@ -1662,6 +1688,59 @@ BOOST_AUTO_TEST_CASE(OpeningHours_TestIsOpen)
  }
 }

+BOOST_AUTO_TEST_CASE(OpeningHours_GetNextTimeOpen)
+{
+  using namespace osmoh;
+
+  TRuleSequences rules;
+
+  char constexpr fmt[] = "%Y-%m-%d %H:%M";
+
+  BOOST_CHECK(Parse("Mo-Tu 15:00-18:00; We off; Th on; Fr 15:00-18:00; Sa 10:00-12:00", rules));
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-03 09:00") == "2022-01-03 15:00");    // Mo
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-03 16:00") == "2022-01-03 18:01");  // Mo
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-04 09:00") == "2022-01-04 15:00");    // Tu
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-04 16:00") == "2022-01-04 18:01");  // Tu
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-05 09:00") == "2022-01-06 00:00");    // We
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-06 16:00") == "2022-01-07 00:00");  // Th
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-07 09:00") == "2022-01-07 15:00");    // Fr
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-07 16:00") == "2022-01-07 18:01");  // Fr
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-08 09:00") == "2022-01-08 10:00");    // Sa
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-08 11:00") == "2022-01-08 12:01");  // Sa
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-09 09:00") == "2022-01-10 15:00");    // Su
+
+  BOOST_CHECK(Parse("Mo-Fr 09:00-12:00, 13:00-20:00; We 10:00-11:00 off; Fr off", rules));
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-03 07:00") == "2022-01-03 09:00");    // Mo morning
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-03 10:00") == "2022-01-03 12:01");  // Mo morning
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-03 12:30") == "2022-01-03 13:00");    // Mo afternoon
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-03 13:30") == "2022-01-03 20:01");  // Mo afternoon
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-03 21:00") == "2022-01-04 09:00");    // Mo night
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-05 09:30") == "2022-01-05 10:00");  // We off
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-05 10:30") == "2022-01-05 11:01");    // We off
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-07 07:30") == "2022-01-10 09:00");    // Fr off
+
+  BOOST_CHECK(Parse("Mo-Sa 08:00-20:00; Feb Mo-Sa 09:00-14:00; Jan 06 off", rules));
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-04 07:00") == "2022-01-04 08:00");    // Tu Jan
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-04 09:00") == "2022-01-04 20:01");  // Tu Jan
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-02-08 07:00") == "2022-02-08 09:00");    // Tu Feb
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-02-08 09:00") == "2022-02-08 14:01");  // Tu Feb
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2020-01-06 07:00") == "2020-01-07 08:00");    // Jan 06
+
+  BOOST_CHECK(Parse("24/7; Mo 15:00-16:00 off", rules));
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-03 15:30") == "2022-01-03 16:01");    // Mo
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-01 15:30") == "2022-01-03 15:00");  // Sa
+
+  BOOST_CHECK(Parse("Mo-Th 15:00+; Fr-Su 13:00+", rules));
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-03 07:30") == "2022-01-03 15:00");    // Mo
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-03 15:30") == "2022-01-04 00:01");  // Mo
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-08 07:30") == "2022-01-08 13:00");    // Sa
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-08 15:30") == "2022-01-09 00:01");  // Sa
+
+  BOOST_CHECK(Parse("Mo-Su 00:00-24:00; Mo-We 00:00-24:00 off", rules));
+  BOOST_CHECK(GetNextTimeOpen(rules, fmt, "2022-01-03 15:30") == "2022-01-06 00:01");    // Mo
+  BOOST_CHECK(GetNextTimeClosed(rules, fmt, "2022-01-01 15:30") == "2022-01-03 00:01");  // Sa
+}
+

 BOOST_AUTO_TEST_CASE(OpeningHours_TestOpeningHours)
 {
--- a/3party/opening_hours/rules_evaluation.cpp
+++ b/3party/opening_hours/rules_evaluation.cpp
@ -385,6 +385,88 @@ bool IsActive(RuleSequence const & rule, time_t const timestamp)
  return res.first && res.second;
 }

+time_t GetNextTimeState(TRuleSequences const & rules, time_t const dateTime, RuleState state)
+{
+  time_t constexpr kTimeTMax = std::numeric_limits<time_t>::max();
+  time_t dateTimeResult = kTimeTMax;
+  time_t dateTimeToCheck;
+
+  // Check in the next 7 days
+  for (int i = 0; i < 7; i++)
+  {
+    for (auto it = rules.rbegin(); it != rules.rend(); ++it)
+    {
+      auto const & times = it->GetTimes();
+
+      // If the rule has no times specified, check at 00:00
+      if (times.size() == 0)
+      {
+        tm tm = MakeTimetuple(dateTime);
+        tm.tm_hour = 0;
+        tm.tm_min = 0;
+        dateTimeToCheck = mktime(&tm);
+        if (dateTimeToCheck == -1)
+          continue;
+        dateTimeToCheck += i * (24 * 60 * 60);
+
+        if (dateTimeToCheck < dateTime || dateTimeToCheck > dateTimeResult)
+          continue;
+
+        if (GetState(rules, dateTimeToCheck) == state)
+          dateTimeResult = dateTimeToCheck;
+      }
+
+      if ((state == RuleState::Open && it->GetModifier() == RuleSequence::Modifier::Closed) ||
+          (state == RuleState::Closed &&
+          (it->GetModifier() == RuleSequence::Modifier::Open || it->GetModifier() == RuleSequence::Modifier::DefaultOpen)))
+      {
+        // Check the ending time of each rule
+        for (auto const & time : times)
+        {
+          tm tm = MakeTimetuple(dateTime);
+          tm.tm_hour = time.GetEnd().GetHourMinutes().GetHoursCount();
+          tm.tm_min = time.GetEnd().GetHourMinutes().GetMinutesCount();
+          dateTimeToCheck = mktime(&tm);
+          if (dateTimeToCheck == -1)
+            continue;
+          dateTimeToCheck += i * (24 * 60 * 60) + 60;  // 1 minute offset
+
+          if (dateTimeToCheck < dateTime || dateTimeToCheck > dateTimeResult)
+            continue;
+
+          if (GetState(rules, dateTimeToCheck) == state)
+            dateTimeResult = dateTimeToCheck;
+        }
+      }
+      else
+      {
+        // Check the starting time of each rule
+        for (auto const & time : times)
+        {
+          tm tm = MakeTimetuple(dateTime);
+          tm.tm_hour = time.GetStart().GetHourMinutes().GetHoursCount();
+          tm.tm_min = time.GetStart().GetHourMinutes().GetMinutesCount();
+          dateTimeToCheck = mktime(&tm);
+          if (dateTimeToCheck == -1)
+            continue;
+          dateTimeToCheck += i * (24 * 60 * 60);
+
+          if (dateTimeToCheck < dateTime || dateTimeToCheck > dateTimeResult)
+            continue;
+
+          if (GetState(rules, dateTimeToCheck) == state)
+            dateTimeResult = dateTimeToCheck;
+        }
+      }
+    }
+
+    if (dateTimeResult < kTimeTMax)
+      return dateTimeResult;
+  }
+
+  return kTimeTMax;
+}
+
 RuleState GetState(TRuleSequences const & rules, time_t const timestamp)
 {
  RuleSequence const * emptyRule = nullptr;
--- a/3party/opening_hours/rules_evaluation.hpp
+++ b/3party/opening_hours/rules_evaluation.hpp
@ -6,27 +6,38 @@

 namespace osmoh
 {
-enum class RuleState
-{
-  Open,
-  Closed,
-  Unknown
-};

 RuleState GetState(TRuleSequences const & rules, time_t const dateTime);

+time_t GetNextTimeState(TRuleSequences const & rules, time_t const dateTime, RuleState state);
+
 inline bool IsOpen(TRuleSequences const & rules, time_t const dateTime)
 {
  return GetState(rules, dateTime) == RuleState::Open;
 }

+inline time_t GetNextTimeOpen(TRuleSequences const & rules, time_t const dateTime)
+{
+  if (GetState(rules, dateTime) == RuleState::Open)
+    return dateTime;
+  return GetNextTimeState(rules, dateTime, RuleState::Open);
+}
+
 inline bool IsClosed(TRuleSequences const & rules, time_t const dateTime)
 {
  return GetState(rules, dateTime) == RuleState::Closed;
 }

+inline time_t GetNextTimeClosed(TRuleSequences const & rules, time_t const dateTime)
+{
+  if (GetState(rules, dateTime) == RuleState::Closed)
+    return dateTime;
+  return GetNextTimeState(rules, dateTime, RuleState::Closed);
+}
+
 inline bool IsUnknown(TRuleSequences const & rules, time_t const dateTime)
 {
  return GetState(rules, dateTime) == RuleState::Unknown;
 }
+
 } // namespace osmoh
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 3.18)
-
 project(omim C CXX)

 set(CMAKE_CXX_STANDARD 17)
@ -8,6 +7,19 @@ set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_C_EXTENSIONS OFF)

+if (APPLE AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))
+  # OBJC/OBJCXX are needed to skip m/mm files in Unity builds.
+  # https://gitlab.kitware.com/cmake/cmake/-/issues/21963
+  enable_language(OBJC)
+  set(CMAKE_OBJC_EXTENSIONS OFF)
+  set(CMAKE_OBJC_STANDARD 11)
+  set(CMAKE_OBJC_FLAGS -fobjc-arc)
+  enable_language(OBJCXX)
+  set(CMAKE_OBJCXX_EXTENSIONS OFF)
+  set(CMAKE_OBJCXX_STANDARD 17)
+  set(CMAKE_OBJCXX_FLAGS -fobjc-arc)
+endif()
+
 option(UNITY_DISABLE "Disable unity build" OFF)

 if (NOT UNITY_DISABLE)
--- a/1
+++ b/1
@ -63,6 +63,7 @@ Strings and translations:
  Lidia Vasiljeva
  Karina Kordon
  Konstantin Pastbin
+  Metehan Özyürek

 Project management:
  Alexander Matveenko
--- a/android/build.gradle
+++ b/android/build.gradle
@ -86,11 +86,9 @@ dependencies {
  implementation 'androidx.preference:preference:1.2.0'
  implementation 'androidx.recyclerview:recyclerview:1.2.1'
  implementation 'androidx.work:work-runtime:2.7.1'
-  implementation 'com.github.bumptech.glide:glide:4.13.2'
  implementation 'com.google.android.material:material:1.7.0-alpha02'
  implementation 'com.google.code.gson:gson:2.9.0'
  implementation 'com.timehop.stickyheadersrecyclerview:library:0.4.3@aar'
-  implementation 'com.trafi:anchor-bottom-sheet-behavior:0.14-alpha'
  implementation 'com.github.devnullorthrow:MPAndroidChart:3.2.0-alpha'
  implementation 'net.jcip:jcip-annotations:1.0'

@ -139,13 +137,13 @@ android {
  compileSdkVersion propCompileSdkVersion.toInteger()
  buildToolsVersion propBuildToolsVersion

-  ndkVersion '23.1.7779620'
+  ndkVersion '24.0.8215888'

  defaultConfig {
    // Default package name is taken from the manifest and should be app.organicmaps
    def ver = getVersion()
-    println('Version: ' + ver.first)
-    println('VersionCode: ' + ver.second)
+    println('Version: ' + ver.second)
+    println('VersionCode: ' + ver.first)
    versionCode = ver.first
    versionName = ver.second
    minSdkVersion propMinSdkVersion.toInteger()
--- a/android/flavors/firebase-enabled/com/mapswithme/util/CrashlyticsUtils.java
+++ b/android/flavors/firebase-enabled/com/mapswithme/util/CrashlyticsUtils.java
@ -7,7 +7,6 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.base.Initializable;
 import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@ -19,8 +18,7 @@ public enum CrashlyticsUtils implements Initializable<Context>
  @SuppressWarnings("NotNullFieldNotInitialized")
  @NonNull
  private Context mContext;
-  private final static String TAG = CrashlyticsUtils.class.getSimpleName();
-  private final static Logger mLogger = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.THIRD_PARTY);
+  private static final String TAG = CrashlyticsUtils.class.getSimpleName();

  public void logException(@NonNull Throwable exception)
  {
@ -58,11 +56,11 @@ public enum CrashlyticsUtils implements Initializable<Context>
  {
    if (isEnabled)
    {
-      mLogger.d(TAG, "Crashlytics enabled");
+      Logger.d(TAG, "Crashlytics enabled");
    }
    else
    {
-      mLogger.d(TAG, "Crashlytics disabled");
+      Logger.d(TAG, "Crashlytics disabled");
    }
    FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(isEnabled);
  }
--- a/android/flavors/gms-enabled/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
+++ b/android/flavors/gms-enabled/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
@ -1,15 +1,11 @@
 package com.mapswithme.maps.location;

-import static com.mapswithme.maps.location.LocationHelper.ERROR_GPS_OFF;
-import static com.mapswithme.maps.location.LocationHelper.ERROR_NOT_SUPPORTED;
-
 import android.content.Context;
 import android.location.Location;
 import android.os.Looper;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import com.google.android.gms.location.FusedLocationProviderClient;
 import com.google.android.gms.location.LocationAvailability;
 import com.google.android.gms.location.LocationCallback;
@ -18,11 +14,13 @@ import com.google.android.gms.location.LocationResult;
 import com.google.android.gms.location.LocationServices;
 import com.google.android.gms.location.LocationSettingsRequest;
 import com.google.android.gms.location.SettingsClient;
+import com.mapswithme.util.log.Logger;
+
+import static com.mapswithme.maps.location.LocationHelper.ERROR_NOT_SUPPORTED;

 class GoogleFusedLocationProvider extends BaseLocationProvider
 {
-  private final static String TAG = GoogleFusedLocationProvider.class.getSimpleName();
-
+  private static final String TAG = GoogleFusedLocationProvider.class.getSimpleName();
  @NonNull
  private final FusedLocationProviderClient mFusedLocationClient;
  @NonNull
@ -45,7 +43,7 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
    public void onLocationAvailability(@NonNull LocationAvailability availability)
    {
      if (!availability.isLocationAvailable()) {
-        LOGGER.w(TAG, "isLocationAvailable returned false");
+        Logger.w(TAG, "isLocationAvailable returned false");
        //mListener.onLocationError(ERROR_GPS_OFF);
      }
    }
@ -68,7 +66,7 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
  @Override
  public void start(long interval)
  {
-    LOGGER.d(TAG, "start()");
+    Logger.d(TAG, "start()");
    if (mActive)
      throw new IllegalStateException("Already subscribed");
    mActive = true;
@ -79,8 +77,8 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
    // Wait a few seconds for accurate locations initially, when accurate locations could not be computed on the device immediately.
    // https://github.com/organicmaps/organicmaps/issues/2149
    locationRequest.setWaitForAccurateLocation(true);
-    LOGGER.d(TAG, "Request Google fused provider to provide locations at this interval = "
-        + interval + " ms");
+    Logger.d(TAG, "Request Google fused provider to provide locations at this interval = "
+                  + interval + " ms");
    locationRequest.setFastestInterval(interval / 2);

    LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder();
@ -88,16 +86,16 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
    final LocationSettingsRequest locationSettingsRequest = builder.build();

    mSettingsClient.checkLocationSettings(locationSettingsRequest).addOnSuccessListener(locationSettingsResponse -> {
-      LOGGER.d(TAG, "Service is available");
+      Logger.d(TAG, "Service is available");
      mFusedLocationClient.requestLocationUpdates(locationRequest, mCallback, Looper.myLooper());
    }).addOnFailureListener(e -> {
-      LOGGER.e(TAG, "Service is not available: " + e);
+      Logger.e(TAG, "Service is not available: " + e);
      mListener.onLocationError(ERROR_NOT_SUPPORTED);
    });

    // onLocationResult() may not always be called regularly, however the device location is known.
    mFusedLocationClient.getLastLocation().addOnSuccessListener(location -> {
-      LOGGER.d(TAG, "onLastLocation, location = " + location);
+      Logger.d(TAG, "onLastLocation, location = " + location);
      if (location == null)
        return;
      mListener.onLocationChanged(location);
@ -107,7 +105,7 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
  @Override
  protected void stop()
  {
-    LOGGER.d(TAG, "stop()");
+    Logger.d(TAG, "stop()");
    mFusedLocationClient.removeLocationUpdates(mCallback);
    mActive = false;
  }
--- a/android/flavors/gms-enabled/com/mapswithme/maps/location/LocationProviderFactory.java
+++ b/android/flavors/gms-enabled/com/mapswithme/maps/location/LocationProviderFactory.java
@ -3,17 +3,14 @@ package com.mapswithme.maps.location;
 import android.content.Context;

 import androidx.annotation.NonNull;
-
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 import com.mapswithme.util.Config;
 import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 public class LocationProviderFactory
 {
-  private final static String TAG = LocationProviderFactory.class.getSimpleName();
-  private final static Logger mLogger = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.LOCATION);
+  private static final String TAG = LocationProviderFactory.class.getSimpleName();

  public static boolean isGoogleLocationAvailable(@NonNull Context context)
  {
@ -24,12 +21,12 @@ public class LocationProviderFactory
  {
    if (isGoogleLocationAvailable(context) && Config.useGoogleServices())
    {
-      mLogger.d(TAG, "Use google provider.");
+      Logger.d(TAG, "Use google provider.");
      return new GoogleFusedLocationProvider(context, listener);
    }
    else
    {
-      mLogger.d(TAG, "Use native provider");
+      Logger.d(TAG, "Use native provider");
      return new AndroidNativeProvider(context, listener);
    }
  }
--- a/android/jni/CMakeLists.txt
+++ b/android/jni/CMakeLists.txt
@ -64,7 +64,7 @@ set(SRC
  com/mapswithme/util/HttpUploader.cpp
  com/mapswithme/util/HttpUploaderUtils.cpp
  com/mapswithme/util/Language.cpp
-  com/mapswithme/util/LoggerFactory.cpp
+  com/mapswithme/util/LogsManager.cpp
  com/mapswithme/util/NetworkPolicy.cpp
  com/mapswithme/util/StringUtils.cpp
  com/mapswithme/vulkan/android_vulkan_context_factory.cpp
--- a/android/jni/com/mapswithme/core/jni_helper.cpp
+++ b/android/jni/com/mapswithme/core/jni_helper.cpp
@ -21,7 +21,7 @@ jclass g_httpClientClazz;
 jclass g_httpParamsClazz;
 jclass g_platformSocketClazz;
 jclass g_utilsClazz;
-jclass g_loggerFactoryClazz;
+jclass g_loggerClazz;
 jclass g_keyValueClazz;
 jclass g_httpUploaderClazz;
 jclass g_httpPayloadClazz;
@ -48,7 +48,7 @@ JNI_OnLoad(JavaVM * jvm, void *)
  g_httpParamsClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/HttpClient$Params");
  g_platformSocketClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/location/PlatformSocket");
  g_utilsClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/Utils");
-  g_loggerFactoryClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/log/LoggerFactory");
+  g_loggerClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/log/Logger");
  g_keyValueClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/KeyValue");
  g_httpUploaderClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/HttpUploader");
  g_httpPayloadClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/HttpPayload");
@ -74,7 +74,7 @@ JNI_OnUnload(JavaVM *, void *)
  env->DeleteGlobalRef(g_httpParamsClazz);
  env->DeleteGlobalRef(g_platformSocketClazz);
  env->DeleteGlobalRef(g_utilsClazz);
-  env->DeleteGlobalRef(g_loggerFactoryClazz);
+  env->DeleteGlobalRef(g_loggerClazz);
  env->DeleteGlobalRef(g_keyValueClazz);
  env->DeleteGlobalRef(g_httpUploaderClazz);
  env->DeleteGlobalRef(g_httpPayloadClazz);
--- a/android/jni/com/mapswithme/core/jni_helper.hpp
+++ b/android/jni/com/mapswithme/core/jni_helper.hpp
@ -22,7 +22,7 @@ extern jclass g_httpClientClazz;
 extern jclass g_httpParamsClazz;
 extern jclass g_platformSocketClazz;
 extern jclass g_utilsClazz;
-extern jclass g_loggerFactoryClazz;
+extern jclass g_loggerClazz;
 extern jclass g_keyValueClazz;
 extern jclass g_httpUploaderClazz;
 extern jclass g_httpPayloadClazz;
--- a/android/jni/com/mapswithme/core/logging.cpp
+++ b/android/jni/com/mapswithme/core/logging.cpp
@ -31,12 +31,12 @@ void AndroidMessage(LogLevel level, SrcPoint const & src, std::string const & s)
  }

  ScopedEnv env(jni::GetJVM());
-  static jmethodID const logCoreMsgMethod = jni::GetStaticMethodID(env.get(), g_loggerFactoryClazz,
-     "logCoreMessage", "(ILjava/lang/String;)V");
+  static jmethodID const logMethod = jni::GetStaticMethodID(env.get(), g_loggerClazz,
+     "log", "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V");

-  std::string const out = DebugPrint(src) + " " + s;
+  std::string const out = DebugPrint(src) + s;
  jni::TScopedLocalRef msg(env.get(), jni::ToJavaString(env.get(), out));
-  env->CallStaticVoidMethod(g_loggerFactoryClazz, logCoreMsgMethod, pr, msg.get());
+  env->CallStaticVoidMethod(g_loggerClazz, logMethod, pr, NULL, msg.get(), NULL);
 }

 void AndroidLogMessage(LogLevel level, SrcPoint const & src, std::string const & s)
@ -69,17 +69,3 @@ void ToggleDebugLogs(bool enabled)
    g_LogLevel = LINFO;
 }
 }
-
-extern "C" {
-
-void DbgPrintC(char const * format, ...)
-{
-  va_list argptr;
-  va_start(argptr, format);
-
-  __android_log_vprint(ANDROID_LOG_INFO, "OMaps_Debug", format, argptr);
-
-  va_end(argptr);
-}
-
-}
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@ -1058,7 +1058,7 @@ Java_com_mapswithme_maps_Framework_nativeGetBookmarksFilesExts(JNIEnv * env, jcl
 }

 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_Framework_nativeSetWritableDir(JNIEnv * env, jclass, jstring jNewPath)
+Java_com_mapswithme_maps_Framework_nativeChangeWritableDir(JNIEnv * env, jclass, jstring jNewPath)
 {
  string newPath = jni::ToNativeString(env, jNewPath);
  g_framework->RemoveLocalMaps();
--- a/android/jni/com/mapswithme/maps/MwmApplication.cpp
+++ b/android/jni/com/mapswithme/maps/MwmApplication.cpp
@ -15,7 +15,7 @@ extern "C"
  }

  // void nativeInitPlatform(String apkPath, String storagePath, String privatePath, String tmpPath,
-  // String obbGooglePath, String flavorName, String buildType, boolean isTablet);
+  // String flavorName, String buildType, boolean isTablet);
  JNIEXPORT void JNICALL
  Java_com_mapswithme_maps_MwmApplication_nativeInitPlatform(JNIEnv * env, jobject thiz,
                                                             jstring apkPath, jstring writablePath,
--- a/android/jni/com/mapswithme/maps/SearchEngine.cpp
+++ b/android/jni/com/mapswithme/maps/SearchEngine.cpp
@ -130,6 +130,7 @@ jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, b
                                                dist.get(), cuisine.get(), brand.get(), airportIata.get(),
                                                roadShields.get(),
                                                static_cast<jint>(result.IsOpenNow()),
+                                                result.GetMinutesUntilOpen(),result.GetMinutesUntilClosed(),
                                                static_cast<jboolean>(popularityHasHigherPriority)));

  jni::TScopedLocalRef name(env, jni::ToJavaString(env, result.GetString()));
@ -267,13 +268,14 @@ extern "C"
    /*
        Description(FeatureId featureId, String featureType, String region, String distance,
                    String cuisine, String brand, String airportIata, String roadShields,
-                    int openNow, boolean hasPopularityHigherPriority)
+                    int openNow, int minutesUntilOpen, int minutesUntilClosed, 
+                    boolean hasPopularityHigherPriority)
    */
    g_descriptionConstructor = jni::GetConstructorID(env, g_descriptionClass,
                                                     "(Lcom/mapswithme/maps/bookmarks/data/FeatureId;"
                                                     "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
                                                     "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
-                                                     "Ljava/lang/String;IZ)V");
+                                                     "Ljava/lang/String;IIIZ)V");

    g_popularityClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/Popularity");
    g_popularityConstructor = jni::GetConstructorID(env, g_popularityClass, "(I)V");
@ -290,12 +292,13 @@ extern "C"
  }

  JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_search_SearchEngine_nativeRunSearch(
-      JNIEnv * env, jclass clazz, jbyteArray bytes, jstring lang, jlong timestamp,
-      jboolean hasPosition, jdouble lat, jdouble lon)
+      JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory,
+      jstring lang, jlong timestamp, jboolean hasPosition, jdouble lat, jdouble lon)
  {
    search::EverywhereSearchParams params;
    params.m_query = jni::ToNativeString(env, bytes);
    params.m_inputLocale = jni::ToNativeString(env, lang);
+    params.m_isCategory = isCategory;
    params.m_onResults = bind(&OnResults, _1, _2, timestamp, false, hasPosition, lat, lon);
    bool const searchStarted = g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(params);
    if (searchStarted)
@ -304,12 +307,13 @@ extern "C"
  }

  JNIEXPORT void JNICALL Java_com_mapswithme_maps_search_SearchEngine_nativeRunInteractiveSearch(
-      JNIEnv * env, jclass clazz, jbyteArray bytes, jstring lang, jlong timestamp,
-      jboolean isMapAndTable)
+      JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory,
+      jstring lang, jlong timestamp, jboolean isMapAndTable)
  {
    search::ViewportSearchParams vparams;
    vparams.m_query = jni::ToNativeString(env, bytes);
    vparams.m_inputLocale = jni::ToNativeString(env, lang);
+    vparams.m_isCategory = isCategory;

    // TODO (@alexzatsepin): set up vparams.m_onCompleted here and use
    // HotelsClassifier for hotel queries detection.
--- a/android/jni/com/mapswithme/maps/editor/Editor.cpp
+++ b/android/jni/com/mapswithme/maps/editor/Editor.cpp
@ -567,16 +567,37 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetSelectedCuisines(JNIEnv * env, j
  return jni::ToJavaStringArray(env, g_editableMapObject.GetCuisines());
 }

+JNIEXPORT jobjectArray JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeFilterCuisinesKeys(JNIEnv * env, jclass thiz, jstring jSubstr)
+{
+  std::string const substr = jni::ToNativeString(env, jSubstr);
+  bool const noFilter = substr.length() == 0;
+  osm::AllCuisines const & cuisines = osm::Cuisines::Instance().AllSupportedCuisines();
+  std::vector<std::string> keys;
+  keys.reserve(cuisines.size());
+
+  for (TCuisine const & cuisine : cuisines)
+  {
+    std::string const & key = cuisine.first;
+    std::string const & label = cuisine.second;
+    if (noFilter || search::ContainsNormalized(key, substr) || search::ContainsNormalized(label, substr))
+      keys.push_back(key);
+  }
+
+  return jni::ToJavaStringArray(env, keys);
+}
+
 JNIEXPORT jobjectArray JNICALL
 Java_com_mapswithme_maps_editor_Editor_nativeTranslateCuisines(JNIEnv * env, jclass clazz, jobjectArray jKeys)
 {
  int const length = env->GetArrayLength(jKeys);
+  auto const & cuisines = osm::Cuisines::Instance();
  std::vector<std::string> translations;
  translations.reserve(length);
  for (int i = 0; i < length; i++)
  {
-    std::string const & key = jni::ToNativeString(env, (jstring) env->GetObjectArrayElement(jKeys, i));
-    translations.push_back(osm::Cuisines::Instance().Translate(key));
+    std::string const key = jni::ToNativeString(env, static_cast<jstring>(env->GetObjectArrayElement(jKeys, i)));
+    translations.push_back(cuisines.Translate(key));
  }
  return jni::ToJavaStringArray(env, translations);
 }
@ -588,7 +609,7 @@ Java_com_mapswithme_maps_editor_Editor_nativeSetSelectedCuisines(JNIEnv * env, j
  std::vector<std::string> cuisines;
  cuisines.reserve(length);
  for (int i = 0; i < length; i++)
-    cuisines.push_back(jni::ToNativeString(env, (jstring) env->GetObjectArrayElement(jKeys, i)));
+    cuisines.push_back(jni::ToNativeString(env, static_cast<jstring>(env->GetObjectArrayElement(jKeys, i))));
  g_editableMapObject.SetCuisines(cuisines);
 }

--- a/android/jni/com/mapswithme/platform/Platform.cpp
+++ b/android/jni/com/mapswithme/platform/Platform.cpp
@ -24,17 +24,17 @@ std::string Platform::GetMemoryInfo() const
  if (env == nullptr)
    return std::string();

-  static std::shared_ptr<jobject> classMemLogging = jni::make_global_ref(env->FindClass("com/mapswithme/util/log/MemLogging"));
-  ASSERT(classMemLogging, ());
+  static std::shared_ptr<jobject> classLogsManager = jni::make_global_ref(env->FindClass("com/mapswithme/util/log/LogsManager"));
+  ASSERT(classLogsManager, ());

  jobject context = android::Platform::Instance().GetContext();
  static jmethodID const getMemoryInfoId
    = jni::GetStaticMethodID(env,
-                             static_cast<jclass>(*classMemLogging),
+                             static_cast<jclass>(*classLogsManager),
                             "getMemoryInfo",
                             "(Landroid/content/Context;)Ljava/lang/String;");
  jstring const memInfoString = static_cast<jstring>(env->CallStaticObjectMethod(
-    static_cast<jclass>(*classMemLogging), getMemoryInfoId, context));
+    static_cast<jclass>(*classLogsManager), getMemoryInfoId, context));
  ASSERT(memInfoString, ());

  return jni::ToNativeString(env, memInfoString);
@ -156,7 +156,6 @@ void Platform::OnExternalStorageStatusChanged(bool isAvailable)
 void Platform::SetWritableDir(std::string const & dir)
 {
  m_writableDir = dir;
-  settings::Set("StoragePath", m_writableDir);
  LOG(LINFO, ("Writable path = ", m_writableDir));
 }

--- a/android/jni/com/mapswithme/util/LoggerFactory.cpp
+++ b/android/jni/com/mapswithme/util/LoggerFactory.cpp
@ -3,7 +3,7 @@

 extern "C" {
 JNIEXPORT void JNICALL
-Java_com_mapswithme_util_log_LoggerFactory_nativeToggleCoreDebugLogs(
+Java_com_mapswithme_util_log_LogsManager_nativeToggleCoreDebugLogs(
    JNIEnv * /*env*/, jclass /*clazz*/, jboolean enabled)
 {
  jni::ToggleDebugLogs(enabled);
--- a/android/jni/com/mapswithme/util/StringUtils.cpp
+++ b/android/jni/com/mapswithme/util/StringUtils.cpp
@ -37,13 +37,13 @@ Java_com_mapswithme_util_StringUtils_nativeContainsNormalized(JNIEnv * env, jcla
 JNIEXPORT jobjectArray JNICALL
 Java_com_mapswithme_util_StringUtils_nativeFilterContainsNormalized(JNIEnv * env, jclass thiz, jobjectArray src, jstring jSubstr)
 {
-  std::string substr = jni::ToNativeString(env, jSubstr);
+  std::string const substr = jni::ToNativeString(env, jSubstr);
  int const length = env->GetArrayLength(src);
  std::vector<std::string> filtered;
  filtered.reserve(length);
  for (int i = 0; i < length; i++)
  {
-    std::string str = jni::ToNativeString(env, (jstring) env->GetObjectArrayElement(src, i));
+    std::string const str = jni::ToNativeString(env, static_cast<jstring>(env->GetObjectArrayElement(src, i)));
    if (search::ContainsNormalized(str, substr))
      filtered.push_back(str);
  }
--- a/android/multidex-config.txt
+++ b/android/multidex-config.txt
@ -13,11 +13,8 @@ com/mapswithme/util/HttpUploader$Result.class
 com/mapswithme/util/HttpUploader.class
 com/mapswithme/util/KeyValue.class
 com/mapswithme/util/SharedPropertiesUtils.class
-com/mapswithme/util/log/BaseLogger.class
-com/mapswithme/util/log/FileLoggerStrategy.class
-com/mapswithme/util/log/LogCatStrategy.class
-com/mapswithme/util/log/LoggerFactory.class
-com/mapswithme/util/log/ZipLogsTask.class
+com/mapswithme/util/log/Logger.class
+com/mapswithme/util/log/LogsManager.class
 com/mapswithme/util/NetworkPolicy.class
 com/mapswithme/util/sharing/ShareableInfoProvider.class
 com/mapswithme/util/Utils.class
--- a/android/proguard-mwm.txt
+++ b/android/proguard-mwm.txt
@ -1,3 +1,11 @@
+# obfuscate supportV7 menu subclasses. it fixes bug with some Samsung and other devices ROMS based on android 4.2.2.
+# more details here : https://code.google.com/p/android/issues/detail?id=78377
+# For some reason, this line disables optimizations and avoids crashes due to missing @Keep attributes.
+# Looks like R8 keeps EVERYTHING except that unused support lib :)
+# TODO: Remove this line after properly marking all JNI-called classes and methods with @Keep.
+# Also remove everything else what is not needed.
+-keep class !android.support.v7.internal.view.menu.**,** {*;}
+
 # Gson support
 -keep class com.mapswithme.util.Gsonable
 -keep class * implements com.mapswithme.util.Gsonable
@ -9,7 +17,10 @@
 # Enabling shrinking causes
 # Execution failed for task ':minifyFdroidReleaseWithR8'.
 # > com.android.tools.r8.CompilationFailedException: Compilation failed to complete
-dontshrink
+# Optimizing leads to crashes like
+# No pending exception expected: java.lang.ClassNotFoundException: Didn't find class "com.mapswithme.util.HttpClient"
+# It requires to manually mark all methods and classes called from NDK.
+-dontoptimize

 -keepnames class * implements com.mapswithme.util.Gsonable {
  !transient <fields>;
--- a/android/res/drawable-hdpi/ic_disclosure_down.webp
+++ b/android/res/drawable-hdpi/ic_disclosure_down.webp
--- a/android/res/drawable-hdpi/ic_disclosure_up.webp
+++ b/android/res/drawable-hdpi/ic_disclosure_up.webp
--- a/android/res/drawable-mdpi/ic_disclosure_down.webp
+++ b/android/res/drawable-mdpi/ic_disclosure_down.webp
--- a/android/res/drawable-mdpi/ic_disclosure_up.webp
+++ b/android/res/drawable-mdpi/ic_disclosure_up.webp
--- a/android/res/drawable-xhdpi/ic_disclosure_down.webp
+++ b/android/res/drawable-xhdpi/ic_disclosure_down.webp
--- a/android/res/drawable-xhdpi/ic_disclosure_up.webp
+++ b/android/res/drawable-xhdpi/ic_disclosure_up.webp
--- a/android/res/drawable-xxhdpi/ic_disclosure_down.webp
+++ b/android/res/drawable-xxhdpi/ic_disclosure_down.webp
--- a/android/res/drawable-xxhdpi/ic_disclosure_up.webp
+++ b/android/res/drawable-xxhdpi/ic_disclosure_up.webp
--- a/android/res/drawable-xxxhdpi/ic_disclosure_down.webp
+++ b/android/res/drawable-xxxhdpi/ic_disclosure_down.webp
--- a/android/res/drawable-xxxhdpi/ic_disclosure_up.webp
+++ b/android/res/drawable-xxxhdpi/ic_disclosure_up.webp
--- a/android/res/layout-land/elevation_profile_bottom_sheet.xml
+++ b/android/res/layout-land/elevation_profile_bottom_sheet.xml
@ -11,9 +11,6 @@
  android:clickable="true"
  android:focusable="true"
  android:fillViewport="true"
-  app:behavior_defaultState="hidden"
-  app:behavior_skipCollapsed="true"
-  app:behavior_hideable="true"
  app:layout_behavior="@string/placepage_behavior">
  <LinearLayout
    android:layout_width="match_parent"
--- a/android/res/layout/activity_map.xml
+++ b/android/res/layout/activity_map.xml
@ -63,11 +63,10 @@
 </RelativeLayout>
  <com.mapswithme.maps.widget.placepage.PlacePageView
    android:id="@+id/placepage"
+    style="?attr/bottomSheetStyle"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:fillViewport="true"
-    app:behavior_hideable="true"
-    app:behavior_defaultState="hidden"
    app:layout_behavior="@string/placepage_behavior"/>
  <FrameLayout
    android:id="@+id/pp_buttons_layout"
--- a/android/res/layout/activity_splash.xml
+++ b/android/res/layout/activity_splash.xml
@ -26,6 +26,5 @@
    android:layout_centerHorizontal="true"
    android:layout_marginBottom="@dimen/margin_double_plus"
    android:textAppearance="@style/MwmTextAppearance.Title"
-    android:textAllCaps="true"
    android:text="@string/app_name"/>
 </RelativeLayout>
--- a/android/res/layout/bottom_sheet.xml
+++ b/android/res/layout/bottom_sheet.xml
@ -5,6 +5,9 @@
  android:layout_height="match_parent"
  android:orientation="vertical">

+  <include
+    layout="@layout/bottom_sheet_handle" />
+
  <androidx.fragment.app.FragmentContainerView
    android:id="@+id/bottom_sheet_menu_header"
    android:layout_width="match_parent"
@ -17,6 +20,8 @@
    android:layout_marginTop="@dimen/margin_base"
    android:layout_marginBottom="@dimen/margin_base"
    android:layout_marginStart="@dimen/margin_base"
+    android:maxLines="3"
+    android:ellipsize="end"
    android:textAppearance="?fontHeadline6"
    tools:text="Title" />

--- a/android/res/layout/elevation_profile_bottom_sheet.xml
+++ b/android/res/layout/elevation_profile_bottom_sheet.xml
@ -11,9 +11,6 @@
  android:clickable="true"
  android:focusable="true"
  android:fillViewport="true"
-  app:behavior_defaultState="hidden"
-  app:behavior_hideable="true"
-  app:behavior_skipAnchored="true"
  app:behavior_peekHeight="@dimen/elevation_profile_peek_height"
  app:layout_behavior="@string/placepage_behavior">
  <LinearLayout
--- a/android/res/layout/item_search_result.xml
+++ b/android/res/layout/item_search_result.xml
@ -8,30 +8,12 @@
  android:minHeight="@dimen/search_item_height"
  android:padding="@dimen/margin_base"
  tools:background="#20FF0000">
-  <FrameLayout
-    android:id="@+id/metadata_container"
-    android:layout_alignParentEnd="true"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    <TextView
-      android:id="@+id/closed"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:gravity="bottom"
-      android:paddingStart="@dimen/margin_half"
-      android:paddingEnd="@dimen/margin_half"
-      android:paddingTop="@dimen/margin_eighth"
-      android:paddingBottom="@dimen/margin_eighth"
-      android:textAppearance="@style/MwmTextAppearance.Body4.Light"
-      android:text="@string/closed"/>
-  </FrameLayout>

  <TextView
      android:id="@+id/title"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:layout_alignParentStart="true"
-      android:layout_toStartOf="@id/metadata_container"
      android:textAppearance="@style/MwmTextAppearance.Body1"
      android:ellipsize="end"
      android:maxLines="2"
@ -43,7 +25,7 @@
      android:layout_height="wrap_content"
      android:layout_alignParentStart="true"
      android:layout_below="@id/title"
-      android:layout_toStartOf="@id/cost"
+      android:layout_toStartOf="@id/costopen"
      android:layout_marginEnd="@dimen/margin_half"
      android:layout_marginTop="@dimen/margin_quarter"
      android:textAppearance="@style/MwmTextAppearance.Body3"
@ -52,28 +34,43 @@
      tools:text="Hotel \u2022 \u2605\u2605\u2605\u2605\u2605"/>

  <LinearLayout
-    android:id="@+id/cost"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:layout_alignParentEnd="true"
-    android:layout_alignTop="@id/description"
-    android:visibility="invisible"
-    android:gravity="center">
+      android:id="@+id/costopen"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentEnd="true"
+      android:layout_alignTop="@id/description">
+
+    <LinearLayout
+        android:id="@+id/cost"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="invisible"
+        android:gravity="center">
+
+      <TextView
+          android:id="@+id/price_category"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:singleLine="true"
+          tools:text="$$$"/>
+
+      <ImageView
+          android:id="@+id/sale"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="@dimen/margin_quarter"
+          android:src="?saleIcon"/>
+
+    </LinearLayout>

    <TextView
-      android:id="@+id/price_category"
+      android:id="@+id/open"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
-      android:singleLine="true"
-      tools:text="$$$"/>
+      android:text="@string/closed"
+      android:textAppearance="@style/MwmTextAppearance.Body3" />

-    <ImageView
-      android:id="@+id/sale"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="@dimen/margin_quarter"
-      android:src="?saleIcon"/>
  </LinearLayout>

  <TextView
@ -86,6 +83,7 @@
      android:layout_marginTop="@dimen/margin_quarter"
      android:layout_marginEnd="@dimen/margin_half"
      android:textAppearance="@style/MwmTextAppearance.Body3"
+      android:textStyle="italic"
      android:maxLines="2"
      android:ellipsize="end"
      tools:text="Russia, Moscow &amp; Central, Moscow"/>
@ -96,7 +94,7 @@
    android:layout_height="wrap_content"
    android:layout_alignParentEnd="true"
    android:layout_alignBaseline="@id/region"
-    android:layout_below="@id/metadata_container"
+    android:layout_below="@id/description"
    android:textAppearance="@style/MwmTextAppearance.Body3"
    android:textColor="?colorAccent"
    tools:text="500 km"/>
--- a/android/res/layout/place_page_preview.xml
+++ b/android/res/layout/place_page_preview.xml
@ -5,23 +5,11 @@
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:gravity="center_vertical"
-  android:background="?cardBackground"
-  android:paddingTop="@dimen/margin_base"
  android:paddingBottom="@dimen/margin_quarter">
-  <LinearLayout
+
+  <include
    android:id="@+id/pull_icon_container"
-    android:layout_width="wrap_content"
-    android:layout_height="@dimen/margin_half"
-    android:layout_marginBottom="@dimen/margin_eighth"
-    android:layout_centerHorizontal="true"
-    android:layout_alignParentTop="true"
-    android:gravity="center"
-    android:orientation="vertical">
-    <ImageView
-      android:id="@+id/pull_icon"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"/>
-  </LinearLayout>
+    layout="@layout/bottom_sheet_handle" />

  <include
    android:id="@+id/downloader_status_frame"
@ -30,7 +18,7 @@
    android:layout_width="@dimen/downloader_status_size"
    android:layout_height="@dimen/downloader_status_size"
    android:layout_marginStart="@dimen/margin_base"
-    android:layout_marginTop="@dimen/margin_half"
+    android:layout_marginTop="@dimen/margin_base_plus"
    android:visibility="gone"
    tools:visibility="visible"/>

@ -41,7 +29,7 @@
    android:orientation="vertical"
    android:layout_alignWithParentIfMissing="true"
    android:layout_below="@id/pull_icon_container"
-    android:layout_marginTop="@dimen/margin_quarter"
+    android:layout_marginTop="@dimen/margin_base"
    android:layout_marginEnd="@dimen/margin_base"
    android:layout_marginStart="@dimen/margin_base"
    android:layout_toEndOf="@id/downloader_status_frame"
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@ -797,6 +797,7 @@
 	<string name="type.craft.carpenter">نجار</string>
 	<string name="type.craft.electrician">كهربائي</string>
 	<string name="type.craft.gardener">مهندس مناظر</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">تكييف</string>
 	<string name="type.craft.metal_construction">عامل معادن</string>
 	<string name="type.craft.painter">رسام</string>
@ -1120,27 +1121,46 @@
 	<string name="type.man_made.water_well">بئر ماء</string>
 	<string name="type.man_made.windmill">طاحونة هواء</string>
 	<string name="type.military.bunker">مأوى</string>
+	<string name="type.natural">طبيعة</string>
+	<string name="type.natural.bare_rock">الصخور العارية</string>
 	<string name="type.natural.bay">خليج</string>
 	<string name="type.natural.beach">شاطئ</string>
+	<string name="type.natural.beach.sand">شاطئ رملي</string>
+	<string name="type.natural.beach.gravel">شاطئ جرافيل</string>
 	<string name="type.natural.cape">رأس</string>
 	<string name="type.natural.cave_entrance">كهف</string>
+	<string name="type.natural.cliff">جرف</string>
+	<string name="type.natural.earth_bank">بنك الأرض</string>
+	<string name="type.man_made.embankment">سد</string>
+	<string name="type.natural.coastline">ساحل</string>
 	<string name="type.natural.geyser">نبع ماء حار</string>
 	<string name="type.natural.glacier">كتلة جليدية</string>
-	<string name="type.natural.grassland">ملعب</string>
+	<string name="type.natural.grassland">أرض عشبية</string>
+	<string name="type.natural.heath">براح</string>
+	<string name="type.natural.hot_spring">حمة</string>
 	<string name="type.natural.water.lake">بحيرة</string>
 	<string name="type.natural.water.lock">ﻞﻔﻘﻟﺍ ﺔﻓﺮﻏ</string>
 	<string name="type.natural.water.pond">بركة</string>
 	<string name="type.natural.water.reservoir">خزان</string>
 	<string name="type.natural.water.basin">حوض المياه</string>
 	<string name="type.natural.water.river">نهر</string>
+	<string name="type.natural.land">بر</string>
+	<string name="type.natural.meadow">مرج</string>
+	<string name="type.natural.orchard">بستان</string>
 	<string name="type.natural.peak">قمة</string>
+	<string name="type.natural.saddle">سرج الجبل</string>
+	<string name="type.natural.rock">صخر</string>
 	<string name="type.natural.scrub">أَيْكَة</string>
 	<string name="type.natural.spring">ينبوع</string>
 	<string name="type.natural.strait">مضيق</string>
 	<string name="type.natural.tree">شجرة</string>
+	<string name="type.natural.tree_row">صف الشجرة</string>
+	<string name="type.natural.vineyard">كرم</string>
 	<string name="type.natural.volcano">بركان</string>
 	<string name="type.natural.water">مسطح مائي</string>
 	<string name="type.natural.wetland">منطقة رطبة</string>
+	<string name="type.natural.wetland.bog">رخاخ</string>
+	<string name="type.natural.wetland.marsh">هور</string>
 	<string name="type.office">مكتب</string>
 	<string name="type.office.company">مكتب شركة</string>
 	<string name="type.office.estate_agent">وكيل عقاري</string>
@ -1279,9 +1299,27 @@
 	<string name="type.shop.video">متجر فيديو</string>
 	<string name="type.shop.video_games">متجر ألعاب فيديو</string>
 	<string name="type.shop.wine">متجر مشروبات روحية</string>
+	<string name="type.sport">رياضة</string>
+	<string name="type.sport.american_football">كرة القدم الأمريكية</string>
+	<string name="type.sport.archery">الرماية</string>
 	<string name="type.sport.athletics">العاب رياضية</string>
+	<string name="type.sport.australian_football">كرة القدم الأسترالية</string>
+	<string name="type.sport.baseball">البيسبول</string>
 	<string name="type.sport.basketball">كرة السلة</string>
+	<string name="type.sport.bowls">لعبة البولينج</string>
+	<string name="type.sport.cricket">كريكت</string>
+	<string name="type.sport.curling">كيرلنغ</string>
 	<string name="type.sport.equestrian">رياضة الفروسية</string>
+	<string name="type.sport.golf">الجولف</string>
+	<string name="type.sport.gymnastics">رياضة بدنية</string>
+	<string name="type.sport.handball">كرة اليد</string>
+	<string name="type.sport.multi">رياضات متنوعة</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">الغوص</string>
+	<string name="type.sport.shooting">رماية</string>
+	<string name="type.sport.skiing">التزحلق</string>
+	<string name="type.sport.soccer">كرة القدم</string>
+	<string name="type.sport.swimming">سباحة</string>
 	<string name="type.sport.tennis">ملعب تنس</string>
 	<string name="type.tourism.alpine_hut">مساكن جبلية</string>
 	<string name="type.tourism.apartment">شُقَق</string>
@ -1302,7 +1340,7 @@
 	<string name="type.tourism.hotel">فندق</string>
 	<string name="type.tourism.information">معلومات سياحية</string>
 	<string name="type.tourism.information.board">لوحة معلومات</string>
-	<string name="type.tourism.information.guidepost">معلومات سياحية</string>
+	<string name="type.tourism.information.guidepost">دليل</string>
 	<string name="type.tourism.information.map">خريطة سياحية</string>
 	<string name="type.tourism.information.office">مكتب سياحة</string>
 	<string name="type.tourism.motel">فندق رخيص</string>
@ -1328,4 +1366,5 @@
 	<string name="type.wheelchair.no">لا يدعم لكراسي المعاقين</string>
 	<string name="type.wheelchair.yes">دعم كامل لكراسي المعاقين</string>
 	<string name="type.building_part">مبنى</string>
+	<string name="type.amenity.events_venue">مكان الأحداث</string>
 </resources>
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@ -355,6 +355,8 @@
 	<string name="routing_arrive">Прыбыццё а %s</string>
 	<string name="categories">Катэгорыі</string>
 	<string name="history">Гісторыя</string>
+	<string name="opens_in">Адчыняецца праз %s</string>
+	<string name="closes_in">Зачыняецца праз %s</string>
 	<string name="closed">Зачынена</string>
 	<string name="search_not_found">Нічога не знойдзена.</string>
 	<string name="search_not_found_query">Паспрабуйце змяніць умовы пошуку.</string>
@ -702,6 +704,7 @@
 	<string name="enable_show_on_lock_screen_description">Калі ўключана, вам не трэба разблакіраваць прыладу кожны раз падчас працы дадатку.</string>

 	<!-- SECTION: Types -->
+	<string name="type.amenity.bicycle_parking">Велапаркоўка</string>
 	<string name="type.amenity.fire_station">Пажарная частка</string>
 	<string name="type.amenity.fuel">АЗС</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. -->
@ -748,6 +751,11 @@
 	<string name="type.barrier.lift_gate">Шлагбаўм</string>
 	<string name="type.barrier.swing_gate">Шлагбаўм</string>
 	<string name="type.cemetery.grave">Магіла</string>
+	<string name="type.craft.beekeeper">Пчаляр</string>
+	<string name="type.craft.blacksmith">Кузня</string>
+	<string name="type.craft.brewery">Крафтавы бровар</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
+	<string name="type.craft.hvac">Ацяпленне, вентыляцыя і кандыцыянаванне</string>
 	<string name="type.craft.metal_construction">Металаканструкцыі</string>
 	<string name="type.cuisine.bubble_tea">Чай з бурбалкамі</string>
 	<string name="type.emergency.defibrillator">Дэфібрылятар</string>
@ -860,8 +868,24 @@
 	<string name="type.man_made.silo">Сілас</string>
 	<string name="type.man_made.storage_tank">Рэзервуар</string>
 	<string name="type.mountain_pass">Перавал</string>
+	<string name="type.natural">Прырода</string>
+	<string name="type.natural.bare_rock">Голая скала</string>
+	<string name="type.natural.bay">Заліў</string>
+	<string name="type.natural.beach">Пляж</string>
 	<string name="type.natural.beach.sand">Пяшчаны пляж</string>
 	<string name="type.natural.beach.gravel">Галечны пляж</string>
+	<string name="type.natural.cape">Мыс</string>
+	<string name="type.natural.cave_entrance">Пячора</string>
+	<string name="type.natural.cliff">Уцёс</string>
+	<string name="type.natural.earth_bank">Абрыў</string>
+	<string name="type.man_made.embankment">Насып</string>
+	<string name="type.natural.coastline">Узбярэжжа</string>
+	<string name="type.natural.geyser">Гейзер</string>
+	<string name="type.natural.glacier">Ледавік</string>
+	<string name="type.natural.grassland">Луг</string>
+	<string name="type.natural.heath">Пустка</string>
+	<string name="type.natural.hot_spring">Геатэрмальная крыніца</string>
+	<string name="type.natural.water.lake">Возера</string>
 	<string name="type.natural.water.lock">Шлюзавая камера</string>
 	<string name="type.natural.water.pond">Сажалка</string>
 	<string name="type.natural.water.reservoir">Вадасховішча</string>
@ -872,7 +896,18 @@
 	<string name="type.natural.orchard">Сад</string>
 	<string name="type.natural.peak">Вяршыня</string>
 	<string name="type.natural.saddle">Седлавіна</string>
+	<string name="type.natural.rock">Горная парода</string>
+	<string name="type.natural.scrub">Зараснікі</string>
+	<string name="type.natural.spring">Крыніца</string>
+	<string name="type.natural.strait">Праліў</string>
+	<string name="type.natural.tree">Дрэва</string>
+	<string name="type.natural.tree_row">Шэраг дрэў</string>
+	<string name="type.natural.vineyard">Вінаграднік</string>
+	<string name="type.natural.volcano">Вулкан</string>
 	<string name="type.natural.water">Вадаём</string>
+	<string name="type.natural.wetland">Балоцістая мясцовасць</string>
+	<string name="type.natural.wetland.bog">Тарфянік</string>
+	<string name="type.natural.wetland.marsh">Балота</string>
 	<string name="type.office.telecommunication">Тэлекамунікацыйная кампанія</string>
 	<string name="type.organic.only">Эка</string>
 	<string name="type.organic.yes">Эка</string>
@ -881,7 +916,32 @@
 	<string name="type.shop.caravan">Продаж аўтадамоў</string>
 	<string name="type.shop.cosmetics">Касметыка</string>
 	<string name="type.shop.funeral_directors">Рытуальныя паслугі</string>
+	<string name="type.sport">Спорт</string>
+	<string name="type.sport.american_football">Амерыканскі футбол</string>
+	<string name="type.sport.archery">Стральба з лука</string>
+	<string name="type.sport.australian_football">Аўстралійскі футбол</string>
+	<string name="type.sport.baseball">Бейсбол</string>
+	<string name="type.sport.bowls">Боўлз</string>
+	<string name="type.sport.cricket">Крикет</string>
+	<string name="type.sport.curling">Кёрлінг</string>
+	<string name="type.sport.equestrian">Конны спорт</string>
+	<string name="type.sport.golf">Гольф</string>
+	<string name="type.sport.gymnastics">Гімнастыка</string>
+	<string name="type.sport.handball">Гандбол</string>
+	<string name="type.sport.multi">Розныя віды спорту</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Месца для дайвінга</string>
+	<string name="type.sport.shooting">Стральба</string>
+	<string name="type.sport.skiing">Катанне на лыжах</string>
+	<string name="type.sport.soccer">Футбол</string>
+	<string name="type.sport.swimming">Плаванне</string>
+	<string name="type.sport.tennis">Тэнісны корт</string>
 	<string name="type.tourism.caravan_site">Кемпінг для аўтадамоў</string>
+	<string name="type.tourism.information">Турыстычная інфармацыя</string>
+	<string name="type.tourism.information.board">Інфармацыйны шчыт</string>
+	<string name="type.tourism.information.guidepost">Даведнік</string>
+	<string name="type.tourism.information.map">Карта</string>
+	<string name="type.tourism.information.office">Турыстычны офіс</string>
 	<string name="type.waterway.river">Рака</string>
 	<string name="type.waterway.river.tunnel">Рака</string>
 	<string name="type.waterway.riverbank">Рака</string>
@ -889,4 +949,5 @@
 	<string name="type.waterway.stream.ephemeral">Рака</string>
 	<string name="type.waterway.stream.intermittent">Рака</string>
 	<string name="type.waterway.stream.tunnel">Рака</string>
+	<string name="type.amenity.events_venue">Месца правядзення мерапрыемстваў</string>
 </resources>
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@ -640,6 +640,8 @@
 	<!-- SECTION: Types: Recycling -->
 	<string name="type.recycling.batteries">Батерии</string>
 	<string name="type.cemetery.grave">Гроб</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
+	<string name="type.craft.hvac">Отопление, вентилация и климатизация</string>
 	<string name="type.craft.metal_construction">Метални конструкции</string>
 	<string name="type.healthcare.laboratory">Медицинска лаборатория</string>

@ -737,9 +739,59 @@
 	<string name="type.historic.archaeological_site">Археологически сайт</string>
 	<string name="type.landuse.basin">Резервоар</string>
 	<string name="type.leisure.picnic_table">Маса за пикник</string>
+	<string name="type.natural">Природа</string>
+	<string name="type.natural.bare_rock">Гола скала</string>
+	<string name="type.natural.bay">Залив</string>
+	<string name="type.natural.beach">Плаж</string>
+	<string name="type.natural.beach.sand">Пясъчен плаж</string>
+	<string name="type.natural.beach.gravel">Чакълест плаж</string>
+	<string name="type.natural.cape">Нос</string>
+	<string name="type.natural.cave_entrance">Пещера</string>
+	<string name="type.natural.cliff">Клиф</string>
+	<string name="type.natural.earth_bank">Скала</string>
+	<string name="type.man_made.embankment">Насип</string>
+	<string name="type.natural.coastline">Крайбрежие</string>
+	<string name="type.natural.geyser">Гейзер</string>
+	<string name="type.natural.glacier">Ледник</string>
+	<string name="type.natural.grassland">Пасища</string>
+	<string name="type.natural.heath">Пустош</string>
+	<string name="type.natural.hot_spring">Геотермален извор</string>
+	<string name="type.natural.water.lake">Езеро</string>
 	<string name="type.natural.water.lock">Заключваща камера</string>
+	<string name="type.natural.water.pond">Езерце</string>
 	<string name="type.natural.water.reservoir">Резервоар</string>
 	<string name="type.natural.water.basin">Резервоар</string>
+	<string name="type.natural.water.river">Река</string>
+	<string name="type.natural.land">Суша</string>
+	<string name="type.natural.meadow">Ливада</string>
+	<string name="type.natural.orchard">Овощна градина</string>
+	<string name="type.natural.peak">Връх</string>
+	<string name="type.natural.saddle">Седло</string>
+	<string name="type.natural.rock">Скала</string>
+	<string name="type.natural.scrub">Гъсталаци</string>
+	<string name="type.natural.spring">Извор</string>
+	<string name="type.natural.strait">Проток</string>
+	<string name="type.natural.tree">Дърво</string>
+	<string name="type.natural.tree_row">Ред дървета</string>
+	<string name="type.natural.vineyard">Лозе</string>
+	<string name="type.natural.volcano">Вулкан</string>
 	<string name="type.natural.water">Воден басейн</string>
+	<string name="type.natural.wetland">Влажна зона</string>
+	<string name="type.natural.wetland.bog">Торфено блато</string>
+	<string name="type.natural.wetland.marsh">Блато</string>
 	<string name="type.office.telecommunication">Телекомуникационна компания</string>
+	<string name="type.sport">Спорт</string>
+	<string name="type.sport.american_football">Американски футбол</string>
+	<string name="type.sport.archery">Стрелба с лък</string>
+	<string name="type.sport.australian_football">Австралийски футбол</string>
+	<string name="type.sport.equestrian">Конен спорт</string>
+	<string name="type.sport.multi">Различни спортове</string>
+	<string name="type.sport.swimming">Плуване</string>
+	<string name="type.sport.tennis">Тенис корт</string>
+	<string name="type.tourism.information">Туринформация</string>
+	<string name="type.tourism.information.board">Информационен щит</string>
+	<string name="type.tourism.information.guidepost">Пътеводител</string>
+	<string name="type.tourism.information.map">Карта</string>
+	<string name="type.tourism.information.office">Туристически офис</string>
+	<string name="type.amenity.events_venue">Място за провеждане на събития</string>
 </resources>
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@ -793,6 +793,7 @@
 	<string name="type.craft.carpenter">Truhlář</string>
 	<string name="type.craft.electrician">Elektrikář</string>
 	<string name="type.craft.gardener">Zahradník</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">HVAC</string>
 	<string name="type.craft.metal_construction">Kovodílna</string>
 	<string name="type.craft.painter">Malíř</string>
@ -1114,27 +1115,46 @@
 	<string name="type.man_made.water_well">Studna</string>
 	<string name="type.man_made.windmill">Větrný mlýn</string>
 	<string name="type.military.bunker">Bunkr</string>
+	<string name="type.natural">Příroda</string>
+	<string name="type.natural.bare_rock">Holá skála</string>
 	<string name="type.natural.bay">Záliv</string>
 	<string name="type.natural.beach">Pláž</string>
+	<string name="type.natural.beach.sand">Písečná pláž</string>
+	<string name="type.natural.beach.gravel">Štěrková pláž</string>
 	<string name="type.natural.cape">Mys</string>
 	<string name="type.natural.cave_entrance">Jeskyně</string>
+	<string name="type.natural.cliff">Útes</string>
+	<string name="type.natural.earth_bank">Útes</string>
+	<string name="type.man_made.embankment">Násyp</string>
+	<string name="type.natural.coastline">Pobřeží</string>
 	<string name="type.natural.geyser">Gejzír</string>
 	<string name="type.natural.glacier">Ledovec</string>
-	<string name="type.natural.grassland">Pole</string>
+	<string name="type.natural.grassland">Louky a pastviny</string>
+	<string name="type.natural.heath">Vřesoviště</string>
+	<string name="type.natural.hot_spring">Termální pramen</string>
 	<string name="type.natural.water.lake">Jezero</string>
 	<string name="type.natural.water.lock">Zámková komora</string>
 	<string name="type.natural.water.pond">Rybník</string>
 	<string name="type.natural.water.reservoir">Nádrž</string>
 	<string name="type.natural.water.basin">Vodní nádrž</string>
 	<string name="type.natural.water.river">Řeka</string>
+	<string name="type.natural.land">Země</string>
+	<string name="type.natural.meadow">Louka</string>
+	<string name="type.natural.orchard">Sad</string>
 	<string name="type.natural.peak">Hora</string>
+	<string name="type.natural.saddle">Sedlo</string>
+	<string name="type.natural.rock">Hornina</string>
 	<string name="type.natural.scrub">Křoviny</string>
 	<string name="type.natural.spring">Pramen</string>
 	<string name="type.natural.strait">Průliv</string>
 	<string name="type.natural.tree">Strom</string>
+	<string name="type.natural.tree_row">Řada stromů</string>
+	<string name="type.natural.vineyard">Vinice</string>
 	<string name="type.natural.volcano">Sopka</string>
 	<string name="type.natural.water">Vodní plocha</string>
 	<string name="type.natural.wetland">Mokřadní oblast</string>
+	<string name="type.natural.wetland.bog">Rašeliniště</string>
+	<string name="type.natural.wetland.marsh">Bažina</string>
 	<string name="type.office">Kancelář</string>
 	<string name="type.office.company">Kancelář společnosti</string>
 	<string name="type.office.estate_agent">Realitní makléř</string>
@ -1270,9 +1290,26 @@
 	<string name="type.shop.video">Videopůjčovna</string>
 	<string name="type.shop.video_games">Obchod s videohrami</string>
 	<string name="type.shop.wine">Vinařství</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Americký fotbal</string>
+	<string name="type.sport.archery">Lukostřelba</string>
 	<string name="type.sport.athletics">Atletika</string>
+	<string name="type.sport.australian_football">Australský fotbal</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketbal</string>
+	<string name="type.sport.cricket">Kriket</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Koňské sporty</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gymnastika</string>
+	<string name="type.sport.handball">Házená</string>
+	<string name="type.sport.multi">Různé sporty</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Potápění</string>
+	<string name="type.sport.shooting">Střílení</string>
+	<string name="type.sport.skiing">Lyžování</string>
+	<string name="type.sport.soccer">Fotbal</string>
+	<string name="type.sport.swimming">Plavání</string>
 	<string name="type.sport.tennis">Tenisový kurt</string>
 	<string name="type.tourism.alpine_hut">Ubytování v horách</string>
 	<string name="type.tourism.apartment">Byty</string>
@ -1290,7 +1327,7 @@
 	<string name="type.tourism.guest_house">Penzion</string>
 	<string name="type.tourism.information">Infocentrum</string>
 	<string name="type.tourism.information.board">Nástěnka</string>
-	<string name="type.tourism.information.guidepost">Infocentrum</string>
+	<string name="type.tourism.information.guidepost">Rozcestník</string>
 	<string name="type.tourism.information.map">Turistická mapa</string>
 	<string name="type.tourism.information.office">Informační centrum</string>
 	<string name="type.tourism.museum">Muzeum</string>
@ -1315,4 +1352,5 @@
 	<string name="type.wheelchair.no">Bez přístupu pro vozíčkáře</string>
 	<string name="type.wheelchair.yes">Plný vstup pro vozíčkáře</string>
 	<string name="type.building_part">Stavba</string>
+	<string name="type.amenity.events_venue">Místo konání akcí</string>
 </resources>
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@ -787,6 +787,7 @@
 	<string name="type.craft.carpenter">Tømrer</string>
 	<string name="type.craft.electrician">Elektriker</string>
 	<string name="type.craft.gardener">Gartner</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Blikkenslager</string>
 	<string name="type.craft.metal_construction">Metalarbejder</string>
 	<string name="type.craft.painter">Maler</string>
@ -1105,27 +1106,46 @@
 	<string name="type.man_made.water_tower">Vandtårn</string>
 	<string name="type.man_made.water_well">Brønd</string>
 	<string name="type.man_made.windmill">Vindmølle</string>
+	<string name="type.natural">Natur</string>
+	<string name="type.natural.bare_rock">Blottet klippe</string>
 	<string name="type.natural.bay">Bugt</string>
 	<string name="type.natural.beach">Strand</string>
+	<string name="type.natural.beach.sand">Sandet strand</string>
+	<string name="type.natural.beach.gravel">Grus Strand</string>
 	<string name="type.natural.cape">Tange</string>
 	<string name="type.natural.cave_entrance">Hule</string>
+	<string name="type.natural.cliff">Klippe</string>
+	<string name="type.natural.earth_bank">Jordbanken</string>
+	<string name="type.man_made.embankment">Dæmning</string>
+	<string name="type.natural.coastline">Kyst</string>
 	<string name="type.natural.geyser">Gejser</string>
 	<string name="type.natural.glacier">Gletsjer</string>
-	<string name="type.natural.grassland">Mark</string>
+	<string name="type.natural.grassland">Græsslette</string>
+	<string name="type.natural.heath">Hede</string>
+	<string name="type.natural.hot_spring">Varm kilde</string>
 	<string name="type.natural.water.lake">Sø</string>
 	<string name="type.natural.water.lock">Låsekammer</string>
 	<string name="type.natural.water.pond">Dam</string>
 	<string name="type.natural.water.reservoir">Reservoir</string>
 	<string name="type.natural.water.basin">Vandbassin</string>
 	<string name="type.natural.water.river">Flod</string>
+	<string name="type.natural.land">Land</string>
+	<string name="type.natural.meadow">Eng</string>
+	<string name="type.natural.orchard">Frugthave</string>
 	<string name="type.natural.peak">Bjerg</string>
+	<string name="type.natural.saddle">Bjergsadel</string>
+	<string name="type.natural.rock">Bjergart</string>
 	<string name="type.natural.scrub">Kratbevokset område</string>
 	<string name="type.natural.spring">Kilde</string>
 	<string name="type.natural.strait">Stræde</string>
 	<string name="type.natural.tree">Træ</string>
+	<string name="type.natural.tree_row">Trærækker</string>
+	<string name="type.natural.vineyard">Vingård</string>
 	<string name="type.natural.volcano">Vulkan</string>
 	<string name="type.natural.water">Vandmasse</string>
 	<string name="type.natural.wetland">Vådområde</string>
+	<string name="type.natural.wetland.bog">Mose</string>
+	<string name="type.natural.wetland.marsh">Marsk</string>
 	<string name="type.office">Kontor</string>
 	<string name="type.office.company">Selskabskontor</string>
 	<string name="type.office.estate_agent">Ejendomsmægler</string>
@ -1260,9 +1280,25 @@
 	<string name="type.shop.video">Videobutik</string>
 	<string name="type.shop.video_games">Computerspilbutik</string>
 	<string name="type.shop.wine">Vinhandel</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Amerikansk fodbold</string>
+	<string name="type.sport.archery">Bueskydning</string>
 	<string name="type.sport.athletics">Atletik</string>
+	<string name="type.sport.australian_football">Australsk fodbold</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketball</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Ridesport</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gymnastik</string>
+	<string name="type.sport.handball">Håndbold</string>
+	<string name="type.sport.multi">Forskellige sportsgrene</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Scuba dykning</string>
+	<string name="type.sport.shooting">Skydning</string>
+	<string name="type.sport.skiing">Stå på ski</string>
+	<string name="type.sport.soccer">Fodbold</string>
+	<string name="type.sport.swimming">Svømning</string>
 	<string name="type.sport.tennis">Tennisbane</string>
 	<string name="type.tourism.alpine_hut">Bjerg logi</string>
 	<string name="type.tourism.apartment">Lejligheder</string>
@ -1280,7 +1316,7 @@
 	<string name="type.tourism.guest_house">Gæstehus</string>
 	<string name="type.tourism.information">Turistinformation</string>
 	<string name="type.tourism.information.board">Informationstavle</string>
-	<string name="type.tourism.information.guidepost">Turistinformation</string>
+	<string name="type.tourism.information.guidepost">Vejviser</string>
 	<string name="type.tourism.information.map">Turistkort</string>
 	<string name="type.tourism.information.office">Turistkontor</string>
 	<string name="type.tourism.picnic_site">Picnic</string>
@ -1302,4 +1338,5 @@
 	<string name="type.wheelchair.no">Ingen tilgængelighed for kørestol</string>
 	<string name="type.wheelchair.yes">Fuld tilgængelighed for kørestol</string>
 	<string name="type.building_part">Bygning</string>
+	<string name="type.amenity.events_venue">Sted for arrangementer</string>
 </resources>
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@ -17,8 +17,6 @@
 	<string name="downloading">Wird heruntergeladen…</string>
 	<!-- Choose measurement on first launch alert - choose metric system button -->
 	<string name="kilometres">Kilometer</string>
-	<!-- Settings/Downloader - size string, only strings different from English should be translated -->
-	<string name="mb">MB</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Meilen</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
@ -45,7 +43,7 @@
 	<string name="disconnect_usb_cable">Bitte USB-Kabel entfernen oder Speicherkarte einsetzen, um Organic Maps zu verwenden</string>
 	<!-- Used in DownloadResources startup screen -->
 	<string name="not_enough_free_space_on_sdcard">Bitte zuerst Speicherplatz auf SD-Karte/USB-Speicher freigeben, um die Anwendung zu nutzen</string>
-	<string name="download_resources">Bevor Sie starten, laden Sie die allgemeine Weltkarte auf Ihr Gerät herunter.\nEs wird %s Speicherplatz benötigt.</string>
+	<string name="download_resources">Bevor Sie starten, laden Sie die allgemeine Weltkarte auf Ihr Gerät herunter.\nEs werden %s Speicherplatz benötigt.</string>
 	<string name="download_resources_continue">Zur Karte</string>
 	<string name="downloading_country_can_proceed">%s wird heruntergeladen. Sie können jetzt\nzur Karte weitergehen.</string>
 	<string name="download_country_ask">%s herunterladen?</string>
@ -63,7 +61,7 @@
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Name des Lesezeichens</string>
 	<!-- "Bookmarks" dialog title -->
-	<string name="bookmarks">Lesezeichengruppen</string>
+	<string name="bookmarks">Lesezeichen</string>
 	<!-- Default bookmark list name -->
 	<string name="core_my_places">Meine Orte</string>
 	<!-- Add bookmark dialog - bookmark name -->
@ -77,11 +75,23 @@
 	<!-- Header of settings activity where user defines storage path -->
 	<string name="maps_storage">Karten speichern auf</string>
 	<!-- Detailed description of Maps Storage settings button -->
-	<string name="maps_storage_summary">Wählen Sie den Speicherort, an den die Karten heruntergeladen werden sollen</string>
+	<string name="maps_storage_summary">Wählen Sie den Speicherort für die heruntergeladenen Karten</string>
 	<!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
 	<string name="maps_storage_downloaded">Karten</string>
+	<!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+	<string name="maps_storage_internal">Interner persönlicher Speicher</string>
+	<!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+	<string name="maps_storage_shared">Interner gemeinsamer Speicher</string>
+	<!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+	<string name="maps_storage_removable">SD-Karte</string>
+	<!-- Generic external storage type in Maps Storage settings -->
+	<string name="maps_storage_external">Externer gemeinsamer Speicher</string>
+	<!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
+	<string name="maps_storage_free_size">%1$s frei von %2$s</string>
 	<!-- Question dialog for transferring maps from one storage to another -->
 	<string name="move_maps">Karten verschieben?</string>
+	<!-- Error moving map files from one storage to another -->
+	<string name="move_maps_error">Fehler beim Verschieben der Karten</string>
 	<!-- Ask to wait user several minutes (some long process in modal dialog). -->
 	<string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen.\nBitte warten…</string>
 	<!-- Measurement units title in settings activity -->
@ -132,16 +142,19 @@
 	<string name="recycling">Recycling</string>
 	<!-- Search category for water; any changes should be duplicated in categories.txt @water! also used to sort bookmarks by type -->
 	<string name="water">Wasser</string>
+	<!-- Search category for RV facilities; any changes should be duplicated in categories.txt @rv! -->
+	<string name="rv">Einrichtungen für Wohnmobile</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notizen</string>
 	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Organic Maps-Lesezeichen mit Ihnen geteilt</string>
+	<string name="share_bookmarks_email_body">Hallo!\n\nIm Anhang sind meine Lesezeichen der Organic Maps App. Sie können sie mit Organic Maps öffnen. Wenn Sie die App nicht installiert haben, können Sie sie von https://omaps.app/get?kmz für iOS oder Android herunterladen.\n\nViel Spaß beim Reisen mit Organic Maps!</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Lesezeichen werden geladen</string>
 	<!-- Kmz file successful loading -->
 	<string name="load_kmz_successful">Lesezeichen erfolgreich geladen! Sie können diese nun auf Ihrer Karte oder im Lesezeichen-Manager anzeigen.</string>
 	<!-- Kml file loading failed -->
-	<string name="load_kmz_failed">Hochladen der Lesezeichen fehlgeschlagen. Die Datei könnte beschädigt oder defekt sein.</string>
+	<string name="load_kmz_failed">Laden der Lesezeichen fehlgeschlagen. Die Datei könnte beschädigt oder defekt sein.</string>
 	<!-- resource for context menu -->
 	<string name="edit">Bearbeiten</string>
 	<!-- Warning message when doing search around current position -->
@ -149,7 +162,7 @@
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Leider sind die Einstellungen für die Kartenspeicherung deaktiviert.</string>
 	<!-- Alert message that downloading is in progress. -->
-	<string name="downloading_is_active">Das Land wird gerade heruntergeladen.</string>
+	<string name="downloading_is_active">Die Karte wird heruntergeladen.</string>
 	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
 	<string name="my_position_share_sms">Hey, sieh dir meinen aktuellen Standort auf Organic Maps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
@ -240,9 +253,9 @@
 	<!-- In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" -->
 	<string name="downloader_status_maps">Karten</string>
 	<string name="downloader_download_all_button">Alle herunterladen</string>
-	<string name="downloader_downloading">Gerade wird heruntergeladen:</string>
+	<string name="downloader_downloading">Wird heruntergeladen:</string>
 	<!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-	<string name="downloader_delete_map_while_routing_dialog">Um die Karte zu löschen, die Navigation unterbrechen.</string>
+	<string name="downloader_delete_map_while_routing_dialog">Zum Löschen der Karte bitte Navigation unterbrechen.</string>
 	<!-- PointsInDifferentMWM -->
 	<string name="routing_failed_cross_mwm_building">Es können nur Routen erstellt werden, die vollständig in einer einzigen Karte enthalten sind.</string>
 	<!-- Context menu item for downloader. -->
@ -304,7 +317,7 @@
 	<!-- SECTION: Routing dialogs strings -->
 	<string name="dialog_routing_disclaimer_title">Wenn Sie der Route folgen, beachten Sie bitte:</string>
 	<string name="dialog_routing_disclaimer_priority">– Straßenverhältnisse, die Verkehrsordnung und Straßenschilder haben stets Vorrang vor Navigationsanweisungen;</string>
-	<string name="dialog_routing_disclaimer_precision">– Die Karte kann ungenau sein, und die vorgeschlagene Route ist möglicherweise nicht der optimalste Weg, um das Ziel zu erreichen;</string>
+	<string name="dialog_routing_disclaimer_precision">– Die Karte kann ungenau sein, und die vorgeschlagene Route ist möglicherweise nicht der optimale Weg, um das Ziel zu erreichen;</string>
 	<string name="dialog_routing_disclaimer_recommendations">— Die vorgeschlagenen Routen sind als Empfehlungen zu verstehen;</string>
 	<string name="dialog_routing_disclaimer_borders">— Bitte seien Sie vorsichtig bei Routen in Grenzgebieten: die Routen, die unsere App erstellt, können manchmal Landesgrenzen in gesperrten Gebieten überschreiten;</string>
 	<string name="dialog_routing_disclaimer_beware">Bitte fahren Sie aufmerksam und sicher!</string>
@ -341,6 +354,8 @@
 	<string name="routing_arrive">Ankunft: %s</string>
 	<string name="categories">Kategorien</string>
 	<string name="history">Verlauf</string>
+	<string name="opens_in">Öffnet in %s</string>
+	<string name="closes_in">Schließt in %s</string>
 	<string name="closed">Geschlossen</string>
 	<string name="search_not_found">Leider wurde nichts gefunden.</string>
 	<string name="search_not_found_query">Versuchen Sie bitte eine andere Suchanfrage.</string>
@ -391,7 +406,7 @@
 	<string name="forgot_password">Passwort vergessen?</string>
 	<string name="logout">Abmelden</string>
 	<string name="thank_you">Danke</string>
-	<string name="edit_place">Platz bearbeiten</string>
+	<string name="edit_place">Eintrag bearbeiten</string>
 	<string name="add_language">Eine Sprache hinzufügen</string>
 	<string name="street">Straße</string>
 	<!-- Editable House Number text field (in address block). -->
@ -421,7 +436,7 @@
 	<string name="editor_focus_map_on_location">Ziehen Sie die Karte, um den Standort des Objektes zu korrigieren.</string>
 	<string name="editor_edit_place_title">Wird bearbeitet</string>
 	<string name="editor_add_place_title">Wird hinzugefügt</string>
-	<string name="editor_edit_place_name_hint">Name des Orts</string>
+	<string name="editor_edit_place_name_hint">Name des Ortes</string>
 	<string name="editor_edit_place_category_title">Kategorie</string>
 	<string name="detailed_problem_description">Detaillierte Beschreibung eines Problems</string>
 	<string name="editor_report_problem_other_title">Ein anderes Problem</string>
@ -433,9 +448,9 @@
 	<string name="download_over_mobile_header">Über eine Mobilfunknetzverbindung herunterladen?</string>
 	<string name="download_over_mobile_message">Das könnte mit einigen Tarifen oder beim Roaming sehr teuer werden.</string>
 	<string name="error_enter_correct_house_number">Richtige Hausnummer eingeben</string>
-	<string name="editor_storey_number">Anzahl der Etagen (%d maximal)</string>
+	<string name="editor_storey_number">Anzahl der Etagen (maximal %d)</string>
 	<!-- Error message in Editor when a user tries to set the number of floors for a building higher than 25 -->
-	<string name="error_enter_correct_storey_number">Bearbeiten Sie die Gebäude mit maximal 25 Etagen</string>
+	<string name="error_enter_correct_storey_number">Das Gebäude kann nicht mehr als 25 Etagen haben</string>
 	<string name="editor_zip_code">Postleitzahl</string>
 	<string name="error_enter_correct_zip_code">Geben Sie die korrekte Postleitzahl ein</string>
 	<!-- Place Page title for long tap -->
@ -455,7 +470,7 @@
 	<string name="current_location_unknown_stop_button">Anhalten</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
-	<string name="kilometers_per_hour">km / h</string>
+	<string name="kilometers_per_hour">km/h</string>
 	<string name="mile">mi</string>
 	<!-- A unit of measure -->
 	<string name="foot">ft</string>
@ -473,22 +488,25 @@
 	<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>
+	<!-- Error message for "Place doesn't exist" dialog when comment is empty -->
+	<string name="delete_place_empty_comment_error">Geben Sie bitte den Grund für die Löschung an</string>
 	<!-- Phone number error message -->
-	<string name="error_enter_correct_phone">Geben Sie die richtige Telefonnummer ein</string>
+	<string name="error_enter_correct_phone">Geben Sie eine gültige Telefonnummer ein</string>
 	<string name="error_enter_correct_web">Geben Sie eine gültige Internetadresse ein</string>
 	<string name="error_enter_correct_email">Geben Sie eine gültige Email-Adresse ein</string>
 	<string name="error_enter_correct_facebook_page">Geben Sie eine gültige Facebook-Webadresse, ein Konto oder einen Seitennamen ein</string>
 	<string name="error_enter_correct_instagram_page">Geben Sie eine gültige Instagram-Webadresse oder einen Kontonamen ein</string>
 	<string name="error_enter_correct_twitter_page">Geben Sie eine gültige Twitter-Webadresse oder einen Benutzernamen ein</string>
 	<string name="error_enter_correct_vk_page">Geben Sie eine gültige VK-Webadresse oder einen Kontonamen ein</string>
+	<string name="error_enter_correct_line_page">Geben Sie eine gültige LINE-Webadresse oder LINE ID ein</string>
 	<string name="placepage_add_place_button">Einen Ort zur Karte hinzufügen</string>
 	<!-- Displayed when saving some edits to the map to warn against publishing personal data -->
-	<string name="editor_share_to_all_dialog_title">Wollen Sie sie an alle Benutzer senden?</string>
+	<string name="editor_share_to_all_dialog_title">An alle Benutzer senden?</string>
 	<!-- iOS Dialog before publishing the modifications to the public map. -->
 	<string name="editor_share_to_all_dialog_message_1">Stellen Sie sicher, dass Sie keine persönlichen Daten eingegeben haben.</string>
 	<string name="editor_share_to_all_dialog_message_2">Wir werden die Änderungen prüfen. Wenn wir Fragen haben, werden wir Sie per Email kontaktieren.</string>
 	<!-- Text under the version number in the Help dialog. TODO: Synchronize other translations with English. -->
-	<string name="about_description">Organic Maps ist eine kostenlose Open-Source-Offline-Kartenanwendung. Keine Werbung. Keine Verfolgung. Wenn Sie einen Fehler auf der Karte sehen, beheben Sie ihn bitte in OpenStreetMap. Das Projekt wird von Enthusiasten in unserer Freizeit erstellt, daher brauchen wir Ihr Feedback und Ihre Unterstützung.</string>
+	<string name="about_description">Organic Maps ist eine schnelle und kostenlose Offline-Karten-App ohne Werbung und Tracking. Die Karten basieren auf den Daten von OpenStreetMap.org, so dass Sie selbst Kartenfehler beheben und Orte hinzufügen können. Organic Maps ist ein Open-Source-Projekt, das von Enthusiasten in ihrer Freizeit entwickelt wird. Ihr Feedback und Ihre Unterstützung sind sehr willkommen!</string>
 	<!-- For the first routing -->
 	<string name="accept">Annehmen</string>
 	<!-- For the first routing -->
@ -501,11 +519,11 @@
 	<string name="mobile_data_option_not_today">Heute nicht verwenden</string>
 	<string name="mobile_data">Mobiles Internet</string>
 	<!-- NOTE to translators: please synchronize your translation with the English one. -->
-	<string name="mobile_data_description">Mobiles Internet wird benötigt, um genauere Informationen über Orte anzuzeigen, wie Fotos, Preise und Bewertungen.</string>
+	<string name="mobile_data_description">Es wird mobiles Internet benötigt, um über Kartenaktualisierungen informiert zu werden und genauere Informationen über Orte anzuzeigen.</string>
 	<string name="mobile_data_option_never">Nie verwenden</string>
 	<string name="mobile_data_option_ask">Immer fragen</string>
 	<string name="traffic_update_maps_text">Um Verkehrsdaten anzuzeigen, müssen die Karten aktualisiert werden.</string>
-	<string name="big_font">Schriftgröße auf der Karte erhöhen</string>
+	<string name="big_font">Schrift auf der Karte vergrößern</string>
 	<string name="traffic_update_app">Bitte aktualisieren Sie Organic Maps</string>
 	<!-- "traffic" as in "road congestion" -->
 	<string name="traffic_data_unavailable">Verkehrsdaten sind nicht verfügbar</string>
@ -514,8 +532,8 @@
 	<string name="feedback_general">Allgemeines Feedback</string>
 	<string name="on">An</string>
 	<string name="off">Aus</string>
-	<string name="prefs_languages_information">Wir verwenden Text-to-Speech-Systeme für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das können Sie bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren.</string>
-	<string name="prefs_languages_information_off">Für einige Sprachen müssen Sie einen anderen Sprachsynthesizer oder ein zusätzliches Sprachpaket aus dem App Store installieren (Google Play, Samsung Apps, App Gallery, FDroid). \nÖffnen Sie die Einstellungen Ihres Gerätes → Sprache und Eingabe → Sprache → Text-to-Speech-Ausgabe. Hier können Sie die Einstellungen für Sprachsynthese verwalten (beispielsweise ein Sprachpaket für die Offline-Verwendung herunterladen) und ein anderes Versprachlichungsprogramm auswählen.</string>
+	<string name="prefs_languages_information">Wir verwenden Text-to-Speech-Systeme für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das Sie bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren können.</string>
+	<string name="prefs_languages_information_off">Für einige Sprachen müssen Sie einen anderen Sprachgenerator oder ein zusätzliches Sprachpaket aus dem App Store installieren (Google Play, Samsung Apps, App Gallery, FDroid). \nÖffnen Sie die Einstellungen Ihres Gerätes → Sprache und Eingabe → Sprache → Text-to-Speech-Ausgabe. Hier können Sie die Einstellungen für Sprachsynthese verwalten (beispielsweise ein Sprachpaket für die Offline-Verwendung herunterladen) und ein anderes Sprachausgabeprogramm auswählen.</string>
 	<string name="prefs_languages_information_off_link">Weitere Informationen finden Sie in dieser Anleitung.</string>
 	<string name="transliteration_title">Transliteration ins Lateinische</string>
 	<string name="learn_more">Weitere Informationen</string>
@ -526,7 +544,7 @@
 	<string name="placepage_remove_stop">Entfernen</string>
 	<string name="placepage_add_stop">Zwischenstopp hinzufügen</string>
 	<string name="dialog_error_storage_title">Problem mit dem Zugreifen auf den Speicher</string>
-	<string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Überprüfen Sie das bitte und kontaktieren Sie uns unter support\@organicmaps.app</string>
+	<string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Überprüfen Sie das bitte oder kontaktieren Sie uns unter support\@organicmaps.app</string>
 	<string name="setting_emulate_bad_storage">Fehlerhaften Speicher emulieren</string>
 	<string name="core_entrance">Eingang</string>
 	<string name="error_enter_correct_name">Bitte geben Sie einen korrekten Namen ein</string>
@ -534,46 +552,49 @@
 	<!-- Do not display all bookmark lists on the map -->
 	<string name="bookmark_lists_hide_all">Alle verbergen</string>
 	<string name="bookmark_lists_show_all">Alle anzeigen</string>
-	<string name="bookmarks_create_new_group">Erstelle eine neue Liste</string>
+	<string name="bookmarks_create_new_group">Neue Liste erstellen</string>
 	<!-- Bookmark categories screen -->
 	<string name="bookmarks_import">Lesezeichen importieren</string>
 	<string name="bookmarks_error_message_share_general">Freigabe wegen eines Anwendungsfehlers nicht möglich</string>
 	<string name="bookmarks_error_title_share_empty">Fehler bei der Freigabe</string>
-	<string name="bookmarks_error_message_share_empty">Es kann keine leere Liste freigegeben werden</string>
+	<string name="bookmarks_error_message_share_empty">Eine leere Liste kann nicht freigegeben werden</string>
 	<string name="bookmarks_error_title_empty_list_name">Der Name darf nicht leer sein</string>
 	<string name="bookmarks_error_message_empty_list_name">Bitte geben Sie den Listennamen ein</string>
 	<string name="bookmarks_new_list_hint">Neue Liste</string>
 	<string name="bookmarks_error_title_list_name_already_taken">Dieser Name ist bereits vergeben</string>
 	<string name="bookmarks_error_message_list_name_already_taken">Bitte wähle einen anderen Namen</string>
-	<string name="please_wait">Warten Sie mal…</string>
+	<string name="please_wait">Bitte warten…</string>
 	<string name="phone_number">Telefonnummer</string>
 	<string name="profile">OpenStreetMap-Profil</string>
 	<plurals name="bookmarks_detect_message">
-	  <item quantity="one">%d Datei wurde gefunden. Sie werden es nach der Konvertierung sehen.</item>
+	  <item quantity="one">%d Datei wurde gefunden. Sie werden sie nach der Konvertierung sehen.</item>
 	  <item quantity="other">%d Dateien wurden gefunden. Sie werden sie nach der Konvertierung sehen.</item>
 	</plurals>
 	<string name="common_check_internet_connection_dialog_title">Keine Internetverbindung</string>
 	<plurals name="objects">
-	  <item quantity="other">%d Platz</item>
+	  <item quantity="one">%d Objekt</item>
+	  <item quantity="other">%d Objekte</item>
 	</plurals>
 	<plurals name="places">
-	  <item quantity="other">%d Plätze</item>
+	  <item quantity="one">%d Ort</item>
+	  <item quantity="other">%d Orte</item>
 	</plurals>
 	<plurals name="tracks">
+	  <item quantity="one">%d Strecke</item>
 	  <item quantity="other">%d Strecken</item>
 	</plurals>
 	<!-- used to choose between the Google and Android location services -->
-	<string name="subtittle_opt_out">Einstellungen der Begleitung</string>
-	<string name="crash_reports">Berichte über die Fehler</string>
-	<string name="crash_reports_description">Wir können Ihre Daten benutzen, um Organic Maps zu entwickeln und zu verbessern. Die Änderungen werden nach dem Neustart der App in Kraft treten.</string>
+	<string name="subtittle_opt_out">Standortdienste</string>
+	<string name="crash_reports">Fehlerberichte</string>
+	<string name="crash_reports_description">Wir können Ihre Daten nutzen, um Organic Maps weiterzuentwickeln und zu verbessern. Die Änderungen werden nach dem Neustart der App wirksam werden.</string>
 	<string name="privacy_policy">Datenschutzerklärung</string>
 	<string name="terms_of_use">Nutzungsbedingungen</string>
 	<string name="button_layer_traffic">Staus</string>
 	<string name="button_layer_subway">U-Bahn</string>
-	<string name="layers_title">Kartenschichten</string>
+	<string name="layers_title">Kartenebenen</string>
 	<string name="subway_data_unavailable">Die U-Bahnkarte steht nicht zur Verfügung</string>
 	<string name="bookmarks_empty_list_title">Die Liste ist leer</string>
-	<string name="bookmarks_empty_list_message">Um eine neue Markierung hinzuzufügen, drücken Sie auf das Sternzeichen in der Karte des Objekts</string>
+	<string name="bookmarks_empty_list_message">Zum Hinzufügen eine Lesezeichens tippen Sie in der Karte auf den Ort und dann unten auf das Sternchen</string>
 	<string name="category_desc_more">…mehr</string>
 	<string name="export_file">Datei exportieren</string>
 	<string name="list_settings">Listeneinstellungen</string>
@ -582,7 +603,7 @@
 	<string name="limited_access">Privater Zugriff</string>
 	<string name="bookmark_list_description_hint">Fügen Sie die Beschreibung hinzu (Text oder html)</string>
 	<string name="not_shared">Persönlich</string>
-	<string name="speedcams_alert_title">Geschwindigkeitskameras</string>
+	<string name="speedcams_alert_title">Blitzer</string>
 	<string name="speedcam_option_auto">Auto</string>
 	<string name="speedcam_option_always">Immer</string>
 	<string name="speedcam_option_never">Niemals</string>
@ -590,11 +611,11 @@
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Karten werden geladen</string>
 	<string name="power_managment_title">Stromsparmodus</string>
-	<string name="power_managment_description">Falls der Stromsparmodus aktiviert ist, wird die App stromintensive Prozesse je nach dem aktuellen Ladezustand deaktivieren</string>
+	<string name="power_managment_description">Wenn der Stromsparmodus aktiviert ist, wird die App stromintensive Funktionen je nach aktuellem Ladezustand des Akkus deaktivieren</string>
 	<string name="power_managment_setting_never">Niemals</string>
 	<string name="power_managment_setting_auto">Auto</string>
 	<string name="power_managment_setting_manual_max">Maximale Stromsparung</string>
-	<string name="enable_logging_warning_message">Diese Option wird aktiviert, um Aktivitäten zwecks Diagnostik zu loggen. Das hilft unserem Team Probleme mit der App zu erkennen. Aktivieren Sie diese Option nur auf Ersuchen des Organic Maps-Supports.</string>
+	<string name="enable_logging_warning_message">Diese Option wird aktiviert, um Aktivitäten zwecks Diagnostik aufzuzeichnen. Das hilft unserem Team, Probleme mit der App zu erkennen. Aktivieren Sie diese Option nur auf Ersuchen des Organic Maps-Supports.</string>
 	<string name="access_rules_author_only">Online bearbeiten</string>
 	<string name="driving_options_title">Routenbeschränkungen</string>
 	<string name="driving_options_subheader">In jeder Reiseroute vermeiden</string>
@ -602,8 +623,8 @@
 	<string name="avoid_unpaved">Erdwege</string>
 	<string name="avoid_ferry">Fährstellen</string>
 	<string name="avoid_motorways">Autobahnen</string>
-	<string name="unable_to_calc_alert_title">Es ist unmöglich, eine Route zu planen</string>
-	<string name="unable_to_calc_alert_subtitle">Leider konnten wir keine Route mit ausgewählten Optionen planen. Ändern Sie die Einstellungen und versuchen Sie den Versuch erneut</string>
+	<string name="unable_to_calc_alert_title">Route kann nicht berechnet werden</string>
+	<string name="unable_to_calc_alert_subtitle">Leider konnten wir keine Route mit den gewählten Optionen erstellen. Ändern Sie die Einstellungen und versuchen Sie es erneut</string>
 	<string name="define_to_avoid_btn">Umwege einstellen</string>
 	<string name="change_driving_options_btn">Routenbeschränkungen aktiv</string>
 	<string name="toll_road">Mautstraße</string>
@ -626,7 +647,7 @@
 	<!-- Android, title, max 20-22 symbols -->
 	<string name="sort_bookmarks">Lesezeichen sortieren</string>
 	<!-- Android -->
-	<string name="by_default">Default</string>
+	<string name="by_default">Nach Voreinstellung</string>
 	<!-- Android -->
 	<string name="by_type">Nach Kategorie</string>
 	<!-- Android -->
@ -656,14 +677,14 @@
 	<string name="fuel_places">Tankstellen</string>
 	<string name="medicine">Medizin</string>
 	<string name="search_in_the_list">In der Liste suchen</string>
-	<string name="religious_places">Heilige Orte</string>
+	<string name="religious_places">Religiöse Stätten</string>
 	<string name="select_list">Wählen Sie die Liste</string>
 	<string name="transit_not_found">Die U-Bahn-Navigation ist in dieser Region noch nicht verfügbar</string>
 	<string name="dialog_pedestrian_route_is_long_header">Keine U-Bahn-Route gefunden</string>
-	<string name="dialog_pedestrian_route_is_long_message">Wählen Sie den Start- und Endpunkt der Route, die am nächsten zur U-Bahn-Station liegen</string>
-	<string name="button_layer_isolines">Terrain</string>
-	<string name="isolines_activation_error_dialog">Um den Topographie-Layer benutzen zu können, aktualisieren oder laden Sie die Karte der benötigten Gegend herunter</string>
-	<string name="isolines_location_error_dialog">Topographie-Layer sind in dieser Region noch nicht verfügbar</string>
+	<string name="dialog_pedestrian_route_is_long_message">Wählen Sie einen zu einer U-Bahn-Station nähergelegenen Start- oder Endpunkt</string>
+	<string name="button_layer_isolines">Gelände</string>
+	<string name="isolines_activation_error_dialog">Um die Topographieebene nutzen zu können, aktualisieren Sie die Karte des betreffenden Gebiets oder laden Sie diese herunter</string>
+	<string name="isolines_location_error_dialog">Topographieebene ist für dieses Gebiet noch nicht verfügbar</string>
 	<string name="elevation_profile_ascent">Bergauf</string>
 	<string name="elevation_profile_descent">Bergab</string>
 	<string name="elevation_profile_minaltitude">Min. Höhe</string>
@ -671,8 +692,12 @@
 	<string name="elevation_profile_difficulty">Schwierigkeitsgrad</string>
 	<string name="elevation_profile_distance">Entf.:</string>
 	<string name="elevation_profile_time">Dauer:</string>
-	<string name="isolines_toast_zooms_1_10">Karte vergrößern, um Isolinien zu sehen</string>
-	<string name="download_map_title">Download der Weltkarte</string>
+	<string name="isolines_toast_zooms_1_10">Karte vergrößern, um Höhenlinien sichtbar zu machen</string>
+	<string name="download_map_title">Herunterladen der Weltkarte</string>
+	<!-- Used in DownloadResources startup screen -->
+	<string name="disk_error">Ordner kann nicht erstellt und Dateien können nicht auf den Gerätespeicher oder die SD-Karte verschoben werden</string>
+	<!-- Used in DownloadResources startup screen -->
+	<string name="disk_error_title">Speicherfehler</string>
 	<!-- Used in DownloadResources startup screen -->
 	<string name="connection_failure">Verbindungsfehler</string>
 	<!-- Used in DownloadResources startup screen -->
@ -795,7 +820,7 @@
 	<string name="type.recycling.cartons">Getränkekarton</string>
 	<string name="type.amenity.sanitary_dump_station">VE-Station</string>
 	<string name="type.amenity.school">Schule</string>
-	<string name="type.amenity.shelter">Schutzhütte</string>
+	<string name="type.amenity.shelter">Unterstand</string>
 	<string name="type.amenity.shower">Dusche</string>
 	<string name="type.amenity.telephone">Telefon</string>
 	<string name="type.amenity.theatre">Theater</string>
@ -858,6 +883,7 @@
 	<string name="type.craft.carpenter">Zimmermann</string>
 	<string name="type.craft.electrician">Elektriker</string>
 	<string name="type.craft.gardener">Landschaftsgärtner</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Heizung</string>
 	<string name="type.craft.metal_construction">Schlosser</string>
 	<string name="type.craft.painter">Maler</string>
@ -865,91 +891,91 @@
 	<string name="type.craft.plumber">Installateur</string>
 	<string name="type.craft.shoemaker">Schuhmacher</string>
 	<string name="type.craft.tailor">Schneider</string>
-	<string name="type.cuisine.african">Afrikanische Küche</string>
-	<string name="type.cuisine.american">Amerikanische Küche</string>
-	<string name="type.cuisine.arab">Arabische Küche</string>
-	<string name="type.cuisine.argentinian">Argentinische Küche</string>
-	<string name="type.cuisine.asian">Asiatische Küche</string>
-	<string name="type.cuisine.austrian">Österreichische Küche</string>
+	<string name="type.cuisine.african">Afrikanisch</string>
+	<string name="type.cuisine.american">Amerikanisch</string>
+	<string name="type.cuisine.arab">Arabisch</string>
+	<string name="type.cuisine.argentinian">Argentinisch</string>
+	<string name="type.cuisine.asian">Asiatisch</string>
+	<string name="type.cuisine.austrian">Österreichisch</string>
 	<string name="type.cuisine.bagel">Bagel</string>
-	<string name="type.cuisine.balkan">Balkanküche</string>
+	<string name="type.cuisine.balkan">Balkanisch</string>
 	<string name="type.cuisine.barbecue">Grill</string>
-	<string name="type.cuisine.bavarian">Bayerische Küche</string>
+	<string name="type.cuisine.bavarian">Bayerisch</string>
 	<string name="type.cuisine.beef_bowl">Gyūdon</string>
-	<string name="type.cuisine.brazilian">Brasilianische Küche</string>
+	<string name="type.cuisine.brazilian">Brasilianisch</string>
 	<string name="type.cuisine.breakfast">Frühstück</string>
 	<string name="type.cuisine.burger">Burger</string>
 	<string name="type.cuisine.buschenschank">Buschenschank</string>
 	<string name="type.cuisine.cake">Kuchen</string>
-	<string name="type.cuisine.caribbean">Karibische Küche</string>
+	<string name="type.cuisine.caribbean">Karibisch</string>
 	<string name="type.cuisine.chicken">Hühnchen</string>
-	<string name="type.cuisine.chinese">Chinesische Küche</string>
+	<string name="type.cuisine.chinese">Chinesisch</string>
 	<string name="type.cuisine.coffee_shop">Kaffee</string>
 	<string name="type.cuisine.crepe">Crêpe</string>
-	<string name="type.cuisine.croatian">Kroatische Küche</string>
+	<string name="type.cuisine.croatian">Kroatisch</string>
 	<string name="type.cuisine.curry">Curry</string>
-	<string name="type.cuisine.deli">Deli-Küche</string>
+	<string name="type.cuisine.deli">Delikatessen</string>
 	<string name="type.cuisine.diner">Diner</string>
 	<string name="type.cuisine.donut">Donuts</string>
-	<string name="type.cuisine.ethiopian">Äthiopische Küche</string>
-	<string name="type.cuisine.filipino">Philippinische Küche</string>
-	<string name="type.cuisine.fine_dining">Gehobene Küche</string>
+	<string name="type.cuisine.ethiopian">Äthiopisch</string>
+	<string name="type.cuisine.filipino">Philippinisch</string>
+	<string name="type.cuisine.fine_dining">Gehoben</string>
 	<string name="type.cuisine.fish">Fisch</string>
 	<string name="type.cuisine.fish_and_chips">Fish and Chips</string>
-	<string name="type.cuisine.french">Französische Küche</string>
+	<string name="type.cuisine.french">Französisch</string>
 	<string name="type.cuisine.friture">Pommes</string>
-	<string name="type.cuisine.georgian">Georgische Küche</string>
-	<string name="type.cuisine.german">Deutsche Küche</string>
-	<string name="type.cuisine.greek">Griechische Küche</string>
+	<string name="type.cuisine.georgian">Georgisch</string>
+	<string name="type.cuisine.german">Deutsch</string>
+	<string name="type.cuisine.greek">Griechisch</string>
 	<string name="type.cuisine.grill">Grill</string>
 	<string name="type.cuisine.heuriger">Heuriger</string>
 	<string name="type.cuisine.hotdog">Hotdog</string>
-	<string name="type.cuisine.hungarian">Ungarische Küche</string>
+	<string name="type.cuisine.hungarian">Ungarisch</string>
 	<string name="type.cuisine.ice_cream">Eis</string>
-	<string name="type.cuisine.indian">Indische Küche</string>
-	<string name="type.cuisine.indonesian">Indonesische Küche</string>
-	<string name="type.cuisine.international">Internationale Küche</string>
-	<string name="type.cuisine.irish">Irische Küche</string>
-	<string name="type.cuisine.italian">Italienische Küche</string>
-	<string name="type.cuisine.italian_pizza">Italienische Küche; Pizza</string>
-	<string name="type.cuisine.japanese">Japanische Küche</string>
+	<string name="type.cuisine.indian">Indisch</string>
+	<string name="type.cuisine.indonesian">Indonesisch</string>
+	<string name="type.cuisine.international">International</string>
+	<string name="type.cuisine.irish">Irisch</string>
+	<string name="type.cuisine.italian">Italienisch</string>
+	<string name="type.cuisine.italian_pizza">Italienisch; Pizza</string>
+	<string name="type.cuisine.japanese">Japanisch</string>
 	<string name="type.cuisine.kebab">Kebap</string>
-	<string name="type.cuisine.korean">Koreanische Küche</string>
-	<string name="type.cuisine.lao">Laotische Küche</string>
-	<string name="type.cuisine.lebanese">Libanesische Küche</string>
-	<string name="type.cuisine.local">Lokale Küche</string>
-	<string name="type.cuisine.malagasy">Madegassische Küche</string>
-	<string name="type.cuisine.malaysian">Malaysische Küche</string>
-	<string name="type.cuisine.mediterranean">Mediterrane Küche</string>
-	<string name="type.cuisine.mexican">Mexikanische Küche</string>
-	<string name="type.cuisine.moroccan">Marokkanische Küche</string>
+	<string name="type.cuisine.korean">Koreanisch</string>
+	<string name="type.cuisine.lao">Laotisch</string>
+	<string name="type.cuisine.lebanese">Libanesisch</string>
+	<string name="type.cuisine.local">Regional</string>
+	<string name="type.cuisine.malagasy">Madegassisch</string>
+	<string name="type.cuisine.malaysian">Malaysisch</string>
+	<string name="type.cuisine.mediterranean">Mediterran</string>
+	<string name="type.cuisine.mexican">Mexikanisch</string>
+	<string name="type.cuisine.moroccan">Marokkanisch</string>
 	<string name="type.cuisine.noodles">Nudeln</string>
-	<string name="type.cuisine.oriental">Orientalische Küche</string>
+	<string name="type.cuisine.oriental">Orientalisch</string>
 	<string name="type.cuisine.pancake">Pfannkuchen</string>
 	<string name="type.cuisine.pasta">Pasta</string>
-	<string name="type.cuisine.persian">Persische Küche</string>
-	<string name="type.cuisine.peruvian">Peruanische Küche</string>
+	<string name="type.cuisine.persian">Persisch</string>
+	<string name="type.cuisine.peruvian">Peruanisch</string>
 	<string name="type.cuisine.pizza">Pizza</string>
-	<string name="type.cuisine.polish">Polnische Küche</string>
-	<string name="type.cuisine.portuguese">Portugiesische Küche</string>
+	<string name="type.cuisine.polish">Polnisch</string>
+	<string name="type.cuisine.portuguese">Portugiesisch</string>
 	<string name="type.cuisine.ramen">Ramen</string>
-	<string name="type.cuisine.regional">Regionale Küche</string>
-	<string name="type.cuisine.russian">Russische Küche</string>
+	<string name="type.cuisine.regional">Regional</string>
+	<string name="type.cuisine.russian">Russisch</string>
 	<string name="type.cuisine.sandwich">Sandwich</string>
 	<string name="type.cuisine.sausage">Wurst</string>
 	<string name="type.cuisine.savory_pancakes">Herzhafte Pfannkuchen</string>
 	<string name="type.cuisine.seafood">Meeresfrüchte</string>
 	<string name="type.cuisine.soba">Soba</string>
-	<string name="type.cuisine.spanish">Spanische Küche</string>
+	<string name="type.cuisine.spanish">Spanisch</string>
 	<string name="type.cuisine.steak_house">Steakhaus</string>
 	<string name="type.cuisine.sushi">Sushi</string>
 	<string name="type.cuisine.tapas">Tapas</string>
 	<string name="type.cuisine.tea">Tee</string>
-	<string name="type.cuisine.thai">Thailändische Küche</string>
-	<string name="type.cuisine.turkish">Türkische Küche</string>
-	<string name="type.cuisine.vegan">Vegane Küche</string>
-	<string name="type.cuisine.vegetarian">Vegetarische Küche</string>
-	<string name="type.cuisine.vietnamese">Vietnamesische Küche</string>
+	<string name="type.cuisine.thai">Thailändisch</string>
+	<string name="type.cuisine.turkish">Türkisch</string>
+	<string name="type.cuisine.vegan">Vegan</string>
+	<string name="type.cuisine.vegetarian">Vegetarisch</string>
+	<string name="type.cuisine.vietnamese">Vietnamesisch</string>
 	<string name="type.emergency">Notfall</string>
 	<string name="type.emergency.defibrillator">Defibrillator</string>
 	<string name="type.emergency.fire_hydrant">Hydrant</string>
@ -1236,7 +1262,7 @@
 	<string name="type.military.bunker">Bunker</string>
 	<string name="type.mountain_pass">Gebirgspass</string>
 	<string name="type.natural">Natur</string>
-	<string name="type.natural.bare_rock">Nackter Fels</string>
+	<string name="type.natural.bare_rock">Kahler Fels</string>
 	<string name="type.natural.bay">Bucht</string>
 	<string name="type.natural.beach">Strand</string>
 	<string name="type.natural.beach.sand">Sandstrand</string>
@ -1244,7 +1270,9 @@
 	<string name="type.natural.cape">Kap</string>
 	<string name="type.natural.cave_entrance">Höhle</string>
 	<string name="type.natural.cliff">Klippe</string>
-	<string name="type.natural.coastline">Küstenlinie</string>
+	<string name="type.natural.earth_bank">Steilabhang</string>
+	<string name="type.man_made.embankment">Damm</string>
+	<string name="type.natural.coastline">Küste</string>
 	<string name="type.natural.geyser">Geysir</string>
 	<string name="type.natural.glacier">Gletscher</string>
 	<string name="type.natural.grassland">Grasland</string>
@ -1256,6 +1284,7 @@
 	<string name="type.natural.water.reservoir">Reservoir</string>
 	<string name="type.natural.water.basin">Wasserbecken</string>
 	<string name="type.natural.water.river">Fluss</string>
+	<string name="type.natural.land">Land</string>
 	<string name="type.natural.meadow">Wiese</string>
 	<string name="type.natural.orchard">Garten</string>
 	<string name="type.natural.peak">Gipfel</string>
@ -1278,7 +1307,7 @@
 	<string name="type.office.government">Regierungsstelle</string>
 	<string name="type.office.insurance">Versicherungsbüro</string>
 	<string name="type.office.lawyer">Anwaltsbüro</string>
-	<string name="type.office.ngo">Büro einer Nichtregierungsorganisation</string>
+	<string name="type.office.ngo">Nichtregierungsorganisation</string>
 	<string name="type.office.telecommunication">Mobilfunkbetreiber</string>
 	<string name="type.organic.only">Bio</string>
 	<string name="type.organic.yes">Bio</string>
@ -1470,26 +1499,26 @@
 	<string name="type.sport.american_football">American Football</string>
 	<string name="type.sport.archery">Bogenschießen</string>
 	<string name="type.sport.athletics">Leichtathletik</string>
-	<string name="type.sport.australian_football">Rugby</string>
+	<string name="type.sport.australian_football">Australian Football</string>
 	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketball</string>
 	<string name="type.sport.bowls">Bowls</string>
 	<string name="type.sport.cricket">Cricket</string>
 	<string name="type.sport.curling">Curling</string>
-	<string name="type.sport.diving">Tauchen</string>
-	<string name="type.sport.equestrian">Reiten</string>
+	<string name="type.sport.equestrian">Reitsport</string>
 	<string name="type.sport.golf">Golf</string>
 	<string name="type.sport.gymnastics">Gymnastik</string>
 	<string name="type.sport.handball">Handball</string>
-	<string name="type.sport.multi">verschiedene Sportarten</string>
-	<string name="type.sport.scuba_diving">Sporttauchen</string>
-	<string name="type.sport.shooting">Sportschießen</string>
-	<string name="type.sport.skiing">Skisport</string>
+	<string name="type.sport.multi">Verschiedene Sportarten</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Gerätetauchen</string>
+	<string name="type.sport.shooting">Schießen</string>
+	<string name="type.sport.skiing">Skifahren</string>
 	<string name="type.sport.soccer">Fußball</string>
 	<string name="type.sport.swimming">Schwimmen</string>
 	<string name="type.sport.tennis">Tennisspielfeld</string>
 	<string name="type.tourism">Tourismus</string>
-	<string name="type.tourism.alpine_hut">Berghütte</string>
+	<string name="type.tourism.alpine_hut">bewirtschaftete Schutzhütte</string>
 	<string name="type.tourism.apartment">Ferienwohnung</string>
 	<string name="type.tourism.artwork">Kunstwerk</string>
 	<string name="type.tourism.artwork.architecture">Kunstwerk</string>
@ -1517,7 +1546,7 @@
 	<string name="type.tourism.resort">Resort</string>
 	<string name="type.tourism.theme_park">Freizeitpark</string>
 	<string name="type.tourism.viewpoint">Aussichtspunkt</string>
-	<string name="type.tourism.wilderness_hut">Wildnishütte</string>
+	<string name="type.tourism.wilderness_hut">unbewirtschaftete Schutzhütte</string>
 	<string name="type.tourism.zoo">Zoo</string>
 	<string name="type.traffic_calming">Verkehrsberuhigung</string>
 	<string name="type.traffic_calming.bump">kurze Bodenwelle</string>
@ -1563,4 +1592,5 @@
 	<string name="type.piste_type.nordic">Langlaufloipe</string>
 	<string name="type.piste_type.sled">Rodelbahn</string>
 	<string name="type.building_part">Gebäude</string>
+	<string name="type.amenity.events_venue">Veranstaltungszentrum</string>
 </resources>
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@ -792,6 +792,7 @@
 	<string name="type.craft.carpenter">Ξυλουργός</string>
 	<string name="type.craft.electrician">Ηλεκτρολόγος</string>
 	<string name="type.craft.gardener">Κηπουρός</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Ψυκτικός</string>
 	<string name="type.craft.metal_construction">Μεταλλουργός</string>
 	<string name="type.craft.painter">Μπογιατζής</string>
@ -1116,27 +1117,46 @@
 	<string name="type.man_made.water_well">Πηγάδι νερού</string>
 	<string name="type.man_made.windmill">Ανεμόμυλος</string>
 	<string name="type.military.bunker">Στρατιωτική αποθήκη</string>
+	<string name="type.natural">Φύση</string>
+	<string name="type.natural.bare_rock">Γυμνός βράχος</string>
 	<string name="type.natural.bay">Κόλπος</string>
 	<string name="type.natural.beach">Παραλία</string>
+	<string name="type.natural.beach.sand">Αμμουδιά</string>
+	<string name="type.natural.beach.gravel">Παραλία Χαλίκι</string>
 	<string name="type.natural.cape">Ακρωτήρι</string>
 	<string name="type.natural.cave_entrance">Σπήλαιο</string>
+	<string name="type.natural.cliff">Γκρεμός</string>
+	<string name="type.natural.earth_bank">Γκρεμός</string>
+	<string name="type.man_made.embankment">Ανάχωμα</string>
+	<string name="type.natural.coastline">Ακτή</string>
 	<string name="type.natural.geyser">Θερμοπίδακας</string>
 	<string name="type.natural.glacier">Παγετώνας</string>
-	<string name="type.natural.grassland">Λιβάδι</string>
+	<string name="type.natural.grassland">Βοσκότοποι</string>
+	<string name="type.natural.heath">Ρείκι</string>
+	<string name="type.natural.hot_spring">Ιαματικές πηγές</string>
 	<string name="type.natural.water.lake">Λίμνη</string>
 	<string name="type.natural.water.lock">Θάλαμος κλειδαριάς</string>
 	<string name="type.natural.water.pond">Δεξαμενή</string>
 	<string name="type.natural.water.reservoir">Δεξαμενή</string>
 	<string name="type.natural.water.basin">Μια λεκάνη νερού</string>
 	<string name="type.natural.water.river">Ποταμός</string>
+	<string name="type.natural.land">Στεριά</string>
+	<string name="type.natural.meadow">Λιβάδι</string>
+	<string name="type.natural.orchard">Οπωρώνας</string>
 	<string name="type.natural.peak">Κορυφή</string>
+	<string name="type.natural.saddle">Σέλα Βουνού</string>
+	<string name="type.natural.rock">Πέτρωμα</string>
 	<string name="type.natural.scrub">Θαμνώδες περιοχή</string>
 	<string name="type.natural.spring">Πηγή νερού</string>
 	<string name="type.natural.strait">Πορθμός</string>
 	<string name="type.natural.tree">Δέντρο</string>
+	<string name="type.natural.tree_row">Σειρά δέντρων</string>
+	<string name="type.natural.vineyard">Αμπελώνας</string>
 	<string name="type.natural.volcano">Ηφαίστειο</string>
 	<string name="type.natural.water">Σώμα νερού</string>
 	<string name="type.natural.wetland">Υγρότοπος</string>
+	<string name="type.natural.wetland.bog">Βάλτος</string>
+	<string name="type.natural.wetland.marsh">Έλος</string>
 	<string name="type.office">Γραφείο</string>
 	<string name="type.office.company">Γραφείο επιχείρησης</string>
 	<string name="type.office.estate_agent">Κτηματομεσίτης</string>
@ -1275,9 +1295,25 @@
 	<string name="type.shop.video">Βίντεο Κλαμπ</string>
 	<string name="type.shop.video_games">Κατάστημα βιντεοπαιχνιδιών</string>
 	<string name="type.shop.wine">Οινοπωλείο</string>
+	<string name="type.sport">Αθλητισμός</string>
+	<string name="type.sport.american_football">αμερικάνικο ποδόσφαιρο</string>
+	<string name="type.sport.archery">Τοξοβολία</string>
 	<string name="type.sport.athletics">Στίβος</string>
+	<string name="type.sport.australian_football">Αυστραλιανό ποδόσφαιρο</string>
+	<string name="type.sport.baseball">Μπέιζμπολ</string>
 	<string name="type.sport.basketball">Μπάσκετ</string>
+	<string name="type.sport.curling">Κέρλινγκ</string>
 	<string name="type.sport.equestrian">Ιππασία</string>
+	<string name="type.sport.golf">Γκολφ</string>
+	<string name="type.sport.gymnastics">Γυμναστική</string>
+	<string name="type.sport.handball">Τόπι</string>
+	<string name="type.sport.multi">Διάφορα αθλήματα</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Κατάδυση</string>
+	<string name="type.sport.shooting">Κυνήγι</string>
+	<string name="type.sport.skiing">Χιονοδρόμια</string>
+	<string name="type.sport.soccer">Ποδόσφαιρο</string>
+	<string name="type.sport.swimming">Κολύμβηση</string>
 	<string name="type.sport.tennis">Γήπεδο τένις</string>
 	<string name="type.tourism.alpine_hut">Ορεινό καταφύγιο</string>
 	<string name="type.tourism.apartment">Διαμερίσματα</string>
@ -1298,7 +1334,7 @@
 	<string name="type.tourism.hotel">Ξενοδοχείο</string>
 	<string name="type.tourism.information">Τουριστικές πληροφορίες</string>
 	<string name="type.tourism.information.board">Πίνακας πληροφοριών</string>
-	<string name="type.tourism.information.guidepost">Τουριστικές πληροφορίες</string>
+	<string name="type.tourism.information.guidepost">Οδηγός</string>
 	<string name="type.tourism.information.map">Τουριστικός χάρτης</string>
 	<string name="type.tourism.information.office">Ενημέρωση τουριστών</string>
 	<string name="type.tourism.motel">Μοτέλ</string>
@ -1324,4 +1360,5 @@
 	<string name="type.wheelchair.no">Δεν υπάρχει πρόβλεψη για άτομα με ειδικές ανάγκες</string>
 	<string name="type.wheelchair.yes">Εξοπλισμένο για άτομα με ειδικές ανάγκες</string>
 	<string name="type.building_part">Κτίριο</string>
+	<string name="type.amenity.events_venue">Κέντρο εκδηλώσεων</string>
 </resources>
--- a/android/res/values-es-rMX/strings.xml
+++ b/android/res/values-es-rMX/strings.xml
@ -310,10 +310,8 @@
 	<string name="type.leisure.park.permissive">Parque</string>
 	<string name="type.leisure.park.private">Parque</string>
 	<string name="type.leisure.sauna">Sauna</string>
-	<string name="type.natural.cape">Cabo</string>
 	<string name="type.natural.geyser">Géiser</string>
 	<string name="type.natural.glacier">Glaciar</string>
-	<string name="type.natural.grassland">Campo</string>
 	<string name="type.natural.scrub">Maleza</string>
 	<string name="type.natural.strait">Estrecho</string>
 	<string name="type.natural.wetland">Tierra pantanosa</string>
@ -323,9 +321,19 @@
 	<string name="type.railway.subway_entrance">Entrada de metro</string>
 	<string name="type.shop.video">Tienda de vídeo</string>
 	<string name="type.shop.video_games">Tienda de videojuegos</string>
+	<string name="type.sport.archery">Tiro al arco</string>
 	<string name="type.sport.athletics">Atletismo</string>
 	<string name="type.sport.basketball">Baloncesto</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Deporte hípico</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.handball">Balonmano</string>
+	<string name="type.sport.multi">Varios deportes</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Submarinismo</string>
+	<string name="type.sport.shooting">Tiroteo</string>
+	<string name="type.sport.skiing">Esquí</string>
+	<string name="type.sport.soccer">Fútbol</string>
 	<string name="type.sport.tennis">Cancha de tenis</string>
 	<string name="type.wheelchair.limited">Parcialmente equipado para discapacitados</string>
 	<string name="type.wheelchair.no">No equipado para discapacitados</string>
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@ -91,7 +91,7 @@
 	<!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @eat! -->
 	<string name="eat">Dónde comer</string>
 	<!-- Search category for grocery stores; any changes should be duplicated in categories.txt @food! -->
-	<string name="food">Productos</string>
+	<string name="food">Alimentación</string>
 	<!-- Search category for public transport; any changes should be duplicated in categories.txt @transport! -->
 	<string name="transport">Transporte</string>
 	<!-- Search category for fuel stations; any changes should be duplicated in categories.txt @fuel! -->
@ -111,7 +111,7 @@
 	<!-- Search category for nightclubs/bars; any changes should be duplicated in categories.txt @nightlife! -->
 	<string name="nightlife">Vida nocturna</string>
 	<!-- Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @children! -->
-	<string name="children">Descanso con niños</string>
+	<string name="children">Ocio en familia</string>
 	<!-- Search category for banks; any changes should be duplicated in categories.txt @bank! -->
 	<string name="bank">Banco</string>
 	<!-- Search category for pharmacies; any changes should be duplicated in categories.txt @pharmacy! -->
@ -130,6 +130,8 @@
 	<string name="recycling">Reciclaje</string>
 	<!-- Search category for water; any changes should be duplicated in categories.txt @water! also used to sort bookmarks by type -->
 	<string name="water">Agua</string>
+	<!-- Search category for RV facilities; any changes should be duplicated in categories.txt @rv! -->
+	<string name="rv">Caravanas</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notas</string>
 	<!-- Email Subject when sharing bookmark list -->
@ -340,6 +342,8 @@
 	<string name="routing_arrive">Llegada: %s</string>
 	<string name="categories">Categorías</string>
 	<string name="history">Historial</string>
+	<string name="opens_in">Abre en %s</string>
+	<string name="closes_in">Cierra en %s</string>
 	<string name="closed">Cerrado</string>
 	<string name="search_not_found">Lo siento, no he encontrado nada.</string>
 	<string name="search_not_found_query">Por favor, prueba con otra consulta.</string>
@ -797,6 +801,7 @@
 	<string name="type.recycling.green_waste">Orgánico</string>
 	<string name="type.recycling.cartons">Cartones de bebida</string>
 	<string name="type.amenity.restaurant">Restaurante</string>
+	<string name="type.amenity.sanitary_dump_station">Estación de vaciado para caravanas</string>
 	<string name="type.amenity.school">Escuela</string>
 	<string name="type.amenity.shelter">Refugio</string>
 	<string name="type.amenity.shower">Ducha</string>
@ -818,9 +823,11 @@
 	<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.parcel_locker">Taquilla de paquetes</string>
+	<string name="type.amenity.vending_machine.fuel">Maquina expendedora de combustible</string>
 	<string name="type.amenity.veterinary">Clínica veterinaria</string>
 	<string name="type.amenity.waste_basket">Papelera</string>
 	<string name="type.amenity.waste_disposal">Basura</string>
+	<string name="type.amenity.waste_transfer_station">Estación de transferencia de residuos</string>
 	<string name="type.amenity.water_point">Fuente de agua</string>
 	<string name="type.barrier">Barrera</string>
 	<string name="type.barrier.block">Bloque</string>
@ -867,16 +874,25 @@
 	<string name="type.building.train_station">Estación de tren</string>
 	<string name="type.building.warehouse">Almacén</string>
 	<string name="type.cemetery.grave">Tumba</string>
+	<string name="type.craft">Gremios</string>
+	<string name="type.craft.beekeeper">Apicultor</string>
+	<string name="type.craft.blacksmith">Herrero</string>
 	<string name="type.craft.brewery">Fábrica de cerveza</string>
 	<string name="type.craft.carpenter">Carpintero</string>
+	<string name="type.craft.confectionery">Confitería</string>
 	<string name="type.craft.electrician">Electricista</string>
+	<string name="type.craft.electronics_repair">Reparación de aparatos electrónicos</string>
 	<string name="type.craft.gardener">Paisajista</string>
+	<string name="type.craft.handicraft">Artesanía</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Aire acondicionado</string>
 	<string name="type.craft.metal_construction">Trabajador del metal</string>
 	<string name="type.craft.painter">Pintor</string>
 	<string name="type.craft.photographer">Fotógrafo</string>
 	<string name="type.craft.plumber">Fontanero</string>
+	<string name="type.craft.sawmill">Serrería</string>
 	<string name="type.craft.shoemaker">Zapatero</string>
+	<string name="type.craft.winery">Bodega</string>
 	<string name="type.craft.tailor">Sastre</string>
 	<string name="type.cuisine.african">Cocina africana</string>
 	<string name="type.cuisine.american">Cocina americana</string>
@ -1195,27 +1211,46 @@
 	<string name="type.man_made.water_well">Pozo</string>
 	<string name="type.man_made.windmill">Molino</string>
 	<string name="type.military.bunker">Búnker</string>
+	<string name="type.natural">Naturaleza</string>
+	<string name="type.natural.bare_rock">Roca desnuda</string>
 	<string name="type.natural.bay">Bahía</string>
 	<string name="type.natural.beach">Playa</string>
+	<string name="type.natural.beach.sand">Playa de arena</string>
+	<string name="type.natural.beach.gravel">Playa de grava</string>
 	<string name="type.natural.cape">Cabo</string>
 	<string name="type.natural.cave_entrance">Cueva</string>
+	<string name="type.natural.cliff">Acantilado</string>
+	<string name="type.natural.earth_bank">Acantilado</string>
+	<string name="type.man_made.embankment">Terraplén</string>
+	<string name="type.natural.coastline">Costa</string>
 	<string name="type.natural.geyser">Geiser</string>
 	<string name="type.natural.glacier">Glaciar</string>
-	<string name="type.natural.grassland">Campo</string>
+	<string name="type.natural.grassland">Herbazal</string>
+	<string name="type.natural.heath">Brezal</string>
+	<string name="type.natural.hot_spring">Aguas termales</string>
 	<string name="type.natural.water.lake">Lago</string>
 	<string name="type.natural.water.lock">Cámara de bloqueo</string>
 	<string name="type.natural.water.pond">Estanque</string>
 	<string name="type.natural.water.reservoir">Embalse</string>
 	<string name="type.natural.water.basin">Cuenca</string>
 	<string name="type.natural.water.river">Río</string>
+	<string name="type.natural.land">Tierra</string>
+	<string name="type.natural.meadow">Prado</string>
+	<string name="type.natural.orchard">Huerto frutal</string>
 	<string name="type.natural.peak">Cima</string>
+	<string name="type.natural.saddle">Silla de montaña</string>
+	<string name="type.natural.rock">Roca</string>
 	<string name="type.natural.scrub">Matorrales</string>
 	<string name="type.natural.spring">Manantial</string>
 	<string name="type.natural.strait">Estrecho</string>
 	<string name="type.natural.tree">Árbol</string>
+	<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.wetland">Terreno pantanoso</string>
+	<string name="type.natural.wetland.bog">Turbera</string>
+	<string name="type.natural.wetland.marsh">Ciénaga</string>
 	<string name="type.office">Oficina</string>
 	<string name="type.office.company">Oficina</string>
 	<string name="type.office.estate_agent">Agente inmobiliario</string>
@ -1357,21 +1392,22 @@
 	<string name="type.shop.wine">Tienda de vinos</string>
 	<string name="type.sport">Deporte</string>
 	<string name="type.sport.american_football">Fútbol americano</string>
-	<string name="type.sport.archery">Tiro con arco</string>
+	<string name="type.sport.archery">Tiro al arco</string>
 	<string name="type.sport.athletics">Atletismo</string>
 	<string name="type.sport.australian_football">Fútbol australiano</string>
 	<string name="type.sport.baseball">Béisbol</string>
 	<string name="type.sport.basketball">Baloncesto</string>
+	<string name="type.sport.bowls">Bolos sobre hierba</string>
 	<string name="type.sport.cricket">Críquet</string>
 	<string name="type.sport.curling">Curling</string>
-	<string name="type.sport.diving">Salto</string>
 	<string name="type.sport.equestrian">Equitación</string>
 	<string name="type.sport.golf">Golf</string>
 	<string name="type.sport.gymnastics">Gimnasia</string>
 	<string name="type.sport.handball">Balonmano</string>
 	<string name="type.sport.multi">Varios deportes</string>
+	<!-- Used to tag a scuba diving site. -->
 	<string name="type.sport.scuba_diving">Submarinismo</string>
-	<string name="type.sport.shooting">Tiro deportivo</string>
+	<string name="type.sport.shooting">Tiroteo</string>
 	<string name="type.sport.skiing">Esquí</string>
 	<string name="type.sport.soccer">Fútbol</string>
 	<string name="type.sport.swimming">Natación</string>
@ -1395,7 +1431,7 @@
 	<string name="type.tourism.hostel">Albergue juvenil</string>
 	<string name="type.tourism.information">Información</string>
 	<string name="type.tourism.information.board">Tablón de información</string>
-	<string name="type.tourism.information.guidepost">Información</string>
+	<string name="type.tourism.information.guidepost">Poste indicador</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.museum">Museo</string>
@ -1417,4 +1453,5 @@
 	<string name="type.wheelchair.no">No equipado para discapacitados</string>
 	<string name="type.wheelchair.yes">Equipado para discapacitados</string>
 	<string name="type.building_part">Edificio</string>
+	<string name="type.amenity.events_venue">Lugar de los eventos</string>
 </resources>
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@ -42,7 +42,7 @@
 	<!-- Used in DownloadResources startup screen -->
 	<string name="disconnect_usb_cable">Mesedez, deskonektatu USB kablea edo sartu SD memoria Organic Maps erabiltzeko</string>
 	<!-- Used in DownloadResources startup screen -->
-	<string name="not_enough_free_space_on_sdcard">Mesedez, askatu lekua SD memorian/USB biltegian aplikazioa erabiltzeko</string>
+	<string name="not_enough_free_space_on_sdcard">Mesedez, egin lekua SD memorian/USB biltegian aplikazioa erabiltzeko</string>
 	<string name="download_resources">Hasi baino lehen, utzi mundu-mapa orokor bat zure gailura deskargatzeko.\nDatuen %s beharrezkoa da.</string>
 	<string name="download_resources_continue">Joan mapara</string>
 	<string name="downloading_country_can_proceed">%s deskargatzen. Orain mapara\n joan zaitezke.</string>
@ -63,7 +63,7 @@
 	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Markagailuak</string>
 	<!-- Default bookmark list name -->
-	<string name="core_my_places">Nire lekuak</string>
+	<string name="core_my_places">Nire tokiak</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Izena</string>
 	<!-- Editor title above street and house number -->
@ -305,7 +305,7 @@
 	<string name="dialog_routing_disclaimer_priority">— Ibilbideen baldintzek, zirkulazio arauek eta bide seinaleek lehentasuna dute beti nabigazio-iradokizunen gainetik;</string>
 	<string name="dialog_routing_disclaimer_precision">— Mapa zehaztugabea izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;</string>
 	<string name="dialog_routing_disclaimer_recommendations">— Iradokitako ibilbideak gomendio gisa soilik ulertu behar dira;</string>
-	<string name="dialog_routing_disclaimer_borders">— Kontuz ibili muga-eremuak dituzten ibilbideetan: gure aplikazioak sortutako ibilbideek batzuetan herrialdeen mugak zeharkatu ditzakete baimendu gabeko lekuetan;</string>
+	<string name="dialog_routing_disclaimer_borders">— Kontuz ibili muga-eremuak dituzten ibilbideetan: gure aplikazioak sortutako ibilbideek batzuetan herrialdeen mugak zeharkatu ditzakete baimendu gabeko tokietan;</string>
 	<string name="dialog_routing_disclaimer_beware">Egon adi eta seguru errepideetan!</string>
 	<string name="dialog_routing_check_gps">Egiaztatu GPS seinalea</string>
 	<string name="dialog_routing_error_location_not_found">Ezin da ibilbidea sortu. Ezin izan dira uneko GPS koordenatuak identifikatu.</string>
@ -348,8 +348,8 @@
 	<string name="clear_search">Ezabatu bilaketa-historia</string>
 	<string name="p2p_your_location">Zure kokapena</string>
 	<string name="p2p_start">Hasi</string>
-	<string name="p2p_from_here">Bertatik</string>
-	<string name="p2p_to_here">Bidea</string>
+	<string name="p2p_from_here">Hemendik</string>
+	<string name="p2p_to_here">Bidea hona</string>
 	<string name="p2p_only_from_current">Nabigazioa zure uneko kokapenetik soilik dago erabilgarri.</string>
 	<string name="p2p_reroute_from_current">Zure uneko kokapenetik ibilbide bat antolatzea nahi duzu?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
@ -372,9 +372,9 @@
 	<string name="editor_report_problem_desription_2">Edo egin ezazu zeure burua https://www.openstreetmap.org/ helbidean</string>
 	<string name="editor_report_problem_send_button">Bidali</string>
 	<string name="editor_report_problem_title">Arazoa</string>
-	<string name="editor_report_problem_no_place_title">Lekua ez da existitzen</string>
+	<string name="editor_report_problem_no_place_title">Tokia ez da existitzen</string>
 	<string name="editor_report_problem_under_construction_title">Mantentze-lanetarako itxita</string>
-	<string name="editor_report_problem_duplicate_place_title">Leku bikoiztua</string>
+	<string name="editor_report_problem_duplicate_place_title">Toki bikoiztua</string>
 	<string name="autodownload">Deskarga automatikoa</string>
 	<!-- Place Page opening hours text -->
 	<string name="daily">Egunero</string>
@ -390,7 +390,7 @@
 	<string name="forgot_password">Pasahitza ahaztu al duzu?</string>
 	<string name="logout">Saioa itxi</string>
 	<string name="thank_you">Eskerrik asko</string>
-	<string name="edit_place">Editatu lekua</string>
+	<string name="edit_place">Editatu tokia</string>
 	<string name="add_language">Gehitu hizkuntza bat</string>
 	<string name="street">Kalea</string>
 	<!-- Editable House Number text field (in address block). -->
@ -419,11 +419,11 @@
 	<string name="editor_focus_map_on_location">Arrastatu mapa objektuaren kokapen zuzena hautatzeko.</string>
 	<string name="editor_edit_place_title">Editatu</string>
 	<string name="editor_add_place_title">Gehitu</string>
-	<string name="editor_edit_place_name_hint">Lekuaren izena</string>
+	<string name="editor_edit_place_name_hint">Tokiaren izena</string>
 	<string name="editor_edit_place_category_title">Kategoria</string>
 	<string name="detailed_problem_description">Arazoaren deskribapen zehatza</string>
 	<string name="editor_report_problem_other_title">Beste arazo bat</string>
-	<string name="placepage_add_business_button">Antolakuntza gehitu</string>
+	<string name="placepage_add_business_button">Negozioa gehitu</string>
 	<string name="message_invalid_feature_position">Hemen ezin da objekturik jarri</string>
 	<string name="login_to_make_edits_visible">Hasi saioa beste erabiltzaileek zuk egindako aldaketak ikus ditzaten.</string>
 	<!-- Downloaded 10 **of** 20 <- it is that "of" -->
@ -437,7 +437,7 @@
 	<string name="editor_zip_code">Posta kodea</string>
 	<string name="error_enter_correct_zip_code">Mesedez, idatzi posta-kode zuzena</string>
 	<!-- Place Page title for long tap -->
-	<string name="core_placepage_unknown_place">Leku ezezaguna</string>
+	<string name="core_placepage_unknown_place">Toki ezezaguna</string>
 	<string name="editor_other_info">Bidali oharra OSM editoreei</string>
 	<string name="editor_detailed_description_hint">Iruzkin zehatza</string>
 	<string name="editor_detailed_description">Iradoki dituzun aldaketak OpenStreetMap komunitatean argitaratuko dira. Deskribatu mapa organikoetan editatu ezin diren xehetasunak.</string>
@ -468,9 +468,9 @@
 	<string name="editor_comment_hint">Iruzkina…</string>
 	<string name="editor_reset_edits_message">Tokiko aldaketa guztiak berrezarri nahi dituzu?</string>
 	<string name="editor_reset_edits_button">Berreskuratu</string>
-	<string name="editor_remove_place_message">Gehitutako lekua kendu?</string>
+	<string name="editor_remove_place_message">Gehitutako tokia ezabatu?</string>
 	<string name="editor_remove_place_button">Kendu</string>
-	<string name="editor_place_doesnt_exist">Lekua ez da existitzen</string>
+	<string name="editor_place_doesnt_exist">Tokia ez da existitzen</string>
 	<!-- Phone number error message -->
 	<string name="error_enter_correct_phone">Mesedez, idatzi telefono-zenbaki zuzena</string>
 	<string name="error_enter_correct_web">Mesedez, sartu baliozko web-helbide bat</string>
@ -499,7 +499,7 @@
 	<string name="mobile_data_option_not_today">Ez erabili gaur</string>
 	<string name="mobile_data">Internet mugikorra</string>
 	<!-- NOTE to translators: please synchronize your translation with the English one. -->
-	<string name="mobile_data_description">Internet mugikorra behar da lekuei buruzko informazio zehatza bistaratzeko, hala nola argazkiak, prezioak eta iritziak.</string>
+	<string name="mobile_data_description">Internet mugikorra behar da tokiei buruzko informazio zehatza bistaratzeko, hala nola argazkiak, prezioak eta iritziak.</string>
 	<string name="mobile_data_option_never">Inoiz erabili</string>
 	<string name="mobile_data_option_ask">Beti galdetu</string>
 	<string name="traffic_update_maps_text">Trafiko datuak bistaratzeko, mapak eguneratu behar dira.</string>
@ -558,7 +558,7 @@
 	<string name="layers_title">Mapa geruzak</string>
 	<string name="subway_data_unavailable">Metroaren mapa ez dago erabilgarri</string>
 	<string name="bookmarks_empty_list_title">Zerrenda hau hutsik dago</string>
-	<string name="bookmarks_empty_list_message">Pin bat gehitzeko, ukitu mapako leku bat eta, ondoren, ukitu izar ikonoa</string>
+	<string name="bookmarks_empty_list_message">Pin bat gehitzeko, ukitu mapako toki bat eta, ondoren, ukitu izarraren ikonoa</string>
 	<string name="category_desc_more">…gehi</string>
 	<string name="export_file">Esportatu fitxategi gisa</string>
 	<string name="list_settings">Zerrenda konfiguratu</string>
@ -571,7 +571,7 @@
 	<string name="speedcam_option_auto">Kotxea</string>
 	<string name="speedcam_option_always">Beti</string>
 	<string name="speedcam_option_never">Inoiz ez</string>
-	<string name="place_description_title">Leku deskribapena</string>
+	<string name="place_description_title">Tokiaren deskribapena</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">Deskargatu mapak</string>
 	<string name="power_managment_title">Energia aurrezteko modua</string>
@ -627,7 +627,7 @@

 	<!-- SECTION: Bookmark types used for sorting -->
 	<string name="food_places">Janari</string>
-	<string name="tourist_places">Leku interesgarriak</string>
+	<string name="tourist_places">Toki interesgarriak</string>
 	<string name="museums">Museoak</string>
 	<string name="parks">Parkeak</string>
 	<string name="swim_places">Igeriketa</string>
@ -641,7 +641,7 @@
 	<string name="fuel_places">Erregai-geltokia</string>
 	<string name="medicine">Medikuntza</string>
 	<string name="search_in_the_list">Bilatu zerrendan</string>
-	<string name="religious_places">Leku sakratuak</string>
+	<string name="religious_places">Erlijio-guneak</string>
 	<string name="select_list">Hautatu zerrenda</string>
 	<string name="transit_not_found">Metro-nabigazioa oraindik ez dago erabilgarri eskualde honetan</string>
 	<string name="dialog_pedestrian_route_is_long_header">Ez da aurkitu metroko ibilbidea</string>
@ -853,6 +853,7 @@
 	<string name="type.craft.carpenter">Arotza</string>
 	<string name="type.craft.electrician">Elektrizista teknikaria</string>
 	<string name="type.craft.gardener">Paisaia</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Aire girotua</string>
 	<string name="type.craft.metal_construction">Metalgintzako langilea</string>
 	<string name="type.craft.painter">Margolaria</string>
@ -1176,27 +1177,46 @@
 	<string name="type.man_made.water_well">Ur putzua</string>
 	<string name="type.man_made.windmill">Haize-errota</string>
 	<string name="type.military.bunker">Bunkerra</string>
+	<string name="type.natural">Natura</string>
+	<string name="type.natural.bare_rock">Harkaitz biluzi</string>
 	<string name="type.natural.bay">Badia</string>
 	<string name="type.natural.beach">Hondartza</string>
+	<string name="type.natural.beach.sand">Hondartza hondartza</string>
+	<string name="type.natural.beach.gravel">Legar Hondartza</string>
 	<string name="type.natural.cape">Lurmuturra</string>
 	<string name="type.natural.cave_entrance">Haitzuloa</string>
+	<string name="type.natural.cliff">Labar</string>
+	<string name="type.natural.earth_bank">Labarra</string>
+	<string name="type.man_made.embankment">Lubeta</string>
+	<string name="type.natural.coastline">Itsasertz</string>
 	<string name="type.natural.geyser">Geyser</string>
 	<string name="type.natural.glacier">Glaziarra</string>
-	<string name="type.natural.grassland">Landa</string>
+	<string name="type.natural.grassland">Belartza</string>
+	<string name="type.natural.heath">Zakardi</string>
+	<string name="type.natural.hot_spring">Ur termal</string>
 	<string name="type.natural.water.lake">Lakua</string>
 	<string name="type.natural.water.lock">Sarraila Ganbera</string>
 	<string name="type.natural.water.pond">Urmaela</string>
 	<string name="type.natural.water.reservoir">Urtegia</string>
 	<string name="type.natural.water.basin">Arroa</string>
 	<string name="type.natural.water.river">Ibai</string>
+	<string name="type.natural.land">Lur lehor</string>
+	<string name="type.natural.meadow">Belardi</string>
+	<string name="type.natural.orchard">Baratzea</string>
 	<string name="type.natural.peak">Goiena</string>
+	<string name="type.natural.saddle">Mendiko jarlekua</string>
+	<string name="type.natural.rock">Arroka</string>
 	<string name="type.natural.scrub">Sastrakak</string>
 	<string name="type.natural.spring">Udaberria</string>
 	<string name="type.natural.strait">Estua</string>
 	<string name="type.natural.tree">Zuhaitza</string>
+	<string name="type.natural.tree_row">Zuhaitz ilara</string>
+	<string name="type.natural.vineyard">Mahasti</string>
 	<string name="type.natural.volcano">Sumendi</string>
 	<string name="type.natural.water">Ur-masa</string>
 	<string name="type.natural.wetland">Lur paduratsua</string>
+	<string name="type.natural.wetland.bog">Zohikaztegi</string>
+	<string name="type.natural.wetland.marsh">Padura</string>
 	<string name="type.office">Bulegoa</string>
 	<string name="type.office.company">Bulegoa</string>
 	<string name="type.office.estate_agent">Higiezinen agentea</string>
@ -1345,14 +1365,14 @@
 	<string name="type.sport.basketball">Saskibaloia</string>
 	<string name="type.sport.cricket">Kilkerra</string>
 	<string name="type.sport.curling">Curling</string>
-	<string name="type.sport.diving">Salto egin</string>
 	<string name="type.sport.equestrian">Zaldi-lasterketa</string>
 	<string name="type.sport.golf">Golfa</string>
 	<string name="type.sport.gymnastics">Gimnasia</string>
 	<string name="type.sport.handball">Eskubaloia</string>
 	<string name="type.sport.multi">Hainbat kirol</string>
+	<!-- Used to tag a scuba diving site. -->
 	<string name="type.sport.scuba_diving">Urpekaritza</string>
-	<string name="type.sport.shooting">Kirolaren jaurtiketa</string>
+	<string name="type.sport.shooting">Tiroketa</string>
 	<string name="type.sport.skiing">Eskia</string>
 	<string name="type.sport.soccer">Futbola</string>
 	<string name="type.sport.swimming">Igeriketa</string>
@ -1376,7 +1396,7 @@
 	<string name="type.tourism.hostel">Gazteen aterpetxea</string>
 	<string name="type.tourism.information">Informazioa</string>
 	<string name="type.tourism.information.board">Informazio taula</string>
-	<string name="type.tourism.information.guidepost">Informazioa</string>
+	<string name="type.tourism.information.guidepost">Gida postua</string>
 	<string name="type.tourism.information.map">Mapa turistikoa</string>
 	<string name="type.tourism.information.office">Turismo bulegoa</string>
 	<string name="type.tourism.museum">Museoa</string>
@ -1398,4 +1418,5 @@
 	<string name="type.wheelchair.no">Ezinduentzako ekipatuta ez dago</string>
 	<string name="type.wheelchair.yes">Ezinduentzako hornitua</string>
 	<string name="type.building_part">Eraikin</string>
+	<string name="type.amenity.events_venue">Ekitaldien Lekua</string>
 </resources>
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@ -1025,27 +1025,46 @@
 	<string name="type.man_made.water_well">چاه اب</string>
 	<string name="type.man_made.windmill">توربین بادی</string>
 	<string name="type.military.bunker">پناهگاه</string>
+	<string name="type.natural">طبیعت</string>
+	<string name="type.natural.bare_rock">سنگ برهنه</string>
 	<string name="type.natural.bay">خلیج</string>
 	<string name="type.natural.beach">ساحل</string>
+	<string name="type.natural.beach.sand">ساحل شنی</string>
+	<string name="type.natural.beach.gravel">ساحل شن</string>
 	<string name="type.natural.cape">دماغه</string>
 	<string name="type.natural.cave_entrance">غار</string>
+	<string name="type.natural.cliff">پرتگاه</string>
+	<string name="type.natural.earth_bank">صخره</string>
+	<string name="type.man_made.embankment">خاک‌ریز</string>
+	<string name="type.natural.coastline">کناره</string>
 	<string name="type.natural.geyser">چشمه آب گرم</string>
 	<string name="type.natural.glacier">یخچال طبیعی</string>
-	<string name="type.natural.grassland">کشتزار</string>
+	<string name="type.natural.grassland">علفزار</string>
+	<string name="type.natural.heath">خلنگزار</string>
+	<string name="type.natural.hot_spring">چشمه آب‌گرم</string>
 	<string name="type.natural.water.lake">دریاچه</string>
 	<string name="type.natural.water.lock">ﻞﻔﻗ ﻕﺎﺗﺍ</string>
 	<string name="type.natural.water.pond">تالاب</string>
 	<string name="type.natural.water.reservoir">مخزن</string>
 	<string name="type.natural.water.basin">حوضه آب</string>
 	<string name="type.natural.water.river">رودخانه</string>
+	<string name="type.natural.land">خشکی</string>
+	<string name="type.natural.meadow">چمنزار</string>
+	<string name="type.natural.orchard">باغ میوه</string>
 	<string name="type.natural.peak">قله</string>
+	<string name="type.natural.saddle">زین کوه</string>
+	<string name="type.natural.rock">سنگ</string>
 	<string name="type.natural.scrub">بوته زار</string>
 	<string name="type.natural.spring">چشمه</string>
 	<string name="type.natural.strait">تنگه</string>
 	<string name="type.natural.tree">درخت</string>
+	<string name="type.natural.tree_row">ردیف درخت</string>
+	<string name="type.natural.vineyard">تاکستان</string>
 	<string name="type.natural.volcano">اتشفشان</string>
 	<string name="type.natural.water">پهنه آبی</string>
 	<string name="type.natural.wetland">ناحیه تالابی</string>
+	<string name="type.natural.wetland.bog">خلاش</string>
+	<string name="type.natural.wetland.marsh">مرداب</string>
 	<string name="type.office">اداره</string>
 	<string name="type.office.company">دفتر شرکت</string>
 	<string name="type.office.estate_agent">بنگاه معاملات ملکی</string>
@ -1183,9 +1202,27 @@
 	<string name="type.shop.video">فروشگاه رسانه‌های تصویری</string>
 	<string name="type.shop.video_games">فروشگاه بازی‌های رایانه‌ای</string>
 	<string name="type.shop.wine">فروشگاه</string>
+	<string name="type.sport">ورزش</string>
+	<string name="type.sport.american_football">فوتبال آمریکایی</string>
+	<string name="type.sport.archery">تیراندازی با کمان</string>
 	<string name="type.sport.athletics">ورزش</string>
+	<string name="type.sport.australian_football">فوتبال استرالیایی</string>
+	<string name="type.sport.baseball">بیسبال</string>
 	<string name="type.sport.basketball">بسکتبال</string>
+	<string name="type.sport.bowls">لعبة البولينج</string>
+	<string name="type.sport.cricket">کریکت</string>
+	<string name="type.sport.curling">کرلینگ</string>
 	<string name="type.sport.equestrian">ورزش های سوارکاری</string>
+	<string name="type.sport.golf">گلف</string>
+	<string name="type.sport.gymnastics">ژیمناستیک</string>
+	<string name="type.sport.handball">هندبال</string>
+	<string name="type.sport.multi">ورزش های مختلف</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">غواصی</string>
+	<string name="type.sport.shooting">ورزش تیراندازی</string>
+	<string name="type.sport.skiing">اسکی</string>
+	<string name="type.sport.soccer">فوتبال</string>
+	<string name="type.sport.swimming">شنا</string>
 	<string name="type.sport.tennis">زمین تنیس</string>
 	<string name="type.tourism.apartment">اپارتمان</string>
 	<string name="type.tourism.artwork">گردشگری</string>
@ -1204,7 +1241,7 @@
 	<string name="type.tourism.hotel">هتل</string>
 	<string name="type.tourism.information">گردشگری</string>
 	<string name="type.tourism.information.board">گردشگری</string>
-	<string name="type.tourism.information.guidepost">گردشگری</string>
+	<string name="type.tourism.information.guidepost">تابلو راهنما</string>
 	<string name="type.tourism.information.map">گردشگری</string>
 	<string name="type.tourism.information.office">گردشگری</string>
 	<string name="type.tourism.motel">هتل</string>
@ -1229,4 +1266,5 @@
 	<string name="type.wheelchair.no">بدون دسترسی با صندلی چرخ دار</string>
 	<string name="type.wheelchair.yes">دسترسی کامل با صندلی چرخ دار</string>
 	<string name="type.building_part">ساختما</string>
+	<string name="type.amenity.events_venue">محل برگزاری رویدادها</string>
 </resources>
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@ -805,6 +805,7 @@
 	<string name="type.craft.carpenter">Puuseppä</string>
 	<string name="type.craft.electrician">Sähkömies</string>
 	<string name="type.craft.gardener">Puutarhuri</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Ilmastointilaite</string>
 	<string name="type.craft.metal_construction">Metallimies</string>
 	<string name="type.craft.painter">Maalari</string>
@ -1127,27 +1128,46 @@
 	<string name="type.man_made.water_well">Kaivo</string>
 	<string name="type.man_made.windmill">Tuulimylly</string>
 	<string name="type.military.bunker">Bunkkeri</string>
+	<string name="type.natural">Luonto</string>
+	<string name="type.natural.bare_rock">Paljas kallio</string>
 	<string name="type.natural.bay">Lahti</string>
 	<string name="type.natural.beach">Ranta</string>
+	<string name="type.natural.beach.sand">Hiekkainen ranta</string>
+	<string name="type.natural.beach.gravel">Soraranta</string>
 	<string name="type.natural.cape">Niemeke</string>
 	<string name="type.natural.cave_entrance">Luola</string>
+	<string name="type.natural.cliff">Jyrkänne</string>
+	<string name="type.natural.earth_bank">Kallio</string>
+	<string name="type.man_made.embankment">Pengerrys</string>
+	<string name="type.natural.coastline">Rannikko</string>
 	<string name="type.natural.geyser">Geysir</string>
 	<string name="type.natural.glacier">Jäätikkö</string>
-	<string name="type.natural.grassland">Pelto</string>
+	<string name="type.natural.grassland">Nurmi</string>
+	<string name="type.natural.heath">Nummi</string>
+	<string name="type.natural.hot_spring">Kuuma lähde</string>
 	<string name="type.natural.water.lake">Järvi</string>
 	<string name="type.natural.water.lock">Lukko kammio</string>
 	<string name="type.natural.water.pond">Lampi</string>
 	<string name="type.natural.water.reservoir">Säiliö</string>
 	<string name="type.natural.water.basin">Vesisäiliö</string>
 	<string name="type.natural.water.river">Joki</string>
+	<string name="type.natural.land">Maa</string>
+	<string name="type.natural.meadow">Niitty</string>
+	<string name="type.natural.orchard">Hedelmänviljely</string>
 	<string name="type.natural.peak">Huippu</string>
+	<string name="type.natural.saddle">Vuoristo satula</string>
+	<string name="type.natural.rock">Kivi</string>
 	<string name="type.natural.scrub">Tiheiköt</string>
 	<string name="type.natural.spring">Lähde</string>
 	<string name="type.natural.strait">Salmi</string>
 	<string name="type.natural.tree">Puu</string>
+	<string name="type.natural.tree_row">Puurivi</string>
+	<string name="type.natural.vineyard">Viinitila</string>
 	<string name="type.natural.volcano">Tulivuori</string>
 	<string name="type.natural.water">Vesimuodostuma</string>
 	<string name="type.natural.wetland">Suoperäinen seutu</string>
+	<string name="type.natural.wetland.bog">Suo</string>
+	<string name="type.natural.wetland.marsh">Marsh</string>
 	<string name="type.office">Toimisto</string>
 	<string name="type.office.company">Yhtiön toimisto</string>
 	<string name="type.office.estate_agent">Kiinteistönvälittäjä</string>
@ -1290,14 +1310,19 @@
 	<string name="type.sport.american_football">Amerikkalainen jalkapallo</string>
 	<string name="type.sport.archery">Jousiammunta</string>
 	<string name="type.sport.athletics">Yleisurheilu</string>
+	<string name="type.sport.australian_football">Australialainen jalkapallo</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Koripallo</string>
-	<string name="type.sport.bowls">Bowls</string>
+	<string name="type.sport.bowls">Nurmikeilailu</string>
 	<string name="type.sport.cricket">Kriketti</string>
 	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Hevosurheilu</string>
 	<string name="type.sport.golf">Golf</string>
 	<string name="type.sport.gymnastics">Voimistelu</string>
 	<string name="type.sport.handball">Käsipallo</string>
+	<string name="type.sport.multi">Erilaisia urheilulajeja</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Sukellus</string>
 	<string name="type.sport.shooting">Ammunta</string>
 	<string name="type.sport.skiing">Hiihto</string>
 	<string name="type.sport.soccer">Jalkapallo</string>
@ -1323,7 +1348,7 @@
 	<string name="type.tourism.hotel">Hotelli</string>
 	<string name="type.tourism.information">Turisti-informaatio</string>
 	<string name="type.tourism.information.board">Informaatio</string>
-	<string name="type.tourism.information.guidepost">Turisti-informaatio</string>
+	<string name="type.tourism.information.guidepost">Tienviitta</string>
 	<string name="type.tourism.information.map">Turistikartta</string>
 	<string name="type.tourism.information.office">Turistitoimisto</string>
 	<string name="type.tourism.motel">Motelli</string>
@ -1363,4 +1388,5 @@
 	<string name="type.piste_type.downhill.novice">Laskettelurinne</string>
 	<string name="type.piste_type.nordic">Latu</string>
 	<string name="type.building_part">Rakennus</string>
+	<string name="type.amenity.events_venue">Tapahtumapaikka</string>
 </resources>
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@ -79,9 +79,21 @@
 	<!-- Detailed description of Maps Storage settings button -->
 	<string name="maps_storage_summary">Sélectionner l\'emplacement où les cartes devraient être téléchargées</string>
 	<!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
-	<string name="maps_storage_downloaded">Cartes</string>
+	<string name="maps_storage_downloaded">Cartes téléchargées</string>
+	<!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+	<string name="maps_storage_internal">Stockage interne privé</string>
+	<!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+	<string name="maps_storage_shared">Stockage interne partagé</string>
+	<!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+	<string name="maps_storage_removable">Carte SD</string>
+	<!-- Generic external storage type in Maps Storage settings -->
+	<string name="maps_storage_external">Stockage externe partagé</string>
+	<!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
+	<string name="maps_storage_free_size">%1$s libres sur %2$s</string>
 	<!-- Question dialog for transferring maps from one storage to another -->
 	<string name="move_maps">Déplacer les cartes ?</string>
+	<!-- Error moving map files from one storage to another -->
+	<string name="move_maps_error">Erreur lors du déplacement des cartes</string>
 	<!-- Ask to wait user several minutes (some long process in modal dialog). -->
 	<string name="wait_several_minutes">Ceci peut prendre plusieurs minutes.\nVeuillez patienter…</string>
 	<!-- Measurement units title in settings activity -->
@ -97,7 +109,7 @@
 	<!-- Search category for public transport; any changes should be duplicated in categories.txt @transport! -->
 	<string name="transport">Transport</string>
 	<!-- Search category for fuel stations; any changes should be duplicated in categories.txt @fuel! -->
-	<string name="fuel">Essence</string>
+	<string name="fuel">Stations-service</string>
 	<!-- Search category for parking lots; any changes should be duplicated in categories.txt @parking! -->
 	<string name="parking">Stationnement</string>
 	<!-- Search category for clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @shopping! -->
@ -132,6 +144,8 @@
 	<string name="recycling">Recyclage</string>
 	<!-- Search category for water; any changes should be duplicated in categories.txt @water! also used to sort bookmarks by type -->
 	<string name="water">Eau</string>
+	<!-- Search category for RV facilities; any changes should be duplicated in categories.txt @rv! -->
+	<string name="rv">Aménagements pour camping-car</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notes</string>
 	<!-- Email Subject when sharing bookmark list -->
@ -342,6 +356,8 @@
 	<string name="routing_arrive">Arrivée: %s</string>
 	<string name="categories">Catégories</string>
 	<string name="history">Historique</string>
+	<string name="opens_in">Ouvert dans %s</string>
+	<string name="closes_in">Fermé dans %s</string>
 	<string name="closed">Fermé</string>
 	<string name="search_not_found">Désolé, je n\'ai rien trouvé.</string>
 	<string name="search_not_found_query">Veuillez essayer un autre mot-clé.</string>
@ -675,12 +691,18 @@
 	<string name="isolines_toast_zooms_1_10">Zoomez pour voir les courbes de niveaux</string>
 	<string name="download_map_title">Télécharger la carte du monde</string>
 	<!-- Used in DownloadResources startup screen -->
+	<string name="disk_error">Impossible de créer un dossier et de déplacer des fichiers sur la mémoire interne de l\'appareil ou sur la carte SD</string>
+	<!-- Used in DownloadResources startup screen -->
 	<string name="connection_failure">Erreur de connexion</string>
 	<!-- Used in DownloadResources startup screen -->
 	<string name="disconnect_usb_cable_title">Déconnectez le câble USB</string>
 	<string name="enable_screen_sleep">Autoriser l\'écran à dormir</string>
 	<!-- Description in preferences -->
-	<string name="enable_screen_sleep_description">Lorsqu\'il est activé, l\'écran sera autorisé à dormir après une période d\'inactivité.</string>
+	<string name="enable_screen_sleep_description">Lorsqu\'il est activé, l\'écran sera autorisé à s\'éteindre après une période d\'inactivité.</string>
+	<!-- A preference title; keep short! -->
+	<string name="enable_show_on_lock_screen">Afficher sur l\'écran de verrouillage</string>
+	<!-- Description in preferences -->
+	<string name="enable_show_on_lock_screen_description">Lorsqu\'il est activé, vous n\'avez pas besoin de déverrouiller votre appareil à chaque fois quand l\'application fonctionne.</string>

 	<!-- SECTION: Types -->
 	<string name="type.aerialway">Transport par câble aérien</string>
@ -773,13 +795,18 @@
 	<string name="type.amenity.recycling">Conteneur de recyclage</string>
 	<string name="type.amenity.recycling.container">Conteneur de recyclage</string>
 	<string name="type.recycling.batteries">Batteries</string>
-	<string name="type.recycling.clothes">Vêtement usagés</string>
+	<string name="type.recycling.clothes">Vêtements usagés</string>
 	<string name="type.recycling.glass_bottles">Verre</string>
 	<string name="type.recycling.paper">Papier usagé</string>
 	<string name="type.recycling.plastic">Déchets plastiques</string>
-	<string name="type.recycling.plastic_bottles">Collecte de bouteilles en plastique</string>
+	<string name="type.recycling.plastic_bottles">Bouteilles en plastique</string>
 	<string name="type.recycling.scrap_metal">Ferraille</string>
 	<string name="type.recycling.small_appliances">Déchets d\'équipements électriques</string>
+	<string name="type.recycling.cardboard">Carton</string>
+	<string name="type.recycling.cans">Emballages métalliques</string>
+	<string name="type.recycling.shoes">Chaussures</string>
+	<string name="type.recycling.green_waste">Déchets organiques</string>
+	<string name="type.recycling.cartons">Briques alimentaires</string>
 	<string name="type.amenity.sanitary_dump_station">Station de vidange</string>
 	<string name="type.amenity.school">École</string>
 	<string name="type.amenity.shelter">Abri</string>
@ -794,11 +821,13 @@
 	<string name="type.amenity.vending_machine.coffee">Distributeur de café</string>
 	<string name="type.amenity.vending_machine.condoms">Distributeur de préservatifs</string>
 	<string name="type.amenity.vending_machine.drinks">Distributeur de boissons</string>
-	<string name="type.amenity.vending_machine.food">Distributeur de aliments</string>
+	<string name="type.amenity.vending_machine.food">Distributeur d\'aliments</string>
 	<string name="type.amenity.vending_machine.newspapers">Distributeur de journaux</string>
 	<string name="type.amenity.vending_machine.parking_tickets">Horodateur</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">Distributeur de billets de transport en commun</string>
 	<string name="type.amenity.vending_machine.sweets">Distributeur de bonbons</string>
+	<string name="type.amenity.vending_machine.excrement_bags">Distributeur de sacs à excréments</string>
+	<string name="type.amenity.parcel_locker">Consigne automatique pour colis</string>
 	<string name="type.amenity.veterinary">Docteur vétérinaire</string>
 	<string name="type.amenity.waste_basket">Poubelle</string>
 	<string name="type.amenity.waste_disposal">Déchets</string>
@ -819,24 +848,50 @@
 	<string name="type.barrier.swing_gate">Barrière tournante</string>
 	<string name="type.barrier.toll_booth">Poste de péage</string>
 	<string name="type.barrier.wall">Mur</string>
+	<string name="type.boundary">Frontière</string>
+	<string name="type.boundary.administrative">Frontière administrative</string>
+	<string name="type.boundary.administrative.10">Frontière administrative</string>
+	<string name="type.boundary.administrative.11">Frontière administrative</string>
+	<string name="type.boundary.administrative.2">Frontière nationale</string>
+	<string name="type.boundary.administrative.3">Frontière administrative</string>
+	<string name="type.boundary.administrative.4">Frontière administrative</string>
+	<string name="type.boundary.administrative.5">Frontière administrative</string>
+	<string name="type.boundary.administrative.6">Frontière administrative</string>
+	<string name="type.boundary.administrative.7">Frontière administrative</string>
+	<string name="type.boundary.administrative.8">Frontière administrative</string>
+	<string name="type.boundary.administrative.9">Frontière administrative</string>
+	<string name="type.boundary.administrative.city">Frontière de la ville</string>
+	<string name="type.boundary.administrative.country">Frontière nationale</string>
+	<string name="type.boundary.administrative.county">Frontière du comté</string>
+	<string name="type.boundary.administrative.municipality">Frontière de la municipalité</string>
+	<string name="type.boundary.administrative.nation">Frontière nationale</string>
+	<string name="type.boundary.administrative.region">Frontière régionale</string>
+	<string name="type.boundary.administrative.suburb">Frontière de quartier</string>
 	<string name="type.boundary.national_park">Parc national</string>
 	<string name="type.building">Bâtiment</string>
 	<string name="type.building.address">Bâtiment</string>
 	<string name="type.building.has_parts">Bâtiment</string>
 	<string name="type.building.train_station">Gare</string>
 	<string name="type.building.warehouse">Entrepôt</string>
-	<string name="type.cemetery.grave">La tombe</string>
+	<string name="type.cemetery.grave">Tombe</string>
 	<string name="type.craft">Artisanat</string>
+	<string name="type.craft.beekeeper">Apiculteur</string>
+	<string name="type.craft.blacksmith">Forgeron</string>
 	<string name="type.craft.brewery">Brasserie artisanale</string>
 	<string name="type.craft.carpenter">Charpentier</string>
+	<string name="type.craft.confectionery">Confiseur</string>
 	<string name="type.craft.electrician">Électricien</string>
+	<string name="type.craft.electronics_repair">Réparation d\'appareils électroniques</string>
 	<string name="type.craft.gardener">Paysagiste</string>
-	<string name="type.craft.hvac">Climatiseur</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
+	<string name="type.craft.hvac">Chauffage, ventilation et climatisation</string>
 	<string name="type.craft.metal_construction">Métallo</string>
 	<string name="type.craft.painter">Peintre</string>
 	<string name="type.craft.photographer">Photographe</string>
 	<string name="type.craft.plumber">Plombier</string>
+	<string name="type.craft.sawmill">Scierie</string>
 	<string name="type.craft.shoemaker">Cordonnier</string>
+	<string name="type.craft.winery">Chai</string>
 	<string name="type.craft.tailor">Tailleur</string>
 	<string name="type.cuisine.african">Cuisine africaine</string>
 	<string name="type.cuisine.american">Cuisine américaine</string>
@ -1103,6 +1158,7 @@
 	<!-- SECTION: Types: Historic -->
 	<string name="type.historic.archaeological_site">Site archéologique</string>
 	<string name="type.historic.battlefield">Champ de bataille</string>
+	<string name="type.historic.boundary_stone">Borne frontière</string>
 	<string name="type.historic.castle">Château</string>
 	<string name="type.historic.castle.defensive">Château</string>
 	<string name="type.historic.castle.stately">Château</string>
@ -1149,6 +1205,7 @@
 	<string name="type.landuse.railway">Installations ferroviaires</string>
 	<string name="type.landuse.reservoir">Bassin de retenue</string>
 	<string name="type.landuse.residential">Zone résidentielle</string>
+	<string name="type.landuse.retail">Zone commerciale</string>
 	<string name="type.landuse.salt_pond">Marais salant</string>
 	<string name="type.landuse.vineyard">Vignes</string>
 	<string name="type.leisure.dog_park">Parc canin</string>
@ -1179,8 +1236,11 @@
 	<string name="type.leisure.water_park">Centre aquatique</string>
 	<string name="type.man_made.breakwater">Brise-lames</string>
 	<string name="type.man_made.chimney">Cheminée d\'usine</string>
+	<string name="type.man_made.cutline">Layon</string>
 	<string name="type.man_made.survey_point">Borne géodésique</string>
+	<string name="type.man_made.flagpole">Mât de drapeau</string>
 	<string name="type.man_made.lighthouse">Phare</string>
+	<string name="type.man_made.mast">Mât</string>
 	<string name="type.man_made.pier">Jetée</string>
 	<string name="type.man_made.storage_tank">Réservoir</string>
 	<string name="type.man_made.surveillance">Caméra de surveillance</string>
@ -1191,24 +1251,32 @@
 	<string name="type.man_made.water_well">Puits à eau</string>
 	<string name="type.man_made.windmill">Moulin à vent</string>
 	<string name="type.mountain_pass">Col de montagne</string>
+	<string name="type.natural">Nature</string>
 	<string name="type.natural.bare_rock">Zone rocheuse</string>
 	<string name="type.natural.bay">Baie</string>
 	<string name="type.natural.beach">Plage</string>
+	<string name="type.natural.beach.sand">Plage de sable</string>
+	<string name="type.natural.beach.gravel">Plage de gravier</string>
 	<string name="type.natural.cape">Cap</string>
 	<string name="type.natural.cave_entrance">Grotte</string>
 	<string name="type.natural.cliff">Falaise</string>
+	<string name="type.natural.earth_bank">Falaise</string>
+	<string name="type.man_made.embankment">Talus</string>
 	<string name="type.natural.coastline">Littoral</string>
 	<string name="type.natural.geyser">Geyser</string>
 	<string name="type.natural.glacier">Glacier</string>
-	<string name="type.natural.grassland">Champ</string>
+	<string name="type.natural.grassland">Pelouse</string>
 	<string name="type.natural.heath">Lande</string>
 	<string name="type.natural.hot_spring">Source chaude</string>
 	<string name="type.natural.water.lake">Lac</string>
-	<string name="type.natural.water.lock">Chambre de verrouillage</string>
+	<string name="type.natural.water.lock">Écluse</string>
 	<string name="type.natural.water.pond">Étang</string>
 	<string name="type.natural.water.reservoir">Réservoir</string>
 	<string name="type.natural.water.basin">Réservoir</string>
 	<string name="type.natural.water.river">Rivière</string>
+	<string name="type.natural.land">Terrain</string>
+	<string name="type.natural.meadow">Prairie</string>
+	<string name="type.natural.orchard">Verger</string>
 	<string name="type.natural.peak">Sommet</string>
 	<string name="type.natural.saddle">Col de montagne</string>
 	<string name="type.natural.rock">Rocher</string>
@ -1217,6 +1285,7 @@
 	<string name="type.natural.strait">Détroit</string>
 	<string name="type.natural.tree">Arbre</string>
 	<string name="type.natural.tree_row">Rangée d\'arbre</string>
+	<string name="type.natural.vineyard">Vignoble</string>
 	<string name="type.natural.volcano">Volcan</string>
 	<string name="type.natural.water">Étendue d\'eau</string>
 	<string name="type.natural.wetland">Zone humide</string>
@ -1255,6 +1324,7 @@
 	<string name="type.place.ocean">Océan</string>
 	<string name="type.place.region">Région</string>
 	<string name="type.place.sea">Mer</string>
+	<string name="type.place.square">Place</string>
 	<string name="type.place.state">État</string>
 	<string name="type.place.state.USA">État</string>
 	<string name="type.place.suburb">Quartier</string>
@ -1263,6 +1333,12 @@
 	<string name="type.power.substation">Poste électrique</string>
 	<string name="type.power.tower">Poteau électrique</string>
 	<string name="type.railway">Chemin de fer</string>
+	<string name="type.railway.abandoned">Chemin de fer abandonné</string>
+	<string name="type.railway.abandoned.bridge">Chemin de fer abandonné</string>
+	<string name="type.railway.abandoned.tunnel">Chemin de fer abandonné</string>
+	<string name="type.railway.construction">Chemin de fer en construction</string>
+	<string name="type.railway.crossing">Traversée de voie ferrée</string>
+	<string name="type.railway.disused">Chemin de fer désaffecté</string>
 	<string name="type.railway.funicular">Funiculaire</string>
 	<string name="type.railway.funicular.bridge">Funiculaire</string>
 	<string name="type.railway.funicular.tunnel">Funiculaire</string>
@ -1271,11 +1347,15 @@
 	<string name="type.railway.monorail">Monorail</string>
 	<string name="type.railway.monorail.bridge">Monorail</string>
 	<string name="type.railway.monorail.tunnel">Monorail</string>
+	<string name="type.railway.platform">Quai de gare</string>
+	<string name="type.railway.preserved">Chemin de fer touristique</string>
 	<string name="type.railway.rail">Chemin de fer</string>
+	<string name="type.railway.rail.bridge">Chemin de fer</string>
+	<string name="type.railway.rail.tunnel">Chemin de fer</string>
 	<string name="type.railway.station">Gare</string>
 	<string name="type.railway.station.light_rail">Gare</string>
 	<string name="type.railway.station.monorail">Gare</string>
-	<string name="type.railway.station.subway">Métro</string>
+	<string name="type.railway.station.subway">Station de métro</string>
 	<string name="type.railway.station.subway.barcelona">Métro</string>
 	<string name="type.railway.station.subway.berlin">Métro</string>
 	<string name="type.railway.station.subway.kiev">Métro</string>
@ -1284,10 +1364,10 @@
 	<string name="type.railway.station.subway.minsk">Métro</string>
 	<string name="type.railway.station.subway.moscow">Métro</string>
 	<string name="type.railway.station.subway.newyork">Métro</string>
-	<string name="type.railway.station.subway.paris">Métro</string>
+	<string name="type.railway.station.subway.paris">Station de métro</string>
 	<string name="type.railway.station.subway.roma">Métro</string>
 	<string name="type.railway.station.subway.spb">Métro</string>
-	<string name="type.railway.subway">Ligne de métroo</string>
+	<string name="type.railway.subway">Ligne de métro</string>
 	<string name="type.railway.subway.bridge">Voie de métro</string>
 	<string name="type.railway.subway.tunnel">Voie de métro</string>
 	<string name="type.railway.subway_entrance">Entrée du métro</string>
@ -1319,6 +1399,7 @@
 	<string name="type.shop.car_parts">Pièces de voiture</string>
 	<string name="type.shop.car_repair">Réparation d\'automobiles</string>
 	<string name="type.shop.car_repair.tyres">Réparation de pneus</string>
+	<string name="type.shop.caravan">Concessionnaire de caravanes et camping-cars</string>
 	<string name="type.shop.chemist">Droguerie</string>
 	<string name="type.shop.chocolate">Chocolatier</string>
 	<string name="type.shop.clothes">Boutique de vêtements</string>
@ -1373,13 +1454,24 @@
 	<string name="type.shop.video">Boutique de vidéos</string>
 	<string name="type.shop.video_games">Boutique de jeux vidéo</string>
 	<string name="type.shop.wine">Caviste</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Football américain</string>
 	<string name="type.sport.archery">Tir à l\'arc</string>
 	<string name="type.sport.athletics">Athlétisme</string>
+	<string name="type.sport.australian_football">Football australien</string>
+	<string name="type.sport.baseball">Base-ball</string>
 	<string name="type.sport.basketball">Basket-ball</string>
+	<string name="type.sport.bowls">Boulingrin</string>
+	<string name="type.sport.cricket">Cricket</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Sport hippique</string>
+	<string name="type.sport.golf">Le golf</string>
 	<string name="type.sport.gymnastics">Gymnastique</string>
+	<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">Plongée sous-marine</string>
-	<string name="type.sport.shooting">Sports de tir</string>
+	<string name="type.sport.shooting">Tir sportif</string>
 	<string name="type.sport.skiing">Ski</string>
 	<string name="type.sport.soccer">Football</string>
 	<string name="type.sport.swimming">Natation</string>
@ -1410,7 +1502,7 @@
 	<string name="type.tourism.wilderness_hut">Refuge non gardé</string>
 	<string name="type.traffic_calming.bump">Ralentisseur</string>
 	<string name="type.traffic_calming.hump">Ralentisseur</string>
-	<string name="type.waterway.dam">Dam</string>
+	<string name="type.waterway.dam">Barrage</string>
 	<string name="type.waterway.ditch">Fossé</string>
 	<string name="type.waterway.ditch.tunnel">Fossé</string>
 	<string name="type.waterway.dock">Cale</string>
@ -1423,8 +1515,23 @@
 	<string name="type.waterway.stream.intermittent">Ruisseau</string>
 	<string name="type.waterway.stream.tunnel">Ruisseau</string>
 	<string name="type.waterway.waterfall">Cascade</string>
+	<string name="type.waterway.weir">Seuil</string>
 	<string name="type.wheelchair.limited">Partiellement équipé pour l\'usage des fauteuils roulants</string>
 	<string name="type.wheelchair.no">Non équipé pour l\'usage des fauteuils roulants</string>
 	<string name="type.wheelchair.yes">Équipé pour l\'usage des fauteuils roulants</string>
+	<!-- en.wikipedia.org/wiki/Surface_lift -->
+	<string name="type.piste_lift">Téléski</string>
+	<string name="type.piste_lift.j.bar">Téléski</string>
+	<string name="type.piste_lift.magic_carpet">Tapis roulant</string>
+	<string name="type.piste_type.downhill">Piste de ski alpin</string>
+	<string name="type.piste_type.downhill.advanced">Piste de ski alpin</string>
+	<string name="type.piste_type.downhill.easy">Piste de ski alpin</string>
+	<string name="type.piste_type.downhill.expert">Piste de ski alpin</string>
+	<string name="type.piste_type.downhill.freeride">Piste de ski alpin</string>
+	<string name="type.piste_type.downhill.intermediate">Piste de ski alpin</string>
+	<string name="type.piste_type.downhill.novice">Piste de ski alpin</string>
+	<string name="type.piste_type.nordic">Piste de ski de fond</string>
+	<string name="type.piste_type.sled">Piste de luge</string>
 	<string name="type.building_part">Bâtiment</string>
+	<string name="type.amenity.events_venue">Lieu des événements</string>
 </resources>
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@ -792,6 +792,7 @@
 	<string name="type.craft.carpenter">Ács</string>
 	<string name="type.craft.electrician">Villanyszerelő</string>
 	<string name="type.craft.gardener">Kertész</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Hűtés-fűtés szerelő</string>
 	<string name="type.craft.metal_construction">Lakatos</string>
 	<string name="type.craft.painter">Festő</string>
@ -1112,27 +1113,46 @@
 	<string name="type.man_made.water_tower">Víztorony</string>
 	<string name="type.man_made.water_well">Ivókút</string>
 	<string name="type.man_made.windmill">Szélmalom</string>
+	<string name="type.natural">Természet</string>
+	<string name="type.natural.bare_rock">Csupasz szikla</string>
 	<string name="type.natural.bay">Öböl</string>
 	<string name="type.natural.beach">Strand</string>
+	<string name="type.natural.beach.sand">Homokos part</string>
+	<string name="type.natural.beach.gravel">Kavicsos strand</string>
 	<string name="type.natural.cape">Hegytető</string>
 	<string name="type.natural.cave_entrance">Barlang</string>
+	<string name="type.natural.cliff">Szikla</string>
+	<string name="type.natural.earth_bank">Szikla</string>
+	<string name="type.man_made.embankment">Töltés</string>
+	<string name="type.natural.coastline">Tengerpart</string>
 	<string name="type.natural.geyser">Gejzír</string>
 	<string name="type.natural.glacier">Gleccser</string>
-	<string name="type.natural.grassland">Mező</string>
+	<string name="type.natural.grassland">Füves puszta</string>
+	<string name="type.natural.heath">Fenyér</string>
+	<string name="type.natural.hot_spring">Termálvíz</string>
 	<string name="type.natural.water.lake">Tó</string>
 	<string name="type.natural.water.lock">Zsilipkamra</string>
 	<string name="type.natural.water.pond">Tavacska</string>
 	<string name="type.natural.water.reservoir">Rezervoár</string>
 	<string name="type.natural.water.basin">Vízgyűjtő</string>
 	<string name="type.natural.water.river">Folyó</string>
+	<string name="type.natural.land">Föld</string>
+	<string name="type.natural.meadow">Rét</string>
+	<string name="type.natural.orchard">Gyümölcsöskert</string>
 	<string name="type.natural.peak">Csúcs</string>
+	<string name="type.natural.saddle">Hegyi nyereg</string>
+	<string name="type.natural.rock">Kőzet</string>
 	<string name="type.natural.scrub">Cserjés</string>
 	<string name="type.natural.spring">Forrás</string>
 	<string name="type.natural.strait">Szoros</string>
 	<string name="type.natural.tree">Fa</string>
+	<string name="type.natural.tree_row">Fa sor</string>
+	<string name="type.natural.vineyard">Szőlőskert</string>
 	<string name="type.natural.volcano">Tűzhányó</string>
 	<string name="type.natural.water">Vizek</string>
 	<string name="type.natural.wetland">Vizes terület</string>
+	<string name="type.natural.wetland.bog">Láp</string>
+	<string name="type.natural.wetland.marsh">Mocsár</string>
 	<string name="type.office">Hivatal</string>
 	<string name="type.office.company">Vállalati iroda</string>
 	<string name="type.office.estate_agent">Ingatlanügynök</string>
@ -1271,9 +1291,26 @@
 	<string name="type.shop.video">Videotéka</string>
 	<string name="type.shop.video_games">Videojáték bolt</string>
 	<string name="type.shop.wine">Szeszesital-üzlet</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Amerikai foci</string>
+	<string name="type.sport.archery">Íjászat</string>
 	<string name="type.sport.athletics">Atlétika</string>
+	<string name="type.sport.australian_football">Ausztrál futball</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Kosárlabda</string>
+	<string name="type.sport.cricket">Krikett</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Lovas sportok</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gimnasztika</string>
+	<string name="type.sport.handball">Kézilabda</string>
+	<string name="type.sport.multi">Különféle sportágak</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Búvárkodás</string>
+	<string name="type.sport.shooting">Lövés</string>
+	<string name="type.sport.skiing">Síelés</string>
+	<string name="type.sport.soccer">Futball</string>
+	<string name="type.sport.swimming">Úszás</string>
 	<string name="type.sport.tennis">Teniszpálya</string>
 	<string name="type.tourism.alpine_hut">Hegyi menedék</string>
 	<string name="type.tourism.apartment">Apartmanok</string>
@ -1293,7 +1330,7 @@
 	<string name="type.tourism.hotel">Szálloda</string>
 	<string name="type.tourism.information">Túrista információ</string>
 	<string name="type.tourism.information.board">Információs tábla</string>
-	<string name="type.tourism.information.guidepost">Túrista információ</string>
+	<string name="type.tourism.information.guidepost">Útmutató</string>
 	<string name="type.tourism.information.map">Turistatérkép</string>
 	<string name="type.tourism.information.office">Idegenforgalmi iroda</string>
 	<string name="type.tourism.museum">Múzeum</string>
@ -1318,4 +1355,5 @@
 	<string name="type.wheelchair.no">Nem akadálymentesített</string>
 	<string name="type.wheelchair.yes">Teljesen akadálymentesített</string>
 	<string name="type.building_part">Épület</string>
+	<string name="type.amenity.events_venue">Rendezvények helyszíne</string>
 </resources>
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@ -1106,27 +1106,46 @@
 	<string name="type.man_made.water_tower">Menara air</string>
 	<string name="type.man_made.water_well">Sumur air</string>
 	<string name="type.man_made.windmill">Kincir angin</string>
+	<string name="type.natural">Alam</string>
+	<string name="type.natural.bare_rock">Batuan telanjang</string>
 	<string name="type.natural.bay">Teluk</string>
 	<string name="type.natural.beach">Pantai</string>
+	<string name="type.natural.beach.sand">Pantai berpasir</string>
+	<string name="type.natural.beach.gravel">Pantai Kerikil</string>
 	<string name="type.natural.cape">Tanjung</string>
 	<string name="type.natural.cave_entrance">Gua</string>
+	<string name="type.natural.cliff">Tebing</string>
+	<string name="type.natural.earth_bank">Jurang</string>
+	<string name="type.man_made.embankment">Tanggul</string>
+	<string name="type.natural.coastline">Pesisir</string>
 	<string name="type.natural.geyser">Geiser</string>
 	<string name="type.natural.glacier">Gletser</string>
-	<string name="type.natural.grassland">Ladang</string>
+	<string name="type.natural.grassland">Padang rumput</string>
+	<string name="type.natural.heath">Lahan kosong</string>
+	<string name="type.natural.hot_spring">Mata air panas</string>
 	<string name="type.natural.water.lake">Danau</string>
 	<string name="type.natural.water.lock">Ruang Kunci</string>
 	<string name="type.natural.water.pond">Kolam</string>
 	<string name="type.natural.water.reservoir">Waduk</string>
 	<string name="type.natural.water.basin">Sebuah baskom air</string>
 	<string name="type.natural.water.river">Sungai</string>
+	<string name="type.natural.land">Daratan</string>
+	<string name="type.natural.meadow">Padang rumput</string>
+	<string name="type.natural.orchard">Kebun</string>
 	<string name="type.natural.peak">Puncak</string>
+	<string name="type.natural.saddle">Pelana Gunung</string>
+	<string name="type.natural.rock">Batu</string>
 	<string name="type.natural.scrub">Semak</string>
 	<string name="type.natural.spring">Mata air</string>
 	<string name="type.natural.strait">Selat</string>
 	<string name="type.natural.tree">Pohon</string>
+	<string name="type.natural.tree_row">Baris pohon</string>
+	<string name="type.natural.vineyard">Kebun anggur</string>
 	<string name="type.natural.volcano">Gunung berapi</string>
 	<string name="type.natural.water">Perairan</string>
 	<string name="type.natural.wetland">Area lahan basah</string>
+	<string name="type.natural.wetland.bog">Rawa gambut</string>
+	<string name="type.natural.wetland.marsh">Paya</string>
 	<string name="type.office">Kantor</string>
 	<string name="type.office.company">Kantor perusahaan</string>
 	<string name="type.office.estate_agent">Agen ril estat</string>
@ -1263,9 +1282,27 @@
 	<string name="type.shop.video">Toko video</string>
 	<string name="type.shop.video_games">Toko permainan video</string>
 	<string name="type.shop.wine">Toko anggur</string>
+	<string name="type.sport">Olahraga</string>
+	<string name="type.sport.american_football">Sepak Bola Amerika</string>
+	<string name="type.sport.archery">Panahan</string>
 	<string name="type.sport.athletics">Atletik</string>
+	<string name="type.sport.australian_football">Sepak bola Australia</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Bola basket</string>
+	<string name="type.sport.bowls">Boling lapangan</string>
+	<string name="type.sport.cricket">Kriket</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Olahraga Berkuda</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Olahraga senam</string>
+	<string name="type.sport.handball">Bola tangan</string>
+	<string name="type.sport.multi">Berbagai Olahraga</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Selam scuba</string>
+	<string name="type.sport.shooting">Penembakan</string>
+	<string name="type.sport.skiing">Bermain ski</string>
+	<string name="type.sport.soccer">Sepak bola</string>
+	<string name="type.sport.swimming">Berenang</string>
 	<string name="type.sport.tennis">Lapangan tenis</string>
 	<string name="type.tourism.alpine_hut">Penginapan di pegunungan</string>
 	<string name="type.tourism.apartment">Apartemen</string>
@ -1283,7 +1320,7 @@
 	<string name="type.tourism.guest_house">Wisma tamu</string>
 	<string name="type.tourism.information">Informasi turis</string>
 	<string name="type.tourism.information.board">Papan informasi</string>
-	<string name="type.tourism.information.guidepost">Informasi turis</string>
+	<string name="type.tourism.information.guidepost">Tongkat petunjuk jalan</string>
 	<string name="type.tourism.information.map">Peta wisata</string>
 	<string name="type.tourism.information.office">Kantor wisata</string>
 	<string name="type.tourism.picnic_site">Lokasi piknik</string>
@ -1307,4 +1344,5 @@
 	<string name="type.wheelchair.no">Tidak ada akses kursi roda</string>
 	<string name="type.wheelchair.yes">Akses penuh kursi roda</string>
 	<string name="type.building_part">Gedung</string>
+	<string name="type.amenity.events_venue">Tempat acara</string>
 </resources>
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@ -338,6 +338,8 @@
 	<string name="routing_arrive">Arrivo a %s</string>
 	<string name="categories">Categorie</string>
 	<string name="history">Cronologia</string>
+	<string name="opens_in">Apre tra %s</string>
+	<string name="closes_in">Chiude tra %s</string>
 	<string name="closed">Chiuso</string>
 	<string name="search_not_found">Non ho trovato nulla.</string>
 	<string name="search_not_found_query">Prova con un\'altra ricerca.</string>
@ -814,10 +816,16 @@
 	<string name="type.building.has_parts">Edificio</string>
 	<string name="type.building.train_station">Stazione ferroviaria</string>
 	<string name="type.cemetery.grave">La tomba</string>
+	<string name="type.craft">Artigianato</string>
+	<string name="type.craft.beekeeper">Apicoltore</string>
+	<string name="type.craft.blacksmith">Fabbro</string>
 	<string name="type.craft.brewery">Birrificio</string>
 	<string name="type.craft.carpenter">Falegname</string>
 	<string name="type.craft.electrician">Elettricista</string>
+	<string name="type.craft.electronics_repair">Riparazioni elettroniche</string>
 	<string name="type.craft.gardener">Giardiniere</string>
+	<string name="type.craft.handicraft">Artigiano</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Impianti HVAC</string>
 	<string name="type.craft.metal_construction">Fabbro</string>
 	<string name="type.craft.painter">Imbianchino</string>
@ -1139,28 +1147,46 @@
 	<string name="type.man_made.water_well">Pozzo d\'acqua</string>
 	<string name="type.man_made.windmill">Mulino a vento</string>
 	<string name="type.mountain_pass">Passo</string>
+	<string name="type.natural">Natura</string>
+	<string name="type.natural.bare_rock">Roccia nuda</string>
 	<string name="type.natural.bay">Baia</string>
 	<string name="type.natural.beach">Spiaggia</string>
+	<string name="type.natural.beach.sand">Spiaggia sabbiosa</string>
+	<string name="type.natural.beach.gravel">Spiaggia di ghiaia</string>
 	<string name="type.natural.cape">Capo</string>
 	<string name="type.natural.cave_entrance">Grotta</string>
+	<string name="type.natural.cliff">Falesia</string>
+	<string name="type.natural.earth_bank">Scogliera</string>
+	<string name="type.man_made.embankment">Rilevato</string>
+	<string name="type.natural.coastline">Costa</string>
 	<string name="type.natural.geyser">Geyser</string>
 	<string name="type.natural.glacier">Ghiacciaio</string>
-	<string name="type.natural.grassland">Campo</string>
+	<string name="type.natural.grassland">Prateria</string>
+	<string name="type.natural.heath">Landa</string>
+	<string name="type.natural.hot_spring">Sorgente calda</string>
 	<string name="type.natural.water.lake">Lago</string>
 	<string name="type.natural.water.lock">Camera di blocco</string>
 	<string name="type.natural.water.pond">Stagno</string>
 	<string name="type.natural.water.reservoir">Serbatoio</string>
 	<string name="type.natural.water.basin">Bacino d\'acqua</string>
 	<string name="type.natural.water.river">Fiume</string>
+	<string name="type.natural.land">Terra</string>
+	<string name="type.natural.meadow">Prato</string>
+	<string name="type.natural.orchard">Frutteto</string>
 	<string name="type.natural.peak">Monte</string>
 	<string name="type.natural.saddle">Sella</string>
+	<string name="type.natural.rock">Roccia</string>
 	<string name="type.natural.scrub">Boscaglia</string>
 	<string name="type.natural.spring">Sorgente</string>
 	<string name="type.natural.strait">Stretto</string>
 	<string name="type.natural.tree">Albero</string>
+	<string name="type.natural.tree_row">Fila di alberi</string>
+	<string name="type.natural.vineyard">Vigneto</string>
 	<string name="type.natural.volcano">Vulcano</string>
 	<string name="type.natural.water">Corpo d\'acqua</string>
 	<string name="type.natural.wetland">Terreno paludoso</string>
+	<string name="type.natural.wetland.bog">Torbiera</string>
+	<string name="type.natural.wetland.marsh">Palude</string>
 	<string name="type.office">Ufficio</string>
 	<string name="type.office.company">Ufficio aziendale</string>
 	<string name="type.office.estate_agent">Agenzia immobiliare</string>
@ -1301,9 +1327,27 @@
 	<string name="type.shop.video">Videoteca</string>
 	<string name="type.shop.video_games">Negozio di videogiochi</string>
 	<string name="type.shop.wine">Negozio di alcolici</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Football americano</string>
+	<string name="type.sport.archery">Tiro con l\'arco</string>
 	<string name="type.sport.athletics">Atletica leggera</string>
+	<string name="type.sport.australian_football">Football australiano</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Pallacanestro</string>
+	<string name="type.sport.bowls">Bowls</string>
+	<string name="type.sport.cricket">Cricket</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Equitazione</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Ginnastica</string>
+	<string name="type.sport.handball">Palla a mano</string>
+	<string name="type.sport.multi">Sport vari</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Immersioni in subacquea</string>
+	<string name="type.sport.shooting">Tiro</string>
+	<string name="type.sport.skiing">Sciare</string>
+	<string name="type.sport.soccer">Calcio</string>
+	<string name="type.sport.swimming">Nuoto</string>
 	<string name="type.sport.tennis">Campo da tennis</string>
 	<string name="type.tourism.alpine_hut">Hotel di montagna</string>
 	<string name="type.tourism.apartment">Residence</string>
@ -1323,7 +1367,7 @@
 	<string name="type.tourism.hotel">Hôtel</string>
 	<string name="type.tourism.information">Informazione</string>
 	<string name="type.tourism.information.board">Tabellone informativo</string>
-	<string name="type.tourism.information.guidepost">Informazione</string>
+	<string name="type.tourism.information.guidepost">Guida</string>
 	<string name="type.tourism.information.map">Mappa turistica</string>
 	<string name="type.tourism.information.office">Ufficio turistico</string>
 	<string name="type.tourism.museum">Museo</string>
@ -1346,4 +1390,5 @@
 	<string name="type.wheelchair.no">Non accessibile ai disabili</string>
 	<string name="type.wheelchair.yes">Accessibile ai disabili</string>
 	<string name="type.building_part">Edificio</string>
+	<string name="type.amenity.events_venue">Sede degli eventi</string>
 </resources>
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@ -407,8 +407,68 @@
 	<!-- SECTION: Types: Historic -->
 	<string name="type.landuse.basin">אגן מים</string>
 	<string name="type.leisure.picnic_table">קינקיפ ןחלוש</string>
+	<string name="type.natural">טבע</string>
+	<string name="type.natural.bare_rock">סלע חשוף</string>
+	<string name="type.natural.bay">מפרץ</string>
+	<string name="type.natural.beach">חוף חולי</string>
+	<string name="type.natural.beach.sand">חוף חולי</string>
+	<string name="type.natural.beach.gravel">חוף חצץ</string>
+	<string name="type.natural.cape">לשון יבשה</string>
+	<string name="type.natural.cave_entrance">מערה</string>
+	<string name="type.natural.cliff">צוק</string>
+	<string name="type.natural.earth_bank">צוּק</string>
+	<string name="type.man_made.embankment">סוֹלְלָה</string>
+	<string name="type.natural.coastline">חוף</string>
+	<string name="type.natural.geyser">גייזר</string>
+	<string name="type.natural.glacier">קרחון</string>
+	<string name="type.natural.grassland">ערבה</string>
+	<string name="type.natural.heath">עֲרָבָה</string>
+	<string name="type.natural.hot_spring">מעיין חם</string>
+	<string name="type.natural.water.lake">אגם</string>
 	<string name="type.natural.water.lock">לוענמ את</string>
+	<string name="type.natural.water.pond">בריכה</string>
 	<string name="type.natural.water.reservoir">מאגר</string>
 	<string name="type.natural.water.basin">אגן מים</string>
+	<string name="type.natural.water.river">נהר</string>
+	<string name="type.natural.land">ארץ</string>
+	<string name="type.natural.meadow">אָחוּ</string>
+	<string name="type.natural.orchard">פרדס</string>
+	<string name="type.natural.peak">פסגה</string>
+	<string name="type.natural.saddle">אוכף הרים</string>
+	<string name="type.natural.rock">סלע</string>
+	<string name="type.natural.scrub">בתה</string>
+	<string name="type.natural.spring">מעיין</string>
+	<string name="type.natural.strait">מצר ים</string>
+	<string name="type.natural.tree">עץ</string>
+	<string name="type.natural.tree_row">שורת עצים</string>
+	<string name="type.natural.vineyard">כרם</string>
+	<string name="type.natural.volcano">הר געש</string>
 	<string name="type.natural.water">גוף מים</string>
+	<string name="type.natural.wetland">ביצה</string>
+	<string name="type.natural.wetland.bog">ביצת כבול</string>
+	<string name="type.natural.wetland.marsh">ביצת עשב</string>
+	<string name="type.sport">ספורט</string>
+	<string name="type.sport.american_football">כדורגל אמריקאי</string>
+	<string name="type.sport.archery">קַשׁתוּת</string>
+	<string name="type.sport.australian_football">פוטבול אוסטרלי</string>
+	<string name="type.sport.baseball">בייסבול</string>
+	<string name="type.sport.bowls">כדורת דשא</string>
+	<string name="type.sport.cricket">קריקט</string>
+	<string name="type.sport.curling">קרלינג</string>
+	<string name="type.sport.equestrian">רכיבה</string>
+	<string name="type.sport.golf">גולף</string>
+	<string name="type.sport.gymnastics">התעמלות</string>
+	<string name="type.sport.handball">כדוריד</string>
+	<string name="type.sport.multi">ענפי ספורט שונים</string>
+	<string name="type.sport.shooting">ירי ספורטיבי</string>
+	<string name="type.sport.skiing">סקי</string>
+	<string name="type.sport.soccer">כדורגל</string>
+	<string name="type.sport.swimming">שחייה</string>
+	<string name="type.sport.tennis">טֶנִיס</string>
+	<string name="type.tourism.information">מידע לתייר</string>
+	<string name="type.tourism.information.board">לוח מידע</string>
+	<string name="type.tourism.information.guidepost">מנחה</string>
+	<string name="type.tourism.information.map">מפת תיירות</string>
+	<string name="type.tourism.information.office">משרד תיירות</string>
+	<string name="type.amenity.events_venue">מקום אירועים</string>
 </resources>
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@ -824,6 +824,7 @@
 	<string name="type.craft.carpenter">大工</string>
 	<string name="type.craft.electrician">電気技師</string>
 	<string name="type.craft.gardener">造園家</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">冷暖房空調</string>
 	<string name="type.craft.metal_construction">金属工</string>
 	<string name="type.craft.painter">塗装工</string>
@ -1206,13 +1207,17 @@
 	<string name="type.natural.bare_rock">岩肌</string>
 	<string name="type.natural.bay">港湾</string>
 	<string name="type.natural.beach">ビーチ</string>
+	<string name="type.natural.beach.sand">砂浜</string>
+	<string name="type.natural.beach.gravel">グラベルビーチ</string>
 	<string name="type.natural.cape">岬</string>
 	<string name="type.natural.cave_entrance">洞窟</string>
 	<string name="type.natural.cliff">崖</string>
+	<string name="type.natural.earth_bank">崖</string>
+	<string name="type.man_made.embankment">盛土</string>
 	<string name="type.natural.coastline">海岸線</string>
 	<string name="type.natural.geyser">間欠泉</string>
 	<string name="type.natural.glacier">氷河</string>
-	<string name="type.natural.grassland">野原</string>
+	<string name="type.natural.grassland">草原</string>
 	<string name="type.natural.heath">ヒース</string>
 	<string name="type.natural.hot_spring">温泉</string>
 	<string name="type.natural.water.lake">湖</string>
@ -1225,6 +1230,7 @@
 	<string name="type.natural.meadow">牧草地</string>
 	<string name="type.natural.orchard">果樹園</string>
 	<string name="type.natural.peak">山頂</string>
+	<string name="type.natural.saddle">鞍部</string>
 	<string name="type.natural.rock">岩</string>
 	<string name="type.natural.scrub">雑木林</string>
 	<string name="type.natural.spring">泉</string>
@ -1438,13 +1444,13 @@
 	<string name="type.sport.bowls">ローンボウルズ</string>
 	<string name="type.sport.cricket">クリケット</string>
 	<string name="type.sport.curling">カーリング</string>
-	<string name="type.sport.diving">ダイビング</string>
 	<string name="type.sport.equestrian">馬術</string>
 	<string name="type.sport.golf">ゴルフ</string>
-	<string name="type.sport.gymnastics">体操競技</string>
+	<string name="type.sport.gymnastics">体操</string>
 	<string name="type.sport.handball">ハンドボール</string>
 	<string name="type.sport.multi">複数</string>
-	<string name="type.sport.scuba_diving">スクーバダイビング</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">スキューバダイビング</string>
 	<string name="type.sport.shooting">射撃競技</string>
 	<string name="type.sport.skiing">スキー</string>
 	<string name="type.sport.soccer">サッカー</string>
@ -1469,7 +1475,7 @@
 	<string name="type.tourism.hostel">ホステル</string>
 	<string name="type.tourism.hotel">ホテル</string>
 	<string name="type.tourism.information">インフォメーション</string>
-	<string name="type.tourism.information.board">案内板</string>
+	<string name="type.tourism.information.board">情報板</string>
 	<string name="type.tourism.information.guidepost">道標</string>
 	<string name="type.tourism.information.map">観光マップ</string>
 	<string name="type.tourism.information.office">観光案内所</string>
@ -1508,4 +1514,5 @@
 	<string name="type.wheelchair.no">車椅子でのアクセスなし</string>
 	<string name="type.wheelchair.yes">車椅子でのアクセスあり</string>
 	<string name="type.building_part">建物</string>
+	<string name="type.amenity.events_venue">イベント会場</string>
 </resources>
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@ -792,6 +792,7 @@
 	<string name="type.craft.carpenter">목수</string>
 	<string name="type.craft.electrician">전기기술자</string>
 	<string name="type.craft.gardener">조경사</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">냉난방기</string>
 	<string name="type.craft.metal_construction">금속공</string>
 	<string name="type.craft.painter">페인트공</string>
@ -1114,27 +1115,46 @@
 	<string name="type.man_made.water_well">우물</string>
 	<string name="type.man_made.windmill">풍차</string>
 	<string name="type.military.bunker">벙커</string>
+	<string name="type.natural">자연</string>
+	<string name="type.natural.bare_rock">베어 락</string>
 	<string name="type.natural.bay">만</string>
 	<string name="type.natural.beach">바닷가</string>
+	<string name="type.natural.beach.sand">모래 사장</string>
+	<string name="type.natural.beach.gravel">자갈 해변</string>
 	<string name="type.natural.cape">곶</string>
 	<string name="type.natural.cave_entrance">동굴</string>
+	<string name="type.natural.cliff">절벽</string>
+	<string name="type.natural.earth_bank">낭떠러지</string>
+	<string name="type.man_made.embankment">둑</string>
+	<string name="type.natural.coastline">연안</string>
 	<string name="type.natural.geyser">간헐천</string>
 	<string name="type.natural.glacier">빙하</string>
-	<string name="type.natural.grassland">밭</string>
+	<string name="type.natural.grassland">초원</string>
+	<string name="type.natural.heath">히스</string>
+	<string name="type.natural.hot_spring">온천</string>
 	<string name="type.natural.water.lake">호수</string>
 	<string name="type.natural.water.lock">잠금 챔버</string>
 	<string name="type.natural.water.pond">연못이</string>
 	<string name="type.natural.water.reservoir">저수지</string>
 	<string name="type.natural.water.basin">저수지</string>
 	<string name="type.natural.water.river">강</string>
+	<string name="type.natural.land">땅</string>
+	<string name="type.natural.meadow">초지</string>
+	<string name="type.natural.orchard">과수원</string>
 	<string name="type.natural.peak">산</string>
+	<string name="type.natural.saddle">산 안장</string>
+	<string name="type.natural.rock">암석</string>
 	<string name="type.natural.scrub">관목지</string>
 	<string name="type.natural.spring">샘</string>
 	<string name="type.natural.strait">해협</string>
 	<string name="type.natural.tree">나무</string>
+	<string name="type.natural.tree_row">나무 행</string>
+	<string name="type.natural.vineyard">포도원</string>
 	<string name="type.natural.volcano">화산</string>
 	<string name="type.natural.water">수역</string>
 	<string name="type.natural.wetland">습지 구역</string>
+	<string name="type.natural.wetland.bog">수렁</string>
+	<string name="type.natural.wetland.marsh">소택</string>
 	<string name="type.office">사무실</string>
 	<string name="type.office.company">회사</string>
 	<string name="type.office.estate_agent">부동산중개사</string>
@ -1273,9 +1293,27 @@
 	<string name="type.shop.video">비디오 가게</string>
 	<string name="type.shop.video_games">비디오 게임 가게</string>
 	<string name="type.shop.wine">와인 샵</string>
+	<string name="type.sport">스포츠</string>
+	<string name="type.sport.american_football">미식 축구</string>
+	<string name="type.sport.archery">양궁</string>
 	<string name="type.sport.athletics">육상 경기장</string>
+	<string name="type.sport.australian_football">오스트레일리안 풋볼</string>
+	<string name="type.sport.baseball">야구</string>
 	<string name="type.sport.basketball">야구</string>
+	<string name="type.sport.bowls">론볼</string>
+	<string name="type.sport.cricket">크리켓</string>
+	<string name="type.sport.curling">컬링</string>
 	<string name="type.sport.equestrian">승마 경기장</string>
+	<string name="type.sport.golf">골프</string>
+	<string name="type.sport.gymnastics">체조</string>
+	<string name="type.sport.handball">핸드볼</string>
+	<string name="type.sport.multi">다양한 스포츠</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">스쿠버 다이빙</string>
+	<string name="type.sport.shooting">사격 경기</string>
+	<string name="type.sport.skiing">스키 타기</string>
+	<string name="type.sport.soccer">축구</string>
+	<string name="type.sport.swimming">수영</string>
 	<string name="type.sport.tennis">테니스 코트</string>
 	<string name="type.tourism.alpine_hut">고산 오두막</string>
 	<string name="type.tourism.apartment">아파트</string>
@ -1296,7 +1334,7 @@
 	<string name="type.tourism.hotel">호텔</string>
 	<string name="type.tourism.information">관광 정보</string>
 	<string name="type.tourism.information.board">정보 게시판</string>
-	<string name="type.tourism.information.guidepost">관광 정보</string>
+	<string name="type.tourism.information.guidepost">도표</string>
 	<string name="type.tourism.information.map">관광안내도</string>
 	<string name="type.tourism.information.office">관광정보센터</string>
 	<string name="type.tourism.motel">모텔</string>
@ -1322,4 +1360,5 @@
 	<string name="type.wheelchair.no">휠체어 접근 금지</string>
 	<string name="type.wheelchair.yes">휠체어 접근 가능</string>
 	<string name="type.building_part">건물</string>
+	<string name="type.amenity.events_venue">행사장</string>
 </resources>
--- a/android/res/values-mr/strings.xml
+++ b/android/res/values-mr/strings.xml
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@ -789,6 +789,7 @@
 	<string name="type.craft.carpenter">Snekker</string>
 	<string name="type.craft.electrician">Elektriker</string>
 	<string name="type.craft.gardener">Anleggsgartner</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Klimaanlegg</string>
 	<string name="type.craft.metal_construction">Metallarbeider</string>
 	<string name="type.craft.painter">Maler</string>
@ -1108,27 +1109,46 @@
 	<string name="type.man_made.water_tower">Vanntårn</string>
 	<string name="type.man_made.water_well">Brønn</string>
 	<string name="type.man_made.windmill">Vindmølle</string>
+	<string name="type.natural">Natur</string>
+	<string name="type.natural.bare_rock">Bar stein</string>
 	<string name="type.natural.bay">Bukt</string>
 	<string name="type.natural.beach">Strand</string>
+	<string name="type.natural.beach.sand">Sandstrand</string>
+	<string name="type.natural.beach.gravel">Grusstrand</string>
 	<string name="type.natural.cape">Kapp</string>
 	<string name="type.natural.cave_entrance">Grotte</string>
+	<string name="type.natural.cliff">Klippe</string>
+	<string name="type.natural.earth_bank">Klippe</string>
+	<string name="type.man_made.embankment">Fylling</string>
+	<string name="type.natural.coastline">Kyst</string>
 	<string name="type.natural.geyser">Gaysir</string>
 	<string name="type.natural.glacier">Isbre</string>
-	<string name="type.natural.grassland">Slette</string>
+	<string name="type.natural.grassland">Sletteland</string>
+	<string name="type.natural.heath">Heath</string>
+	<string name="type.natural.hot_spring">Varm kilde</string>
 	<string name="type.natural.water.lake">Innsjø</string>
 	<string name="type.natural.water.lock">Låsekammer</string>
 	<string name="type.natural.water.pond">Dam</string>
 	<string name="type.natural.water.reservoir">Reservoar</string>
 	<string name="type.natural.water.basin">Vannvask</string>
 	<string name="type.natural.water.river">Elv</string>
+	<string name="type.natural.land">Land</string>
+	<string name="type.natural.meadow">Eng</string>
+	<string name="type.natural.orchard">Frukthage</string>
 	<string name="type.natural.peak">Høydepunkt</string>
+	<string name="type.natural.saddle">Fjellsadel</string>
+	<string name="type.natural.rock">Bergart</string>
 	<string name="type.natural.scrub">Myr</string>
 	<string name="type.natural.spring">Vår</string>
 	<string name="type.natural.strait">Sund</string>
 	<string name="type.natural.tree">Tre</string>
+	<string name="type.natural.tree_row">Trerekke</string>
+	<string name="type.natural.vineyard">Vingård</string>
 	<string name="type.natural.volcano">Vulkan</string>
 	<string name="type.natural.water">Vassmasse</string>
 	<string name="type.natural.wetland">Våtmarksområde</string>
+	<string name="type.natural.wetland.bog">Myr</string>
+	<string name="type.natural.wetland.marsh">Sump</string>
 	<string name="type.office">Kontor</string>
 	<string name="type.office.company">Firmakontor</string>
 	<string name="type.office.estate_agent">Eiendomsmegler</string>
@ -1265,9 +1285,27 @@
 	<string name="type.shop.video">Videobutikken</string>
 	<string name="type.shop.video_games">Videospillbutikken</string>
 	<string name="type.shop.wine">Alkoholutsalg</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Amerikansk fotball</string>
+	<string name="type.sport.archery">Bueskyting</string>
 	<string name="type.sport.athletics">Friidrett</string>
+	<string name="type.sport.australian_football">Australsk fotball</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketball</string>
+	<string name="type.sport.bowls">Bowls</string>
+	<string name="type.sport.cricket">Cricket</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Hestesport</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gymnastikk</string>
+	<string name="type.sport.handball">Håndball</string>
+	<string name="type.sport.multi">Ulike idretter</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Dykking</string>
+	<string name="type.sport.shooting">Skyting</string>
+	<string name="type.sport.skiing">Stå på ski</string>
+	<string name="type.sport.soccer">Fotball</string>
+	<string name="type.sport.swimming">Svømming</string>
 	<string name="type.sport.tennis">Tennisbane</string>
 	<string name="type.tourism.alpine_hut">Fjellstue</string>
 	<string name="type.tourism.apartment">Leiligheter</string>
@ -1287,7 +1325,7 @@
 	<string name="type.tourism.hotel">Hotell</string>
 	<string name="type.tourism.information">Turistinformasjon</string>
 	<string name="type.tourism.information.board">Informasjonstavle</string>
-	<string name="type.tourism.information.guidepost">Turistinformasjon</string>
+	<string name="type.tourism.information.guidepost">Guidepost</string>
 	<string name="type.tourism.information.map">Turistkart</string>
 	<string name="type.tourism.information.office">Turistkontor</string>
 	<string name="type.tourism.motel">Motell</string>
@ -1312,4 +1350,5 @@
 	<string name="type.wheelchair.no">Ingen tilgang for rullestol</string>
 	<string name="type.wheelchair.yes">Full tilgang for rullestol</string>
 	<string name="type.building_part">Bygning</string>
+	<string name="type.amenity.events_venue">Arrangementssted</string>
 </resources>
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@ -793,6 +793,7 @@
 	<string name="type.craft.carpenter">Timmerman</string>
 	<string name="type.craft.electrician">Elektricien</string>
 	<string name="type.craft.gardener">Tuinarchitect</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Airconditioning</string>
 	<string name="type.craft.metal_construction">Metaalarbeider</string>
 	<string name="type.craft.painter">Schilder</string>
@ -1116,13 +1117,17 @@
 	<string name="type.natural.bare_rock">Kale steen</string>
 	<string name="type.natural.bay">Baai</string>
 	<string name="type.natural.beach">Strand</string>
+	<string name="type.natural.beach.sand">Zandstrand</string>
+	<string name="type.natural.beach.gravel">Kiezelstrand</string>
 	<string name="type.natural.cape">Kaap</string>
 	<string name="type.natural.cave_entrance">Grot</string>
 	<string name="type.natural.cliff">Klif</string>
+	<string name="type.natural.earth_bank">Klif</string>
+	<string name="type.man_made.embankment">Baanlichaam</string>
 	<string name="type.natural.coastline">Kustlijn</string>
 	<string name="type.natural.geyser">Geiser</string>
 	<string name="type.natural.glacier">Gletsjer</string>
-	<string name="type.natural.grassland">Veld</string>
+	<string name="type.natural.grassland">Grasland</string>
 	<string name="type.natural.heath">Heide</string>
 	<string name="type.natural.hot_spring">Heetwaterbron</string>
 	<string name="type.natural.water.lake">Meer</string>
@ -1135,6 +1140,7 @@
 	<string name="type.natural.meadow">Weiland</string>
 	<string name="type.natural.orchard">Boomgaard</string>
 	<string name="type.natural.peak">Top</string>
+	<string name="type.natural.saddle">Bergzadel</string>
 	<string name="type.natural.rock">Steen</string>
 	<string name="type.natural.scrub">Kreupel bos</string>
 	<string name="type.natural.spring">Bron</string>
@ -1282,9 +1288,27 @@
 	<string name="type.shop.video">Videowinkel</string>
 	<string name="type.shop.video_games">Winkel voor videogames</string>
 	<string name="type.shop.wine">Wijn</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Amerikaans voetbal</string>
+	<string name="type.sport.archery">Boogschieten</string>
 	<string name="type.sport.athletics">Atletiek</string>
+	<string name="type.sport.australian_football">Australian football</string>
+	<string name="type.sport.baseball">Basketbal</string>
 	<string name="type.sport.basketball">Basketbal</string>
+	<string name="type.sport.bowls">Bowls</string>
+	<string name="type.sport.cricket">Cricket</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Paardesport</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gymnastiek</string>
+	<string name="type.sport.handball">Handbal</string>
+	<string name="type.sport.multi">Diverse sporten</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Duiken</string>
+	<string name="type.sport.shooting">schieten</string>
+	<string name="type.sport.skiing">Skiën</string>
+	<string name="type.sport.soccer">Voetbal</string>
+	<string name="type.sport.swimming">Zwemmen</string>
 	<string name="type.sport.tennis">Tennisveld</string>
 	<string name="type.tourism.alpine_hut">Berghut</string>
 	<string name="type.tourism.apartment">Appartementen</string>
@ -1301,7 +1325,7 @@
 	<string name="type.tourism.guest_house">Gasthuis</string>
 	<string name="type.tourism.information">Toeristische informatie</string>
 	<string name="type.tourism.information.board">Informatiebord</string>
-	<string name="type.tourism.information.guidepost">Toeristische informatie</string>
+	<string name="type.tourism.information.guidepost">Wegwijzer</string>
 	<string name="type.tourism.information.map">Toeristische kaart</string>
 	<string name="type.tourism.information.office">Toeristische informatie</string>
 	<string name="type.tourism.picnic_site">Picnicplaats</string>
@ -1325,4 +1349,5 @@
 	<string name="type.wheelchair.no">Niet uitgerust voor gehandicapten</string>
 	<string name="type.wheelchair.yes">Uitgerust voor gehandicapten</string>
 	<string name="type.building_part">Gebouw</string>
+	<string name="type.amenity.events_venue">Evenementenlocatie</string>
 </resources>
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@ -853,6 +853,7 @@
 	<string name="type.craft.carpenter">Stolarz</string>
 	<string name="type.craft.electrician">Elektryk</string>
 	<string name="type.craft.gardener">Ogrodnik</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Klimatyzacja</string>
 	<string name="type.craft.metal_construction">Ślusarz, obrabiacz metalu</string>
 	<string name="type.craft.painter">Malarz</string>
@ -1229,13 +1230,17 @@
 	<string name="type.natural.bare_rock">Skała macierzysta</string>
 	<string name="type.natural.bay">Zatoka</string>
 	<string name="type.natural.beach">Plaża</string>
+	<string name="type.natural.beach.sand">Piaszczysta plaża</string>
+	<string name="type.natural.beach.gravel">Żwirowa plaża</string>
 	<string name="type.natural.cape">Przylądek</string>
 	<string name="type.natural.cave_entrance">Jaskinia</string>
 	<string name="type.natural.cliff">Klif</string>
+	<string name="type.natural.earth_bank">Żleb</string>
+	<string name="type.man_made.embankment">Nasyp</string>
 	<string name="type.natural.coastline">Linia brzegowa</string>
 	<string name="type.natural.geyser">Gejzer</string>
 	<string name="type.natural.glacier">Lodowiec</string>
-	<string name="type.natural.grassland">Pastwisko</string>
+	<string name="type.natural.grassland">Formacje trawiaste</string>
 	<string name="type.natural.heath">Wrzosowisko</string>
 	<string name="type.natural.hot_spring">Gorące źródło</string>
 	<string name="type.natural.water.lake">Jezioro</string>
@ -1244,9 +1249,11 @@
 	<string name="type.natural.water.reservoir">Zbiornik</string>
 	<string name="type.natural.water.basin">Zbiornik</string>
 	<string name="type.natural.water.river">Rzeka</string>
+	<string name="type.natural.land">Grunt</string>
 	<string name="type.natural.meadow">Łąka</string>
 	<string name="type.natural.orchard">Sad</string>
 	<string name="type.natural.peak">Szczyt</string>
+	<string name="type.natural.saddle">Siodło</string>
 	<string name="type.natural.rock">Skała</string>
 	<string name="type.natural.scrub">Zarośla</string>
 	<string name="type.natural.spring">Źródło</string>
@ -1405,19 +1412,26 @@
 	<string name="type.shop.video">Wypożyczalnia wideo</string>
 	<string name="type.shop.video_games">Sklep z grami wideo</string>
 	<string name="type.shop.wine">Sklep monopolowy</string>
+	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Futbol amerykański</string>
-	<string name="type.sport.archery">Łucznictwo sportowe</string>
+	<string name="type.sport.archery">Łucznictwo</string>
 	<string name="type.sport.athletics">Lekka atletyka</string>
+	<string name="type.sport.australian_football">Futbol australijski</string>
 	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Koszykówka</string>
 	<string name="type.sport.bowls">Kręgle</string>
 	<string name="type.sport.cricket">Krykiet</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Jeździectwo</string>
 	<string name="type.sport.golf">Golf</string>
 	<string name="type.sport.gymnastics">Gimnastyka</string>
-	<string name="type.sport.handball">Piłka ręczna</string>
+	<string name="type.sport.handball">Gra w piłkę ręczną</string>
+	<string name="type.sport.multi">Różne sporty</string>
+	<!-- Used to tag a scuba diving site. -->
 	<string name="type.sport.scuba_diving">Nurkowanie</string>
 	<string name="type.sport.shooting">Strzelectwo sportowe</string>
+	<string name="type.sport.skiing">Jazda na nartach</string>
+	<string name="type.sport.soccer">Piłka nożna</string>
 	<string name="type.sport.swimming">Pływanie</string>
 	<string name="type.sport.tennis">Kort tenisowy</string>
 	<string name="type.tourism">Turystyka</string>
@ -1438,7 +1452,7 @@
 	<string name="type.tourism.guest_house">Pensjonat</string>
 	<string name="type.tourism.information">Informacja turystyczna</string>
 	<string name="type.tourism.information.board">Tablica informacyjna</string>
-	<string name="type.tourism.information.guidepost">Informacja turystyczna</string>
+	<string name="type.tourism.information.guidepost">Drogowskaz</string>
 	<string name="type.tourism.information.map">Mapa turystyczna</string>
 	<string name="type.tourism.information.office">Biuro informacji turystycznej</string>
 	<string name="type.tourism.museum">Muzeum</string>
@ -1466,4 +1480,5 @@
 	<string name="type.wheelchair.no">Nie wyposażono dla osób niepełnosprawnych</string>
 	<string name="type.wheelchair.yes">Wyposażono dla osób niepełnosprawnych</string>
 	<string name="type.building_part">Część budynku</string>
+	<string name="type.amenity.events_venue">Miejsce wydarzeń</string>
 </resources>
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@ -345,6 +345,8 @@
 	<string name="routing_arrive">Chegada: %s</string>
 	<string name="categories">Categorias</string>
 	<string name="history">Histórico</string>
+	<string name="opens_in">Abre em %s</string>
+	<string name="closes_in">Fecha em %s</string>
 	<string name="closed">Fechado</string>
 	<string name="search_not_found">Sinto muito, nenhum resultado foi encontrado.</string>
 	<string name="search_not_found_query">Por favor, tente outro termo de busca.</string>
@ -720,7 +722,7 @@
 	<string name="type.amenity.bench">Assento</string>
 	<string name="type.amenity.bicycle_parking">Bicicletário</string>
 	<string name="type.amenity.bicycle_rental">Aluguel de bicicletas</string>
-	<string name="type.amenity.bicycle_repair_station">Estação de conserto de bicicletas</string>
+	<string name="type.amenity.bicycle_repair_station">Oficina de conserto de bicicletas</string>
 	<string name="type.amenity.biergarten">Jardim da cerveja</string>
 	<string name="type.amenity.brothel">Bordel</string>
 	<string name="type.amenity.bureau_de_change">Casa de câmbio</string>
@ -871,6 +873,7 @@
 	<string name="type.craft.carpenter">Carpinteiro</string>
 	<string name="type.craft.electrician">Eletricista</string>
 	<string name="type.craft.gardener">Jardineiro</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Ar-condicionado</string>
 	<string name="type.craft.metal_construction">Serralheiro metálico</string>
 	<string name="type.craft.painter">Pintor</string>
@ -974,74 +977,75 @@
 	<string name="type.highway">Rodovia</string>
 	<string name="type.highway.bridleway">Caminho para cavaleiros</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.bridleway.bridge">Ponte</string>
-	<string name="type.highway.bridleway.permissive">Caminho para cavaleiros</string>
+	<string name="type.highway.bridleway.bridge">Ponte para cavaleiros</string>
+	<string name="type.highway.bridleway.permissive">Caminho para cavaleiros permissivo</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.bridleway.tunnel">Túnel</string>
+	<string name="type.highway.bridleway.tunnel">Túnel para cavaleiros</string>
 	<string name="type.highway.bus_stop">Ponto de ônibus</string>
 	<string name="type.highway.construction">Pista em construção</string>
 	<string name="type.highway.cycleway">Ciclovia</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.cycleway.bridge">Ponte</string>
-	<string name="type.highway.cycleway.permissive">Ciclovia</string>
+	<string name="type.highway.cycleway.bridge">Ponte para ciclistas</string>
+	<string name="type.highway.cycleway.permissive">Caminho para ciclistas permissivo</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.cycleway.tunnel">Túnel</string>
+	<string name="type.highway.cycleway.tunnel">Túnel para ciclistas</string>
+	<string name="type.highway.elevator">Elevador</string>
 	<string name="type.highway.footway">Caminho pedonal</string>
 	<string name="type.highway.footway.alpine_hiking">Caminho pedonal</string>
-	<string name="type.highway.footway.area">Caminho pedonal</string>
+	<string name="type.highway.footway.area">Área de pedestres</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.footway.bridge">Ponte</string>
-	<string name="type.highway.footway.demanding_alpine_hiking">Caminho pedonal</string>
-	<string name="type.highway.footway.demanding_mountain_hiking">Caminho pedonal</string>
-	<string name="type.highway.footway.difficult_alpine_hiking">Caminho pedonal</string>
+	<string name="type.highway.footway.bridge">Ponte para pedestres</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Caminho pedonal difícil</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Caminho pedonal difícil</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Caminho pedonal difícil</string>
 	<string name="type.highway.footway.hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.mountain_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.permissive">Caminho pedonal</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.footway.tunnel">Túnel</string>
+	<string name="type.highway.footway.tunnel">Túnel para pedestres</string>
 	<string name="type.highway.ford">Rio raso</string>
 	<string name="type.highway.living_street">Zona de coexistência</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.living_street.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.living_street.tunnel">Túnel</string>
+	<string name="type.highway.living_street.tunnel">Túnel rodoviário</string>
 	<string name="type.highway.motorway">Rodovia</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.motorway.bridge">Ponte</string>
+	<string name="type.highway.motorway.bridge">Ponte rodoviária</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.motorway.tunnel">Túnel</string>
+	<string name="type.highway.motorway.tunnel">Túnel rodoviário</string>
 	<string name="type.highway.motorway_junction">Saída de rodovia</string>
-	<string name="type.highway.motorway_link">Rodovia</string>
+	<string name="type.highway.motorway_link">Acesso a rodovia</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.motorway_link.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Túnel</string>
 	<string name="type.highway.path">Caminho</string>
-	<string name="type.highway.path.alpine_hiking">Caminho</string>
-	<string name="type.highway.path.bicycle">Caminho</string>
+	<string name="type.highway.path.alpine_hiking">Caminho pedonal</string>
+	<string name="type.highway.path.bicycle">Caminho para ciclistas</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Ponte</string>
-	<string name="type.highway.path.demanding_alpine_hiking">Caminho</string>
-	<string name="type.highway.path.demanding_mountain_hiking">Caminho</string>
-	<string name="type.highway.path.difficult_alpine_hiking">Caminho</string>
-	<string name="type.highway.path.hiking">Caminho</string>
-	<string name="type.highway.path.horse">Caminho</string>
-	<string name="type.highway.path.mountain_hiking">Caminho</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Caminho pedonal difícil</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Caminho pedonal difícil</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Caminho pedonal difícil</string>
+	<string name="type.highway.path.hiking">Caminho pedonal</string>
+	<string name="type.highway.path.horse">Caminho para cavaleiros</string>
+	<string name="type.highway.path.mountain_hiking">Caminho pedonal</string>
 	<string name="type.highway.path.permissive">Caminho</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Túnel</string>
 	<string name="type.highway.pedestrian">Rua pedonal</string>
 	<string name="type.highway.pedestrian.area">Rua pedonal</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
-	<string name="type.highway.pedestrian.bridge">Ponte</string>
+	<string name="type.highway.pedestrian.bridge">Ponte para pedestres</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.pedestrian.tunnel">Túnel</string>
+	<string name="type.highway.pedestrian.tunnel">Túnel para pedestres</string>
 	<string name="type.highway.primary">Estrada</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.primary.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.primary.tunnel">Túnel</string>
-	<string name="type.highway.primary_link">Estrada</string>
+	<string name="type.highway.primary.tunnel">Túnel rodoviário</string>
+	<string name="type.highway.primary_link">Saída de rodovia</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.primary_link.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@ -1052,7 +1056,7 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.residential.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.residential.tunnel">Túnel</string>
+	<string name="type.highway.residential.tunnel">Túnel residencial</string>
 	<string name="type.highway.rest_area">Área de descanso</string>
 	<string name="type.highway.road">Estrada</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
@ -1063,20 +1067,20 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.secondary.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.secondary.tunnel">Túnel</string>
-	<string name="type.highway.secondary_link">Estrada</string>
+	<string name="type.highway.secondary.tunnel">Túnel rodoviário</string>
+	<string name="type.highway.secondary_link">Saída de rodovia</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.secondary_link.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.secondary_link.tunnel">Túnel</string>
+	<string name="type.highway.secondary_link.tunnel">Túnel rodoviário</string>
 	<string name="type.highway.service">Estrada de acesso ou serviço</string>
 	<string name="type.highway.service.area">Estrada de acesso ou serviço</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.service.bridge">Ponte</string>
-	<string name="type.highway.service.driveway">Estrada de acesso ou serviço</string>
+	<string name="type.highway.service.driveway">Via de acesso</string>
 	<string name="type.highway.service.parking_aisle">Estrada de estacionamento</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.service.tunnel">Túnel</string>
+	<string name="type.highway.service.tunnel">Túnel rodoviário</string>
 	<string name="type.highway.services">Área de serviços de estrada</string>
 	<string name="type.highway.speed_camera">Radar de velocidade</string>
 	<string name="type.highway.steps">Escadas</string>
@ -1088,12 +1092,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.tertiary.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.tertiary.tunnel">Túnel</string>
-	<string name="type.highway.tertiary_link">Estrada</string>
+	<string name="type.highway.tertiary.tunnel">Túnel rodoviário</string>
+	<string name="type.highway.tertiary_link">Saída de rodovia</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.tertiary_link.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.tertiary_link.tunnel">Túnel</string>
+	<string name="type.highway.tertiary_link.tunnel">Túnel rodoviário</string>
 	<string name="type.highway.track">Estrada rústica</string>
 	<string name="type.highway.track.area">Estrada rústica</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
@ -1106,36 +1110,36 @@
 	<string name="type.highway.track.no.access">Estrada rústica</string>
 	<string name="type.highway.track.permissive">Estrada rústica</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.track.tunnel">Túnel</string>
+	<string name="type.highway.track.tunnel">Túnel rodoviário</string>
 	<string name="type.highway.traffic_signals">Semáforo</string>
 	<string name="type.highway.trunk">Via expressa</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.trunk.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.trunk.tunnel">Túnel</string>
-	<string name="type.highway.trunk_link">Via expressa</string>
+	<string name="type.highway.trunk.tunnel">Túnel rodoviário</string>
+	<string name="type.highway.trunk_link">Saída de rodovia</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.trunk_link.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.trunk_link.tunnel">Túnel</string>
+	<string name="type.highway.trunk_link.tunnel">Túnel rodoviário</string>
 	<string name="type.highway.unclassified">Estrada sem classificação</string>
 	<string name="type.highway.unclassified.area">Estrada sem classificação</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.unclassified.bridge">Ponte</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
-	<string name="type.highway.unclassified.tunnel">Túnel</string>
-	<string name="type.area_highway.cycleway">Ciclovia</string>
+	<string name="type.highway.unclassified.tunnel">Túnel rodoviário</string>
+	<string name="type.area_highway.cycleway">Caminho para ciclistas</string>
 	<string name="type.area_highway.footway">Caminho pedonal</string>
-	<string name="type.area_highway.living_street">Zona de coexistência</string>
+	<string name="type.area_highway.living_street">Rua residencial</string>
 	<string name="type.area_highway.motorway">Rodovia</string>
 	<string name="type.area_highway.path">Caminho</string>
-	<string name="type.area_highway.pedestrian">Rua pedonal</string>
+	<string name="type.area_highway.pedestrian">Caminho pedonal</string>
 	<string name="type.area_highway.primary">Estrada</string>
 	<string name="type.area_highway.residential">Rua residencial</string>
 	<string name="type.area_highway.secondary">Estrada</string>
 	<string name="type.area_highway.service">Estrada de acesso ou serviço</string>
 	<string name="type.area_highway.tertiary">Estrada</string>
-	<string name="type.area_highway.steps">Escadas</string>
+	<string name="type.area_highway.steps">Travessia</string>
 	<string name="type.area_highway.track">Pista para desportos não motorizados</string>
 	<string name="type.area_highway.trunk">Via expressa</string>
 	<string name="type.area_highway.unclassified">Estrada sem classificação</string>
@ -1175,6 +1179,7 @@
 	<string name="type.landuse.churchyard">Adro de igreja</string>
 	<string name="type.landuse.commercial">Área comercial</string>
 	<string name="type.landuse.construction">Construção</string>
+	<string name="type.landuse.education">Instituições educacionais</string>
 	<string name="type.landuse.farm">Fazenda</string>
 	<string name="type.landuse.farmland">Campo agrícola</string>
 	<string name="type.landuse.farmyard">Pátio de fazenda</string>
@ -1241,6 +1246,8 @@
 	<string name="type.man_made.pier">Píer</string>
 	<string name="type.man_made.pipeline">Pipeline</string>
 	<string name="type.man_made.pipeline.overground">Pipeline aéreo</string>
+	<string name="type.man_made.silo">Silo</string>
+	<string name="type.man_made.storage_tank">Tanque de armazenagem</string>
 	<string name="type.man_made.surveillance">Câmara de vigilância</string>
 	<string name="type.man_made.tower">Torre</string>
 	<string name="type.man_made.wastewater_plant">Estação de tratamento de esgoto</string>
@ -1251,40 +1258,8 @@
 	<string name="type.man_made.works">Fábrica</string>
 	<string name="type.military">Militar</string>
 	<string name="type.military.bunker">Búnquer</string>
-	<string name="type.natural">Natureza</string>
-	<string name="type.natural.bare_rock">Zona rochosa</string>
-	<string name="type.natural.bay">Baía</string>
-	<string name="type.natural.beach">Praia</string>
-	<string name="type.natural.cape">Cabo</string>
-	<string name="type.natural.cave_entrance">Caverna</string>
-	<string name="type.natural.cliff">Falésia</string>
-	<string name="type.natural.coastline">Linha costeira</string>
 	<string name="type.natural.geyser">Gêiser</string>
 	<string name="type.natural.glacier">Geleira</string>
-	<string name="type.natural.grassland">Pradaria</string>
-	<string name="type.natural.heath">Charneca</string>
-	<string name="type.natural.hot_spring">Nascente de água quente</string>
-	<string name="type.natural.water.lake">Lago</string>
-	<string name="type.natural.water.lock">Câmara de Bloqueio</string>
-	<string name="type.natural.water.pond">Lagoa</string>
-	<string name="type.natural.water.basin">Reservatório</string>
-	<string name="type.natural.water.river">Rio</string>
-	<string name="type.natural.land">Campo</string>
-	<string name="type.natural.meadow">Pradaria</string>
-	<string name="type.natural.orchard">Pomar</string>
-	<string name="type.natural.peak">Pico</string>
-	<string name="type.natural.rock">Rochedo</string>
-	<string name="type.natural.scrub">Matagal</string>
-	<string name="type.natural.spring">Nascente</string>
-	<string name="type.natural.strait">Estreito</string>
-	<string name="type.natural.tree">Árvore</string>
-	<string name="type.natural.tree_row">Linha de árvores</string>
-	<string name="type.natural.vineyard">Vinha</string>
-	<string name="type.natural.volcano">Vulcão</string>
-	<string name="type.natural.water">Corpo de água</string>
-	<string name="type.natural.wetland">Zona úmida</string>
-	<string name="type.natural.wetland.bog">Zona úmida</string>
-	<string name="type.natural.wetland.marsh">Zona úmida</string>
 	<string name="type.noexit">Via sem saída</string>
 	<string name="type.office">Escritório</string>
 	<string name="type.office.company">Escritório de empresa</string>
@ -1349,7 +1324,7 @@
 	<string name="type.railway.funicular">Funicular</string>
 	<string name="type.railway.funicular.bridge">Funicular</string>
 	<string name="type.railway.funicular.tunnel">Funicular</string>
-	<string name="type.railway.halt">Estação de trem</string>
+	<string name="type.railway.halt">Ponto de parada</string>
 	<string name="type.railway.level_crossing">Passagem em nível</string>
 	<string name="type.railway.light_rail">Metrô de superfície</string>
 	<string name="type.railway.light_rail.bridge">Metrô de superfície</string>
@ -1489,19 +1464,11 @@
 	<string name="type.sport.australian_football">Futebol australiano</string>
 	<string name="type.sport.baseball">Beisebol</string>
 	<string name="type.sport.basketball">Basquetebol</string>
-	<string name="type.sport.bowls">Bowls</string>
-	<string name="type.sport.cricket">Críquete</string>
-	<string name="type.sport.curling">Curling</string>
-	<string name="type.sport.diving">Mergulho</string>
 	<string name="type.sport.equestrian">Esportes equestres</string>
-	<string name="type.sport.golf">Golfe</string>
-	<string name="type.sport.gymnastics">Ginástica</string>
-	<string name="type.sport.handball">Andebol</string>
+	<string name="type.sport.handball">Handebol</string>
 	<string name="type.sport.multi">Vários desportos</string>
+	<!-- Used to tag a scuba diving site. -->
 	<string name="type.sport.scuba_diving">Mergulho autônomo</string>
-	<string name="type.sport.shooting">Tiro esportivo</string>
-	<string name="type.sport.skiing">Esqui</string>
-	<string name="type.sport.soccer">Futebol</string>
 	<string name="type.sport.swimming">Natação esportiva</string>
 	<string name="type.sport.tennis">Quadra de tênis</string>
 	<string name="type.tourism">Turismo</string>
@ -1523,9 +1490,7 @@
 	<string name="type.tourism.hostel">Hostel</string>
 	<string name="type.tourism.hotel">Hotel</string>
 	<string name="type.tourism.information">Informações turísticas</string>
-	<string name="type.tourism.information.board">Painel de informações</string>
 	<string name="type.tourism.information.guidepost">Poste com direções</string>
-	<string name="type.tourism.information.map">Mapa turístico</string>
 	<string name="type.tourism.information.office">Escritório de turismo</string>
 	<string name="type.tourism.motel">Motel</string>
 	<string name="type.tourism.museum">Museu</string>
@ -1579,4 +1544,5 @@
 	<string name="type.piste_type.nordic">Pista tipo nórdico</string>
 	<string name="type.piste_type.sled">Pista para trenós</string>
 	<string name="type.building_part">Parte de edifício</string>
+	<string name="type.amenity.events_venue">Local do evento</string>
 </resources>
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@ -853,6 +853,7 @@
 	<string name="type.craft.carpenter">Carpinteiro</string>
 	<string name="type.craft.electrician">Eletricista</string>
 	<string name="type.craft.gardener">Jardineiro</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Instalador de ar-condicionado</string>
 	<string name="type.craft.metal_construction">Serralheiro metálico</string>
 	<string name="type.craft.painter">Pintor</string>
@ -1237,17 +1238,21 @@
 	<string name="type.natural.bare_rock">Zona rochosa</string>
 	<string name="type.natural.bay">Baía</string>
 	<string name="type.natural.beach">Praia</string>
+	<string name="type.natural.beach.sand">Praia de areia</string>
+	<string name="type.natural.beach.gravel">Praia de Cascalho</string>
 	<string name="type.natural.cape">Cabo</string>
 	<string name="type.natural.cave_entrance">Caverna</string>
 	<string name="type.natural.cliff">Falésia</string>
+	<string name="type.natural.earth_bank">Penhasco</string>
+	<string name="type.man_made.embankment">Aterro</string>
 	<string name="type.natural.coastline">Linha costeira</string>
-	<string name="type.natural.geyser">Gêiser</string>
+	<string name="type.natural.geyser">Géiser</string>
 	<string name="type.natural.glacier">Glaciar</string>
-	<string name="type.natural.grassland">Pradaria</string>
+	<string name="type.natural.grassland">Campo</string>
 	<string name="type.natural.heath">Charneca</string>
 	<string name="type.natural.hot_spring">Nascente de água quente</string>
 	<string name="type.natural.water.lake">Lago</string>
-	<string name="type.natural.water.lock">Câmara de Bloqueio</string>
+	<string name="type.natural.water.lock">Câmara de Eclusa</string>
 	<string name="type.natural.water.pond">Lagoa</string>
 	<string name="type.natural.water.reservoir">Reservatório</string>
 	<string name="type.natural.water.basin">Reservatório</string>
@ -1256,6 +1261,7 @@
 	<string name="type.natural.meadow">Pradaria</string>
 	<string name="type.natural.orchard">Pomar</string>
 	<string name="type.natural.peak">Pico</string>
+	<string name="type.natural.saddle">Sela da Montanha</string>
 	<string name="type.natural.rock">Rochedo</string>
 	<string name="type.natural.scrub">Matagal</string>
 	<string name="type.natural.spring">Nascente</string>
@ -1466,22 +1472,22 @@
 	<string name="type.shop.video_games">Loja de jogos de vídeo</string>
 	<string name="type.shop.wine">Loja de vinhos</string>
 	<string name="type.sport">Desporto</string>
-	<string name="type.sport.american_football">Futebol americano</string>
+	<string name="type.sport.american_football">Futebol Americano</string>
 	<string name="type.sport.archery">Tiro com arco</string>
 	<string name="type.sport.athletics">Atletismo</string>
-	<string name="type.sport.australian_football">Futebol australiano</string>
-	<string name="type.sport.baseball">Beisebol</string>
+	<string name="type.sport.australian_football">Futebol Australiano</string>
+	<string name="type.sport.baseball">Basebol</string>
 	<string name="type.sport.basketball">Basquetebol</string>
-	<string name="type.sport.bowls">Bowls</string>
+	<string name="type.sport.bowls">Lawn bowls</string>
 	<string name="type.sport.cricket">Críquete</string>
 	<string name="type.sport.curling">Curling</string>
-	<string name="type.sport.diving">Mergulho</string>
 	<string name="type.sport.equestrian">Hipismo</string>
 	<string name="type.sport.golf">Golfe</string>
 	<string name="type.sport.gymnastics">Ginástica</string>
 	<string name="type.sport.handball">Andebol</string>
 	<string name="type.sport.multi">Vários desportos</string>
-	<string name="type.sport.scuba_diving">Mergulho autónomo</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Mergulho autônomo</string>
 	<string name="type.sport.shooting">Tiro desportivo</string>
 	<string name="type.sport.skiing">Esqui</string>
 	<string name="type.sport.soccer">Futebol</string>
@ -1562,4 +1568,5 @@
 	<string name="type.piste_type.nordic">Pista tipo nórdico</string>
 	<string name="type.piste_type.sled">Pista para trenós</string>
 	<string name="type.building_part">Parte de edifício</string>
+	<string name="type.amenity.events_venue">Local dos eventos</string>
 </resources>
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@ -1132,27 +1132,46 @@
 	<string name="type.man_made.water_well">Puț de apă</string>
 	<string name="type.man_made.windmill">Moară de vânt</string>
 	<string name="type.military.bunker">Buncăr</string>
+	<string name="type.natural">Natură</string>
+	<string name="type.natural.bare_rock">Piatră goală</string>
 	<string name="type.natural.bay">Golf</string>
 	<string name="type.natural.beach">Plajă</string>
+	<string name="type.natural.beach.sand">Plaja nisipoasa</string>
+	<string name="type.natural.beach.gravel">Plaja cu pietriș</string>
 	<string name="type.natural.cape">Mantie</string>
 	<string name="type.natural.cave_entrance">Peșteră</string>
+	<string name="type.natural.cliff">Faleză</string>
+	<string name="type.natural.earth_bank">Faleza</string>
+	<string name="type.man_made.embankment">Rambleu</string>
+	<string name="type.natural.coastline">Relief litoral</string>
 	<string name="type.natural.geyser">Gheizer</string>
 	<string name="type.natural.glacier">Ghețar</string>
-	<string name="type.natural.grassland">Câmp</string>
+	<string name="type.natural.grassland">Pajiști</string>
+	<string name="type.natural.heath">Landă</string>
+	<string name="type.natural.hot_spring">Izvor termal</string>
 	<string name="type.natural.water.lake">Lac</string>
 	<string name="type.natural.water.lock">Camera de blocare</string>
 	<string name="type.natural.water.pond">Heleșteu</string>
 	<string name="type.natural.water.reservoir">Rezervor</string>
 	<string name="type.natural.water.basin">Bazin de apă</string>
 	<string name="type.natural.water.river">Râu</string>
+	<string name="type.natural.land">Teren</string>
+	<string name="type.natural.meadow">Fâneață</string>
+	<string name="type.natural.orchard">Livadă</string>
 	<string name="type.natural.peak">Munte</string>
+	<string name="type.natural.saddle">Sela da Montanha</string>
+	<string name="type.natural.rock">Rocă</string>
 	<string name="type.natural.scrub">Boschet</string>
 	<string name="type.natural.spring">Izvor</string>
 	<string name="type.natural.strait">Strâmtoare</string>
 	<string name="type.natural.tree">Arbore</string>
+	<string name="type.natural.tree_row">Rândul de copaci</string>
+	<string name="type.natural.vineyard">Vie</string>
 	<string name="type.natural.volcano">Vulcan</string>
 	<string name="type.natural.water">Apă</string>
 	<string name="type.natural.wetland">Loc mlăștinos</string>
+	<string name="type.natural.wetland.bog">Turbărie</string>
+	<string name="type.natural.wetland.marsh">Mlaştină</string>
 	<string name="type.office">Birou</string>
 	<string name="type.office.company">Sediu companei</string>
 	<string name="type.office.estate_agent">Agent imobiliar</string>
@ -1288,9 +1307,25 @@
 	<string name="type.shop.video">Magazin video</string>
 	<string name="type.shop.video_games">Magazin de jocuri video</string>
 	<string name="type.shop.wine">Vinărie</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Fotbal american</string>
+	<string name="type.sport.archery">TIR cu arcul</string>
 	<string name="type.sport.athletics">Atletica ușoară</string>
+	<string name="type.sport.australian_football">Fotbal australian</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Baschetbal</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Sport ecvestru</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gimnastică</string>
+	<string name="type.sport.handball">Handbal</string>
+	<string name="type.sport.multi">Sporturi Diverse</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Scufundări</string>
+	<string name="type.sport.shooting">Filmare</string>
+	<string name="type.sport.skiing">Schi</string>
+	<string name="type.sport.soccer">Fotbal</string>
+	<string name="type.sport.swimming">Natație</string>
 	<string name="type.sport.tennis">Teren de tenis</string>
 	<string name="type.tourism.alpine_hut">Cabană de munte</string>
 	<string name="type.tourism.apartment">Apartamente</string>
@ -1308,7 +1343,7 @@
 	<string name="type.tourism.guest_house">Pensiune</string>
 	<string name="type.tourism.information">Informații turistice</string>
 	<string name="type.tourism.information.board">Panou de informații</string>
-	<string name="type.tourism.information.guidepost">Informații turistice</string>
+	<string name="type.tourism.information.guidepost">Postul de ghidare</string>
 	<string name="type.tourism.information.map">Hartă turistică</string>
 	<string name="type.tourism.information.office">Birou de informații turistice</string>
 	<string name="type.tourism.museum">Muzeu</string>
@ -1331,4 +1366,5 @@
 	<string name="type.wheelchair.no">Nu este utilat pentru invalizi</string>
 	<string name="type.wheelchair.yes">Utilat pentru invalizi</string>
 	<string name="type.building_part">Clădire</string>
+	<string name="type.amenity.events_venue">Locul de desfășurare a evenimentelor</string>
 </resources>
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@ -357,6 +357,8 @@
 	<string name="routing_arrive">Прибытие в %s</string>
 	<string name="categories">Категории</string>
 	<string name="history">История</string>
+	<string name="opens_in">Открывается через %s</string>
+	<string name="closes_in">Закроется через %s</string>
 	<string name="closed">Закрыто</string>
 	<string name="search_not_found">К сожалению, мы ничего не нашли.</string>
 	<string name="search_not_found_query">Попробуйте изменить условия поиска.</string>
@ -509,7 +511,7 @@
 	<string name="editor_share_to_all_dialog_message_1">Убедитесь, что вы не ввели личные данные.</string>
 	<string name="editor_share_to_all_dialog_message_2">Если при проверке изменений возникнут вопросы, мы напишем вам на email.</string>
 	<!-- Text under the version number in the Help dialog. TODO: Synchronize other translations with English. -->
-	<string name="about_description">Organic Maps — быстрые и бесплатные карты, которые работают без Интернета. Все картографические данные берутся из OpenStreetMap.org, там можно самостоятельно исправлять ошибки и добавлять новые объекты. В Organic Maps нет рекламы и сбора пресональных данных. Это проект с открытым исходным кодом, создаваемый энтузиастами в свободное время. Будем рады вашей поддержке и обратной связи!</string>
+	<string name="about_description">Organic Maps — быстрые и бесплатные карты, которые работают без Интернета. Все картографические данные берутся из OpenStreetMap.org, там можно самостоятельно исправлять ошибки и добавлять новые объекты. В Organic Maps нет рекламы и сбора персональных данных. Это проект с открытым исходным кодом, создаваемый энтузиастами в свободное время. Будем рады вашей поддержке и обратной связи!</string>
 	<!-- For the first routing -->
 	<string name="accept">Принять</string>
 	<!-- For the first routing -->
@ -741,7 +743,7 @@
 	<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_parking">Велопарковка</string>
 	<string name="type.amenity.bicycle_rental">Велопрокат</string>
 	<string name="type.amenity.bicycle_repair_station">Станция ремонта велосипедов</string>
 	<string name="type.amenity.biergarten">Пивная под открытым небом</string>
@ -907,15 +909,16 @@
 	<string name="type.cemetery.grave">Могила</string>
 	<string name="type.craft">Мастерская</string>
 	<string name="type.craft.beekeeper">Пчеловод</string>
-	<string name="type.craft.blacksmith">Кузнец</string>
-	<string name="type.craft.brewery">Крафтовое пиво</string>
+	<string name="type.craft.blacksmith">Кузница</string>
+	<string name="type.craft.brewery">Крафтовая пивоварня</string>
 	<string name="type.craft.carpenter">Столяр</string>
 	<string name="type.craft.confectionery">Кондитер</string>
 	<string name="type.craft.electrician">Электрик</string>
 	<string name="type.craft.electronics_repair">Ремонт электроники</string>
 	<string name="type.craft.gardener">Садовник</string>
-	<string name="type.craft.handicraft">Декоративный мастер</string>
-	<string name="type.craft.hvac">Кондиционеры</string>
+	<string name="type.craft.handicraft">Ремесленная мастерская</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
+	<string name="type.craft.hvac">Отопление, вентиляция и кондиционирование</string>
 	<string name="type.craft.metal_construction">Металлоконструкции</string>
 	<string name="type.craft.painter">Маляр</string>
 	<string name="type.craft.photographer">Фотограф</string>
@ -1315,11 +1318,13 @@
 	<string name="type.natural.beach.gravel">Галечный пляж</string>
 	<string name="type.natural.cape">Мыс</string>
 	<string name="type.natural.cave_entrance">Пещера</string>
-	<string name="type.natural.cliff">Обрыв</string>
+	<string name="type.natural.cliff">Утёс</string>
+	<string name="type.natural.earth_bank">Обрыв</string>
+	<string name="type.man_made.embankment">Насыпь</string>
 	<string name="type.natural.coastline">Береговая линия</string>
 	<string name="type.natural.geyser">Гейзер</string>
 	<string name="type.natural.glacier">Ледник</string>
-	<string name="type.natural.grassland">Поле</string>
+	<string name="type.natural.grassland">Луг</string>
 	<string name="type.natural.heath">Пустошь</string>
 	<string name="type.natural.hot_spring">Горячий источник</string>
 	<string name="type.natural.water.lake">Озеро</string>
@ -1552,19 +1557,19 @@
 	<string name="type.sport.american_football">Американский футбол</string>
 	<string name="type.sport.archery">Стрельба из лука</string>
 	<string name="type.sport.athletics">Лёгкая атлетика</string>
-	<string name="type.sport.australian_football">Регби</string>
+	<string name="type.sport.australian_football">Австралийский футбол</string>
 	<string name="type.sport.baseball">Бейсбол</string>
 	<string name="type.sport.basketball">Баскетбол</string>
-	<string name="type.sport.bowls">Кегли</string>
+	<string name="type.sport.bowls">Боулз</string>
 	<string name="type.sport.cricket">Крикет</string>
-	<string name="type.sport.curling">Керлинг</string>
-	<string name="type.sport.diving">Подводное плавание</string>
+	<string name="type.sport.curling">Кёрлинг</string>
 	<string name="type.sport.equestrian">Конный спорт</string>
 	<string name="type.sport.golf">Гольф</string>
 	<string name="type.sport.gymnastics">Гимнастика</string>
 	<string name="type.sport.handball">Гандбол</string>
 	<string name="type.sport.multi">Различные виды спорта</string>
-	<string name="type.sport.scuba_diving">Акваланг</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Место для дайвинга</string>
 	<string name="type.sport.shooting">Стрельба</string>
 	<string name="type.sport.skiing">Лыжи</string>
 	<string name="type.sport.soccer">Футбол</string>
@ -1590,7 +1595,7 @@
 	<string name="type.tourism.hotel">Гостиница</string>
 	<string name="type.tourism.information">Туринформация</string>
 	<string name="type.tourism.information.board">Информационный щит</string>
-	<string name="type.tourism.information.guidepost">Туринформация</string>
+	<string name="type.tourism.information.guidepost">Указательный столб</string>
 	<string name="type.tourism.information.map">Карта</string>
 	<string name="type.tourism.information.office">Туристический офис</string>
 	<string name="type.tourism.motel">Мотель</string>
@ -1645,4 +1650,5 @@
 	<string name="type.piste_type.nordic">Лыжня</string>
 	<string name="type.piste_type.sled">Трасса для саней</string>
 	<string name="type.building_part">Здание</string>
+	<string name="type.amenity.events_venue">Место проведения мероприятий</string>
 </resources>
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@ -790,6 +790,7 @@
 	<string name="type.craft.carpenter">Tesár</string>
 	<string name="type.craft.electrician">Elektrikár</string>
 	<string name="type.craft.gardener">Záhradníctvo</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Vzduchotechnika</string>
 	<string name="type.craft.metal_construction">Kovorobotník</string>
 	<string name="type.craft.painter">Maliar natierač</string>
@ -1110,26 +1111,46 @@
 	<string name="type.man_made.water_tower">Vodojem</string>
 	<string name="type.man_made.water_well">Studňa</string>
 	<string name="type.man_made.windmill">Veterný mlyn</string>
+	<string name="type.natural">Príroda</string>
+	<string name="type.natural.bare_rock">Holá skala</string>
 	<string name="type.natural.bay">Záliv</string>
+	<string name="type.natural.beach">Pláž</string>
+	<string name="type.natural.beach.sand">Piesočná pláž</string>
+	<string name="type.natural.beach.gravel">Štrková pláž</string>
 	<string name="type.natural.cape">Mys</string>
 	<string name="type.natural.cave_entrance">Jaskyňa</string>
+	<string name="type.natural.cliff">Útes</string>
+	<string name="type.natural.earth_bank">Útes</string>
+	<string name="type.man_made.embankment">Násyp</string>
+	<string name="type.natural.coastline">Pobrežie</string>
 	<string name="type.natural.geyser">Gejzír</string>
 	<string name="type.natural.glacier">Ľadovec</string>
-	<string name="type.natural.grassland">Lúka</string>
+	<string name="type.natural.grassland">Pasienky</string>
+	<string name="type.natural.heath">Heath</string>
+	<string name="type.natural.hot_spring">Termálny prameň</string>
 	<string name="type.natural.water.lake">Jazero</string>
 	<string name="type.natural.water.lock">Uzamykacia komora</string>
 	<string name="type.natural.water.pond">Rybník</string>
 	<string name="type.natural.water.reservoir">Nádrž</string>
 	<string name="type.natural.water.basin">Vodná nádrž</string>
 	<string name="type.natural.water.river">Rieka</string>
+	<string name="type.natural.land">Pôda</string>
+	<string name="type.natural.meadow">Lúka</string>
+	<string name="type.natural.orchard">Sad</string>
 	<string name="type.natural.peak">Hora</string>
+	<string name="type.natural.saddle">Sedlo</string>
+	<string name="type.natural.rock">Hornina</string>
 	<string name="type.natural.scrub">Krovie</string>
 	<string name="type.natural.spring">Prameň</string>
 	<string name="type.natural.strait">Prieliv</string>
 	<string name="type.natural.tree">Strom</string>
+	<string name="type.natural.tree_row">Stromový rad</string>
+	<string name="type.natural.vineyard">Vinohrad</string>
 	<string name="type.natural.volcano">Vulkán</string>
 	<string name="type.natural.water">Voda</string>
 	<string name="type.natural.wetland">Oblasť mokradí</string>
+	<string name="type.natural.wetland.bog">Rašelinisko</string>
+	<string name="type.natural.wetland.marsh">Močiar</string>
 	<string name="type.office">Kancelária</string>
 	<string name="type.office.company">Sídlo spoločnosti</string>
 	<string name="type.office.estate_agent">Realitný agent</string>
@ -1266,9 +1287,24 @@
 	<string name="type.shop.video">Predajňa s videami</string>
 	<string name="type.shop.video_games">Predajňa s videohrami</string>
 	<string name="type.shop.wine">Vinotéka</string>
+	<string name="type.sport">Šport</string>
+	<string name="type.sport.american_football">Americký futbal</string>
+	<string name="type.sport.archery">Lukostreľba</string>
 	<string name="type.sport.athletics">Atletika</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketbal</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Jazdecké športy</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gymnastika</string>
+	<string name="type.sport.handball">Hádzaná</string>
+	<string name="type.sport.multi">Rôzne športy</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Potápanie</string>
+	<string name="type.sport.shooting">Streľba</string>
+	<string name="type.sport.skiing">Lyžovanie</string>
+	<string name="type.sport.soccer">Futbal</string>
+	<string name="type.sport.swimming">Plávanie</string>
 	<string name="type.sport.tennis">Tenisový kurt</string>
 	<string name="type.tourism.alpine_hut">Horská chata</string>
 	<string name="type.tourism.apartment">Apartmány</string>
@ -1286,7 +1322,7 @@
 	<string name="type.tourism.guest_house">Penzión</string>
 	<string name="type.tourism.information">Infocentrum</string>
 	<string name="type.tourism.information.board">Informačné centrum</string>
-	<string name="type.tourism.information.guidepost">Infocentrum</string>
+	<string name="type.tourism.information.guidepost">Smerovník</string>
 	<string name="type.tourism.information.map">Turistická mapa</string>
 	<string name="type.tourism.information.office">Turistické informačné centrum</string>
 	<string name="type.tourism.museum">Múzeum</string>
@ -1311,4 +1347,5 @@
 	<string name="type.wheelchair.no">Žiaden bezbariérový prístup</string>
 	<string name="type.wheelchair.yes">Úplný bezbariérový prístup</string>
 	<string name="type.building_part">Budova</string>
+	<string name="type.amenity.events_venue">Miesto konania podujatí</string>
 </resources>
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@ -787,6 +787,7 @@
 	<string name="type.craft.carpenter">Snickare</string>
 	<string name="type.craft.electrician">Elektriker</string>
 	<string name="type.craft.gardener">Trädgårdsmästare</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Vvs</string>
 	<string name="type.craft.metal_construction">Metallarbetare</string>
 	<string name="type.craft.painter">Målare</string>
@ -1105,27 +1106,46 @@
 	<string name="type.man_made.water_tower">Vattentorn</string>
 	<string name="type.man_made.water_well">Brunn</string>
 	<string name="type.man_made.windmill">Väderkvarn</string>
+	<string name="type.natural">Natur</string>
+	<string name="type.natural.bare_rock">Kala stenar</string>
 	<string name="type.natural.bay">Bukt</string>
 	<string name="type.natural.beach">Strand</string>
+	<string name="type.natural.beach.sand">Sandig strand</string>
+	<string name="type.natural.beach.gravel">Grusstrand</string>
 	<string name="type.natural.cape">Udde</string>
 	<string name="type.natural.cave_entrance">Grotta</string>
+	<string name="type.natural.cliff">Klint</string>
+	<string name="type.natural.earth_bank">Klippa</string>
+	<string name="type.man_made.embankment">Vägbank</string>
+	<string name="type.natural.coastline">Kust</string>
 	<string name="type.natural.geyser">Gejser</string>
 	<string name="type.natural.glacier">Glaciär</string>
-	<string name="type.natural.grassland">Fältet</string>
+	<string name="type.natural.grassland">Gräsmarker</string>
+	<string name="type.natural.heath">Hed</string>
+	<string name="type.natural.hot_spring">Het källa</string>
 	<string name="type.natural.water.lake">Sjö</string>
 	<string name="type.natural.water.lock">Låskammare</string>
 	<string name="type.natural.water.pond">Damm</string>
 	<string name="type.natural.water.reservoir">Reservoar</string>
 	<string name="type.natural.water.basin">Vattenbassäng</string>
 	<string name="type.natural.water.river">Flod</string>
+	<string name="type.natural.land">Landa</string>
+	<string name="type.natural.meadow">Äng</string>
+	<string name="type.natural.orchard">Fruktodling</string>
 	<string name="type.natural.peak">Bergstopp</string>
+	<string name="type.natural.saddle">Fjällsadel</string>
+	<string name="type.natural.rock">Bergart</string>
 	<string name="type.natural.scrub">Ruggen</string>
 	<string name="type.natural.spring">Vattenkälla</string>
 	<string name="type.natural.strait">Sund</string>
 	<string name="type.natural.tree">Träd</string>
+	<string name="type.natural.tree_row">Trädrad</string>
+	<string name="type.natural.vineyard">Vingård</string>
 	<string name="type.natural.volcano">Vulkan</string>
 	<string name="type.natural.water">Vatten</string>
 	<string name="type.natural.wetland">Sumpmarken</string>
+	<string name="type.natural.wetland.bog">Myr</string>
+	<string name="type.natural.wetland.marsh">Kärr</string>
 	<string name="type.office">Kontor</string>
 	<string name="type.office.company">Företagskontor</string>
 	<string name="type.office.estate_agent">Fastighetsmäklare</string>
@ -1260,9 +1280,25 @@
 	<string name="type.shop.video">Video butik</string>
 	<string name="type.shop.video_games">Videospel butik</string>
 	<string name="type.shop.wine">Vinhandel</string>
+	<string name="type.sport">Sport</string>
+	<string name="type.sport.american_football">Amerikansk fotboll</string>
+	<string name="type.sport.archery">Bågskytte</string>
 	<string name="type.sport.athletics">Friidrott</string>
+	<string name="type.sport.baseball">Baseboll</string>
 	<string name="type.sport.basketball">Basket</string>
+	<string name="type.sport.bowls">Bowls</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Ridsport</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Gymnastik</string>
+	<string name="type.sport.handball">Handboll</string>
+	<string name="type.sport.multi">Olika sporter</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Dykning</string>
+	<string name="type.sport.shooting">Skytte</string>
+	<string name="type.sport.skiing">Skidåkning</string>
+	<string name="type.sport.soccer">Fotboll</string>
+	<string name="type.sport.swimming">Simning</string>
 	<string name="type.sport.tennis">Tennisbana</string>
 	<string name="type.tourism.alpine_hut">Bergsboende</string>
 	<string name="type.tourism.apartment">Lägenheter</string>
@ -1282,7 +1318,7 @@
 	<string name="type.tourism.hotel">Hotell</string>
 	<string name="type.tourism.information">Turistinformation</string>
 	<string name="type.tourism.information.board">Informationstavla</string>
-	<string name="type.tourism.information.guidepost">Turistinformation</string>
+	<string name="type.tourism.information.guidepost">Vägledning</string>
 	<string name="type.tourism.information.map">Turistkarta</string>
 	<string name="type.tourism.information.office">Turistcenter</string>
 	<string name="type.tourism.motel">Motell</string>
@ -1306,4 +1342,5 @@
 	<string name="type.wheelchair.no">Ej utrustad för handikappade</string>
 	<string name="type.wheelchair.yes">Utrustad för handikappade</string>
 	<string name="type.building_part">Byggnad</string>
+	<string name="type.amenity.events_venue">Evenemangslokal</string>
 </resources>
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@ -344,27 +344,78 @@
 	<string name="type.leisure.park.private">Hifadhi</string>
 	<string name="type.leisure.picnic_table">Jedwali la Picnic</string>
 	<string name="type.leisure.sauna">Chumba cha mvuke</string>
+	<string name="type.natural">Uasilia</string>
+	<string name="type.natural.bare_rock">Mwamba tupu</string>
+	<string name="type.natural.bay">Hori</string>
+	<string name="type.natural.beach">Pwani</string>
+	<string name="type.natural.beach.sand">Pwani ya mchanga</string>
+	<string name="type.natural.beach.gravel">Pwani ya Gravel</string>
 	<string name="type.natural.cape">Rasi</string>
+	<string name="type.natural.cave_entrance">Pango</string>
+	<string name="type.natural.cliff">Mwamba</string>
+	<string name="type.natural.earth_bank">Mwamba</string>
+	<string name="type.man_made.embankment">Tuta</string>
+	<string name="type.natural.coastline">Pwani</string>
 	<string name="type.natural.geyser">Chemchem ya maji moto</string>
 	<string name="type.natural.glacier">Mto barafu</string>
-	<string name="type.natural.grassland">Shamba</string>
+	<string name="type.natural.grassland">Nyasi</string>
+	<string name="type.natural.heath">Afya</string>
+	<string name="type.natural.hot_spring">Majira ya joto</string>
+	<string name="type.natural.water.lake">Ziwa</string>
 	<string name="type.natural.water.lock">Chumba cha kufuli</string>
+	<string name="type.natural.water.pond">Bwawa</string>
 	<string name="type.natural.water.reservoir">Hifadhi</string>
 	<string name="type.natural.water.basin">Bonde la Maji</string>
+	<string name="type.natural.water.river">Mto</string>
+	<string name="type.natural.land">Nchi kavu</string>
+	<string name="type.natural.meadow">Meadow</string>
+	<string name="type.natural.orchard">Bustani</string>
+	<string name="type.natural.peak">Kilele</string>
+	<string name="type.natural.saddle">Tandiko la mlima</string>
+	<string name="type.natural.rock">Mwamba</string>
 	<string name="type.natural.scrub">Eneo la Vichaka</string>
+	<string name="type.natural.spring">Chemchemi</string>
 	<string name="type.natural.strait">Mlango Bahari</string>
+	<string name="type.natural.tree">Mti</string>
+	<string name="type.natural.tree_row">Safu ya mti</string>
+	<string name="type.natural.vineyard">Shamba la mizabibu</string>
+	<string name="type.natural.volcano">Volkeno</string>
+	<string name="type.natural.water">Maji</string>
 	<string name="type.natural.wetland">Maeneo yenye majimaji</string>
+	<string name="type.natural.wetland.bog">Bogi</string>
+	<string name="type.natural.wetland.marsh">Marsh</string>
 	<string name="type.railway.level_crossing">Tambuka Reli</string>
 	<string name="type.railway.monorail">Mfumo wa reli moja</string>
 	<string name="type.railway.rail">Njia ya Reli</string>
 	<string name="type.railway.subway_entrance">Lango la kuingilia stesheni ya reli</string>
 	<string name="type.shop.video">Duka la Video</string>
 	<string name="type.shop.video_games">Duka la Video za Michezo</string>
+	<string name="type.sport">Michezo</string>
+	<string name="type.sport.american_football">Soka ya Marekani</string>
+	<string name="type.sport.archery">Upigaji mishale</string>
 	<string name="type.sport.athletics">Riadha</string>
+	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Mpira wa kikapu</string>
+	<string name="type.sport.curling">Kukunja</string>
 	<string name="type.sport.equestrian">Michezo ya Farasi</string>
+	<string name="type.sport.golf">Gofu</string>
+	<string name="type.sport.gymnastics">Gymnastics</string>
+	<string name="type.sport.handball">Mpira wa mikono</string>
+	<string name="type.sport.multi">Michezo Mbalimbali</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Upigaji mbizi wa Scuba</string>
+	<string name="type.sport.shooting">Kupiga risasi</string>
+	<string name="type.sport.skiing">Skii</string>
+	<string name="type.sport.soccer">Soka</string>
+	<string name="type.sport.swimming">Kuogelea</string>
 	<string name="type.sport.tennis">Wanja wa tenisi</string>
+	<string name="type.tourism.information">Taarifa za Watalii</string>
+	<string name="type.tourism.information.board">Bodi ya habari</string>
+	<string name="type.tourism.information.guidepost">Chapisho la mwongozo</string>
+	<string name="type.tourism.information.map">Ramani ya Watalii</string>
+	<string name="type.tourism.information.office">Ofisi ya watalii</string>
 	<string name="type.wheelchair.limited">Viti vya magurudumu vinaruhusiwa vichache</string>
 	<string name="type.wheelchair.no">Viti vya magurudumu haviruhusiwi</string>
 	<string name="type.wheelchair.yes">Viti vya magurudumu vinaruhusiwa kabisa</string>
+	<string name="type.amenity.events_venue">Ukumbi wa Matukio</string>
 </resources>
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@ -795,6 +795,7 @@
 	<string name="type.craft.carpenter">ช่างไม้</string>
 	<string name="type.craft.electrician">ช่างไฟฟ้า</string>
 	<string name="type.craft.gardener">คนจัดสวน</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">ระบบปรับอากาศ</string>
 	<string name="type.craft.metal_construction">ช่างเหล็ก</string>
 	<string name="type.craft.painter">ช่างทาสี</string>
@ -1118,27 +1119,46 @@
 	<string name="type.man_made.water_well">บ่อน้ำ</string>
 	<string name="type.man_made.windmill">กังหันลม</string>
 	<string name="type.military.bunker">บังเกอร์</string>
+	<string name="type.natural">ธรรมชาติ</string>
+	<string name="type.natural.bare_rock">เปลือยร็อค</string>
 	<string name="type.natural.bay">อ่าว</string>
 	<string name="type.natural.beach">ชายหาด</string>
+	<string name="type.natural.beach.sand">หาดทราย</string>
+	<string name="type.natural.beach.gravel">หาดกรวด</string>
 	<string name="type.natural.cape">พื้นที่ยื่นเข้าไปในน้ำ</string>
 	<string name="type.natural.cave_entrance">ถ้ำ</string>
+	<string name="type.natural.cliff">หน้าผา</string>
+	<string name="type.natural.earth_bank">หน้าผา</string>
+	<string name="type.man_made.embankment">เขื่อน</string>
+	<string name="type.natural.coastline">ชายฝั่ง</string>
 	<string name="type.natural.geyser">นำ้พุร้อน</string>
 	<string name="type.natural.glacier">ธารน้ำแข็ง</string>
 	<string name="type.natural.grassland">ทุ่งหญ้า</string>
+	<string name="type.natural.heath">เฮลธ์</string>
+	<string name="type.natural.hot_spring">บ่อน้ำร้อน</string>
 	<string name="type.natural.water.lake">ทะเลสาบ</string>
 	<string name="type.natural.water.lock">ห้องล็อค</string>
 	<string name="type.natural.water.pond">บ่อ</string>
 	<string name="type.natural.water.reservoir">อ่างเก็บน้ำ</string>
 	<string name="type.natural.water.basin">อ่างน้ำ</string>
 	<string name="type.natural.water.river">แม่น้ำ</string>
+	<string name="type.natural.land">พื้นดิน</string>
+	<string name="type.natural.meadow">ทุ่งหญ้า</string>
+	<string name="type.natural.orchard">สวนผลไม้</string>
 	<string name="type.natural.peak">จุดสูงสุด</string>
+	<string name="type.natural.saddle">อานภูเขา</string>
+	<string name="type.natural.rock">หิน</string>
 	<string name="type.natural.scrub">ป่าละเมาะ</string>
 	<string name="type.natural.spring">ฤดูใบไม้ผลิ</string>
 	<string name="type.natural.strait">ช่องแคบ</string>
 	<string name="type.natural.tree">ต้นไม้</string>
+	<string name="type.natural.tree_row">แถวต้นไม้</string>
+	<string name="type.natural.vineyard">ไร่องุ่น</string>
 	<string name="type.natural.volcano">ภูเขาไฟ</string>
 	<string name="type.natural.water">แหล่งน้ำ</string>
 	<string name="type.natural.wetland">พื้นที่น้ำท่วมขัง</string>
+	<string name="type.natural.wetland.bog">พรุ</string>
+	<string name="type.natural.wetland.marsh">ที่ลุ่มชื้นแฉะ</string>
 	<string name="type.office">สำนักงาน</string>
 	<string name="type.office.company">สำนักงานบริษัท</string>
 	<string name="type.office.estate_agent">นายหน้าอสังหาริมทรัพย์</string>
@ -1277,9 +1297,24 @@
 	<string name="type.shop.video">ร้านขายดีวีดี</string>
 	<string name="type.shop.video_games">ร้านขายวิดีโอเกม</string>
 	<string name="type.shop.wine">ร้านขายไวน์</string>
+	<string name="type.sport">กีฬา</string>
+	<string name="type.sport.american_football">อเมริกันฟุตบอล</string>
+	<string name="type.sport.archery">ยิงธนู</string>
 	<string name="type.sport.athletics">กรีฑา</string>
+	<string name="type.sport.baseball">เบสบอล</string>
 	<string name="type.sport.basketball">บาสเก็ตบอล</string>
+	<string name="type.sport.curling">เคอร์ลิง</string>
 	<string name="type.sport.equestrian">กีฬาแข่งม้า</string>
+	<string name="type.sport.golf">กอล์ฟ</string>
+	<string name="type.sport.gymnastics">ยิมนาสติก</string>
+	<string name="type.sport.handball">แฮนด์บอล</string>
+	<string name="type.sport.multi">กีฬาต่างๆ</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">ดำน้ำลึก</string>
+	<string name="type.sport.shooting">ยิงปืน</string>
+	<string name="type.sport.skiing">เล่นสกี</string>
+	<string name="type.sport.soccer">ฟุตบอล</string>
+	<string name="type.sport.swimming">การว่ายน้ำ</string>
 	<string name="type.sport.tennis">คอร์ทเทนนิส</string>
 	<string name="type.tourism.alpine_hut">ที่พักบนภูเขาโรงแรม</string>
 	<string name="type.tourism.apartment">อพาร์ตเมนต์</string>
@ -1300,7 +1335,7 @@
 	<string name="type.tourism.hotel">โรงแรม</string>
 	<string name="type.tourism.information">ข้อมูลการท่องเที่ยว</string>
 	<string name="type.tourism.information.board">บอร์ดประชาสัมพันธ์</string>
-	<string name="type.tourism.information.guidepost">ข้อมูลการท่องเที่ยว</string>
+	<string name="type.tourism.information.guidepost">ไกด์โพส</string>
 	<string name="type.tourism.information.map">แผนที่ท่องเที่ยว</string>
 	<string name="type.tourism.information.office">ศูนย์บริการนักท่องเที่ยว</string>
 	<string name="type.tourism.motel">โมเทล</string>
@ -1326,4 +1361,5 @@
 	<string name="type.wheelchair.no">พื้นที่ไม่สามารถใช้รถเข็นสำหรับผู้ป่วย/ผู้สูงอายุ</string>
 	<string name="type.wheelchair.yes">พื้นใช้รถเข็นสำหรับผู้ป่วย/ผู้สูงอายุได้</string>
 	<string name="type.building_part">อาคาร</string>
+	<string name="type.amenity.events_venue">สถานที่จัดงาน</string>
 </resources>
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@ -344,6 +344,8 @@
 	<string name="routing_arrive">Varış: %s</string>
 	<string name="categories">Kategoriler</string>
 	<string name="history">Geçmiş</string>
+	<string name="opens_in">%s sonra açılıyor</string>
+	<string name="closes_in">%s sonra kapanıyor</string>
 	<string name="closed">Kapalı</string>
 	<string name="search_not_found">Üzgünüz, hiç bir şey bulamadık.</string>
 	<string name="search_not_found_query">Lütfen başka bir sorgu girin.</string>
@ -880,10 +882,15 @@
 	<string name="type.building.warehouse">Depo</string>
 	<string name="type.cemetery.grave">Mezar</string>
 	<string name="type.craft">Zanaat</string>
+	<string name="type.craft.beekeeper">Arıcı</string>
+	<string name="type.craft.blacksmith">Demirci</string>
 	<string name="type.craft.brewery">Bira Fabrikası</string>
 	<string name="type.craft.carpenter">Marangoz</string>
 	<string name="type.craft.electrician">Elektrikçi</string>
+	<string name="type.craft.electronics_repair">Elektronik Tamircisi</string>
 	<string name="type.craft.gardener">Bahçe Düzenleyici</string>
+	<string name="type.craft.handicraft">El İşi</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Klimacı</string>
 	<string name="type.craft.metal_construction">Dökümcü</string>
 	<string name="type.craft.painter">Boyacı</string>
@ -1271,7 +1278,7 @@
 	<string name="type.military">Askeri</string>
 	<string name="type.military.bunker">Sığınak</string>
 	<string name="type.mountain_pass">Boğaz</string>
-	<string name="type.natural">Doğal</string>
+	<string name="type.natural">Doğa</string>
 	<string name="type.natural.bare_rock">Çıplak Kaya</string>
 	<string name="type.natural.bay">Koy</string>
 	<string name="type.natural.beach">Plaj</string>
@ -1280,10 +1287,12 @@
 	<string name="type.natural.cape">Burun</string>
 	<string name="type.natural.cave_entrance">Mağara</string>
 	<string name="type.natural.cliff">Uçurum</string>
+	<string name="type.natural.earth_bank">Uçurum</string>
+	<string name="type.man_made.embankment">Set</string>
 	<string name="type.natural.coastline">Kıyı Şeridi</string>
 	<string name="type.natural.geyser">Gayzer</string>
 	<string name="type.natural.glacier">Buzul</string>
-	<string name="type.natural.grassland">Yeşillik</string>
+	<string name="type.natural.grassland">Campo</string>
 	<string name="type.natural.heath">Çalı</string>
 	<string name="type.natural.hot_spring">Kaplıca</string>
 	<string name="type.natural.water.lake">Göl</string>
@ -1509,21 +1518,21 @@
 	<string name="type.sport.american_football">Amerikan Futbolu</string>
 	<string name="type.sport.archery">Okçuluk</string>
 	<string name="type.sport.athletics">Atletizm</string>
-	<string name="type.sport.australian_football">Ragbi</string>
+	<string name="type.sport.australian_football">Avustralya futbolu</string>
 	<string name="type.sport.baseball">Beyzbol</string>
 	<string name="type.sport.basketball">Basketbol</string>
 	<string name="type.sport.bowls">Kuka Oynu</string>
 	<string name="type.sport.cricket">Kriket</string>
-	<string name="type.sport.curling">Сurling</string>
-	<string name="type.sport.diving">Dalış</string>
+	<string name="type.sport.curling">Körling</string>
 	<string name="type.sport.equestrian">Binicilik Sporları</string>
 	<string name="type.sport.golf">Golf</string>
 	<string name="type.sport.gymnastics">Jimnastik</string>
 	<string name="type.sport.handball">Hentbol</string>
 	<string name="type.sport.multi">Çeşitli Sporlar</string>
+	<!-- Used to tag a scuba diving site. -->
 	<string name="type.sport.scuba_diving">Tüplü Dalış</string>
-	<string name="type.sport.shooting">Atış Sporları</string>
-	<string name="type.sport.skiing">Kayak</string>
+	<string name="type.sport.shooting">Çekim</string>
+	<string name="type.sport.skiing">Kayak yapmak</string>
 	<string name="type.sport.soccer">Futbol</string>
 	<string name="type.sport.swimming">Yüzme</string>
 	<string name="type.sport.tennis">Tenis Kortu</string>
@ -1547,7 +1556,7 @@
 	<string name="type.tourism.hotel">Otel</string>
 	<string name="type.tourism.information">Turist Bilgilendirme</string>
 	<string name="type.tourism.information.board">Bilgi Panosu</string>
-	<string name="type.tourism.information.guidepost">Turist Bilgilendirme</string>
+	<string name="type.tourism.information.guidepost">Kılavuz direği</string>
 	<string name="type.tourism.information.map">Turist Haritası</string>
 	<string name="type.tourism.information.office">Turizm Ofisi</string>
 	<string name="type.tourism.motel">Motel</string>
@ -1601,4 +1610,5 @@
 	<string name="type.piste_type.nordic">İskandinav Kayak Pisti</string>
 	<string name="type.piste_type.sled">Kızak Pisti</string>
 	<string name="type.building_part">Bina</string>
+	<string name="type.amenity.events_venue">Etkinlik mekanı</string>
 </resources>
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@ -350,6 +350,8 @@
 	<string name="routing_arrive">Прибуття в %s</string>
 	<string name="categories">Категорії</string>
 	<string name="history">Історія</string>
+	<string name="opens_in">Відкривається через %s</string>
+	<string name="closes_in">Зачиняється через %s</string>
 	<string name="closed">Зачинено</string>
 	<string name="search_not_found">На жаль, нічого не знайдено.</string>
 	<string name="search_not_found_query">Спробуйте змінити запит.</string>
@ -716,7 +718,7 @@
 	<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_parking">Велопарковка</string>
 	<string name="type.amenity.bicycle_rental">Велопрокат</string>
 	<string name="type.amenity.bicycle_repair_station">Станція ремонту велосипедів</string>
 	<string name="type.amenity.biergarten">Пивна під відкритим небом</string>
@ -877,11 +879,14 @@
 	<string name="type.building.warehouse">Склад</string>
 	<string name="type.cemetery.grave">Могила</string>
 	<string name="type.craft">Майстерня</string>
-	<string name="type.craft.brewery">Пивоварня</string>
+	<string name="type.craft.beekeeper">Бджоляр</string>
+	<string name="type.craft.blacksmith">Кузня</string>
+	<string name="type.craft.brewery">Крафтова пивоварня</string>
 	<string name="type.craft.carpenter">Столяр</string>
 	<string name="type.craft.electrician">Електрик</string>
 	<string name="type.craft.gardener">Садівник</string>
-	<string name="type.craft.hvac">Кондиціонери</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
+	<string name="type.craft.hvac">Опалення, вентиляція та кондиціювання повітря</string>
 	<string name="type.craft.metal_construction">Металоконструкції</string>
 	<string name="type.craft.painter">Маляр</string>
 	<string name="type.craft.photographer">Фотограф</string>
@ -1276,11 +1281,13 @@
 	<string name="type.natural.beach.gravel">Гальковий пляж</string>
 	<string name="type.natural.cape">Мис</string>
 	<string name="type.natural.cave_entrance">Печера</string>
-	<string name="type.natural.cliff">Обрив</string>
+	<string name="type.natural.cliff">Урвище</string>
+	<string name="type.natural.earth_bank">Обрив</string>
+	<string name="type.man_made.embankment">Насип</string>
 	<string name="type.natural.coastline">Берегова лiнiя</string>
 	<string name="type.natural.geyser">Гейзер</string>
 	<string name="type.natural.glacier">Льодовик</string>
-	<string name="type.natural.grassland">Поле</string>
+	<string name="type.natural.grassland">Луг</string>
 	<string name="type.natural.heath">Пустище</string>
 	<string name="type.natural.hot_spring">Горяче джерело</string>
 	<string name="type.natural.water.lake">Озеро</string>
@ -1504,22 +1511,22 @@
 	<string name="type.shop.wine">Винна крамниця</string>
 	<string name="type.sport">Спорт</string>
 	<string name="type.sport.american_football">Американський футбол</string>
-	<string name="type.sport.archery">Стрiльба з лука</string>
+	<string name="type.sport.archery">Стрільба з лука</string>
 	<string name="type.sport.athletics">Легка атлетика</string>
-	<string name="type.sport.australian_football">Регбi</string>
+	<string name="type.sport.australian_football">Австралійський футбол</string>
 	<string name="type.sport.baseball">Бейсбол</string>
 	<string name="type.sport.basketball">Баскетбол</string>
-	<string name="type.sport.bowls">Кеглi</string>
+	<string name="type.sport.bowls">Боулз</string>
 	<string name="type.sport.cricket">Крикет</string>
-	<string name="type.sport.curling">Керлiнг</string>
-	<string name="type.sport.diving">Пiдводне плавання</string>
+	<string name="type.sport.curling">Керлінг</string>
 	<string name="type.sport.equestrian">Кінний спорт</string>
 	<string name="type.sport.golf">Гольф</string>
-	<string name="type.sport.gymnastics">Гiмнастика</string>
+	<string name="type.sport.gymnastics">Гімнастика</string>
 	<string name="type.sport.handball">Гандбол</string>
 	<string name="type.sport.multi">Рiзноманiтнi типи спорту</string>
-	<string name="type.sport.scuba_diving">Акваланг</string>
-	<string name="type.sport.shooting">Стрiльба</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Місце для дайвінгу</string>
+	<string name="type.sport.shooting">Стрільба</string>
 	<string name="type.sport.skiing">Лижi</string>
 	<string name="type.sport.soccer">Футбол</string>
 	<string name="type.sport.swimming">Плавання</string>
@ -1544,7 +1551,7 @@
 	<string name="type.tourism.hotel">Готель</string>
 	<string name="type.tourism.information">Турінформація</string>
 	<string name="type.tourism.information.board">Інформаційний щит</string>
-	<string name="type.tourism.information.guidepost">Турінформація</string>
+	<string name="type.tourism.information.guidepost">Вказівний стовп</string>
 	<string name="type.tourism.information.map">Мапа</string>
 	<string name="type.tourism.information.office">Туристичний офіс</string>
 	<string name="type.tourism.motel">Мотель</string>
@ -1599,4 +1606,5 @@
 	<string name="type.piste_type.nordic">Лижня</string>
 	<string name="type.piste_type.sled">Траса для санок</string>
 	<string name="type.building_part">Будівля</string>
+	<string name="type.amenity.events_venue">Місце проведення подій</string>
 </resources>
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@ -792,6 +792,7 @@
 	<string name="type.craft.carpenter">Thợ mộc</string>
 	<string name="type.craft.electrician">Thợ điện</string>
 	<string name="type.craft.gardener">Người thiết kế và xây dựng cảnh quan</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">Điều hòa nhiệt độ</string>
 	<string name="type.craft.metal_construction">Nhà kim khí</string>
 	<string name="type.craft.painter">Họa sỹ</string>
@ -1113,27 +1114,46 @@
 	<string name="type.man_made.water_well">Giếng Nước</string>
 	<string name="type.man_made.windmill">Cối xay gió</string>
 	<string name="type.military.bunker">Boongke</string>
+	<string name="type.natural">Tự nhiên</string>
+	<string name="type.natural.bare_rock">Đá trần</string>
 	<string name="type.natural.bay">Vịnh</string>
 	<string name="type.natural.beach">Bãi biển</string>
+	<string name="type.natural.beach.sand">Bãi cát</string>
+	<string name="type.natural.beach.gravel">Bãi biển sỏi</string>
 	<string name="type.natural.cape">Áo choàng</string>
 	<string name="type.natural.cave_entrance">Hang động</string>
+	<string name="type.natural.cliff">Vách đá</string>
+	<string name="type.natural.earth_bank">Vách đá</string>
+	<string name="type.man_made.embankment">Kè</string>
+	<string name="type.natural.coastline">Bờ biển</string>
 	<string name="type.natural.geyser">Suối nước nóng</string>
 	<string name="type.natural.glacier">Sông băng</string>
-	<string name="type.natural.grassland">Cánh đồng</string>
+	<string name="type.natural.grassland">Đồng cỏ</string>
+	<string name="type.natural.heath">Cây thạch thảo</string>
+	<string name="type.natural.hot_spring">Suối nước nóng</string>
 	<string name="type.natural.water.lake">Hồ</string>
 	<string name="type.natural.water.lock">Khoang khóa</string>
 	<string name="type.natural.water.pond">Ao</string>
 	<string name="type.natural.water.reservoir">Hồ chứa</string>
 	<string name="type.natural.water.basin">Một chậu nước</string>
 	<string name="type.natural.water.river">Sông</string>
+	<string name="type.natural.land">Đất liền</string>
+	<string name="type.natural.meadow">Thảo điền</string>
+	<string name="type.natural.orchard">Vườn cây ăn trái</string>
 	<string name="type.natural.peak">Đỉnh</string>
+	<string name="type.natural.saddle">Col</string>
+	<string name="type.natural.rock">Đá</string>
 	<string name="type.natural.scrub">Bụi rậm</string>
 	<string name="type.natural.spring">Suối</string>
 	<string name="type.natural.strait">Eo biển</string>
 	<string name="type.natural.tree">Cây</string>
+	<string name="type.natural.tree_row">Hàng cây</string>
+	<string name="type.natural.vineyard">Vườn nho</string>
 	<string name="type.natural.volcano">Núi lửa</string>
 	<string name="type.natural.water">Thủy vực</string>
 	<string name="type.natural.wetland">Khu vực đầm lầy</string>
+	<string name="type.natural.wetland.bog">Đầm lầy toan</string>
+	<string name="type.natural.wetland.marsh">Đầm lầy cỏ</string>
 	<string name="type.office">Văn phòng</string>
 	<string name="type.office.company">Văn phòng công ty</string>
 	<string name="type.office.estate_agent">Đại Lý Bất Động Sản</string>
@ -1272,9 +1292,26 @@
 	<string name="type.shop.video">Cửa hàng bán/cho thuê bằng đĩa</string>
 	<string name="type.shop.video_games">Cửa hàng bán trò chơi điện tử</string>
 	<string name="type.shop.wine">Rượu</string>
+	<string name="type.sport">Thể thao</string>
+	<string name="type.sport.american_football">Bóng bầu dục Mỹ</string>
+	<string name="type.sport.archery">Bắn cung</string>
 	<string name="type.sport.athletics">Điền kinh</string>
+	<string name="type.sport.australian_football">Bóng bầu dục Úc</string>
+	<string name="type.sport.baseball">Bóng chày</string>
 	<string name="type.sport.basketball">Bóng rổ</string>
+	<string name="type.sport.cricket">Cricket</string>
+	<string name="type.sport.curling">Bi đá trên băng</string>
 	<string name="type.sport.equestrian">Thể thao cưỡi ngựa</string>
+	<string name="type.sport.golf">Golf</string>
+	<string name="type.sport.gymnastics">Thể dục</string>
+	<string name="type.sport.handball">bóng ném</string>
+	<string name="type.sport.multi">Các môn thể thao khác nhau</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Môn lặn</string>
+	<string name="type.sport.shooting">Chụp</string>
+	<string name="type.sport.skiing">Trượt tuyết</string>
+	<string name="type.sport.soccer">Bóng đá</string>
+	<string name="type.sport.swimming">Bơi</string>
 	<string name="type.sport.tennis">Sân tenis</string>
 	<string name="type.tourism.alpine_hut">Nhà ở trên núi</string>
 	<string name="type.tourism.apartment">Căn hộ</string>
@ -1295,7 +1332,7 @@
 	<string name="type.tourism.hotel">Khách sạn</string>
 	<string name="type.tourism.information">Thông tin du lịch</string>
 	<string name="type.tourism.information.board">Bảng Thông Tin</string>
-	<string name="type.tourism.information.guidepost">Thông tin du lịch</string>
+	<string name="type.tourism.information.guidepost">Hướng dẫn</string>
 	<string name="type.tourism.information.map">Bản Đồ Du Lịch</string>
 	<string name="type.tourism.information.office">Văn Phòng Du Lịch</string>
 	<string name="type.tourism.motel">Nhà nghỉ</string>
@ -1321,4 +1358,5 @@
 	<string name="type.wheelchair.no">Không trang bị cho người khuyết tật</string>
 	<string name="type.wheelchair.yes">Được trang bị cho người khuyết tật</string>
 	<string name="type.building_part">Tòa nhà</string>
+	<string name="type.amenity.events_venue">Địa điểm tổ chức sự kiện</string>
 </resources>
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@ -827,6 +827,7 @@
 	<string name="type.craft.carpenter">木工</string>
 	<string name="type.craft.electrician">電工</string>
 	<string name="type.craft.gardener">園藝師</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">空調設備</string>
 	<string name="type.craft.metal_construction">鐵工</string>
 	<string name="type.craft.painter">油漆工</string>
@ -1158,27 +1159,46 @@
 	<string name="type.man_made.water_well">水井</string>
 	<string name="type.man_made.windmill">風車</string>
 	<string name="type.military.bunker">地堡</string>
+	<string name="type.natural">自然</string>
+	<string name="type.natural.bare_rock">岩石</string>
 	<string name="type.natural.bay">海灣</string>
 	<string name="type.natural.beach">海灘</string>
+	<string name="type.natural.beach.sand">沙灘</string>
+	<string name="type.natural.beach.gravel">礫石海灘</string>
 	<string name="type.natural.cape">海角</string>
 	<string name="type.natural.cave_entrance">洞穴</string>
+	<string name="type.natural.cliff">懸崖</string>
+	<string name="type.natural.earth_bank">懸崖</string>
+	<string name="type.man_made.embankment">路堤</string>
+	<string name="type.natural.coastline">海岸線</string>
 	<string name="type.natural.geyser">間歇泉</string>
 	<string name="type.natural.glacier">冰川</string>
-	<string name="type.natural.grassland">田野</string>
+	<string name="type.natural.grassland">草原</string>
+	<string name="type.natural.heath">石楠荒原</string>
+	<string name="type.natural.hot_spring">溫泉</string>
 	<string name="type.natural.water.lake">湖泊</string>
-	<string name="type.natural.water.lock">鎖室</string>
+	<string name="type.natural.water.lock">船閘</string>
 	<string name="type.natural.water.pond">潭</string>
 	<string name="type.natural.water.reservoir">水庫</string>
 	<string name="type.natural.water.basin">水庫</string>
 	<string name="type.natural.water.river">河流</string>
+	<string name="type.natural.land">陸地</string>
+	<string name="type.natural.meadow">草甸</string>
+	<string name="type.natural.orchard">果園</string>
 	<string name="type.natural.peak">山峰</string>
+	<string name="type.natural.saddle">山坳</string>
+	<string name="type.natural.rock">岩石</string>
 	<string name="type.natural.scrub">叢林</string>
 	<string name="type.natural.spring">泉水</string>
 	<string name="type.natural.strait">海峽</string>
 	<string name="type.natural.tree">樹</string>
+	<string name="type.natural.tree_row">樹列</string>
+	<string name="type.natural.vineyard">葡萄園</string>
 	<string name="type.natural.volcano">火山</string>
 	<string name="type.natural.water">水體</string>
 	<string name="type.natural.wetland">沼澤</string>
+	<string name="type.natural.wetland.bog">泥炭地</string>
+	<string name="type.natural.wetland.marsh">草沼</string>
 	<string name="type.office">辦公室</string>
 	<string name="type.office.company">公司辦公室</string>
 	<string name="type.office.estate_agent">地產代理</string>
@ -1325,9 +1345,27 @@
 	<string name="type.shop.video">視頻商城</string>
 	<string name="type.shop.video_games">電子遊戲商城</string>
 	<string name="type.shop.wine">販酒處</string>
-	<string name="type.sport.athletics">田徑</string>
+	<string name="type.sport">體育運動</string>
+	<string name="type.sport.american_football">美式足球</string>
+	<string name="type.sport.archery">射箭</string>
+	<string name="type.sport.athletics">競技</string>
+	<string name="type.sport.australian_football">澳式足球</string>
+	<string name="type.sport.baseball">棒球</string>
 	<string name="type.sport.basketball">籃球</string>
+	<string name="type.sport.bowls">草地滾球</string>
+	<string name="type.sport.cricket">板球</string>
+	<string name="type.sport.curling">冰壺</string>
 	<string name="type.sport.equestrian">馬術運動</string>
+	<string name="type.sport.golf">高爾夫球</string>
+	<string name="type.sport.gymnastics">體操</string>
+	<string name="type.sport.handball">手球</string>
+	<string name="type.sport.multi">各種運動</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">水肺潛水</string>
+	<string name="type.sport.shooting">射擊</string>
+	<string name="type.sport.skiing">滑雪</string>
+	<string name="type.sport.soccer">足球</string>
+	<string name="type.sport.swimming">游泳</string>
 	<string name="type.sport.tennis">網球場</string>
 	<string name="type.tourism.alpine_hut">山上住宿</string>
 	<string name="type.tourism.apartment">公寓</string>
@ -1347,8 +1385,8 @@
 	<string name="type.tourism.hostel">旅舍</string>
 	<string name="type.tourism.hotel">飯店</string>
 	<string name="type.tourism.information">觀光諮詢</string>
-	<string name="type.tourism.information.board">資訊中心</string>
-	<string name="type.tourism.information.guidepost">觀光諮詢</string>
+	<string name="type.tourism.information.board">標示</string>
+	<string name="type.tourism.information.guidepost">指路牌</string>
 	<string name="type.tourism.information.map">旅遊地圖</string>
 	<string name="type.tourism.information.office">旅遊辦事處</string>
 	<string name="type.tourism.motel">汽車旅館</string>
@ -1374,4 +1412,5 @@
 	<string name="type.wheelchair.no">未配備殘疾人專用</string>
 	<string name="type.wheelchair.yes">配備殘疾人專用</string>
 	<string name="type.building_part">建築物</string>
+	<string name="type.amenity.events_venue">活動場所</string>
 </resources>
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@ -846,6 +846,7 @@
 	<string name="type.craft.carpenter">木匠</string>
 	<string name="type.craft.electrician">电工</string>
 	<string name="type.craft.gardener">园艺工</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">暖通工程师</string>
 	<string name="type.craft.metal_construction">金属制造工</string>
 	<string name="type.craft.painter">油漆匠</string>
@ -1224,33 +1225,42 @@
 	<string name="type.natural.bare_rock">岩石</string>
 	<string name="type.natural.bay">海湾</string>
 	<string name="type.natural.beach">海滩</string>
+	<string name="type.natural.beach.sand">沙滩</string>
+	<string name="type.natural.beach.gravel">砾石海滩</string>
 	<string name="type.natural.cape">海角</string>
 	<string name="type.natural.cave_entrance">洞口</string>
-	<string name="type.natural.cliff">峭壁</string>
+	<string name="type.natural.cliff">悬崖</string>
+	<string name="type.natural.earth_bank">悬崖</string>
+	<string name="type.man_made.embankment">路堤</string>
 	<string name="type.natural.coastline">海岸线</string>
 	<string name="type.natural.geyser">间歇泉</string>
 	<string name="type.natural.glacier">冰川</string>
 	<string name="type.natural.grassland">草原</string>
-	<string name="type.natural.heath">荒野</string>
+	<string name="type.natural.heath">石楠荒原</string>
 	<string name="type.natural.hot_spring">温泉</string>
 	<string name="type.natural.water.lake">湖</string>
-	<string name="type.natural.water.lock">锁室</string>
+	<string name="type.natural.water.lock">船闸</string>
 	<string name="type.natural.water.pond">池塘</string>
 	<string name="type.natural.water.reservoir">水库</string>
 	<string name="type.natural.water.basin">水盆地</string>
 	<string name="type.natural.water.river">河流</string>
+	<string name="type.natural.land">陆地</string>
+	<string name="type.natural.meadow">草甸</string>
+	<string name="type.natural.orchard">果园</string>
 	<string name="type.natural.peak">峰</string>
+	<string name="type.natural.saddle">山坳</string>
 	<string name="type.natural.rock">岩石</string>
 	<string name="type.natural.scrub">灌木丛</string>
 	<string name="type.natural.spring">泉水</string>
 	<string name="type.natural.strait">海峡</string>
 	<string name="type.natural.tree">树</string>
 	<string name="type.natural.tree_row">树列</string>
+	<string name="type.natural.vineyard">葡萄园</string>
 	<string name="type.natural.volcano">火山</string>
 	<string name="type.natural.water">水體</string>
 	<string name="type.natural.wetland">湿地</string>
 	<string name="type.natural.wetland.bog">泥炭地</string>
-	<string name="type.natural.wetland.marsh">沼泽地</string>
+	<string name="type.natural.wetland.marsh">草沼</string>
 	<string name="type.office">办公地点</string>
 	<string name="type.office.company">企业公司</string>
 	<string name="type.office.estate_agent">地产中介</string>
@ -1429,18 +1439,25 @@
 	<string name="type.shop.video">影像店</string>
 	<string name="type.shop.video_games">电子游戏店</string>
 	<string name="type.shop.wine">酒品商店</string>
-	<string name="type.sport.athletics">田径</string>
+	<string name="type.sport">体育运动</string>
+	<string name="type.sport.american_football">美式足球</string>
+	<string name="type.sport.archery">射箭</string>
+	<string name="type.sport.athletics">竞技</string>
+	<string name="type.sport.australian_football">澳式足球</string>
 	<string name="type.sport.baseball">棒球</string>
 	<string name="type.sport.basketball">篮球</string>
-	<string name="type.sport.bowls">保龄球</string>
+	<string name="type.sport.bowls">草地滾球</string>
 	<string name="type.sport.cricket">板球</string>
-	<string name="type.sport.diving">跳水</string>
+	<string name="type.sport.curling">冰壶</string>
 	<string name="type.sport.equestrian">马术运动</string>
 	<string name="type.sport.golf">高尔夫球</string>
 	<string name="type.sport.gymnastics">体操</string>
 	<string name="type.sport.handball">手球</string>
-	<string name="type.sport.multi">多元</string>
+	<string name="type.sport.multi">各种运动</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">水肺潜水</string>
 	<string name="type.sport.shooting">射击</string>
+	<string name="type.sport.skiing">滑雪</string>
 	<string name="type.sport.soccer">足球</string>
 	<string name="type.sport.swimming">游泳</string>
 	<string name="type.sport.tennis">网球场</string>
@ -1463,8 +1480,8 @@
 	<string name="type.tourism.hostel">旅舍</string>
 	<string name="type.tourism.hotel">旅店</string>
 	<string name="type.tourism.information">旅游问询处</string>
-	<string name="type.tourism.information.board">公告板</string>
-	<string name="type.tourism.information.guidepost">旅游信息</string>
+	<string name="type.tourism.information.board">标示</string>
+	<string name="type.tourism.information.guidepost">指路牌</string>
 	<string name="type.tourism.information.map">旅游地图</string>
 	<string name="type.tourism.information.office">旅游咨询中心</string>
 	<string name="type.tourism.motel">汽车旅馆</string>
@ -1499,4 +1516,5 @@
 	<string name="type.wheelchair.no">未配备残疾人专用</string>
 	<string name="type.wheelchair.yes">配备残疾人专用</string>
 	<string name="type.building_part">建筑部分</string>
+	<string name="type.amenity.events_venue">活动场所</string>
 </resources>
--- a/android/res/values/attrs.xml
+++ b/android/res/values/attrs.xml
@ -86,17 +86,6 @@
  <attr name="bookmarkSubscriptionCardTextColor" format="color"/>
  <attr name="imgPromoBookingTitle" format="reference"/>

-  <declare-styleable name="AnchorBottomSheetBehavior_Layout">
-    <attr name="behavior_anchorOffset" format="dimension" />
-    <attr name="behavior_defaultState" format="enum">
-      <enum name="expanded" value="3" />
-      <enum name="collapsed" value="4" />
-      <enum name="hidden" value="5" />
-      <enum name="anchored" value="6" />
-    </attr>
-    <attr name="behavior_skipAnchored" format="boolean" />
-  </declare-styleable>
-
  <declare-styleable name="ParallaxViewPagerBg">
    <attr name="autoScroll" format="boolean" />
    <attr name="scrollPeriod" format="integer" />
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@ -60,7 +60,7 @@
  <string name="never_enum_value" translatable="false">NEVER</string>
  <string name="always_enum_value" translatable="false">ALWAYS</string>
  <string name="auto_enum_value" translatable="false">AUTO</string>
-  <string name="placepage_behavior" translatable="false">com.trafi.anchorbottomsheetbehavior.AnchorBottomSheetBehavior</string>
+  <string name="placepage_behavior" translatable="false">com.google.android.material.bottomsheet.BottomSheetBehavior</string>

  <string name="privacy_policy_url" translatable="false">https://organicmaps.app/privacy</string>
  <string name="terms_of_use_url" translatable="false">https://organicmaps.app/terms</string>
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@ -157,7 +157,7 @@
 	<!-- Kmz file successful loading -->
 	<string name="load_kmz_successful">Bookmarks loaded successfully! You can find them on the map or on the Bookmarks Manager screen.</string>
 	<!-- Kml file loading failed -->
-	<string name="load_kmz_failed">Bookmarks upload failed. The file may be corrupted or defective.</string>
+	<string name="load_kmz_failed">Failed to load bookmarks. The file may be corrupted or defective.</string>
 	<!-- resource for context menu -->
 	<string name="edit">Edit</string>
 	<!-- Warning message when doing search around current position -->
@ -375,6 +375,8 @@
 	<string name="routing_arrive">Arrival at %s</string>
 	<string name="categories">Categories</string>
 	<string name="history">History</string>
+	<string name="opens_in">Opens in %s</string>
+	<string name="closes_in">Closes in %s</string>
 	<string name="closed">Closed</string>
 	<string name="search_not_found">Oops, no results found.</string>
 	<string name="search_not_found_query">Try changing your search criteria.</string>
@ -920,16 +922,17 @@
 	<string name="type.building.warehouse">Warehouse</string>
 	<string name="type.cemetery.grave">Grave</string>
 	<string name="type.craft">Craft</string>
-	<string name="type.craft.beekeeper">beekeeper</string>
+	<string name="type.craft.beekeeper">Beekeeper</string>
 	<string name="type.craft.blacksmith">Blacksmith</string>
 	<string name="type.craft.brewery">Craft Brewery</string>
 	<string name="type.craft.carpenter">Carpenter</string>
 	<string name="type.craft.confectionery">Confectionery</string>
 	<string name="type.craft.electrician">Electrician</string>
-	<string name="type.craft.electronics_repair">Electronics repair</string>
+	<string name="type.craft.electronics_repair">Electronics Repair</string>
 	<string name="type.craft.gardener">Gardener</string>
 	<string name="type.craft.handicraft">Handicraft</string>
-	<string name="type.craft.hvac">Hvac</string>
+	<!-- Heating, Ventilation, and Air Conditioning -->
+	<string name="type.craft.hvac">HVAC</string>
 	<string name="type.craft.metal_construction">Metal Worker</string>
 	<string name="type.craft.painter">Painter</string>
 	<string name="type.craft.photographer">Photographer</string>
@ -1338,19 +1341,21 @@
 	<string name="type.military">Military</string>
 	<string name="type.military.bunker">Bunker</string>
 	<string name="type.mountain_pass">Mountain Pass</string>
-	<string name="type.natural">Natural</string>
+	<string name="type.natural">Nature</string>
 	<string name="type.natural.bare_rock">Bare Rock</string>
 	<string name="type.natural.bay">Bay</string>
 	<string name="type.natural.beach">Beach</string>
-	<string name="type.natural.beach.sand">Sandy Beach</string>
+	<string name="type.natural.beach.sand">Sand Beach</string>
 	<string name="type.natural.beach.gravel">Gravel Beach</string>
 	<string name="type.natural.cape">Cape</string>
 	<string name="type.natural.cave_entrance">Cave</string>
 	<string name="type.natural.cliff">Cliff</string>
+	<string name="type.natural.earth_bank">Earth Bank</string>
+	<string name="type.man_made.embankment">Embankment</string>
 	<string name="type.natural.coastline">Coastline</string>
 	<string name="type.natural.geyser">Geyser</string>
 	<string name="type.natural.glacier">Glacier</string>
-	<string name="type.natural.grassland">Field</string>
+	<string name="type.natural.grassland">Grassland</string>
 	<string name="type.natural.heath">Heath</string>
 	<string name="type.natural.hot_spring">Hot Spring</string>
 	<string name="type.natural.water.lake">Lake</string>
@ -1374,8 +1379,8 @@
 	<string name="type.natural.volcano">Volcano</string>
 	<string name="type.natural.water">Waterbody</string>
 	<string name="type.natural.wetland">Wetland</string>
-	<string name="type.natural.wetland.bog">Wetland</string>
-	<string name="type.natural.wetland.marsh">Wetland</string>
+	<string name="type.natural.wetland.bog">Bog</string>
+	<string name="type.natural.wetland.marsh">Marsh</string>
 	<string name="type.noexit">Dead End</string>
 	<string name="type.office">Office</string>
 	<string name="type.office.company">Company Office</string>
@ -1579,26 +1584,26 @@
 	<string name="type.shop.video">Video Shop</string>
 	<string name="type.shop.video_games">Video Games Shop</string>
 	<string name="type.shop.wine">Wine Shop</string>
-	<string name="type.sport">sport</string>
+	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">American Football</string>
 	<string name="type.sport.archery">Archery</string>
 	<string name="type.sport.athletics">Athletics</string>
-	<string name="type.sport.australian_football">Rugby</string>
+	<string name="type.sport.australian_football">Australian Football</string>
 	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketball</string>
 	<string name="type.sport.bowls">Bowls</string>
 	<string name="type.sport.cricket">Cricket</string>
-	<string name="type.sport.curling">Сurling</string>
-	<string name="type.sport.diving">Diving</string>
+	<string name="type.sport.curling">Curling</string>
 	<string name="type.sport.equestrian">Equestrian Sports</string>
 	<string name="type.sport.golf">Golf</string>
 	<string name="type.sport.gymnastics">Gymnastics</string>
 	<string name="type.sport.handball">Handball</string>
-	<string name="type.sport.multi">Various Sport</string>
-	<string name="type.sport.scuba_diving">Scuba Diving</string>
+	<string name="type.sport.multi">Various Sports</string>
+	<!-- Used to tag a scuba diving site. -->
+	<string name="type.sport.scuba_diving">Scuba diving site</string>
 	<string name="type.sport.shooting">Shooting</string>
 	<string name="type.sport.skiing">Skiing</string>
-	<string name="type.sport.soccer">Soccer (Football)</string>
+	<string name="type.sport.soccer">Soccer</string>
 	<string name="type.sport.swimming">Swimming</string>
 	<string name="type.sport.tennis">Tennis Court</string>
 	<string name="type.tourism">Tourism</string>
@ -1621,7 +1626,7 @@
 	<string name="type.tourism.hotel">Hotel</string>
 	<string name="type.tourism.information">Tourist Information</string>
 	<string name="type.tourism.information.board">Information Board</string>
-	<string name="type.tourism.information.guidepost">Tourist Information</string>
+	<string name="type.tourism.information.guidepost">Guidepost</string>
 	<string name="type.tourism.information.map">Tourist Map</string>
 	<string name="type.tourism.information.office">Tourist Office</string>
 	<string name="type.tourism.motel">Motel</string>
@ -1676,4 +1681,5 @@
 	<string name="type.piste_type.nordic">Nordic Ski Trail</string>
 	<string name="type.piste_type.sled">Sledding Piste</string>
 	<string name="type.building_part">Building</string>
+	<string name="type.amenity.events_venue">Events Venue</string>
 </resources>
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@ -386,21 +386,21 @@
    <item name="android:textSize">@dimen/text_size_toolbar</item>
  </style>

-  <style name="MwmWidget.BottomSheet" parent="Widget.Material3.BottomSheet.Modal">
-    <item name="android:background">?cardBackground</item>
+  <style
+    name="MwmTheme.BottomSheetDialog"
+    parent="@style/ThemeOverlay.Material3.BottomSheetDialog">
+    <item name="bottomSheetStyle">@style/MwmWidget.BottomSheetDialog</item>
+  </style>
+
+  <style name="MwmWidget.BottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
    <item name="backgroundTint">?cardBackground</item>
-    <item name="behavior_hideable">false</item>
+    <item name="elevationOverlayEnabled">false</item>
    <item name="shapeAppearance">@style/ShapeAppearance.Material3.LargeComponent</item>
  </style>

-  <style name="MwmWidget.BottomSheetDialog" parent="Theme.Material3.Light.BottomSheetDialog">
-    <item name="colorSurface">?cardBackground</item>
-    <item name="elevationOverlayEnabled">false</item>
-  </style>
-
-  <style name="MwmWidget.Night.BottomSheetDialog" parent="Theme.Material3.Dark.BottomSheetDialog" >
-    <item name="colorSurface">?cardBackground</item>
-    <item name="elevationOverlayEnabled">false</item>
+  <style name="MwmWidget.BottomSheet" parent="MwmWidget.BottomSheetDialog">
+    <item name="android:background">?cardBackground</item>
+    <item name="behavior_hideable">false</item>
  </style>

 </resources>
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@ -172,7 +172,10 @@
    <item name="chipTextColor">@color/bg_primary</item>
    <item name="android:popupMenuStyle">@style/PopupMenu</item>

+    <!-- Style used for bottom sheet behavior components -->
    <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
+    <!-- Theme used for bottom sheet dialog components -->
+    <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
  </style>

  <!-- Night theme -->
@ -341,5 +344,6 @@
    <item name="android:popupMenuStyle">@style/PopupMenu.Dark</item>

    <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
+    <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
  </style>
 </resources>
--- a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
+++ b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
@ -33,15 +33,13 @@ import com.mapswithme.util.StringUtils;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.Utils;
 import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 import java.util.List;

@SuppressLint("StringFormatMatches")
 public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity implements AlertDialogCallback
 {
-  private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.DOWNLOADER);
-  private static final String TAG = DownloadResourcesLegacyActivity.class.getName();
+  private static final String TAG = DownloadResourcesLegacyActivity.class.getSimpleName();

  private static final String ERROR_LOADING_DIALOG_TAG = "error_loading_dialog";
  private static final int ERROR_LOADING_DIALOG_REQ_CODE = 234;
@ -441,7 +439,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity imp
      return null;

    String msg = "Incoming intent uri: " + intent;
-    LOGGER.i(TAG, msg);
+    Logger.i(TAG, msg);
    CrashlyticsUtils.INSTANCE.log(Log.INFO, TAG, msg);

    MapTask mapTaskToForward;
--- a/android/src/com/mapswithme/maps/Framework.java
+++ b/android/src/com/mapswithme/maps/Framework.java
@ -7,8 +7,6 @@ import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Size;
-import androidx.annotation.UiThread;
-
 import com.mapswithme.maps.api.ParsedRoutingData;
 import com.mapswithme.maps.api.ParsedSearchRequest;
 import com.mapswithme.maps.api.ParsingResult;
@ -22,8 +20,6 @@ import com.mapswithme.maps.routing.TransitRouteInfo;
 import com.mapswithme.maps.settings.SettingsPrefsFragment;
 import com.mapswithme.maps.widget.placepage.PlacePageData;
 import com.mapswithme.util.Constants;
-import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@ -34,9 +30,6 @@ import java.lang.annotation.RetentionPolicy;
 */
 public class Framework
 {
-  private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
-  private static final String TAG = Framework.class.getSimpleName();
-
  @Retention(RetentionPolicy.SOURCE)
  @IntDef({MAP_STYLE_CLEAR, MAP_STYLE_DARK, MAP_STYLE_VEHICLE_CLEAR, MAP_STYLE_VEHICLE_DARK})

@ -224,7 +217,7 @@ public class Framework

  public static native String nativeGetWritableDir();

-  public static native void nativeSetWritableDir(String newPath);
+  public static native void nativeChangeWritableDir(String newPath);

  // Routing.
  public static native boolean nativeIsRoutingActive();
--- a/android/src/com/mapswithme/maps/MapFragment.java
+++ b/android/src/com/mapswithme/maps/MapFragment.java
@ -16,23 +16,18 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-
 import com.mapswithme.maps.base.BaseMwmFragment;
 import com.mapswithme.maps.location.LocationHelper;
 import com.mapswithme.util.Config;
-import com.mapswithme.util.Counters;
-import com.mapswithme.util.PermissionsUtils;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.concurrency.UiThread;
 import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 public class MapFragment extends BaseMwmFragment
                      implements View.OnTouchListener,
                                 SurfaceHolder.Callback
 {
  public static final String ARG_LAUNCH_BY_DEEP_LINK = "launch_by_deep_link";
-  private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
  private static final String TAG = MapFragment.class.getSimpleName();

  // Should correspond to android::MultiTouchAction from Framework.cpp
@ -158,61 +153,62 @@ public class MapFragment extends BaseMwmFragment
  @Override
  public void surfaceCreated(SurfaceHolder surfaceHolder)
  {
-//    if (isThemeChangingProcess())
-//    {
-//      LOGGER.d(TAG, "Activity is being recreated due theme changing, skip 'surfaceCreated' callback");
-//      return;
-//    }
-//
-//    LOGGER.d(TAG, "surfaceCreated, mSurfaceCreated = " + mSurfaceCreated);
-//    final Surface surface = surfaceHolder.getSurface();
-//    if (nativeIsEngineCreated())
-//    {
-//      if (!nativeAttachSurface(surface))
-//      {
-//        reportUnsupported();
-//        return;
-//      }
-//      mSurfaceCreated = true;
-//      mSurfaceAttached = true;
-//      mRequireResize = true;
-//      nativeResumeSurfaceRendering();
-//      return;
-//    }
-//
-//    mRequireResize = false;
-//    final Rect rect = surfaceHolder.getSurfaceFrame();
-//    setupWidgets(rect.width(), rect.height());
-//
-//    final DisplayMetrics metrics = new DisplayMetrics();
-//    requireActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
-//    final float exactDensityDpi = metrics.densityDpi;
-//
-//    final boolean firstStart = LocationHelper.INSTANCE.isInFirstRun();
-//    if (!nativeCreateEngine(surface, (int) exactDensityDpi, firstStart, mLaunchByDeepLink,
-//                            BuildConfig.VERSION_CODE))
-//    {
-//      reportUnsupported();
-//      return;
-//    }
-//
-//    if (firstStart)
-//    {
-//      UiThread.runLater(new Runnable()
-//      {
-//        @Override
-//        public void run()
-//        {
-//          LocationHelper.INSTANCE.onExitFromFirstRun();
-//        }
-//      });
-//    }
-//
-//    mSurfaceCreated = true;
-//    mSurfaceAttached = true;
-//    nativeResumeSurfaceRendering();
-//    if (mMapRenderingListener != null)
-//      mMapRenderingListener.onRenderingCreated();
+
+    if (isThemeChangingProcess())
+    {
+      Logger.d(TAG, "Activity is being recreated due theme changing, skip 'surfaceCreated' callback");
+      return;
+    }
+
+    Logger.d(TAG, "surfaceCreated, mSurfaceCreated = " + mSurfaceCreated);
+    final Surface surface = surfaceHolder.getSurface();
+    if (nativeIsEngineCreated())
+    {
+      if (!nativeAttachSurface(surface))
+      {
+        reportUnsupported();
+        return;
+      }
+      mSurfaceCreated = true;
+      mSurfaceAttached = true;
+      mRequireResize = true;
+      nativeResumeSurfaceRendering();
+      return;
+    }
+
+    mRequireResize = false;
+    final Rect rect = surfaceHolder.getSurfaceFrame();
+    setupWidgets(rect.width(), rect.height());
+
+    final DisplayMetrics metrics = new DisplayMetrics();
+    requireActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
+    final float exactDensityDpi = metrics.densityDpi;
+
+    final boolean firstStart = LocationHelper.INSTANCE.isInFirstRun();
+    if (!nativeCreateEngine(surface, (int) exactDensityDpi, firstStart, mLaunchByDeepLink,
+                            BuildConfig.VERSION_CODE))
+    {
+      reportUnsupported();
+      return;
+    }
+
+    if (firstStart)
+    {
+      UiThread.runLater(new Runnable()
+      {
+        @Override
+        public void run()
+        {
+          LocationHelper.INSTANCE.onExitFromFirstRun();
+        }
+      });
+    }
+
+    mSurfaceCreated = true;
+    mSurfaceAttached = true;
+    nativeResumeSurfaceRendering();
+    if (mMapRenderingListener != null)
+      mMapRenderingListener.onRenderingCreated();
  }

  @Override
@ -220,11 +216,11 @@ public class MapFragment extends BaseMwmFragment
  {
    if (isThemeChangingProcess())
    {
-      LOGGER.d(TAG, "Activity is being recreated due theme changing, skip 'surfaceChanged' callback");
+      Logger.d(TAG, "Activity is being recreated due theme changing, skip 'surfaceChanged' callback");
      return;
    }

-    LOGGER.d(TAG, "surfaceChanged, mSurfaceCreated = " + mSurfaceCreated);
+    Logger.d(TAG, "surfaceChanged, mSurfaceCreated = " + mSurfaceCreated);
    if (!mSurfaceCreated || (!mRequireResize && surfaceHolder.isCreating()))
      return;

@ -241,13 +237,13 @@ public class MapFragment extends BaseMwmFragment
  @Override
  public void surfaceDestroyed(SurfaceHolder surfaceHolder)
  {
-    LOGGER.d(TAG, "surfaceDestroyed");
+    Logger.d(TAG, "surfaceDestroyed");
    destroySurface();
  }

  void destroySurface()
  {
-    LOGGER.d(TAG, "destroySurface, mSurfaceCreated = " + mSurfaceCreated +
+    Logger.d(TAG, "destroySurface, mSurfaceCreated = " + mSurfaceCreated +
             ", mSurfaceAttached = " + mSurfaceAttached + ", isAdded = " + isAdded());
    if (!mSurfaceCreated || !mSurfaceAttached || !isAdded())
      return;
@ -288,14 +284,14 @@ public class MapFragment extends BaseMwmFragment
  {
    super.onStart();
    nativeSetRenderingInitializationFinishedListener(mMapRenderingListener);
-    LOGGER.d(TAG, "onStart");
+    Logger.d(TAG, "onStart");
  }

  public void onStop()
  {
    super.onStop();
    nativeSetRenderingInitializationFinishedListener(null);
-    LOGGER.d(TAG, "onStop");
+    Logger.d(TAG, "onStop");
  }

  private boolean isThemeChangingProcess()
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@ -26,7 +26,6 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
-
 import com.mapswithme.maps.Framework.PlacePageActivationListener;
 import com.mapswithme.maps.api.ParsedMwmRequest;
 import com.mapswithme.maps.background.AppBackgroundTracker;
@ -96,8 +95,6 @@ import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.Utils;
 import com.mapswithme.util.bottomsheet.MenuBottomSheetFragment;
 import com.mapswithme.util.bottomsheet.MenuBottomSheetItem;
-import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 import java.util.ArrayList;
 import java.util.Objects;
--- a/android/src/com/mapswithme/maps/MwmApplication.java
+++ b/android/src/com/mapswithme/maps/MwmApplication.java
@ -8,7 +8,6 @@ import android.os.Message;
 import android.util.Log;

 import androidx.annotation.NonNull;
-
 import com.mapswithme.maps.background.AppBackgroundTracker;
 import com.mapswithme.maps.background.NotificationChannelFactory;
 import com.mapswithme.maps.background.NotificationChannelProvider;
@ -35,7 +34,7 @@ import com.mapswithme.util.StorageUtils;
 import com.mapswithme.util.ThemeSwitcher;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;
+import com.mapswithme.util.log.LogsManager;

 import java.io.IOException;
 import java.util.List;
@ -44,8 +43,7 @@ public class MwmApplication extends Application implements AppBackgroundTracker.
 {
  @SuppressWarnings("NotNullFieldNotInitialized")
  @NonNull
-  private final Logger mLogger = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
-  public final static String TAG = "MwmApplication";
+  private static final String TAG = MwmApplication.class.getSimpleName();

  private AppBackgroundTracker mBackgroundTracker;
  @SuppressWarnings("NotNullFieldNotInitialized")
@ -105,16 +103,16 @@ public class MwmApplication extends Application implements AppBackgroundTracker.
  public void onCreate()
  {
    super.onCreate();
-    mLogger.i(TAG, "Initializing application");
+    Logger.i(TAG, "Initializing application");
+    LogsManager.INSTANCE.initFileLogging(this);

-    LoggerFactory.INSTANCE.initFileLogging(this);

    // Set configuration directory as early as possible.
    // Other methods may explicitly use Config, which requires settingsDir to be set.
    final String settingsPath = StorageUtils.getSettingsPath(this);
    if (!StorageUtils.createDirectory(settingsPath))
      throw new AssertionError("Can't create settingsDir " + settingsPath);
-    mLogger.d(TAG, "Settings path = " + settingsPath);
+    Logger.d(TAG, "Settings path = " + settingsPath);
    nativeSetSettingsDir(settingsPath);

    mMainLoopHandler = new Handler(getMainLooper());
@ -154,14 +152,14 @@ public class MwmApplication extends Application implements AppBackgroundTracker.
      return;

    final String apkPath = StorageUtils.getApkPath(this);
-    mLogger.d(TAG, "Apk path = " + apkPath);
-    // Note: StoragePathManager uses Config, which requires initConfig() to be called.
+    Logger.d(TAG, "Apk path = " + apkPath);
+    // Note: StoragePathManager uses Config, which requires SettingsDir to be set.
    final String writablePath = StoragePathManager.findMapsStorage(this);
-    mLogger.d(TAG, "Writable path = " + writablePath);
+    Logger.d(TAG, "Writable path = " + writablePath);
    final String privatePath = StorageUtils.getPrivatePath(this);
-    mLogger.d(TAG, "Private path = " + privatePath);
+    Logger.d(TAG, "Private path = " + privatePath);
    final String tempPath = StorageUtils.getTempPath(this);
-    mLogger.d(TAG, "Temp path = " + tempPath);
+    Logger.d(TAG, "Temp path = " + tempPath);

    // If platform directories are not created it means that native part of app will not be able
    // to work at all. So, we just ignore native part initialization in this case, e.g. when the
@ -174,13 +172,12 @@ public class MwmApplication extends Application implements AppBackgroundTracker.
                       tempPath,
                       BuildConfig.FLAVOR,
                       BuildConfig.BUILD_TYPE, UiUtils.isTablet(this));
-
+    Config.setStoragePath(writablePath);
    Config.setStatisticsEnabled(SharedPropertiesUtils.isStatisticsEnabled(this));

    Editor.init(this);
    mPlatformInitialized = true;
-    Log.i("Native", "Initializing application");
-    mLogger.i(TAG, "Platform initialized");
+    Logger.i(TAG, "Platform initialized");
  }

  private void createPlatformDirectories(@NonNull String writablePath,
@ -216,7 +213,7 @@ public class MwmApplication extends Application implements AppBackgroundTracker.
    IsolinesManager.from(this).initialize(null);
    mBackgroundTracker.addListener(this);

-    mLogger.i(TAG, "Framework initialized");
+    Logger.i(TAG, "Framework initialized");
    mFrameworkInitialized = true;
  }

--- a/android/src/com/mapswithme/maps/MwmBroadcastReceiver.java
+++ b/android/src/com/mapswithme/maps/MwmBroadcastReceiver.java
@ -6,14 +6,12 @@ import android.content.Intent;
 import android.util.Log;

 import androidx.annotation.NonNull;
-
 import com.mapswithme.util.CrashlyticsUtils;
 import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 public abstract class MwmBroadcastReceiver extends BroadcastReceiver
 {
-  private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
+  private static final String TAG = MwmBroadcastReceiver.class.getSimpleName();

  @NonNull
  protected String getTag()
@ -28,11 +26,11 @@ public abstract class MwmBroadcastReceiver extends BroadcastReceiver
  {
    MwmApplication app = MwmApplication.from(context);
    String msg = "onReceive: " + intent;
-    LOGGER.i(getTag(), msg);
+    Logger.i(TAG, msg);
    CrashlyticsUtils.INSTANCE.log(Log.INFO, getTag(), msg);
    if (!app.arePlatformAndCoreInitialized())
    {
-      LOGGER.w(getTag(), "Application is not initialized, ignoring " + intent);
+      Logger.w(TAG, "Application is not initialized, ignoring " + intent);
      return;
    }

--- a/android/src/com/mapswithme/maps/MwmJobIntentService.java
+++ b/android/src/com/mapswithme/maps/MwmJobIntentService.java
@ -5,14 +5,12 @@ import android.util.Log;

 import androidx.annotation.NonNull;
 import androidx.core.app.JobIntentService;
-
 import com.mapswithme.util.CrashlyticsUtils;
 import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 public abstract class MwmJobIntentService extends JobIntentService
 {
-  private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
+  private static final String TAG = MwmJobIntentService.class.getSimpleName();

  @NonNull
  protected String getTag()
@ -27,11 +25,11 @@ public abstract class MwmJobIntentService extends JobIntentService
  {
    MwmApplication app = MwmApplication.from(this);
    String msg = "onHandleWork: " + intent;
-    LOGGER.i(getTag(), msg);
+    Logger.i(TAG, msg);
    CrashlyticsUtils.INSTANCE.log(Log.INFO, getTag(), msg);
    if (!app.arePlatformAndCoreInitialized())
    {
-      LOGGER.w(getTag(), "Application is not initialized, ignoring " + intent);
+      Logger.w(TAG, "Application is not initialized, ignoring " + intent);
      return;
    }

--- a/android/src/com/mapswithme/maps/background/AppBackgroundTracker.java
+++ b/android/src/com/mapswithme/maps/background/AppBackgroundTracker.java
@ -7,12 +7,10 @@ import android.os.Bundle;
 import android.util.SparseArray;

 import androidx.annotation.NonNull;
-
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.util.Listeners;
 import com.mapswithme.util.concurrency.UiThread;
 import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 import java.lang.ref.WeakReference;

@ -22,7 +20,6 @@ import java.lang.ref.WeakReference;
 */
 public final class AppBackgroundTracker
 {
-  private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
  private static final String TAG = AppBackgroundTracker.class.getSimpleName();
  private static final int TRANSITION_DELAY_MS = 1000;

@ -67,7 +64,7 @@ public final class AppBackgroundTracker
    @Override
    public void onActivityStarted(Activity activity)
    {
-      LOGGER.d(TAG, "onActivityStarted activity = " + activity);
+      Logger.d(TAG, "onActivityStarted activity = " + activity);
      if (mActivities.size() == 0)
        notifyVisibleAppLaunchListeners();
      mActivities.put(activity.hashCode(), new WeakReference<>(activity));
@ -77,7 +74,7 @@ public final class AppBackgroundTracker
    @Override
    public void onActivityStopped(Activity activity)
    {
-      LOGGER.d(TAG, "onActivityStopped activity = " + activity);
+      Logger.d(TAG, "onActivityStopped activity = " + activity);
      mActivities.remove(activity.hashCode());
      onActivityChanged();
    }
@ -85,31 +82,31 @@ public final class AppBackgroundTracker
    @Override
    public void onActivityCreated(Activity activity, Bundle savedInstanceState)
    {
-      LOGGER.d(TAG, "onActivityCreated activity = " + activity);
+      Logger.d(TAG, "onActivityCreated activity = " + activity);
    }

    @Override
    public void onActivityDestroyed(Activity activity)
    {
-      LOGGER.d(TAG, "onActivityDestroyed activity = " + activity);
+      Logger.d(TAG, "onActivityDestroyed activity = " + activity);
    }

    @Override
    public void onActivityResumed(Activity activity)
    {
-      LOGGER.d(TAG, "onActivityResumed activity = " + activity);
+      Logger.d(TAG, "onActivityResumed activity = " + activity);
    }

    @Override
    public void onActivityPaused(Activity activity)
    {
-      LOGGER.d(TAG, "onActivityPaused activity = " + activity);
+      Logger.d(TAG, "onActivityPaused activity = " + activity);
    }

    @Override
    public void onActivitySaveInstanceState(Activity activity, Bundle outState)
    {
-      LOGGER.d(TAG, "onActivitySaveInstanceState activity = " + activity);
+      Logger.d(TAG, "onActivitySaveInstanceState activity = " + activity);
    }
  };

--- a/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java
+++ b/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java
@ -6,17 +6,14 @@ import android.util.Log;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import com.mapswithme.util.Config;
 import com.mapswithme.util.CrashlyticsUtils;
 import com.mapswithme.util.Utils;
 import com.mapswithme.util.concurrency.UiThread;
 import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 public class BaseActivityDelegate
 {
-  private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
  private static final String TAG = BaseActivityDelegate.class.getSimpleName();
  @NonNull
  private final BaseActivity mActivity;
@ -97,6 +94,6 @@ public class BaseActivityDelegate
  {
    String msg = mActivity.getClass().getSimpleName() + ": " + method + " activity: " + mActivity;
    CrashlyticsUtils.INSTANCE.log(Log.INFO, TAG, msg);
-    LOGGER.i(TAG, msg);
+    Logger.i(TAG, msg);
  }
 }
--- a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
+++ b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
@ -16,7 +16,6 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.SplashActivity;
@ -26,11 +25,12 @@ import com.mapswithme.util.ThemeUtils;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.Utils;
 import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 public abstract class BaseMwmFragmentActivity extends AppCompatActivity
                                  implements BaseActivity
 {
+  private static final String TAG = BaseMwmFragmentActivity.class.getSimpleName();
+
  private final BaseActivityDelegate mBaseDelegate = new BaseActivityDelegate(this);
  private boolean mSafeCreated;

@ -280,9 +280,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
    }
    catch (ClassCastException e)
    {
-      Logger logger = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
-      String tag = this.getClass().getSimpleName();
-      logger.i(tag, "Fragment '" + currentFragment + "' doesn't handle back press by itself.");
+      Logger.i(TAG, "Fragment '" + currentFragment + "' doesn't handle back press by itself.");
      return false;
    }
  }
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
@ -8,18 +8,14 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.DocumentsContract;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;

 import androidx.annotation.CallSuper;
-import androidx.annotation.IdRes;
 import androidx.annotation.LayoutRes;
-import androidx.annotation.MenuRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.adapter.OnItemClickListener;
@ -32,13 +28,12 @@ import com.mapswithme.maps.dialog.DialogUtils;
 import com.mapswithme.maps.dialog.EditTextDialogFragment;
 import com.mapswithme.maps.widget.PlaceholderView;
 import com.mapswithme.maps.widget.recycler.ItemDecoratorFactory;
-import com.mapswithme.util.bottomsheet.MenuBottomSheetFragment;
 import com.mapswithme.util.StorageUtils;
+import com.mapswithme.util.bottomsheet.MenuBottomSheetFragment;
 import com.mapswithme.util.bottomsheet.MenuBottomSheetItem;
 import com.mapswithme.util.concurrency.ThreadPool;
 import com.mapswithme.util.concurrency.UiThread;
 import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 import java.io.File;
 import java.util.ArrayList;
@ -47,20 +42,19 @@ import java.util.concurrent.atomic.AtomicInteger;

 public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<BookmarkCategoriesAdapter>
    implements BookmarkManager.BookmarksLoadingListener,
-    CategoryListCallback,
-    OnItemClickListener<BookmarkCategory>,
-    OnItemMoreClickListener<BookmarkCategory>,
-    OnItemLongClickListener<BookmarkCategory>, BookmarkManager.BookmarksSharingListener
+               CategoryListCallback,
+               OnItemClickListener<BookmarkCategory>,
+               OnItemMoreClickListener<BookmarkCategory>,
+               OnItemLongClickListener<BookmarkCategory>, BookmarkManager.BookmarksSharingListener

 {
+  private static final String TAG = BookmarkCategoriesFragment.class.getSimpleName();
+
  static final int REQ_CODE_DELETE_CATEGORY = 102;
  static final int REQ_CODE_IMPORT_DIRECTORY = 103;

  private static final int MAX_CATEGORY_NAME_LENGTH = 60;

-  private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
-  private static final String TAG = BookmarkCategoriesFragment.class.getSimpleName();
-
  @Nullable
  private BookmarkCategory mSelectedCategory;
  @Nullable
@ -286,7 +280,7 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
      final Uri rootUri = data.getData();
      final ProgressDialog dialog = DialogUtils.createModalProgressDialog(context, R.string.wait_several_minutes);
      dialog.show();
-      LOGGER.d(TAG, "Importing bookmarks from " + rootUri);
+      Logger.d(TAG, "Importing bookmarks from " + rootUri);
      MwmApplication app = MwmApplication.from(context);
      final File tempDir = new File(StorageUtils.getTempPath(app));
      final ContentResolver resolver = context.getContentResolver();
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksSharingHelper.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksSharingHelper.java
@ -5,20 +5,17 @@ import android.app.ProgressDialog;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
 import com.mapswithme.maps.bookmarks.data.BookmarkSharingResult;
 import com.mapswithme.maps.dialog.DialogUtils;
 import com.mapswithme.util.SharingUtils;
 import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.LoggerFactory;

 public enum BookmarksSharingHelper
 {
  INSTANCE;

-  private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
  private static final String TAG = BookmarksSharingHelper.class.getSimpleName();

  @Nullable
@ -51,8 +48,7 @@ public enum BookmarksSharingHelper
        DialogUtils.showAlertDialog(context, R.string.dialog_routing_system_error,
                                    R.string.bookmarks_error_message_share_general);
        String catName = BookmarkManager.INSTANCE.getCategoryById(result.getCategoryId()).getName();
-        LOGGER.e(TAG, "Failed to share bookmark category '" + catName + "', error code: "
-                      + result.getCode());
+        Logger.e(TAG, "Failed to share bookmark category '" + catName + "', error code: " + result.getCode());
        break;
      default:
        throw new AssertionError("Unsupported bookmark sharing code: " + result.getCode());
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksToolbarController.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksToolbarController.java
@ -43,4 +43,10 @@ public class BookmarksToolbarController extends SearchToolbarController
    else
      mFragment.cancelSearch();
  }
+
+  @Override
+  protected boolean showBackButton()
+  {
+    return false;
+  }
 }
--- a/Show more
+++ b/Show more