Merge commit 'eb264889e3' into traffic

2025-12-20 05:13:58 +00:00 · 2025-10-10 18:40:35 +03:00
parent 30b2df89cd eb264889e3
commit bf36c875d5
808 changed files with 31595 additions and 27751 deletions
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -144,7 +144,7 @@ project.afterEvaluate {

  final taskName = gradle.startParameter.taskNames

-  if (['assemble', 'bundle', 'compile', 'install'].any{taskName.any{task->task.startsWith(it)}}) {
+  if (['assemble', 'bundle', 'compile', 'install', 'run'].any{taskName.any{task->task.startsWith(it)}}) {
    exec {
      workingDir '../..'

--- a/android/sdk/src/main/cpp/CMakeLists.txt
+++ b/android/sdk/src/main/cpp/CMakeLists.txt
@@ -27,13 +27,14 @@ set(SRC
  app/organicmaps/sdk/search/SearchEngine.cpp
  app/organicmaps/sdk/search/SearchRecents.cpp
  app/organicmaps/sdk/routing/JunctionInfo.hpp
+  app/organicmaps/sdk/routing/LaneInfo.cpp
+  app/organicmaps/sdk/routing/LaneInfo.hpp
  app/organicmaps/sdk/routing/RouteMarkData.hpp
  app/organicmaps/sdk/routing/RouteMarkType.hpp
  app/organicmaps/sdk/routing/RoutePointInfo.hpp
  app/organicmaps/sdk/routing/RouteRecommendationType.hpp
  app/organicmaps/sdk/routing/RoutingInfo.hpp
  app/organicmaps/sdk/routing/RoutingOptions.cpp
-  app/organicmaps/sdk/routing/SingleLaneInfo.hpp
  app/organicmaps/sdk/routing/TransitRouteInfo.hpp
  app/organicmaps/sdk/routing/TransitStepInfo.hpp
  app/organicmaps/sdk/ChoosePositionMode.cpp
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp
@@ -31,24 +31,6 @@ JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOAut
  return ToJavaString(env, auth.BuildOAuth2Url());
 }

-JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithPassword(JNIEnv * env, jclass clazz,
-                                                                                          jstring login,
-                                                                                          jstring password)
-{
-  OsmOAuth auth = OsmOAuth::ServerAuth();
-  try
-  {
-    if (auth.AuthorizePassword(ToNativeString(env, login), ToNativeString(env, password)))
-      return ToJavaString(env, auth.GetAuthToken());
-    LOG(LWARNING, ("nativeAuthWithPassword: invalid login or password."));
-  }
-  catch (std::exception const & ex)
-  {
-    LOG(LWARNING, ("nativeAuthWithPassword error ", ex.what()));
-  }
-  return nullptr;
-}
-
 JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithOAuth2Code(JNIEnv * env, jclass,
                                                                                            jstring oauth2code)
 {
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/LaneInfo.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/LaneInfo.cpp
@@ -0,0 +1,50 @@
+#include "LaneInfo.hpp"
+
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
+
+#include <vector>
+
+namespace
+{
+jobject ToJavaLaneWay(JNIEnv * env, routing::turns::lanes::LaneWay const & laneWay)
+{
+  static jclass const laneWayClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/LaneWay");
+  jfieldID fieldID =
+      env->GetStaticFieldID(laneWayClass, DebugPrint(laneWay).c_str(), "Lapp/organicmaps/sdk/routing/LaneWay;");
+  return env->GetStaticObjectField(laneWayClass, fieldID);
+}
+}  // namespace
+
+jobjectArray CreateLanesInfo(JNIEnv * env, routing::turns::lanes::LanesInfo const & lanes)
+{
+  if (lanes.empty())
+    return nullptr;
+
+  static jclass const laneWayClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/LaneWay");
+  static jclass const laneInfoClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/LaneInfo");
+  auto const lanesSize = static_cast<jsize>(lanes.size());
+  jobjectArray jLanes = env->NewObjectArray(lanesSize, laneInfoClass, nullptr);
+  ASSERT(jLanes, (jni::DescribeException()));
+  // Java signature : LaneInfo(LaneWay[] laneWays, LaneWay activeLane)
+  static jmethodID const ctorLaneInfoID = jni::GetConstructorID(
+      env, laneInfoClass, "([Lapp/organicmaps/sdk/routing/LaneWay;Lapp/organicmaps/sdk/routing/LaneWay;)V");
+
+  for (jsize j = 0; j < lanesSize; ++j)
+  {
+    auto const laneWays = lanes[j].laneWays.GetActiveLaneWays();
+    auto const laneWaysSize = static_cast<jsize>(laneWays.size());
+    jni::TScopedLocalObjectArrayRef jLaneWays(env, env->NewObjectArray(laneWaysSize, laneWayClass, nullptr));
+    ASSERT(jLanes, (jni::DescribeException()));
+    for (jsize i = 0; i < laneWaysSize; ++i)
+    {
+      jni::TScopedLocalRef jLaneWay(env, ToJavaLaneWay(env, laneWays[i]));
+      env->SetObjectArrayElement(jLaneWays.get(), i, jLaneWay.get());
+    }
+    jni::TScopedLocalRef jLaneInfo(env, env->NewObject(laneInfoClass, ctorLaneInfoID, jLaneWays.get(),
+                                                       ToJavaLaneWay(env, lanes[j].recommendedWay)));
+    ASSERT(jLaneInfo.get(), (jni::DescribeException()));
+    env->SetObjectArrayElement(jLanes, j, jLaneInfo.get());
+  }
+
+  return jLanes;
+}
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/LaneInfo.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/LaneInfo.hpp
@@ -0,0 +1,7 @@
+#pragma once
+
+#include <jni.h>
+
+#include "routing/lanes/lane_info.hpp"
+
+jobjectArray CreateLanesInfo(JNIEnv * env, routing::turns::lanes::LanesInfo const & lanes);
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp
@@ -1,7 +1,7 @@
 #pragma once

 #include "app/organicmaps/sdk/core/jni_helper.hpp"
-#include "app/organicmaps/sdk/routing/SingleLaneInfo.hpp"
+#include "app/organicmaps/sdk/routing/LaneInfo.hpp"
 #include "app/organicmaps/sdk/util/Distance.hpp"

 #include "map/routing_manager.hpp"
@@ -13,12 +13,13 @@ jobject CreateRoutingInfo(JNIEnv * env, routing::FollowingInfo const & info, Rou
  //                              String currentStreet, String nextStreet, String nextNextStreet,
  //                              double completionPercent, int vehicleTurnOrdinal, int
  //                              vehicleNextTurnOrdinal, int pedestrianTurnOrdinal, int exitNum,
-  //                              int totalTime, SingleLaneInfo[] lanes)
+  //                              int totalTime, LaneInfo[] lanes, double speedLimitMps, boolean speedLimitExceeded,
+  //                              boolean shouldPlayWarningSignal)
  static jmethodID const ctorRouteInfoID =
      jni::GetConstructorID(env, klass,
                            "(Lapp/organicmaps/sdk/util/Distance;Lapp/organicmaps/sdk/util/Distance;"
                            "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DIIIII"
-                            "[Lapp/organicmaps/sdk/routing/SingleLaneInfo;DZZ)V");
+                            "[Lapp/organicmaps/sdk/routing/LaneInfo;DZZ)V");

  jobjectArray jLanes = CreateLanesInfo(env, info.m_lanes);

--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp
@@ -1,34 +0,0 @@
-#pragma once
-
-#include "app/organicmaps/sdk/core/jni_helper.hpp"
-
-#include "routing/following_info.hpp"
-
-#include <vector>
-
-jobjectArray CreateLanesInfo(JNIEnv * env, std::vector<routing::FollowingInfo::SingleLaneInfoClient> const & lanes)
-{
-  if (lanes.empty())
-    return nullptr;
-
-  static jclass const laneClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/SingleLaneInfo");
-  auto const lanesSize = static_cast<jsize>(lanes.size());
-  jobjectArray jLanes = env->NewObjectArray(lanesSize, laneClass, nullptr);
-  ASSERT(jLanes, (jni::DescribeException()));
-  static jmethodID const ctorSingleLaneInfoID = jni::GetConstructorID(env, laneClass, "([BZ)V");
-
-  for (jsize j = 0; j < lanesSize; ++j)
-  {
-    auto const laneSize = static_cast<jsize>(lanes[j].m_lane.size());
-    jni::TScopedLocalByteArrayRef singleLane(env, env->NewByteArray(laneSize));
-    ASSERT(singleLane.get(), (jni::DescribeException()));
-    env->SetByteArrayRegion(singleLane.get(), 0, laneSize, lanes[j].m_lane.data());
-
-    jni::TScopedLocalRef singleLaneInfo(
-        env, env->NewObject(laneClass, ctorSingleLaneInfoID, singleLane.get(), lanes[j].m_isRecommended));
-    ASSERT(singleLaneInfo.get(), (jni::DescribeException()));
-    env->SetObjectArrayElement(jLanes, j, singleLaneInfo.get());
-  }
-
-  return jLanes;
-}
--- a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java
@@ -70,7 +70,9 @@ public class Metadata implements Parcelable
    FMD_CONTACT_BLUESKY(51),
    FMD_PANORAMAX(52),
    FMD_CHECK_DATE(53),
-    FMD_CHECK_DATE_OPEN_HOURS(54);
+    FMD_CHECK_DATE_OPEN_HOURS(54),
+    //FMD_BRANCH(55),
+    FMD_CHARGE_SOCKETS(56);
    private final int mMetaType;

    MetadataType(int metadataType)
--- a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
@@ -3,7 +3,7 @@ package app.organicmaps.sdk.editor;
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.sdk.editor.OhState;
+
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;

--- a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
@@ -3,7 +3,6 @@ package app.organicmaps.sdk.maplayer;
 import android.content.Context;
 import androidx.annotation.NonNull;
 import app.organicmaps.sdk.Framework;
-import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
 import app.organicmaps.sdk.maplayer.subway.SubwayManager;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
--- a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
@@ -5,5 +5,5 @@ public enum IsolinesState
  DISABLED,
  ENABLED,
  EXPIREDDATA,
-  NODATA;
+  NODATA
 }
--- a/android/sdk/src/main/java/app/organicmaps/sdk/routing/LaneInfo.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/routing/LaneInfo.java
@@ -0,0 +1,27 @@
+package app.organicmaps.sdk.routing;
+
+import androidx.annotation.NonNull;
+
+public final class LaneInfo
+{
+  public final LaneWay[] mLaneWays;
+  public final LaneWay mActiveLaneWay;
+
+  public LaneInfo(@NonNull LaneWay[] laneWays, LaneWay activeLane)
+  {
+    mLaneWays = laneWays;
+    mActiveLaneWay = activeLane;
+  }
+
+  @NonNull
+  @Override
+  public String toString()
+  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("LaneInfo{activeLaneWay=").append(mActiveLaneWay.toString()).append(", laneWays=[");
+    for (LaneWay i : mLaneWays)
+      sb.append(" ").append(i);
+    sb.append("]}");
+    return sb.toString();
+  }
+}
--- a/android/sdk/src/main/java/app/organicmaps/sdk/routing/LaneWay.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/routing/LaneWay.java
@@ -3,25 +3,20 @@ package app.organicmaps.sdk.routing;
 import androidx.annotation.DrawableRes;
 import app.organicmaps.sdk.R;

-/**
- * IMPORTANT : Order of enum values MUST BE the same
- * with native LaneWay enum (see routing/turns.hpp for details).
- * Information for every lane is composed of some number values below.
- * For example, a lane may have THROUGH and RIGHT values.
- */
 public enum LaneWay
 {
-  NONE(R.drawable.ic_turn_straight),
-  REVERSE(R.drawable.ic_turn_uleft),
-  SHARP_LEFT(R.drawable.ic_turn_left_sharp),
-  LEFT(R.drawable.ic_turn_left),
-  SLIGHT_LEFT(R.drawable.ic_turn_left_slight),
-  MERGE_TO_RIGHT(R.drawable.ic_turn_right_slight),
-  THROUGH(R.drawable.ic_turn_straight),
-  MERGE_TO_LEFT(R.drawable.ic_turn_left_slight),
-  SLIGHT_RIGHT(R.drawable.ic_turn_right_slight),
-  RIGHT(R.drawable.ic_turn_right),
-  SHARP_RIGHT(R.drawable.ic_turn_right_sharp);
+  None(R.drawable.ic_turn_straight),
+  ReverseLeft(R.drawable.ic_turn_uleft),
+  SharpLeft(R.drawable.ic_turn_left_sharp),
+  Left(R.drawable.ic_turn_left),
+  MergeToLeft(R.drawable.ic_turn_left_slight),
+  SlightLeft(R.drawable.ic_turn_left_slight),
+  Through(R.drawable.ic_turn_straight),
+  SlightRight(R.drawable.ic_turn_right_slight),
+  MergeToRight(R.drawable.ic_turn_right_slight),
+  Right(R.drawable.ic_turn_right),
+  SharpRight(R.drawable.ic_turn_right_sharp),
+  ReverseRight(R.drawable.ic_turn_uright);

  public final int mTurnRes;

--- a/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java
@@ -1,6 +1,7 @@
 package app.organicmaps.sdk.routing;

 import androidx.annotation.Keep;
+import androidx.annotation.Nullable;
 import app.organicmaps.sdk.util.Distance;

 // Called from JNI.
@@ -25,7 +26,8 @@ public final class RoutingInfo
  public final CarDirection carDirection;
  public final CarDirection nextCarDirection;
  public final int exitNum;
-  public final SingleLaneInfo[] lanes;
+  @Nullable
+  public final LaneInfo[] lanes;
  // For pedestrian routing.
  public final PedestrianTurnDirection pedestrianTurnDirection;
  // Current speed limit in meters per second.
@@ -37,7 +39,7 @@ public final class RoutingInfo
  private RoutingInfo(Distance distToTarget, Distance distToTurn, String currentStreet, String nextStreet,
                      String nextNextStreet, double completionPercent, int vehicleTurnOrdinal,
                      int vehicleNextTurnOrdinal, int pedestrianTurnOrdinal, int exitNum, int totalTime,
-                      SingleLaneInfo[] lanes, double speedLimitMps, boolean speedLimitExceeded,
+                      @Nullable LaneInfo[] lanes, double speedLimitMps, boolean speedLimitExceeded,
                      boolean shouldPlayWarningSignal)
  {
    this.distToTarget = distToTarget;
--- a/android/sdk/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java
@@ -1,31 +0,0 @@
-package app.organicmaps.sdk.routing;
-
-import androidx.annotation.NonNull;
-
-public final class SingleLaneInfo
-{
-  public LaneWay[] mLane;
-  public boolean mIsActive;
-
-  public SingleLaneInfo(@NonNull byte[] laneOrdinals, boolean isActive)
-  {
-    mLane = new LaneWay[laneOrdinals.length];
-    final LaneWay[] values = LaneWay.values();
-    for (int i = 0; i < mLane.length; i++)
-      mLane[i] = values[laneOrdinals[i]];
-
-    mIsActive = isActive;
-  }
-
-  @NonNull
-  @Override
-  public String toString()
-  {
-    final int initialCapacity = 32;
-    StringBuilder sb = new StringBuilder(initialCapacity);
-    sb.append("Is the lane active? ").append(mIsActive).append(". The lane directions IDs are");
-    for (LaneWay i : mLane)
-      sb.append(" ").append(i.ordinal());
-    return sb.toString();
-  }
-}
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 import androidx.annotation.NonNull;
-import app.organicmaps.sdk.R;

 public final class Config
 {
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java
@@ -19,6 +19,9 @@ public final class Constants

    public static final String MATRIX = "https://matrix.to/#/%23comaps:matrix.org";
    public static final String MASTODON = "https://floss.social/@comaps";
+    public static final String LEMMY = "https://sopuli.xyz/c/CoMaps";
+    public static final String BLUESKY = "https://bsky.app/profile/comaps.app";
+    public static final String PIXELFED = "https://pixelfed.social/comaps";
    public static final String FB_OM_COMMUNITY_HTTP = "https://www.facebook.com/profile.php?id=61575286559965";
    public static final String FB_OM_COMMUNITY_NATIVE = "fb://profile/61575286559965";

--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
@@ -131,12 +131,12 @@ public final class Logger

      final String threadName = "(" + Thread.currentThread().getName() + ") ";
      if (logsFolder == null || BuildConfig.DEBUG)
-        Log.println(level, tag, threadName + sb.toString());
+        Log.println(level, tag, threadName + sb);

      if (logsFolder != null)
      {
        sb.insert(0, String.valueOf(getLevelChar(level)) + '/' + tag + ": ");
-        LogsManager.EXECUTOR.execute(new WriteTask(logsFolder + File.separator + FILENAME, threadName + sb.toString()));
+        LogsManager.EXECUTOR.execute(new WriteTask(logsFolder + File.separator + FILENAME, threadName + sb));
      }
    }
  }
--- a/android/sdk/src/main/res/values-af/types_strings.xml
+++ b/android/sdk/src/main/res/values-af/types_strings.xml
@@ -410,6 +410,8 @@
    <string name="type.highway.pedestrian.area">Voetgangergebied</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Voetgangerbrug</string>
+
+    <string name="type.highway.pedestrian.square">Plein</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Voetgangertonnel</string>
    <string name="type.highway.primary">Primêre pad</string>
--- a/android/sdk/src/main/res/values-ar/types_strings.xml
+++ b/android/sdk/src/main/res/values-ar/types_strings.xml
@@ -431,6 +431,8 @@
    <string name="type.highway.pedestrian.area">شارع للمشاة</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">جسر</string>
+
+    <string name="type.highway.pedestrian.square">ميدان</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">نفق</string>
    <string name="type.highway.primary">شارع رئيسي</string>
--- a/android/sdk/src/main/res/values-az/types_strings.xml
+++ b/android/sdk/src/main/res/values-az/types_strings.xml
@@ -421,6 +421,8 @@
    <string name="type.highway.pedestrian.area">Piyada ərazisi</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Körpü</string>
+
+    <string name="type.highway.pedestrian.square">Kvadrat</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Tunel</string>
    <string name="type.highway.primary">Əsas yol</string>
--- a/android/sdk/src/main/res/values-be/types_strings.xml
+++ b/android/sdk/src/main/res/values-be/types_strings.xml
@@ -211,6 +211,8 @@
    <string name="type.highway.path.tunnel">Тунэль</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Мост</string>
+
+    <string name="type.highway.pedestrian.square">Плошча</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Тунэль</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
--- a/android/sdk/src/main/res/values-ber/strings.xml
+++ b/android/sdk/src/main/res/values-ber/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/android/sdk/src/main/res/values-ber/types_strings.xml
+++ b/android/sdk/src/main/res/values-ber/types_strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
--- a/android/sdk/src/main/res/values-bg/types_strings.xml
+++ b/android/sdk/src/main/res/values-bg/types_strings.xml
@@ -164,6 +164,8 @@
    <string name="type.highway.path.tunnel">Тунел</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Мост</string>
+
+    <string name="type.highway.pedestrian.square">Площад</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Тунел</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
--- a/android/sdk/src/main/res/values-bn/types_strings.xml
+++ b/android/sdk/src/main/res/values-bn/types_strings.xml
@@ -1,4 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="type.addr_interpolation">ঠিকানা/ব্লক</string>
+    <string name="type.amenity.fast_food">ফাস্ট ফুড</string>
+    <string name="type.office.security">সিকিউরিটি গার্ড অফিস</string>
+    <string name="type.building.guardhouse">সিকিউরিটি বুথ</string>
+    <string name="type.power.portal">পাওয়ার পোর্টাল</string>
+    <string name="type.amenity.ferry_terminal">ফেরি</string>
+    <string name="type.amenity.fire_station">দমকল স্টেশন</string>
+    <string name="type.amenity.food_court">ফুড কোর্ট</string>
+    <string name="type.amenity.fountain">ফাউন্টেন</string>
+    <string name="type.amenity.fuel">গ্যাস স্টেশন</string>
+    <string name="type.amenity.grave_yard">কবরস্থান</string>
+    <string name="type.amenity.grave_yard.christian">খ্রিস্টান কবরস্থান</string>
+    <string name="type.amenity.hospital">হাসপাতাল</string>
+    <string name="type.amenity.ice_cream">আইসক্রিম</string>
+    <string name="type.amenity.internet_cafe">ইন্টারনেট ক্যাফে</string>
+    <string name="type.amenity.kindergarten">কিন্ডারগার্টেন</string>
+    <string name="type.amenity.library">গ্রন্থাগার</string>
+    <string name="type.amenity.marketplace">মার্কেটপ্লেস</string>
+    <string name="type.amenity.motorcycle_parking">বাইক পার্কিং</string>
+    <string name="type.amenity.nightclub">নাইটক্লাব</string>
+    <string name="type.amenity.nursing_home">নার্সিংহোম</string>
+    <string name="type.amenity.parking">পার্কিং</string>
+    <string name="type.amenity.parking.fee">পার্কিং</string>
+    <string name="type.amenity.parking.multi.storey">বহুতল পার্কিং</string>
+    <string name="type.amenity.parking.multi.storey.fee">বহুতল পার্কিং</string>
+    <string name="type.amenity.parking.no.access">ব্যক্তিগত পার্কিং</string>
+    <string name="type.amenity.parking.permissive">প্রাইভেট পার্কিং</string>
+    <string name="type.amenity.parking.private">প্রাইভেট পার্কিং</string>
+    <string name="type.amenity.parking.underground">আন্ডারগ্রাউন্ড পার্কিং</string>
+    <string name="type.amenity.parking.underground.fee">আন্ডারগ্রাউন্ড পার্কিং</string>
+    <string name="type.amenity.parking.street_side">রোড-পার্শ্ববর্তী পার্কিং</string>
+    <string name="type.amenity.parking.street_side.private">ব্যক্তিগত সড়ক-পার্শ্ববর্তী পার্কিং</string>
+    <string name="type.amenity.parking.lane">লেন পার্কিং</string>
+    <string name="type.amenity.parking.underground.private">ব্যক্তিগত আন্ডারগ্রাউন্ড পার্কিং</string>
 </resources>
--- a/android/sdk/src/main/res/values-ca/types_strings.xml
+++ b/android/sdk/src/main/res/values-ca/types_strings.xml
@@ -912,6 +912,7 @@
    <string name="type.highway.pedestrian.tunnel">Túnel de vianants</string>
    <string name="type.cuisine.turkish">Turca</string>
    <string name="type.highway.pedestrian.bridge">Pont de vianants</string>
+    <string name="type.highway.pedestrian.square">Plaça</string>
    <string name="type.historic.city_gate">Porta de la ciutat</string>
    <string name="type.cuisine.irish">Irlandesa</string>
    <string name="type.cuisine.italian">Italiana</string>
@@ -964,4 +965,70 @@
    <string name="type.amenity.studio">Estudi</string>
    <string name="type.barrier.guard_rail">Barrera de seguretat</string>
    <string name="type.leisure.hackerspace">Hacklab</string>
+    <string name="type.amenity.bicycle_parking.covered">Aparcament de bicicletes cobert</string>
+    <string name="type.power.portal">Torre d\'alta tensió</string>
+    <string name="type.amenity.luggage_locker">Taquilla d\'equipatge</string>
+    <string name="type.amenity.animal_shelter">Refugi d\'animals</string>
+    <string name="type.barrier.swing_gate">Barrera abatible</string>
+    <string name="type.craft.brewery">Cerveseria artesana</string>
+    <string name="type.craft.painter">Pintor</string>
+    <string name="type.craft.plumber">Lampista</string>
+    <string name="type.craft.sawmill">Serradora</string>
+    <string name="type.craft.shoemaker">Sabater</string>
+    <string name="type.cuisine.arab">Àrab</string>
+    <string name="type.cuisine.bagel">Bagel</string>
+    <string name="type.cuisine.bubble_tea">Té de bombolles</string>
+    <string name="type.cuisine.crepe">Crep</string>
+    <string name="type.cuisine.deli">Delicatessen</string>
+    <string name="type.cuisine.donut">Donut</string>
+    <string name="type.cuisine.fish">Peix</string>
+    <string name="type.cuisine.fish_and_chips">Fish and Chips</string>
+    <string name="type.cuisine.kebab">Kebab</string>
+    <string name="type.cuisine.oriental">Oriental</string>
+    <string name="type.cuisine.pancake">Pancake</string>
+    <string name="type.cuisine.pasta">Pasta</string>
+    <string name="type.cuisine.pizza">Pizza</string>
+    <string name="type.cuisine.ramen">Ramen</string>
+    <string name="type.cuisine.sandwich">Sandvitx</string>
+    <string name="type.cuisine.friture">Fregida</string>
+    <string name="type.cuisine.heuriger">Heuriger (local tradicional austríac)</string>
+    <string name="type.cuisine.hotdog">Frànkfurt</string>
+    <string name="type.cuisine.sausage">Salsitxes</string>
+    <string name="type.cuisine.savory_pancakes">Pancakes salats</string>
+    <string name="type.cuisine.seafood">Productes del mar</string>
+    <string name="type.cuisine.soba">Fideus soba</string>
+    <string name="type.cuisine.steak_house">Steak House</string>
+    <string name="type.cuisine.sushi">Sushi</string>
+    <string name="type.cuisine.tapas">Tapes</string>
+    <string name="type.cuisine.thai">Tailandès</string>
+    <string name="type.cuisine.vegan">Vegana</string>
+    <string name="type.cuisine.vegetarian">Vegetariana</string>
+    <string name="type.emergency.fire_hydrant">Boca d\'incendis</string>
+    <string name="type.entrance">Entrada</string>
+    <string name="type.healthcare.alternative">Medicina alternativa</string>
+    <string name="type.healthcare.audiologist">Audiòleg</string>
+    <string name="type.healthcare.optometrist">Optometrista</string>
+    <string name="type.healthcare.speech_therapist">Logopeda</string>
+    <string name="type.highway.cycleway">Carril bici</string>
+    <string name="type.highway.cycleway.permissive">Carril bici</string>
+    <string name="type.highway.footway">Sender</string>
+    <string name="type.highway.living_street">Carrer de prioritat peatonal</string>
+    <string name="type.highway.motorway">Autopista</string>
+    <string name="type.highway.motorway.bridge">Pont d\'autopista</string>
+    <string name="type.highway.motorway.tunnel">Túnel d\'autopista</string>
+    <string name="type.highway.motorway_junction">Sortida</string>
+    <string name="type.highway.residential">Carrer residencial</string>
+    <string name="type.highway.residential.area">Carrer residencial</string>
+    <string name="type.highway.rest_area">Àrea de descans</string>
+    <string name="type.highway.service">Via de servei</string>
+    <string name="type.highway.service.area">Via de servei</string>
+    <string name="type.highway.services">Àrea de servei</string>
+    <string name="type.highway.ladder">Escala</string>
+    <string name="type.highway.tertiary">Carretera terciària</string>
+    <string name="type.highway.unclassified">Carretera sense classificar</string>
+    <string name="type.highway.unclassified.area">Carretera sense classificar</string>
+    <string name="type.area_highway.cycleway">Carril bici</string>
+    <string name="type.area_highway.footway">Sender</string>
+    <string name="type.area_highway.pedestrian">Carrer de vianants</string>
+    <string name="type.area_highway.residential">Carrer residencial</string>
 </resources>
--- a/android/sdk/src/main/res/values-cs/types_strings.xml
+++ b/android/sdk/src/main/res/values-cs/types_strings.xml
@@ -375,6 +375,7 @@
    <string name="type.highway.pedestrian.area">Ulice</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Most</string>
+    <string name="type.highway.pedestrian.square">Náměstí</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Tunel pro pěší</string>
    <string name="type.highway.primary">Ulice</string>
@@ -1390,4 +1391,8 @@
    <string name="type.amenity.ranger_station">Správci parku</string>
    <string name="type.amenity.animal_shelter">Útulek pro zvířata</string>
    <string name="type.barrier.wicket_gate">Branka</string>
+    <string name="type.power.portal">Portál el. vedení</string>
+    <string name="type.office.security">Strážnice</string>
+    <string name="type.building.guardhouse">Vrátnice</string>
+    <string name="type.shop.lighting">Obchod s osvětlením</string>
 </resources>
--- a/android/sdk/src/main/res/values-da/strings.xml
+++ b/android/sdk/src/main/res/values-da/strings.xml
@@ -32,4 +32,12 @@
    <string name="maps_storage_removable">SD-kort</string>
    <string name="maps_storage_external">Ekstern delt lagerplads</string>
    <string name="today">I dag</string>
+    <string name="days_ago">%s dage siden</string>
+    <string name="yesterday">I går</string>
+    <string name="week_ago">%s uge siden</string>
+    <string name="weeks_ago">%s uger siden</string>
+    <string name="month_ago">%s måned siden</string>
+    <string name="months_ago">%s måneder siden</string>
+    <string name="year_ago">%s år siden</string>
+    <string name="years_ago">%s år siden</string>
 </resources>
--- a/android/sdk/src/main/res/values-da/types_strings.xml
+++ b/android/sdk/src/main/res/values-da/types_strings.xml
@@ -365,6 +365,7 @@
    <string name="type.highway.pedestrian.area">Gågadeareal</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Bro</string>
+    <string name="type.highway.pedestrian.square">Torv</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Tunnel</string>
    <string name="type.highway.primary">Hovedvej</string>
@@ -1382,4 +1383,10 @@
    <string name="type.landuse.religious">Religiøs jord</string>
    <string name="type.power.pole">Elmast</string>
    <string name="type.railway.station.subway.qingdao">Undergrundsstation</string>
+    <string name="type.office.security">Sikkerhedsvagtkontor</string>
+    <string name="type.building.guardhouse">Sikkerhedsbås</string>
+    <string name="type.amenity.animal_shelter">Dyreinternat</string>
+    <string name="type.barrier.wicket_gate">Portlåge</string>
+    <string name="type.natural.wetland.reedbed">Rørskov</string>
+    <string name="type.shop.lighting">Lysbutik</string>
 </resources>
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -420,6 +420,7 @@
    <string name="type.highway.pedestrian.area">Fußgängerzone</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Brücke</string>
+    <string name="type.highway.pedestrian.square">Platz</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Fußgängertunnel</string>
    <string name="type.highway.primary">Hauptstraße</string>
@@ -1391,4 +1392,8 @@
    <string name="type.amenity.ranger_station">Försterstation</string>
    <string name="type.amenity.animal_shelter">Tierheim</string>
    <string name="type.barrier.wicket_gate">Schlupfpforte</string>
+    <string name="type.office.security">Büro des Sicherheitsdienstes</string>
+    <string name="type.building.guardhouse">Pförtnerhäuschen</string>
+    <string name="type.power.portal">Abspannportal</string>
+    <string name="type.shop.lighting">Lampenladen</string>
 </resources>
--- a/android/sdk/src/main/res/values-el/types_strings.xml
+++ b/android/sdk/src/main/res/values-el/types_strings.xml
@@ -383,6 +383,8 @@
    <string name="type.highway.pedestrian.area">Οδός</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Γέφυρα</string>
+
+    <string name="type.highway.pedestrian.square">Πλατεία</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Σήραγγα</string>
    <string name="type.highway.primary">Οδός</string>
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -79,7 +79,7 @@
    <string name="type.amenity.hunting_stand">Puesto de caza</string>
    <string name="type.amenity.ice_cream">Heladería</string>
    <string name="type.amenity.internet_cafe">Cibercafé</string>
-    <string name="type.amenity.kindergarten">Escuela infantil</string>
+    <string name="type.amenity.kindergarten">Guardería</string>
    <string name="type.amenity.library">Biblioteca</string>
    <string name="type.amenity.loading_dock">Muelle de carga</string>
    <string name="type.amenity.marketplace">Mercado</string>
@@ -424,8 +424,8 @@
    <string name="type.highway.path.difficult">Sendero difícil o poco visible</string>
    <!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
    <string name="type.highway.path.expert">Sendero muy difícil o indistinguible</string>
-    <string name="type.highway.path.bicycle">Camino para bicicletas</string>
-    <string name="type.highway.footway.bicycle">Camino para bicicletas</string>
+    <string name="type.highway.path.bicycle">Camino para bicicletas y peatones</string>
+    <string name="type.highway.footway.bicycle">Camino para bicicletas y peatones</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.path.bridge">Puente</string>
    <string name="type.highway.path.horse">Sendero ecuestre</string>
@@ -435,6 +435,7 @@
    <string name="type.highway.pedestrian.area">Zona peatonal</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Puente peatonal</string>
+    <string name="type.highway.pedestrian.square">Plaza</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Túnel peatonal</string>
    <string name="type.highway.primary">Carretera principal</string>
@@ -1381,7 +1382,7 @@
    <string name="type.amenity.bicycle_parking.covered">Parking de bici cubierto</string>
    <string name="type.post_office.post_partner">Asociado de Correo</string>
    <string name="type.natural.wetland.tidalflat">Llanura de marea</string>
-    <string name="type.natural.wetland.swamp">Ciénaga</string>
+    <string name="type.natural.wetland.swamp">Pantano</string>
    <string name="type.amenity.ranger_station">Estación de guardabosques</string>
    <string name="type.amenity.luggage_locker">Casillero de maletas</string>
    <string name="type.natural.wetland.mangrove">Manglares</string>
@@ -1393,4 +1394,9 @@
    <string name="type.railway.station.subway.qingdao">Estación de Metro</string>
    <string name="type.leisure.escape_game">Sala de Escape</string>
    <string name="type.amenity.animal_shelter">Refugio de animales</string>
+    <string name="type.barrier.wicket_gate">Portillo</string>
+    <string name="type.office.security">Oficina de Seguridad Privada</string>
+    <string name="type.building.guardhouse">Garita de seguridad</string>
+    <string name="type.power.portal">Torre de alta tensión</string>
+    <string name="type.shop.lighting">Tienda de iluminación</string>
 </resources>
--- a/android/sdk/src/main/res/values-et/types_strings.xml
+++ b/android/sdk/src/main/res/values-et/types_strings.xml
@@ -433,6 +433,7 @@
    <string name="type.highway.pedestrian.area">Jalakäijate ala</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Jalakäijate sild</string>
+    <string name="type.highway.pedestrian.square">Väljak</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Jalakäijate tunnel</string>
    <string name="type.highway.primary">Põhimaantee</string>
@@ -1393,4 +1394,8 @@
    <string name="type.amenity.ranger_station">Pargivahi maja</string>
    <string name="type.amenity.animal_shelter">Loomade varjupaik</string>
    <string name="type.barrier.wicket_gate">Jalgvärav</string>
+    <string name="type.building.guardhouse">Valvuriputka</string>
+    <string name="type.power.portal">Õhuliini värava-tüüpi mast</string>
+    <string name="type.office.security">Turvafirma kontor</string>
+    <string name="type.shop.lighting">Lambipood</string>
 </resources>
--- a/android/sdk/src/main/res/values-eu/strings.xml
+++ b/android/sdk/src/main/res/values-eu/strings.xml
@@ -36,4 +36,10 @@
    <string name="mb">MB</string>
    <string name="gb">GB</string>
    <string name="today">Gaur</string>
+    <string name="yesterday">Atzo</string>
+    <string name="days_ago">duela %s egun</string>
+    <string name="week_ago">duela %s aste</string>
+    <string name="weeks_ago">duela %s aste</string>
+    <string name="month_ago">duela %s hilabete</string>
+    <string name="year_ago">duela %s urte</string>
 </resources>
--- a/android/sdk/src/main/res/values-eu/types_strings.xml
+++ b/android/sdk/src/main/res/values-eu/types_strings.xml
@@ -424,6 +424,7 @@
    <string name="type.highway.pedestrian.area">Oinezkoen eremua</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Oinezkoen zubia</string>
+    <string name="type.highway.pedestrian.square">Plaza</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Oinezkoen tunela</string>
    <string name="type.highway.primary">Errepide nagusia</string>
@@ -1348,4 +1349,5 @@
    <string name="type.natural.wetland.saltmarsh">Gatz-padura</string>
    <string name="type.natural.wetland.saltmarsh.tidal">Mareako gatz-padura</string>
    <string name="type.railway.station.subway.qingdao">Metro geltokia</string>
+    <string name="type.amenity.animal_shelter">Animalien babeslekua</string>
 </resources>
--- a/android/sdk/src/main/res/values-fa/strings.xml
+++ b/android/sdk/src/main/res/values-fa/strings.xml
@@ -4,14 +4,14 @@
    <string name="mb">مگابایت</string>
    <string name="gb">گیگابایت</string>
    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">مکان من</string>
+    <string name="core_my_position">ایستار من</string>
    <!-- Default bookmark list name -->
-    <string name="core_my_places">مکان من</string>
+    <string name="core_my_places">گیاگ‌های من</string>
    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">وای فای</string>
+    <string name="category_wifi">وای‌فای</string>
    <string name="postal_code">کد پستی</string>
    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">نقطه نقشه</string>
+    <string name="core_placepage_unknown_place">خَجَکِ نقشه</string>
    <!-- abbreviation for meters -->
    <string name="m">متر</string>
    <!-- abbreviation for kilometers -->
@@ -19,14 +19,26 @@
    <!-- abbreviation for mile(s) -->
    <string name="mi">مایل</string>
    <!-- A unit of measure -->
-    <string name="ft">فوت</string>
+    <string name="ft">پای</string>
    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">خروج</string>
-    <string name="core_entrance">ورودی</string>
-    <string name="subway_data_unavailable">نقشه مترو موجود نیست</string>
-    <string name="public_access">دسترسی عمومی</string>
-    <string name="limited_access">دسترسی محدود</string>
-    <string name="not_shared">خصوصی</string>
+    <string name="core_exit">اوزیدن</string>
+    <string name="core_entrance">آدین</string>
+    <string name="subway_data_unavailable">نقشه مترو ناهَندِمان است</string>
+    <string name="public_access">دسترسی اَمَرکانیگ</string>
+    <string name="limited_access">دسترسی کرانمند</string>
+    <string name="not_shared">خوشیک</string>
    <string name="access_rules_author_only">ویرایش آنلاین</string>
    <string name="today">امروز</string>
+    <string name="yesterday">دیروز</string>
+    <string name="days_ago">%s روز پیش</string>
+    <string name="week_ago">%s هفته پیش</string>
+    <string name="weeks_ago">%s هفته پیش</string>
+    <string name="month_ago">%s ماه پیش</string>
+    <string name="months_ago">%s ماه پیش</string>
+    <string name="year_ago">%s سال پیش</string>
+    <string name="years_ago">%s سال پیش</string>
+    <string name="maps_storage_shared">ویر درونی اَنبازیده</string>
+    <string name="maps_storage_external">ویر بیرونی اَنبازیده</string>
+    <string name="maps_storage_removable">کارت SD</string>
+    <string name="maps_storage_internal">ویر درونی خوِشیک</string>
 </resources>
--- a/android/sdk/src/main/res/values-fa/types_strings.xml
+++ b/android/sdk/src/main/res/values-fa/types_strings.xml
@@ -16,18 +16,18 @@
    <string name="type.amenity.bench">نیمکت</string>
    <string name="type.amenity.bicycle_parking">ایستگاه دوچرخه</string>
    <string name="type.amenity.bicycle_rental">جایگاه کرایه دوچرخه</string>
-    <string name="type.amenity.bicycle_repair_station">ایستگاه تعمیر دوچرخه</string>
+    <string name="type.amenity.bicycle_repair_station">ایستگاه نوسازی دوچرخه</string>
    <string name="type.amenity.biergarten">غذا</string>
-    <string name="type.amenity.brothel">فاحشه خانه</string>
+    <string name="type.amenity.brothel">جه‌خانه</string>
    <string name="type.amenity.bureau_de_change">صرافی</string>
-    <string name="type.amenity.bus_station">حمل و نقل</string>
-    <string name="type.amenity.cafe">کافه</string>
+    <string name="type.amenity.bus_station">ایستگاه اتوبوس</string>
+    <string name="type.amenity.cafe">قهوه‌خانه</string>
    <string name="type.amenity.car_rental">مکان اجاره ماشین</string>
    <string name="type.amenity.motorcycle_rental">اجاره موتور سیکلت</string>
    <string name="type.amenity.car_wash">کارواش</string>
    <string name="type.amenity.casino">قمارخانه</string>
    <string name="type.amenity.gambling">قمار</string>
-    <string name="type.leisure.adult_gaming_centre">مرکز بازی بزرگسالان</string>
+    <string name="type.leisure.adult_gaming_centre">کانون بازی بزرگسالان</string>
    <string name="type.leisure.amusement_arcade">گذرگاه طاقدار</string>
    <string name="type.amenity.charging_station">ایستگاه شارژ</string>
    <string name="type.amenity.charging_station.bicycle">ایستگاه شارژ دوچرخه</string>
@@ -42,27 +42,27 @@
    <string name="type.amenity.conference_centre">مرکز کنفرانس</string>
    <string name="type.amenity.courthouse">دادگاه</string>
    <string name="type.amenity.dentist">دندان پزشکی</string>
-    <string name="type.amenity.doctors">کلینیک</string>
-    <string name="type.amenity.drinking_water">اب اشامیدنی</string>
-    <string name="type.drinking_water.yes">اب اشامیدنی</string>
-    <string name="type.amenity.driving_school">اموزشگاه رانندگی</string>
+    <string name="type.amenity.doctors">پزشک</string>
+    <string name="type.amenity.drinking_water">آب آشامیدنی</string>
+    <string name="type.drinking_water.yes">آب آشامیدنی</string>
+    <string name="type.amenity.driving_school">آموزشگاه رانندگی</string>
    <string name="type.amenity.exhibition_centre">مرکز نمایشگاه</string>
    <string name="type.amenity.money_transfer">انتقال پول</string>
-    <string name="type.amenity.music_school">ﯽﻘﯿﺳﻮﻣ ﻩﺎﮕﺷﺯﻮﻣﺁ</string>
-    <string name="type.amenity.language_school">ﻥﺎﺑﺯ ﻪﺳﺭﺪﻣ</string>
+    <string name="type.amenity.music_school">آموزشگاه هونا</string>
+    <string name="type.amenity.language_school">آموزشگاه زبان</string>
    <string name="type.office.diplomatic">سفارت</string>
    <string name="type.amenity.fast_food">فست فود</string>
    <string name="type.amenity.ferry_terminal">حمل و نقل</string>
-    <string name="type.amenity.fire_station">ایستگاه اتش نشانی</string>
+    <string name="type.amenity.fire_station">ایستگاه آتش‌نشانی</string>
    <string name="type.amenity.fountain">فواره</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. -->
-    <string name="type.amenity.grave_yard">قبرستان</string>
+    <string name="type.amenity.grave_yard">گورستان</string>
    <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
-    <string name="type.amenity.grave_yard.christian">قبرستان</string>
+    <string name="type.amenity.grave_yard.christian">گورستان مسیحیان</string>
    <string name="type.amenity.hospital">بیمارستان</string>
    <string name="type.amenity.hunting_stand">شکارگاه</string>
-    <string name="type.amenity.ice_cream">غذا</string>
+    <string name="type.amenity.ice_cream">بستنی</string>
    <string name="type.amenity.internet_cafe">کافی نت</string>
    <string name="type.amenity.kindergarten">مهدکودک</string>
    <string name="type.amenity.library">کتابخانه</string>
@@ -291,6 +291,7 @@
    <string name="type.highway.pedestrian.area">جاده</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">پل</string>
+    <string name="type.highway.pedestrian.square">میدان</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">تونل</string>
    <string name="type.highway.primary">جاده</string>
@@ -943,7 +944,7 @@
    <string name="type.shop.stationery">لوازم التحریر</string>
    <string name="type.shop.supermarket">فروشگاه</string>
    <string name="type.shop.tattoo">سالن خالکوبی</string>
-    <string name="type.shop.tea">فروشگاه</string>
+    <string name="type.shop.tea">چای‌خانه</string>
    <string name="type.shop.ticket">فروشگاه</string>
    <string name="type.shop.toys">فروشگاه</string>
    <string name="type.shop.travel_agency">اژانس مسافرتی</string>
@@ -958,23 +959,23 @@
    <!-- maybe change to Art Gallery for en-US when supported -->
    <string name="type.shop.art">ﺮﻨﻫ ﻩﺎﮕﺷﻭﺮﻓ</string>
    <string name="type.shop.baby_goods">ﻥﺎﮐﺩﻮﮐ ﻩﺎﮕﺷﻭﺮﻓ</string>
-    <string name="type.shop.bag">ﻒﯿﮐ ﻩﺎﮕﺷﻭﺮﻓ</string>
+    <string name="type.shop.bag">کیف فروشی</string>
    <string name="type.shop.bed">فروشگاه تخت</string>
    <string name="type.shop.boutique">ﮏﯿﺗﻮﺑ</string>
    <string name="type.shop.charity">ﻪﯾﺮﯿﺧ ﻩﺎﮕﺷﻭﺮﻓ</string>
-    <string name="type.shop.cheese">ﺮﯿﻨﭘ ﻩﺎﮕﺷﻭﺮﻓ</string>
+    <string name="type.shop.cheese">پنیر فروشی</string>
    <string name="type.shop.craft">ﯽﺘﺳﺩ ﻊﯾﺎﻨﺻ ﻭ ﺮﻨﻫ</string>
    <string name="type.shop.dairy">ﯽﻨﺒﻟ ﺕﻻﻮﺼﺤﻣ</string>
    <string name="type.shop.electrical">ﯽﮑﯾﺮﺘﮑﻟﺍ ﻡﺯﺍﻮﻟ ﻩﺯﺎﻐﻣ</string>
-    <string name="type.shop.fishing">ﯼﺮﯿﮕﯿﻫﺎﻣ ﻩﺎﮕﺷﻭﺮﻓ</string>
+    <string name="type.shop.fishing">فروشگاه ماهی‌گیری</string>
    <string name="type.shop.interior_decoration">ﯽﻠﺧﺍﺩ ﻥﻮﯿﺳﺍﺭﻮﮐﺩ</string>
    <string name="type.shop.lottery">ﯽﯾﺎﻣﺯﺁ ﺖﺨﺑ ﻂﯿﻠﺑ</string>
-    <string name="type.shop.medical_supply">ﯽﮑﺷﺰﭘ ﻡﺯﺍﻮﻟ</string>
+    <string name="type.shop.medical_supply">فروشگاه ابزار پزشکی</string>
    <string name="type.shop.nutrition_supplements">ﯽﯾﺍﺬﻏ ﯼﺎﻫ ﻞﻤﮑﻣ</string>
    <string name="type.shop.paint">ﺪﻨﮐ ﯽﻣ ﮓﻧﺭ</string>
-    <string name="type.shop.perfumery">ﯼﺯﺎﺳﺮﻄﻋ</string>
+    <string name="type.shop.perfumery">مشگ فروشی</string>
    <string name="type.shop.sewing">ﯽﻃﺎﯿﺧ ﻡﺯﺍﻮﻟ</string>
-    <string name="type.shop.storage_rental">ﺭﺎﺒﻧﺍ ﻩﺭﺎﺟﺍ</string>
+    <string name="type.shop.storage_rental">انباری کرایه‌ای</string>
    <string name="type.shop.tobacco">ﻮﮐﺎﺒﻨﺗ</string>
    <string name="type.shop.trade">ﻡﺯﺍﻮﻟ ﺕﺭﺎﺠﺗ</string>
    <string name="type.shop.watches">ﺖﻋﺎﺳ</string>
@@ -1052,13 +1053,13 @@
    <string name="type.tourism.theme_park">گردشگری</string>
    <string name="type.tourism.viewpoint">گردشگری</string>
    <!-- Typically more basic, not staffed and free (compared to alpine_hut). -->
-    <string name="type.tourism.wilderness_hut">کلبه‌ی صحرایی</string>
-    <string name="type.tourism.zoo">گردشگری</string>
-    <string name="type.tourism.zoo.petting">باغ وحش پتینگ</string>
+    <string name="type.tourism.wilderness_hut">کلبه‌ی بِیدایی</string>
+    <string name="type.tourism.zoo">جانورگاه</string>
+    <string name="type.tourism.zoo.petting">جانورگاه اهلی</string>
    <string name="type.waterway.canal">کانال اب</string>
    <string name="type.waterway.canal.tunnel">کانال اب</string>
    <string name="type.waterway.fish_pass">نردبان ماهی</string>
-    <string name="type.natural.water.ditch">خندق زهکشی</string>
+    <string name="type.natural.water.ditch">جوی زهکش</string>
    <string name="type.waterway.ditch.tunnel">کولورت</string>
    <string name="type.waterway.drain.tunnel">کولورت</string>
    <string name="type.waterway.river">رودخانه</string>
@@ -1067,8 +1068,8 @@
    <string name="type.waterway.stream.ephemeral">رودخانه</string>
    <string name="type.waterway.stream.intermittent">رودخانه</string>
    <string name="type.waterway.stream.tunnel">رودخانه</string>
-    <string name="type.waterway.waterfall">گردشگری</string>
-    <string name="type.wheelchair.limited">دسترسی محدود با صندلی چرخ دار</string>
+    <string name="type.waterway.waterfall">آبشار</string>
+    <string name="type.wheelchair.limited">دسترسی کرانمند با رواگ‌صندلی</string>
    <string name="type.wheelchair.no">بدون دسترسی با صندلی چرخ دار</string>
    <string name="type.wheelchair.yes">دسترسی کامل با صندلی چرخ دار</string>
    <string name="type.piste_type.snow_park">پارک برفی</string>
@@ -1089,10 +1090,10 @@
    <!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->
    <string name="type.amenity.dojo">دوجو</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
-    <string name="type.leisure.sports_hall">سالن ورزشی</string>
+    <string name="type.leisure.sports_hall">سرای ورزش</string>
    <string name="type.man_made.silo">سیلو</string>
    <string name="type.man_made.storage_tank">مخازن سیال</string>
-    <string name="type.aerialway.cable_car">خودردو کابلی</string>
+    <string name="type.aerialway.cable_car">رَسَن‌رو</string>
    <string name="type.aerialway.station">ایستگاه راه‌هوایی</string>
    <string name="type.aeroway">زیرساخت مرز‌هوایی</string>
    <string name="type.aerialway">راه هوایی</string>
@@ -1101,4 +1102,16 @@
    <string name="type.aeroway.gate">دروازه</string>
    <string name="type.aeroway.taxiway">رج وزیگ</string>
    <string name="type.aeroway.terminal">پایانه</string>
+    <string name="type.aerialway.chair_lift">تختِ وَزان</string>
+    <string name="type.aerialway.drag_lift">اَهرامَنده</string>
+    <string name="type.aerialway.gondola">کَدیزگوار</string>
+    <string name="type.aerialway.mixed_lift">بالابر گُمیخته</string>
+    <string name="type.aeroway.runway">نوار فرودگاه</string>
+    <string name="type.tourism">گردشگری</string>
+    <string name="type.waterway.dam">آب‌بند</string>
+    <string name="type.barrier.ditch">جوی</string>
+    <string name="type.waterway.drain">زهکش</string>
+    <string name="type.natural.water.drain">زهکش</string>
+    <string name="type.waterway.weir">سرریز</string>
+    <string name="type.wheelchair">رواگ‌صندلی</string>
 </resources>
--- a/android/sdk/src/main/res/values-fi/strings.xml
+++ b/android/sdk/src/main/res/values-fi/strings.xml
@@ -37,4 +37,12 @@
    <string name="not_shared">Yksityinen</string>
    <string name="access_rules_author_only">Nettimuokkaus</string>
    <string name="today">Tänään</string>
+    <string name="yesterday">Eilen</string>
+    <string name="days_ago">%s päivää sitten</string>
+    <string name="week_ago">%s viikko sitten</string>
+    <string name="weeks_ago">%s viikkoa sitten</string>
+    <string name="month_ago">%s kuukausi sitten</string>
+    <string name="months_ago">%s kuukautta sitten</string>
+    <string name="year_ago">%s vuosi sitten</string>
+    <string name="years_ago">%s vuotta sitten</string>
 </resources>
--- a/android/sdk/src/main/res/values-fi/types_strings.xml
+++ b/android/sdk/src/main/res/values-fi/types_strings.xml
@@ -425,6 +425,7 @@
    <string name="type.highway.pedestrian.area">Jalankulkualue</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Jalankulkusilta</string>
+    <string name="type.highway.pedestrian.square">Tori</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Jalankulkutunneli</string>
    <string name="type.highway.primary">Pääkatu</string>
@@ -1392,4 +1393,7 @@
    <string name="type.amenity.ranger_station">Vartioasema</string>
    <string name="type.amenity.animal_shelter">Eläinsuoja</string>
    <string name="type.barrier.wicket_gate">Käyntiportti</string>
+    <string name="type.office.security">Vartijoiden toimisto</string>
+    <string name="type.building.guardhouse">Vartijankoppi</string>
+    <string name="type.power.portal">Sähköportaali</string>
 </resources>
--- a/android/sdk/src/main/res/values-fr/strings.xml
+++ b/android/sdk/src/main/res/values-fr/strings.xml
@@ -31,12 +31,12 @@
    <!-- Subway exits for public transport marks on the map -->
    <string name="core_exit">Sortie</string>
    <string name="core_entrance">Entrée</string>
-    <string name="subway_data_unavailable">La carte du métro n\'est pas disponible</string>
+    <string name="subway_data_unavailable">La carte du métro n’est pas disponible</string>
    <string name="public_access">Accès publique</string>
    <string name="limited_access">Accès limité</string>
    <string name="not_shared">Privé</string>
-    <string name="access_rules_author_only">Édition en ligne</string>
-    <string name="today">Aujourd\'hui</string>
+    <string name="access_rules_author_only">Modification en ligne</string>
+    <string name="today">Aujourd’hui</string>
    <string name="yesterday">Hier</string>
    <string name="days_ago">Il y a %s jours</string>
    <string name="week_ago">Il y a %s semaine</string>
--- a/android/sdk/src/main/res/values-fr/types_strings.xml
+++ b/android/sdk/src/main/res/values-fr/types_strings.xml
@@ -15,9 +15,9 @@
    <string name="type.aeroway.aerodrome">Aéroport</string>
    <string name="type.aeroway.aerodrome.international">Aéroport</string>
    <string name="type.aeroway.apron">Aire de stationnement pour aéronefs</string>
-    <string name="type.aeroway.gate">Porte d\'embarquement</string>
+    <string name="type.aeroway.gate">Porte d’embarquement</string>
    <string name="type.aeroway.helipad">Hélisurface</string>
-    <string name="type.aeroway.runway">Piste d\'aviation</string>
+    <string name="type.aeroway.runway">Piste d’aviation</string>
    <string name="type.aeroway.taxiway">Taxiway</string>
    <string name="type.amenity">Infrastructures</string>
    <string name="type.amenity.arts_centre">Centre artistique</string>
@@ -34,12 +34,12 @@
    <string name="type.amenity.cafe">Café</string>
    <string name="type.amenity.car_rental">Location de voitures</string>
    <string name="type.amenity.motorcycle_rental">Location de motos</string>
-    <string name="type.amenity.car_sharing">Station d\'autopartage</string>
+    <string name="type.amenity.car_sharing">Station d’autopartage</string>
    <string name="type.amenity.car_wash">Station de lavage</string>
    <string name="type.amenity.casino">Casino</string>
-    <string name="type.amenity.gambling">Jeu d\'argent</string>
+    <string name="type.amenity.gambling">Jeu d’argent</string>
    <string name="type.leisure.adult_gaming_centre">Centre de jeux pour adultes</string>
-    <string name="type.leisure.amusement_arcade">Salle de jeux d\'arcade</string>
+    <string name="type.leisure.amusement_arcade">Salle de jeux d’arcade</string>
    <string name="type.amenity.charging_station">Borne de recharge</string>
    <string name="type.amenity.charging_station.bicycle">Borne de recharge pour vélo</string>
    <string name="type.amenity.charging_station.motorcar">Borne de recharge pour voiture</string>
@@ -57,8 +57,8 @@
    <string name="type.amenity.drinking_water">Eau potable</string>
    <string name="type.drinking_water.yes">Eau potable</string>
    <string name="type.amenity.driving_school">Auto-école</string>
-    <string name="type.amenity.exhibition_centre">Centre d\'exposition</string>
-    <string name="type.amenity.money_transfer">Transfert d\'argent</string>
+    <string name="type.amenity.exhibition_centre">Centre d’exposition</string>
+    <string name="type.amenity.money_transfer">Transfert d’argent</string>
    <string name="type.amenity.music_school">École de musique</string>
    <string name="type.amenity.language_school">École de langue</string>
    <string name="type.office.diplomatic">Ambassade</string>
@@ -133,7 +133,7 @@
    <string name="type.recycling.plastic">Déchets plastiques</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.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>
@@ -161,7 +161,7 @@
    <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 d\'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>
@@ -186,7 +186,7 @@
    <string name="type.barrier.cycle_barrier">Barrière à vélos</string>
    <string name="type.waterway.ditch">Fossé de drainage</string>
    <string name="type.natural.water.moat">Fossé</string>
-    <string name="type.natural.water.wastewater">Bassin d\'eaux usées</string>
+    <string name="type.natural.water.wastewater">Bassin d’eaux usées</string>
    <string name="type.barrier.entrance">Entrée</string>
    <string name="type.barrier.fence">Clôture</string>
    <string name="type.barrier.gate">Porte</string>
@@ -232,7 +232,7 @@
    <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.electronics_repair">Réparation d’appareils électroniques</string>
    <string name="type.craft.gardener">Paysagiste</string>
    <string name="type.craft.grinding_mill">Moulin à broyer</string>
    <string name="type.craft.handicraft">Artisanat</string>
@@ -243,7 +243,7 @@
    <string name="type.craft.metal_construction">Constructions métalliques</string>
    <string name="type.craft.painter">Peintre</string>
    <string name="type.craft.photographer">Photographe</string>
-    <string name="type.shop.camera">Boutique d\'appareils photo</string>
+    <string name="type.shop.camera">Boutique d’appareils photo</string>
    <string name="type.craft.plumber">Plombier</string>
    <string name="type.craft.sawmill">Scierie</string>
    <string name="type.craft.shoemaker">Cordonnier</string>
@@ -334,10 +334,10 @@
    <string name="type.cuisine.vegetarian">Cuisine végétarienne</string>
    <string name="type.cuisine.vietnamese">Cuisine vietnamienne</string>
    <string name="type.emergency">Urgence</string>
-    <string name="type.emergency.assembly_point">Point de rassemblement d\'urgence</string>
+    <string name="type.emergency.assembly_point">Point de rassemblement d’urgence</string>
    <string name="type.emergency.defibrillator">Défibrillateur</string>
    <string name="type.emergency.fire_hydrant">Bouche d’incendie</string>
-    <string name="type.emergency.phone">Téléphone d\'urgence</string>
+    <string name="type.emergency.phone">Téléphone d’urgence</string>
    <!-- A place where a lifeguard is on duty. -->
    <string name="type.emergency.lifeguard">Sauveteur</string>
    <!-- A mountain rescue base for search and rescue activities. -->
@@ -399,16 +399,16 @@
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.motorway.tunnel">Tunnel</string>
    <string name="type.highway.motorway_junction">Sortie</string>
-    <string name="type.highway.motorway_link">Bretelle d\'autoroute</string>
+    <string name="type.highway.motorway_link">Bretelle d’autoroute</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.motorway_link.bridge">Pont</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.motorway_link.tunnel">Tunnel</string>
    <string name="type.highway.path">Chemin</string>
    <!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-    <string name="type.highway.path.difficult">Sentier difficile ou peu visibl</string>
+    <string name="type.highway.path.difficult">Sentier difficile ou peu visible</string>
    <!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-    <string name="type.highway.path.expert">Sentier très difficile ou indiscernabl</string>
+    <string name="type.highway.path.expert">Sentier très difficile ou indiscernable</string>
    <string name="type.highway.path.bicycle">Chemin</string>
    <string name="type.highway.footway.bicycle">Chemin</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
@@ -420,21 +420,22 @@
    <string name="type.highway.pedestrian.area">Rue piétonne</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Pont</string>
+    <string name="type.highway.pedestrian.square">Parc</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.pedestrian.tunnel">Tunnel</string>
-    <string name="type.highway.primary">Rue</string>
+    <string name="type.highway.pedestrian.tunnel">Tunnel piéton</string>
+    <string name="type.highway.primary">Rue principale</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.primary.bridge">Pont</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.primary.tunnel">Tunnel</string>
-    <string name="type.highway.primary_link">Rue</string>
+    <string name="type.highway.primary_link">Accès à rue principale</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.primary_link.bridge">Pont</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.primary_link.tunnel">Tunnel</string>
    <string name="type.highway.raceway">Circuit</string>
-    <string name="type.highway.residential">Rue</string>
-    <string name="type.highway.residential.area">Rue</string>
+    <string name="type.highway.residential">Rue résidentielle</string>
+    <string name="type.highway.residential.area">Rue résidentielle</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.residential.bridge">Pont</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
@@ -622,9 +623,9 @@
    <string name="type.leisure.pitch">Terrain de sport</string>
    <string name="type.leisure.playground">Aire de jeu</string>
    <string name="type.leisure.sauna">Sauna</string>
-    <string name="type.leisure.slipway">Cale de mise à l\'eau</string>
+    <string name="type.leisure.slipway">Cale de mise à l’eau</string>
    <string name="type.leisure.sports_centre">Centre sportif</string>
-    <string name="type.sport.climbing">Centre d\'escalade</string>
+    <string name="type.sport.climbing">Centre d’escalade</string>
    <string name="type.sport.yoga">Yoga</string>
    <string name="type.leisure.stadium">Stade</string>
    <string name="type.leisure.swimming_pool">Piscine</string>
@@ -633,7 +634,7 @@
    <string name="type.leisure.track.area">Piste de course</string>
    <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.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>
@@ -651,8 +652,8 @@
    <string name="type.man_made.petroleum_well">Puits de pétrole ou de gaz</string>
    <!-- A tower/mast constructed to burn off excess gas. -->
    <string name="type.man_made.flare">Torche à gaz</string>
-    <string name="type.man_made.wastewater_plant">Station d\'épuration</string>
-    <string name="type.man_made.water_tap">Robinet d\'eau</string>
+    <string name="type.man_made.wastewater_plant">Station d’épuration</string>
+    <string name="type.man_made.water_tap">Robinet d’eau</string>
    <string name="type.man_made.water_tap.drinking_water_no">Robinet d\'eau</string>
    <string name="type.man_made.water_tower">Château d\'eau</string>
    <string name="type.man_made.water_well">Puits à eau</string>
@@ -669,12 +670,12 @@
    <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.beach.gravel">Plage de galets</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.earth_bank">Talus</string>
+    <string name="type.man_made.embankment">Remblai</string>
    <string name="type.natural.coastline">Littoral</string>
    <string name="type.natural.desert">Désert</string>
    <string name="type.natural.geyser">Geyser</string>
@@ -698,10 +699,10 @@
    <string name="type.natural.spring">Source</string>
    <string name="type.natural.spring.drinking_water_no">Source</string>
    <string name="type.natural.strait">Détroit</string>
-    <string name="type.natural.tree_row">Rangée d\'arbres</string>
+    <string name="type.natural.tree_row">Rangée d’arbres</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.water">Étendue d’eau</string>
    <string name="type.natural.wetland">Zone humide</string>
    <string name="type.natural.wetland.bog">Tourbière</string>
    <string name="type.natural.wetland.marsh">Marais</string>
@@ -711,8 +712,8 @@
    <string name="type.office.estate_agent">Agence immobilière</string>
    <string name="type.office.government">Administration publique</string>
    <string name="type.office.insurance">Bureau d’assurance</string>
-    <string name="type.office.lawyer">Cabinet d\'avocat</string>
-    <string name="type.office.ngo">Bureau ONG</string>
+    <string name="type.office.lawyer">Cabinet d’avocat</string>
+    <string name="type.office.ngo">Bureau d’ONG</string>
    <string name="type.office.telecommunication">Opérateur mobile</string>
    <string name="type.organic.only">Biologique</string>
    <string name="type.organic.yes">Biologique</string>
@@ -734,7 +735,7 @@
    <string name="type.place.farm">Ferme</string>
    <string name="type.place.hamlet">Hameau</string>
    <string name="type.place.island">Île</string>
-    <string name="type.place.islet">Île</string>
+    <string name="type.place.islet">Îlet</string>
    <string name="type.place.isolated_dwelling">Lieu-dit</string>
    <string name="type.place.locality">Lieu-dit</string>
    <!-- Named part of a city or town, bigger than place=neighbourhood and smaller than place=suburb (Wiki: https://wiki.openstreetmap.org/wiki/Tag:place%3Dquarter) -->
@@ -764,7 +765,7 @@
    <string name="type.power.plant.gas">Centrale à turbine à gaz</string>
    <string name="type.power.plant.hydro">Centrale hydroélectrique</string>
    <string name="type.power.plant.solar">Centrale solaire</string>
-    <string name="type.power.plant.wind">Ferme d\'éoliennes</string>
+    <string name="type.power.plant.wind">Ferme d’éoliennes</string>
    <string name="type.power.substation">Poste électrique</string>
    <!-- A tower or pylon carrying high voltage electricity cables. -->
    <string name="type.power.tower">Pylône électrique</string>
@@ -1068,7 +1069,7 @@
    <string name="type.shop.cannabis">Magasin de cannabis</string>
    <string name="type.shop.car">Concessionnaire automobile</string>
    <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">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.carpet">Magasin de tapis</string>
@@ -1076,7 +1077,7 @@
    <string name="type.shop.chocolate">Chocolatier</string>
    <string name="type.shop.clothes">Boutique de vêtements</string>
    <string name="type.shop.coffee">Boutique de cafés</string>
-    <string name="type.shop.computer">Magasin d\'informatique</string>
+    <string name="type.shop.computer">Magasin d’informatique</string>
    <string name="type.shop.confectionery">Confiserie</string>
    <string name="type.shop.convenience">Supérette</string>
    <string name="type.shop.copyshop">Boutique de photocopies</string>
@@ -1086,11 +1087,11 @@
    <string name="type.shop.department_store">Grand magasin</string>
    <string name="type.shop.doityourself">Magasin de bricolage</string>
    <string name="type.shop.dry_cleaning">Nettoyage à sec</string>
-    <string name="type.shop.electronics">Magasin d\'électroménager</string>
+    <string name="type.shop.electronics">Magasin d’électroménager</string>
    <string name="type.shop.erotic">Boutique érotique</string>
    <string name="type.shop.fabric">Magasin de tissus</string>
-    <string name="type.shop.farm">Magasin d\'alimentation à la ferme</string>
-    <string name="type.shop.fashion_accessories">Boutique d\'accessoires de mode</string>
+    <string name="type.shop.farm">Magasin d’alimentation à la ferme</string>
+    <string name="type.shop.fashion_accessories">Boutique d’accessoires de mode</string>
    <string name="type.shop.florist">Fleuriste</string>
    <string name="type.shop.funeral_directors">Pompes funèbres</string>
    <string name="type.shop.furniture">Magasin de meubles</string>
@@ -1101,11 +1102,11 @@
    <string name="type.shop.grocery">Épicerie</string>
    <string name="type.shop.hairdresser">Coiffeur</string>
    <string name="type.shop.hardware">Quincaillerie</string>
-    <string name="type.shop.health_food">Magasin d\'alimentation diététique</string>
-    <string name="type.shop.hearing_aids">Magasin d\'appareils auditifs</string>
+    <string name="type.shop.health_food">Magasin d’alimentation diététique</string>
+    <string name="type.shop.hearing_aids">Magasin d’appareils auditifs</string>
    <string name="type.shop.herbalist">Herboristerie</string>
    <string name="type.shop.hifi">Matériel Hi-Fi</string>
-    <string name="type.shop.houseware">Magasin d\'articles ménagers</string>
+    <string name="type.shop.houseware">Magasin d’articles ménagers</string>
    <string name="type.shop.jewelry">Bijouterie</string>
    <string name="type.shop.kiosk">Kiosque</string>
    <string name="type.shop.kitchen">Magasin de cuisine</string>
@@ -1117,7 +1118,7 @@
    <string name="type.shop.motorcycle">Magasin de motos</string>
    <string name="type.shop.motorcycle_repair">Réparateur de moto</string>
    <string name="type.shop.music">Disquaire</string>
-    <string name="type.shop.musical_instrument">Magasin d\'instruments de musique</string>
+    <string name="type.shop.musical_instrument">Magasin d’instruments de musique</string>
    <string name="type.shop.newsagent">Kiosque à journaux</string>
    <string name="type.shop.optician">Opticien</string>
    <string name="type.shop.outdoor">Matériel de loisirs de plein air</string>
@@ -1131,7 +1132,7 @@
    <string name="type.shop.rental">Magasin de location</string>
    <string name="type.shop.rental.bicycle">Magasin de location de vélos</string>
    <string name="type.shop.seafood">Poissonnier</string>
-    <string name="type.shop.second_hand">Boutique d\'objets d\'occasion</string>
+    <string name="type.shop.second_hand">Boutique d’objets d’occasion</string>
    <string name="type.shop.shoes">Magasin de chaussures</string>
    <string name="type.shop.sports">Articles de sport</string>
    <string name="type.shop.stationery">Papeterie</string>
@@ -1146,20 +1147,20 @@
    <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.shop.agrarian">Magasin d\'agriculture</string>
+    <string name="type.shop.agrarian">Magasin de matériel agricole</string>
    <string name="type.shop.antiques">Antiquités</string>
-    <string name="type.shop.appliance">Magasin d\'électroménager</string>
+    <string name="type.shop.appliance">Magasin d’électroménager</string>
    <!-- maybe change to Art Gallery for en-US when supported -->
-    <string name="type.shop.art">Boutique d\'art</string>
+    <string name="type.shop.art">Boutique d’art</string>
    <string name="type.shop.baby_goods">Magasin de puériculture</string>
    <string name="type.shop.bag">Magasin de sacs</string>
    <string name="type.shop.bed">Magasin de literie</string>
    <string name="type.shop.boutique">Boutique</string>
    <string name="type.shop.charity">Magasin de charité</string>
    <string name="type.shop.cheese">Fromagerie</string>
-    <string name="type.shop.craft">Matériel d\'arts et de loisirs créatifs</string>
+    <string name="type.shop.craft">Matériel d’arts et de loisirs créatifs</string>
    <string name="type.shop.dairy">Crémerie</string>
-    <string name="type.shop.electrical">Magasin de fournitures et d\'appareils électriques</string>
+    <string name="type.shop.electrical">Magasin de fournitures et d’appareils électriques</string>
    <string name="type.shop.fishing">Magasin de pêche</string>
    <string name="type.shop.interior_decoration">Décorations intérieures</string>
    <string name="type.shop.lottery">Tickets de loterie</string>
@@ -1175,7 +1176,7 @@
    <string name="type.shop.wholesale">Magasin de gros</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.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>
@@ -1212,7 +1213,7 @@
    <string name="type.tourism.aquarium">Aquarium</string>
    <!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
    <string name="type.tourism.alpine_hut">Auberge de montagne</string>
-    <string name="type.tourism.apartment">Appart\'hôtel</string>
+    <string name="type.tourism.apartment">Appart’hôtel</string>
    <string name="type.tourism.artwork">Œuvre</string>
    <string name="type.tourism.artwork.architecture">Œuvre</string>
    <string name="type.tourism.artwork.painting">Œuvre</string>
@@ -1224,26 +1225,26 @@
    <string name="type.attraction.carousel">Carrousel</string>
    <string name="type.attraction.historic">Attraction historique</string>
    <string name="type.attraction.maze">Labyrinthe</string>
-    <string name="type.attraction.roller_coaster">Les montagnes russes</string>
+    <string name="type.attraction.roller_coaster">Montagnes russes</string>
    <string name="type.attraction.water_slide">Toboggan aquatique</string>
    <string name="type.tourism.camp_site">Camping</string>
    <string name="type.tourism.caravan_site">Aire de camping-car</string>
    <!-- A rentable countryside vacation house. -->
    <string name="type.tourism.chalet">Chalet de vacances</string>
-    <string name="type.tourism.gallery">Galerie d\'art</string>
-    <string name="type.tourism.guest_house">Maison d\'hôtes</string>
+    <string name="type.tourism.gallery">Galerie d’art</string>
+    <string name="type.tourism.guest_house">Maison d’hôtes</string>
    <string name="type.tourism.hostel">Auberge de jeunesse</string>
    <string name="type.tourism.hotel">Hôtel</string>
    <string name="type.tourism.information">Informations touristiques</string>
-    <string name="type.tourism.information.board">Panneau d\'informations</string>
+    <string name="type.tourism.information.board">Panneau d’informations</string>
    <string name="type.tourism.information.guidepost">Poteaux indicateurs</string>
    <string name="type.tourism.information.map">Carte touristique</string>
    <string name="type.tourism.information.office">Office de tourisme</string>
-    <string name="type.tourism.information.visitor_centre">centre de visite</string>
+    <string name="type.tourism.information.visitor_centre">Centre de visite</string>
    <string name="type.tourism.museum">Musée</string>
    <string name="type.tourism.picnic_site">Terrain de pique-nique</string>
    <string name="type.leisure.resort">Complexe touristique</string>
-    <string name="type.tourism.theme_park">Parc d\'attractions</string>
+    <string name="type.tourism.theme_park">Parc d’attractions</string>
    <string name="type.tourism.viewpoint">Belvédère</string>
    <!-- Typically more basic, not staffed and free (compared to alpine_hut). -->
    <string name="type.tourism.wilderness_hut">Refuge non gardé</string>
@@ -1257,7 +1258,7 @@
    <string name="type.waterway.ditch.tunnel">Drain</string>
    <string name="type.waterway.dock">Cale</string>
    <string name="type.waterway.drain.tunnel">Drain</string>
-    <string name="type.waterway.lock_gate">Porte d\'écluse</string>
+    <string name="type.waterway.lock_gate">Porte d’écluse</string>
    <string name="type.waterway.river">Rivière</string>
    <string name="type.waterway.river.tunnel">Rivière</string>
    <string name="type.waterway.stream">Ruisseau</string>
@@ -1266,9 +1267,9 @@
    <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>
+    <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>
    <string name="type.aerialway.j.bar">Téléski</string>
    <string name="type.aerialway.magic_carpet">Tapis roulant</string>
    <string name="type.piste_type.downhill">Piste de ski alpin</string>
@@ -1291,7 +1292,7 @@
    <string name="type.piste_type.hike">Sentier de randonnée dans la neige</string>
    <string name="type.piste_type.connection">Connexion aux pistes</string>
    <string name="type.piste_type.skitour">Sentier Skitour</string>
-    <string name="type.amenity.events_venue">Lieu des événements</string>
+    <string name="type.amenity.events_venue">Lieu des évènements</string>
    <string name="type.shop.auction">Vente aux enchères</string>
    <string name="type.shop.collector">Objets de collection</string>
    <string name="type.self_service.yes">Libre-service disponible</string>
@@ -1308,7 +1309,7 @@
    <string name="type.leisure.sports_hall">Salle de sport</string>
    <string name="type.aeroway.terminal">Terminal</string>
    <string name="type.power.pole">Pylône électrique</string>
-    <string name="type.man_made.utility_pole">Pylônes (Télécommunication, lampadaire)</string>
+    <string name="type.man_made.utility_pole">Pylônes (télécommunication, lampadaire)</string>
    <string name="type.amenity.bar">Bar</string>
    <string name="type.amenity.biergarten">Biergarten</string>
    <string name="type.amenity.taxi">Station de taxi</string>
@@ -1390,7 +1391,11 @@
    <string name="type.amenity.luggage_locker">Casier à bagages</string>
    <string name="type.post_office.post_partner">Partenaire de publication</string>
    <string name="type.amenity.ranger_station">Poste de garde forestier</string>
-    <string name="type.leisure.escape_game">Escape Room</string>
+    <string name="type.leisure.escape_game">Escape room</string>
    <string name="type.amenity.animal_shelter">Abri pour animaux</string>
    <string name="type.barrier.wicket_gate">Portillon</string>
+    <string name="type.office.security">Bureau des agents de sécurité</string>
+    <string name="type.building.guardhouse">Guérite de sécurité</string>
+    <string name="type.power.portal">Portique haute tension</string>
+    <string name="type.shop.lighting">Boutique de luminaires</string>
 </resources>
--- a/android/sdk/src/main/res/values-gl/types_strings.xml
+++ b/android/sdk/src/main/res/values-gl/types_strings.xml
@@ -403,6 +403,8 @@
    <string name="type.highway.pedestrian">Cale peonil</string>
    <string name="type.highway.pedestrian.area">Zona peonil</string>
    <string name="type.highway.pedestrian.bridge">Puente peonil</string>
+
+    <string name="type.highway.pedestrian.square">Praza</string>
    <string name="type.highway.pedestrian.tunnel">Túnel peonil</string>
    <string name="type.highway.primary">Estrada principal</string>
    <string name="type.highway.primary.bridge">Puente</string>
--- a/android/sdk/src/main/res/values-gsw/strings.xml
+++ b/android/sdk/src/main/res/values-gsw/strings.xml
@@ -23,4 +23,12 @@
    <string name="core_entrance">Iigang</string>
    <string name="public_access">Öffentliche Zuegriff</string>
    <string name="today">Hüt</string>
+    <string name="days_ago">vor %s Täg</string>
+    <string name="week_ago">vor %s Wuche</string>
+    <string name="weeks_ago">vor %s Wuche</string>
+    <string name="month_ago">vor %s Monet</string>
+    <string name="months_ago">vor %s Mönet</string>
+    <string name="year_ago">vor %s Jahr</string>
+    <string name="years_ago">vor %s Jahre</string>
+    <string name="yesterday">Geschter</string>
 </resources>
--- a/android/sdk/src/main/res/values-gsw/types_strings.xml
+++ b/android/sdk/src/main/res/values-gsw/types_strings.xml
@@ -50,7 +50,7 @@
    <string name="type.amenity.car_rental">Autovermietig</string>
    <string name="type.amenity.car_sharing">Carsharing</string>
    <string name="type.amenity.car_wash">Autowöschaalag</string>
-    <string name="type.amenity.casino">Casino</string>
+    <string name="type.amenity.casino">Kasino</string>
    <string name="type.amenity.gambling">Glücksspiel</string>
    <string name="type.leisure.adult_gaming_centre">Gaming-Zentrum für Erwachsni</string>
    <string name="type.leisure.amusement_arcade">Arkade</string>
@@ -77,7 +77,7 @@
    <string name="type.amenity.fast_food">Fast-Food</string>
    <string name="type.amenity.ferry_terminal">Fähraaleger</string>
    <string name="type.amenity.fire_station">Füürwehr</string>
-    <string name="type.amenity.food_court">Food Court</string>
+    <string name="type.amenity.food_court">Gastronomieberiich</string>
    <string name="type.amenity.fountain">Springbrunne</string>
    <string name="type.amenity.fuel">Tankstell</string>
    <string name="type.amenity.grave_yard.christian">Fridhof</string>
@@ -365,6 +365,7 @@
    <string name="type.highway.pedestrian">Fuessgängerzone</string>
    <string name="type.highway.pedestrian.area">Fuessgängerzone</string>
    <string name="type.highway.pedestrian.bridge">Fuessgängerzonebrugg</string>
+    <string name="type.highway.pedestrian.square">Platz</string>
    <string name="type.highway.primary">Hauptstrass</string>
    <string name="type.highway.primary.bridge">Brugg</string>
    <string name="type.highway.primary.tunnel">Hauptstrassetunnel</string>
@@ -1297,4 +1298,10 @@
    <string name="type.amenity.bicycle_parking.covered">Überdachte Veloparkplatz</string>
    <string name="type.amenity.luggage_locker">Gepäckschlüüssfach</string>
    <string name="type.amenity.ranger_station">Förschterstation</string>
+    <string name="type.barrier.wicket_gate">Schlupfpforte</string>
+    <string name="type.amenity.animal_shelter">Tierheim</string>
+    <string name="type.office.security">Sicherheitsdienst</string>
+    <string name="type.building.guardhouse">Pförtnerhüüsli</string>
+    <string name="type.power.portal">Abspannportal</string>
+    <string name="type.shop.lighting">Lampelade</string>
 </resources>
--- a/android/sdk/src/main/res/values-hr/types_strings.xml
+++ b/android/sdk/src/main/res/values-hr/types_strings.xml
@@ -2,4 +2,8 @@
 <resources>
    <string name="type.leisure.hackerspace">Hackerspace</string>
    <string name="type.man_made.silo">Silo</string>
+    <string name="type.addr_interpolation.even">adresa/blok</string>
+    <string name="type.addr_interpolation.odd">adresa/blok</string>
+    <string name="type.aerialway">Žičara</string>
+    <string name="type.addr_interpolation">adresa/blok</string>
 </resources>
--- a/android/sdk/src/main/res/values-hu/types_strings.xml
+++ b/android/sdk/src/main/res/values-hu/types_strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- SECTION: Types -->
-    <string name="type.addr_interpolation">Cím/blokk</string>
-    <string name="type.addr_interpolation.even">Cím/blokk</string>
-    <string name="type.addr_interpolation.odd">Cím/blokk</string>
+    <string name="type.addr_interpolation">Cím/háztömb</string>
+    <string name="type.addr_interpolation.even">Cím/háztömb</string>
+    <string name="type.addr_interpolation.odd">Cím/háztömb</string>
    <string name="type.aerialway.station">Felvonóállomás</string>
    <string name="type.aeroway.aerodrome">Repülőtér</string>
    <string name="type.aeroway.aerodrome.international">Nemzetközi repülőtér</string>
@@ -20,7 +20,7 @@
    <string name="type.amenity.biergarten">Sörkert</string>
    <string name="type.amenity.brothel">Bordélyház</string>
    <string name="type.amenity.bureau_de_change">Pénzváltó</string>
-    <string name="type.amenity.bus_station">Autóbuszállomás</string>
+    <string name="type.amenity.bus_station">Buszállomás</string>
    <string name="type.amenity.cafe">Kávézó</string>
    <string name="type.amenity.car_rental">Autókölcsönző</string>
    <string name="type.amenity.motorcycle_rental">Motorkerékpár-bérlés</string>
@@ -64,7 +64,7 @@
    <string name="type.amenity.hospital">Kórház</string>
    <string name="type.amenity.hunting_stand">Magasles</string>
    <string name="type.amenity.ice_cream">Fagylaltárus</string>
-    <string name="type.amenity.internet_cafe">Internet kávézó</string>
+    <string name="type.amenity.internet_cafe">Internetkávézó</string>
    <string name="type.amenity.kindergarten">Óvoda</string>
    <string name="type.amenity.library">Könyvtár</string>
    <string name="type.amenity.loading_dock">Rakodórámpa</string>
@@ -164,7 +164,7 @@
    <string name="type.barrier.entrance">Bejárat</string>
    <string name="type.barrier.gate">Kapu</string>
    <string name="type.barrier.kissing_gate">Lengőkapu</string>
-    <string name="type.barrier.lift_gate">Felnyitható sorompó</string>
+    <string name="type.barrier.lift_gate">Emelkedő sorompó</string>
    <string name="type.barrier.stile">Kerítésátjáró</string>
    <string name="type.barrier.turnstile">Forgókapu</string>
    <string name="type.barrier.swing_gate">Elforduló sorompó</string>
@@ -251,7 +251,7 @@
    <string name="type.cuisine.heuriger">Heuriger</string>
    <string name="type.cuisine.hotdog">Hotdog</string>
    <string name="type.cuisine.hungarian">Magyar</string>
-    <string name="type.cuisine.ice_cream">Jégkrém</string>
+    <string name="type.cuisine.ice_cream">Fagylalt</string>
    <string name="type.cuisine.indian">Indiai</string>
    <string name="type.cuisine.indonesian">Indonéz</string>
    <string name="type.cuisine.international">Nemzetközi</string>
@@ -377,6 +377,7 @@
    <string name="type.highway.pedestrian.area">Sétálóutca</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Híd</string>
+    <string name="type.highway.pedestrian.square">Tér</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Alagút</string>
    <string name="type.highway.primary">Utca</string>
@@ -512,7 +513,7 @@
    <string name="type.historic.mine">Történelmi bánya</string>
    <string name="type.historic.monument">Monumentális, épületszerű műemlék</string>
    <string name="type.historic.pillory">Pellengér</string>
-    <string name="type.historic.ruins">Történelmi rom</string>
+    <string name="type.historic.ruins">Történelmi romok</string>
    <string name="type.historic.ship">Hajó</string>
    <string name="type.historic.tank">Történelmi tank</string>
    <string name="type.historic.tomb">Történelmi sír</string>
@@ -718,7 +719,7 @@
    <string name="type.railway.station.light_rail">HÉV-állomás</string>
    <string name="type.railway.station.light_rail.berlin">S-Bahn-állomás</string>
    <string name="type.railway.station.light_rail.london">DLR-állomás</string>
-    <string name="type.railway.station.light_rail.porto">Portói metró</string>
+    <string name="type.railway.station.light_rail.porto">Porto Metro</string>
    <string name="type.railway.station.monorail">Egysínűvasút-állomás</string>
    <string name="type.railway.station.subway">Metróállomás</string>
    <string name="type.railway.station.subway.adana">Metróállomás</string>
@@ -775,7 +776,7 @@
    <string name="type.railway.station.subway.lille">Metróállomás</string>
    <string name="type.railway.station.subway.lima">Metróállomás</string>
    <string name="type.railway.station.subway.lisboa">Metróállomás</string>
-    <string name="type.railway.station.subway.london">Földalatti állomás</string>
+    <string name="type.railway.station.subway.london">Metróállomás</string>
    <string name="type.railway.station.subway.lyon">Metróállomás</string>
    <string name="type.railway.station.subway.madrid">Metróállomás</string>
    <string name="type.railway.station.subway.malaga">Metróállomás</string>
@@ -950,7 +951,7 @@
    <string name="type.railway.subway_entrance.yokohama">Metrólejáró</string>
    <string name="type.railway.tram_stop">Villamosmegálló</string>
    <string name="type.shop">Bolt</string>
-    <string name="type.shop.alcohol">Szeszesitalbolt</string>
+    <string name="type.shop.alcohol">Szeszesital-bolt</string>
    <string name="type.shop.bakery">Pékség</string>
    <string name="type.shop.bathroom_furnishing">Fürdőszoba-berendezés</string>
    <string name="type.shop.beauty">Szépségszalon</string>
@@ -1005,7 +1006,7 @@
    <string name="type.shop.laundry">Mosoda</string>
    <string name="type.shop.mall">Bevásárlóközpont</string>
    <string name="type.shop.massage">Masszázsszalon</string>
-    <string name="type.shop.mobile_phone">Mobiltelefon bolt</string>
+    <string name="type.shop.mobile_phone">Mobiltelefon-bolt</string>
    <string name="type.shop.money_lender">Pénzkölcsönző</string>
    <string name="type.shop.motorcycle">Motorkerékpár-szaküzlet</string>
    <string name="type.shop.motorcycle_repair">Motorkerékpár-szerviz</string>
@@ -1037,8 +1038,8 @@
    <string name="type.shop.tyres">Autógumi-szaküzlet</string>
    <string name="type.shop.variety_store">100 forintos bolt</string>
    <string name="type.shop.video">Videófilmbolt vagy -kölcsönző</string>
-    <string name="type.shop.video_games">Videojáték-bolt</string>
-    <string name="type.shop.wine">Boszaküzlet</string>
+    <string name="type.shop.video_games">Videojáték-szaküzlet</string>
+    <string name="type.shop.wine">Borszaküzlet</string>
    <string name="type.shop.agrarian">Gazdabolt</string>
    <string name="type.shop.antiques">Régiségkereskedés</string>
    <string name="type.shop.appliance">Háztartásigép-bolt</string>
@@ -1173,13 +1174,13 @@
    <!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
    <string name="type.emergency.emergency_ward_entrance">Sürgősségi kórterem bejárata</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->
-    <string name="type.amenity.dojo">Dodzsó</string>
+    <string name="type.amenity.dojo">Dodzso</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
    <string name="type.leisure.sports_hall">Sportcsarnok</string>
    <string name="type.aeroway.runway">Kifutópálya</string>
    <string name="type.aeroway.terminal">Terminál</string>
    <string name="type.recycling.cans">Fémdoboz</string>
-    <string name="type.recycling.green_waste">Zöld/szerves hulladék</string>
+    <string name="type.recycling.green_waste">Szerves hulladék</string>
    <string name="type.recycling.cartons">Italos karton</string>
    <string name="type.amenity.sanitary_dump_station">Szennyvízürítőhely</string>
    <string name="type.amenity.shelter.lean_to">Háromoldalú fészer</string>
@@ -1251,7 +1252,7 @@
    <string name="type.landuse.meadow">Rét</string>
    <string name="type.landuse.orchard">Gyümölcsös</string>
    <string name="type.aerialway">Drótkötélpályás felvonó</string>
-    <string name="type.barrier.chain">Lánckorlát</string>
+    <string name="type.barrier.chain">Lánc</string>
    <string name="type.boundary.administrative">Közigazgatási határ</string>
    <string name="type.landuse.education">Oktatási létesítmény</string>
    <string name="type.landuse.farmyard">Tanyaudvar</string>
@@ -1304,7 +1305,7 @@
    <string name="type.aerialway.mixed_lift">Vegyes sífelvonó</string>
    <string name="type.boundary.administrative.3">Tartományhatár</string>
    <string name="type.boundary.administrative.4">Regionális határ</string>
-    <string name="type.leisure.hackerspace">Hacker-tér (hackerspace)</string>
+    <string name="type.leisure.hackerspace">Hackerspace</string>
    <string name="type.leisure.marina">Kishajókikötő</string>
    <string name="type.man_made.cairn">Kőhalom (mesterséges)</string>
    <string name="type.railway.light_rail">Könnyűvasút, HÉV</string>
@@ -1361,19 +1362,19 @@
    <string name="type.piste_type.downhill.intermediate">Sípálya középhaladóknak</string>
    <string name="type.piste_type.downhill.area">Sípálya</string>
    <string name="type.piste_type.downhill.advanced">Sípálya tapasztaltaknak</string>
-    <string name="type.piste_type.downhill.easy">Könnyű sípálya</string>
+    <string name="type.piste_type.downhill.easy">Sípálya újoncoknak</string>
    <string name="type.piste_type.downhill.expert.area">Sípálya szakértőknek</string>
    <string name="type.piste_type.downhill.intermediate.area">Sípálya középhaladóknak</string>
-    <string name="type.piste_type.downhill.easy.area">Könnyű sípálya</string>
-    <string name="type.piste_type.downhill.freeride">Természetes eredetű sípálya (ingyenes)</string>
-    <string name="type.amenity.luggage_locker">Poggyászmegőrző</string>
-    <string name="type.amenity.love_hotel">Szálloda szerelmeseknek</string>
+    <string name="type.piste_type.downhill.easy.area">Sípálya újoncoknak</string>
+    <string name="type.piste_type.downhill.freeride">Természetes eredetű sípálya</string>
+    <string name="type.amenity.luggage_locker">Csomagmegőrző</string>
+    <string name="type.amenity.love_hotel">Szeretőszálló</string>
    <string name="type.amenity.studio">Stúdió</string>
    <string name="type.amenity.bicycle_parking.covered">Fedett kerékpártároló</string>
-    <string name="type.post_office.post_partner">Posta partner</string>
+    <string name="type.post_office.post_partner">Postapartnerpont</string>
    <string name="type.amenity.animal_shelter">Állatmenhely</string>
-    <string name="type.barrier.guard_rail">Védőkorlát</string>
-    <string name="type.barrier.wicket_gate">Kiskapu</string>
+    <string name="type.barrier.guard_rail">Szalagkorlát</string>
+    <string name="type.barrier.wicket_gate">Személybejáró</string>
    <string name="type.highway.ladder">Létra</string>
    <string name="type.landuse.plant_nursery">Faiskola</string>
    <string name="type.leisure.firepit">Tűzrakóhely</string>
@@ -1388,6 +1389,10 @@
    <string name="type.sport.diving">Légzőkészülék nélküli búvárkodás</string>
    <string name="type.landuse.religious">Vallási föld</string>
    <string name="type.natural.wetland.saltmarsh">Sós mocsár</string>
-    <string name="type.amenity.ranger_station">Erdészház</string>
+    <string name="type.amenity.ranger_station">Vadőrség</string>
    <string name="type.leisure.escape_game">Szabadulószoba</string>
+    <string name="type.shop.lighting">Világítástechnikai szaküzlet</string>
+    <string name="type.office.security">Biztonsági őr irodája</string>
+    <string name="type.building.guardhouse">Biztonsági fülke</string>
+    <string name="type.power.portal">Villanytorony (Portál)</string>
 </resources>
--- a/android/sdk/src/main/res/values-in/types_strings.xml
+++ b/android/sdk/src/main/res/values-in/types_strings.xml
@@ -371,6 +371,8 @@
    <string name="type.highway.pedestrian.area">Jalan</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Menjembatani</string>
+
+    <string name="type.highway.pedestrian.square">Lapangan kota</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Terowongan</string>
    <string name="type.highway.primary">Jalan</string>
--- a/android/sdk/src/main/res/values-is/types_strings.xml
+++ b/android/sdk/src/main/res/values-is/types_strings.xml
@@ -1018,6 +1018,8 @@
    <string name="type.highway.footway.bridge">Göngubrú</string>
    <string name="type.highway.footway.tunnel">Göng fyrir fótgangandi</string>
    <string name="type.highway.pedestrian.bridge">Göngubrú</string>
+
+    <string name="type.highway.pedestrian.square">Torg</string>
    <string name="type.historic">Sögulegur hlutur</string>
    <string name="type.historic.stone">Sögulegur steinn</string>
    <string name="type.historic.memorial.war_memorial">Stríðsminnismerki</string>
--- a/android/sdk/src/main/res/values-it/types_strings.xml
+++ b/android/sdk/src/main/res/values-it/types_strings.xml
@@ -157,7 +157,7 @@
    <string name="type.amenity.shelter.basic_hut">Capanna di Bivacco</string>
    <string name="type.amenity.public_bath">Terme pubbliche</string>
    <string name="type.amenity.shower">Doccia</string>
-    <string name="type.amenity.stripclub">Stripclub</string>
+    <string name="type.amenity.stripclub">Strip club</string>
    <string name="type.amenity.taxi">Taxi</string>
    <string name="type.amenity.telephone">Telefono</string>
    <string name="type.amenity.theatre">Teatro</string>
@@ -205,7 +205,7 @@
    <string name="type.barrier.retaining_wall">Muro di sostegno</string>
    <string name="type.barrier.stile">Scaletta per recinzioni</string>
    <string name="type.barrier.turnstile">Tornello</string>
-    <string name="type.barrier.swing_gate">Barriera ferroviaria</string>
+    <string name="type.barrier.swing_gate">Cancello a battente</string>
    <string name="type.barrier.toll_booth">Casello di pedaggio</string>
    <string name="type.barrier.wall">Muro</string>
    <string name="type.boundary">Confine</string>
@@ -432,6 +432,8 @@
    <string name="type.highway.pedestrian.area">Area pedonale</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Ponte</string>
+
+    <string name="type.highway.pedestrian.square">Piazza</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Tunnel</string>
    <string name="type.highway.primary">Strada</string>
@@ -830,7 +832,7 @@
    <string name="type.railway.station.light_rail.london">Stazione ferroviaria</string>
    <string name="type.railway.station.light_rail.porto">Stazione ferroviaria</string>
    <string name="type.railway.station.monorail">Stazione ferroviaria</string>
-    <string name="type.railway.station.subway">Stazione Metropolitana</string>
+    <string name="type.railway.station.subway">Stazione della metropolitana</string>
    <string name="type.railway.station.subway.adana">Stazione metropolitana</string>
    <string name="type.railway.station.subway.algiers">Stazione metropolitana</string>
    <string name="type.railway.station.subway.almaty">Stazione metropolitana</string>
@@ -885,7 +887,7 @@
    <string name="type.railway.station.subway.lille">Stazione metropolitana</string>
    <string name="type.railway.station.subway.lima">Stazione metropolitana</string>
    <string name="type.railway.station.subway.lisboa">Stazione metropolitana</string>
-    <string name="type.railway.station.subway.london">Stazione Metropolitana di Londra</string>
+    <string name="type.railway.station.subway.london">Stazione della metropolitana londinese</string>
    <string name="type.railway.station.subway.lyon">Stazione metropolitana</string>
    <string name="type.railway.station.subway.madrid">Stazione metropolitana</string>
    <string name="type.railway.station.subway.malaga">Stazione metropolitana</string>
@@ -900,10 +902,10 @@
    <string name="type.railway.station.subway.montreal">Stazione metropolitana</string>
    <string name="type.railway.station.subway.moscow">Stazione metropolitana</string>
    <string name="type.railway.station.subway.munchen">Stazione metropolitana</string>
-    <string name="type.railway.station.subway.nagoya">Stazione metropolitana</string>
-    <string name="type.railway.station.subway.newyork">Stazione metropolitana</string>
+    <string name="type.railway.station.subway.nagoya">Stazione della metropolitana</string>
+    <string name="type.railway.station.subway.newyork">Stazione della metropolitana</string>
    <string name="type.railway.station.subway.nnov">Stazione metropolitana</string>
-    <string name="type.railway.station.subway.novosibirsk">Stazione metropolitana</string>
+    <string name="type.railway.station.subway.novosibirsk">Stazione della metropolitana</string>
    <string name="type.railway.station.subway.osaka">Stazione metropolitana</string>
    <string name="type.railway.station.subway.oslo">Stazione metropolitana</string>
    <string name="type.railway.station.subway.palma">Stazione metropolitana</string>
@@ -1390,7 +1392,10 @@
    <string name="type.natural.wetland.fen">Palude</string>
    <string name="type.leisure.escape_game">Escape Room</string>
    <string name="type.amenity.ranger_station">Stazione delle guardie forestali</string>
-    <string name="type.landuse.religious">Terreno Religioso</string>
-    <string name="type.amenity.animal_shelter">Rifugio per Animali</string>
+    <string name="type.landuse.religious">Terreno religioso</string>
+    <string name="type.amenity.animal_shelter">Rifugio per animali</string>
    <string name="type.barrier.wicket_gate">Cancello pedonale</string>
+    <string name="type.building.guardhouse">Guardiola</string>
+    <string name="type.office.security">Ufficio della sicurezza</string>
+    <string name="type.power.portal">Portale elettrico</string>
 </resources>
--- a/android/sdk/src/main/res/values-iw/types_strings.xml
+++ b/android/sdk/src/main/res/values-iw/types_strings.xml
@@ -433,6 +433,8 @@
    <string name="type.highway.pedestrian.area">אזור הולכי רגל</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">גשר הולכי רגל</string>
+
+    <string name="type.highway.pedestrian.square">כיכר עירונית</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">מנהרה להולכי רגל</string>
    <string name="type.highway.primary">כביש ראשי</string>
--- a/android/sdk/src/main/res/values-ja/types_strings.xml
+++ b/android/sdk/src/main/res/values-ja/types_strings.xml
@@ -406,6 +406,8 @@
    <string name="type.highway.pedestrian.area">ストリート</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">橋</string>
+
+    <string name="type.highway.pedestrian.square">広場</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">トンネル</string>
    <string name="type.highway.primary">ストリート</string>
--- a/android/sdk/src/main/res/values-ko/types_strings.xml
+++ b/android/sdk/src/main/res/values-ko/types_strings.xml
@@ -377,6 +377,8 @@
    <string name="type.highway.pedestrian.area">거리</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">다리</string>
+
+    <string name="type.highway.pedestrian.square">광장</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">터널</string>
    <string name="type.highway.primary">거리</string>
--- a/android/sdk/src/main/res/values-lt/strings.xml
+++ b/android/sdk/src/main/res/values-lt/strings.xml
@@ -37,4 +37,12 @@
    <string name="not_shared">Privatus</string>
    <string name="access_rules_author_only">Taisymas internete</string>
    <string name="today">Šiandien</string>
+    <string name="week_ago">Prieš %s sav.</string>
+    <string name="weeks_ago">prieš %s sav.</string>
+    <string name="month_ago">prieš %s mėn.</string>
+    <string name="months_ago">prieš %s mėn.</string>
+    <string name="year_ago">prieš %s m.</string>
+    <string name="years_ago">prieš %s m.</string>
+    <string name="days_ago">prieš %s d.</string>
+    <string name="yesterday">Vakar</string>
 </resources>
--- a/android/sdk/src/main/res/values-lv/strings.xml
+++ b/android/sdk/src/main/res/values-lv/strings.xml
@@ -35,4 +35,12 @@
    <string name="gb">GB</string>
    <string name="mb">MB</string>
    <string name="today">Šodien</string>
+    <string name="yesterday">Vakar</string>
+    <string name="days_ago">Pirms %s dienām</string>
+    <string name="week_ago">Pirms %s nedēļas</string>
+    <string name="weeks_ago">Pirms %s nedēļām</string>
+    <string name="month_ago">Pirms %s mēneša</string>
+    <string name="months_ago">Pirms %s mēnešiem</string>
+    <string name="year_ago">Pirms %s gada</string>
+    <string name="years_ago">Pirms %s gadiem</string>
 </resources>
--- a/android/sdk/src/main/res/values-lv/types_strings.xml
+++ b/android/sdk/src/main/res/values-lv/types_strings.xml
@@ -57,4 +57,29 @@
    <string name="type.highway.busway.tunnel">Tunelis</string>
    <string name="type.aeroway.aerodrome.international">Starptautiskā lidosta</string>
    <string name="type.highway.bus_stop">Pietura</string>
+    <string name="type.amenity.studio">Studija</string>
+    <string name="type.amenity.luggage_locker">Bagāžas glabātava</string>
+    <string name="type.cuisine.noodles">Nūdeles</string>
+    <string name="type.leisure.firepit">Ugunskura vieta</string>
+    <string name="type.railway.narrow_gauge.bridge">Šaursliežu dzelzceļa tilts</string>
+    <string name="type.shop.mobile_phone">Viedtālruņa veikals</string>
+    <string name="type.tourism.viewpoint">Skatu laukums</string>
+    <string name="type.tourism.information.visitor_centre">Apmeklētāju centrs</string>
+    <string name="type.amenity.bicycle_parking.covered">Divriteņu novietne ar jumtu</string>
+    <string name="type.highway.ladder">Kāpnes</string>
+    <string name="type.landuse.plant_nursery">Stādaudzētava</string>
+    <string name="type.man_made.silo">Krātuve</string>
+    <string name="type.amenity.animal_shelter">Dzīvnieku patversme</string>
+    <string name="type.natural.wetland.swamp">Purvs</string>
+    <string name="type.railway.station.subway.qingdao">Metro stacija</string>
+    <string name="type.highway.pedestrian.bridge">Gājēju tilts</string>
+    <string name="type.highway.primary">Galvenais ceļš</string>
+    <string name="type.highway.primary.bridge">Tilts</string>
+    <string name="type.highway.primary.tunnel">Tunelis</string>
+    <string name="type.highway.pedestrian.square">Laukums</string>
+    <string name="type.highway.pedestrian.tunnel">Gājēju tunelis</string>
+    <string name="type.shop.lighting">Gaismekļu veikals</string>
+    <string name="type.sport">Sports</string>
+    <string name="type.sport.american_football">Amerikāņu futbols</string>
+    <string name="type.sport.archery">Lokšaušana</string>
 </resources>
--- a/android/sdk/src/main/res/values-mr/types_strings.xml
+++ b/android/sdk/src/main/res/values-mr/types_strings.xml
@@ -340,6 +340,8 @@
    <string name="type.highway.pedestrian.area">पादचारी झोन</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">पादचारी पूल</string>
+
+    <string name="type.highway.pedestrian.square">चौरस</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">पादचारी बोगदा</string>
    <string name="type.highway.primary">प्राथमिक मार्ग</string>
--- a/android/sdk/src/main/res/values-mt/strings.xml
+++ b/android/sdk/src/main/res/values-mt/strings.xml
@@ -24,4 +24,6 @@
    <string name="access_rules_author_only">Editjar onlajn</string>
    <string name="public_access">Aċċess pubbliku</string>
    <string name="today">Illum</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
 </resources>
--- a/android/sdk/src/main/res/values-nb/types_strings.xml
+++ b/android/sdk/src/main/res/values-nb/types_strings.xml
@@ -387,6 +387,8 @@
    <string name="type.highway.pedestrian.area">Gågate</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Bru</string>
+
+    <string name="type.highway.pedestrian.square">Torg</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Tunnel</string>
    <string name="type.highway.primary">Hovedvei</string>
@@ -1195,4 +1197,10 @@
    <string name="type.leisure.hackerspace">Skaperverksted</string>
    <string name="type.man_made.silo">Silo</string>
    <string name="type.aeroway">Luftromsinfrastruktur</string>
+    <string name="type.aeroway.apron">Oppstillingsplass</string>
+    <string name="type.aeroway.gate">Gate</string>
+    <string name="type.aeroway.helipad">Helipad</string>
+    <string name="type.aeroway.runway">Rullebane</string>
+    <string name="type.aeroway.taxiway">Taxibane</string>
+    <string name="type.aeroway.terminal">Terminal</string>
 </resources>
--- a/android/sdk/src/main/res/values-nl/strings.xml
+++ b/android/sdk/src/main/res/values-nl/strings.xml
@@ -33,7 +33,7 @@
    <string name="limited_access">Beperkte toegang</string>
    <string name="not_shared">Privé</string>
    <string name="access_rules_author_only">Wordt online bewerkt</string>
-    <string name="gb">VK</string>
+    <string name="gb">GB</string>
    <string name="mb">MB</string>
    <string name="today">Vandaag</string>
    <string name="yesterday">Gisteren</string>
@@ -42,6 +42,6 @@
    <string name="weeks_ago">%s weken geleden</string>
    <string name="month_ago">%s maand geleden</string>
    <string name="year_ago">%s jaar geleden</string>
-    <string name="years_ago">%s jaar geleden</string>
+    <string name="years_ago">%s jaren geleden</string>
    <string name="months_ago">%s maanden geleden</string>
 </resources>
--- a/android/sdk/src/main/res/values-nl/types_strings.xml
+++ b/android/sdk/src/main/res/values-nl/types_strings.xml
@@ -29,7 +29,7 @@
    <string name="type.amenity.bench">Zitbank</string>
    <string name="type.amenity.bicycle_parking">Fietsenstalling</string>
    <string name="type.amenity.bicycle_rental">Fietsverhuur</string>
-    <string name="type.amenity.bicycle_repair_station">Fiets reparatie station</string>
+    <string name="type.amenity.bicycle_repair_station">Fietsreparatie</string>
    <string name="type.amenity.biergarten">Biertuin</string>
    <string name="type.amenity.brothel">Bordeel</string>
    <string name="type.amenity.bureau_de_change">Wisselkantoor</string>
@@ -38,11 +38,11 @@
    <string name="type.amenity.car_rental">Autoverhuur</string>
    <string name="type.amenity.motorcycle_rental">Motorverhuur</string>
    <string name="type.amenity.car_sharing">Autodelen</string>
-    <string name="type.amenity.car_wash">Wasserette</string>
+    <string name="type.amenity.car_wash">Autowasstraat</string>
    <string name="type.amenity.casino">Casino</string>
    <string name="type.amenity.gambling">Gokken</string>
    <string name="type.leisure.adult_gaming_centre">Gamingcentrum voor volwassenen</string>
-    <string name="type.leisure.amusement_arcade">Spelletjeshal</string>
+    <string name="type.leisure.amusement_arcade">Speelhal</string>
    <string name="type.amenity.charging_station">Oplaadstation</string>
    <string name="type.amenity.charging_station.bicycle">Oplaadstation voor fietsen</string>
    <string name="type.amenity.charging_station.motorcar">Oplaadstation voor auto\'s</string>
@@ -56,7 +56,7 @@
    <string name="type.amenity.conference_centre">Conferentiecentrum</string>
    <string name="type.amenity.courthouse">Rechtbank</string>
    <string name="type.amenity.dentist">Tandarts</string>
-    <string name="type.amenity.doctors">Huisartsenpost</string>
+    <string name="type.amenity.doctors">Artsenpost</string>
    <string name="type.amenity.drinking_water">Drinkwater</string>
    <string name="type.drinking_water.yes">Drinkwater</string>
    <string name="type.amenity.driving_school">Rijschool</string>
@@ -80,7 +80,7 @@
    <string name="type.amenity.internet_cafe">Internetcafé</string>
    <string name="type.amenity.kindergarten">Kleuterschool</string>
    <string name="type.amenity.library">Bibliotheek</string>
-    <string name="type.amenity.loading_dock">Laad-dock</string>
+    <string name="type.amenity.loading_dock">Laaddek</string>
    <string name="type.amenity.marketplace">Markt</string>
    <string name="type.amenity.motorcycle_parking">Parking Motorfietsen</string>
    <string name="type.amenity.nightclub">Nachtclub</string>
@@ -430,6 +430,7 @@
    <string name="type.highway.pedestrian.area">Voetgangersgebied</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Voetgangersbrug</string>
+    <string name="type.highway.pedestrian.square">Plein</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Voetgangerstunnel</string>
    <string name="type.highway.primary">Hoofdweg</string>
@@ -1393,4 +1394,8 @@
    <string name="type.amenity.ranger_station">Boswachterkantoor</string>
    <string name="type.amenity.animal_shelter">Dierenasiel</string>
    <string name="type.barrier.wicket_gate">Klinket</string>
+    <string name="type.office.security">Beveiligingskantoor</string>
+    <string name="type.building.guardhouse">Beveiligingsloket</string>
+    <string name="type.power.portal">Verdeelstation</string>
+    <string name="type.shop.lighting">Verlichtingswinkel</string>
 </resources>
--- a/android/sdk/src/main/res/values-pl/types_strings.xml
+++ b/android/sdk/src/main/res/values-pl/types_strings.xml
@@ -77,7 +77,7 @@
    <string name="type.amenity.grave_yard.christian">Cmentarz chrześcijański</string>
    <string name="type.amenity.hospital">Szpital</string>
    <string name="type.amenity.hunting_stand">Ambona myśliwska</string>
-    <string name="type.amenity.ice_cream">Stoisko z lodami</string>
+    <string name="type.amenity.ice_cream">Lodziarnia</string>
    <string name="type.amenity.internet_cafe">Kafejka internetowa</string>
    <string name="type.amenity.kindergarten">Przedszkole</string>
    <string name="type.amenity.library">Biblioteka</string>
@@ -97,14 +97,14 @@
    <string name="type.amenity.parking.underground">Parking podziemny</string>
    <string name="type.amenity.parking.underground.fee">Parking podziemny</string>
    <string name="type.amenity.parking.underground.private">Prywatny parking podziemny</string>
-    <string name="type.amenity.parking.street_side">Parking od strony ulicy</string>
-    <string name="type.amenity.parking.street_side.fee">Parking od strony ulicy</string>
-    <string name="type.amenity.parking.street_side.private">Prywatna ulica parking boczny</string>
+    <string name="type.amenity.parking.street_side">Parking obok jezdni</string>
+    <string name="type.amenity.parking.street_side.fee">Parking obok jezdni</string>
+    <string name="type.amenity.parking.street_side.private">Prywatny parking obok jezdni</string>
    <string name="type.amenity.parking.lane">Parking na pasie ruchu</string>
    <string name="type.amenity.parking.lane.fee">Parking na pasie ruchu</string>
-    <string name="type.amenity.parking.lane.private">Parking na prywatnym pasie ruchu</string>
+    <string name="type.amenity.parking.lane.private">Prywatny parking na pasie ruchu</string>
    <string name="type.amenity.parking_entrance">Wjazd na parking</string>
-    <string name="type.amenity.parking_entrance.private">Prywatne wejście na parking</string>
+    <string name="type.amenity.parking_entrance.private">Prywatny wjazd na parking</string>
    <string name="type.amenity.parking_entrance.permissive">Wjazd na parking</string>
    <string name="type.amenity.parking_space">Miejsce parkingowe</string>
    <string name="type.amenity.parking_space.permissive">Miejsce parkingowe</string>
@@ -173,7 +173,7 @@
    <string name="type.amenity.vending_machine.food">Automat z jedzeniem</string>
    <string name="type.amenity.vending_machine.newspapers">Automat z gazetami</string>
    <string name="type.amenity.vending_machine.parking_tickets">Parkometr</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Automat biletowy do transportu publicznego</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Automat biletowy</string>
    <string name="type.amenity.vending_machine.sweets">Automat ze słodyczami</string>
    <string name="type.amenity.vending_machine.excrement_bags">Automat z torebkami na odchody</string>
    <string name="type.amenity.parcel_locker">Paczkomat</string>
@@ -247,7 +247,7 @@
    <string name="type.craft.handicraft">Rzemiosło artystyczne</string>
    <!-- Heating, Ventilation, and Air Conditioning -->
    <string name="type.craft.hvac">Klimatyzacja</string>
-    <string name="type.craft.key_cutter">Cięcie kluczy</string>
+    <string name="type.craft.key_cutter">Dorabianie kluczy</string>
    <string name="type.craft.locksmith">Ślusarz</string>
    <string name="type.craft.metal_construction">Ślusarz, obrabiacz metalu</string>
    <string name="type.craft.painter">Malarz</string>
@@ -278,7 +278,7 @@
    <string name="type.cuisine.chicken">Kurczak</string>
    <string name="type.cuisine.chinese">Kuchnia chińska</string>
    <string name="type.cuisine.coffee_shop">Kawa</string>
-    <string name="type.cuisine.crepe">Naleśnikarnia</string>
+    <string name="type.cuisine.crepe">Crepe</string>
    <string name="type.cuisine.croatian">Kuchnia chorwacka</string>
    <string name="type.cuisine.curry">Curry</string>
    <string name="type.cuisine.deli">Delikatesy</string>
@@ -298,7 +298,7 @@
    <string name="type.cuisine.heuriger">Heuriger</string>
    <string name="type.cuisine.hotdog">Hot-dogi</string>
    <string name="type.cuisine.hungarian">Kuchnia węgierska</string>
-    <string name="type.cuisine.ice_cream">Lodziarnia</string>
+    <string name="type.cuisine.ice_cream">Lody</string>
    <string name="type.cuisine.indian">Kuchnia indyjska</string>
    <string name="type.cuisine.indonesian">Kuchnia indonezyjska</string>
    <string name="type.cuisine.international">Kuchnia międzynarodowa</string>
@@ -322,14 +322,14 @@
    <string name="type.cuisine.pasta">Makarony</string>
    <string name="type.cuisine.persian">Kuchnia perska</string>
    <string name="type.cuisine.peruvian">Kuchnia peruwiańska</string>
-    <string name="type.cuisine.pizza">Pizzeria</string>
+    <string name="type.cuisine.pizza">Pizza</string>
    <string name="type.cuisine.polish">Kuchnia polska</string>
    <string name="type.cuisine.portuguese">Kuchnia portugalska</string>
-    <string name="type.cuisine.ramen">Zupa ramen</string>
+    <string name="type.cuisine.ramen">Ramen</string>
    <string name="type.cuisine.regional">Kuchnia regionalna</string>
    <string name="type.cuisine.russian">Kuchnia rosyjska</string>
    <string name="type.cuisine.sandwich">Kanapki</string>
-    <string name="type.cuisine.sausage">Kiełbasiarnia</string>
+    <string name="type.cuisine.sausage">Kiełbasa</string>
    <string name="type.cuisine.savory_pancakes">Wytrawne naleśniki</string>
    <string name="type.cuisine.seafood">Owoce morza</string>
    <string name="type.cuisine.soba">Soba</string>
@@ -337,7 +337,7 @@
    <string name="type.cuisine.steak_house">Steki</string>
    <string name="type.cuisine.sushi">Sushi</string>
    <string name="type.cuisine.tapas">Tapas</string>
-    <string name="type.cuisine.tea">Herbaciarnia</string>
+    <string name="type.cuisine.tea">Herbata</string>
    <string name="type.cuisine.thai">Kuchnia tajska</string>
    <string name="type.cuisine.turkish">Kuchnia turecka</string>
    <string name="type.cuisine.vegan">Kuchnia wegańska</string>
@@ -431,6 +431,8 @@
    <string name="type.highway.pedestrian.area">Obszar deptaka</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Most dla pieszych</string>
+
+    <string name="type.highway.pedestrian.square">Plac</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Tunel dla pieszych</string>
    <string name="type.highway.primary">Ulica</string>
@@ -629,9 +631,9 @@
    <string name="type.leisure.nature_reserve">Rezerwat przyrody</string>
    <string name="type.leisure.outdoor_seating">Siedzenia zewnętrzne</string>
    <string name="type.leisure.park">Park</string>
-    <string name="type.leisure.park.no.access">Park</string>
+    <string name="type.leisure.park.no.access">Prywatny park</string>
    <string name="type.leisure.park.permissive">Park</string>
-    <string name="type.leisure.park.private">Park</string>
+    <string name="type.leisure.park.private">Prywatny park</string>
    <string name="type.leisure.picnic_table">Stół piknikowy</string>
    <string name="type.leisure.pitch">Boisko sportowe</string>
    <string name="type.leisure.playground">Plac zabaw</string>
@@ -829,124 +831,124 @@
    <string name="type.railway.station">Dworzec kolejowy</string>
    <string name="type.railway.station.funicular">Kolej linowo-terenowa</string>
    <string name="type.railway.station.light_rail">Dworzec kolejowy</string>
-    <string name="type.railway.station.light_rail.berlin">Dworzec kolejowy</string>
-    <string name="type.railway.station.light_rail.london">Dworzec kolejowy</string>
-    <string name="type.railway.station.light_rail.porto">Dworzec kolejowy</string>
+    <string name="type.railway.station.light_rail.berlin">Stacja S-Bahn</string>
+    <string name="type.railway.station.light_rail.london">Stacja DLR</string>
+    <string name="type.railway.station.light_rail.porto">Stacja Metra Porto</string>
    <string name="type.railway.station.monorail">Dworzec kolejowy</string>
-    <string name="type.railway.station.subway">Metro</string>
-    <string name="type.railway.station.subway.adana">Metro</string>
-    <string name="type.railway.station.subway.algiers">Metro</string>
-    <string name="type.railway.station.subway.almaty">Metro</string>
-    <string name="type.railway.station.subway.amsterdam">Metro</string>
-    <string name="type.railway.station.subway.ankara">Metro</string>
-    <string name="type.railway.station.subway.athens">Metro</string>
-    <string name="type.railway.station.subway.baku">Metro</string>
-    <string name="type.railway.station.subway.bangkok">Metro</string>
-    <string name="type.railway.station.subway.barcelona">Metro</string>
-    <string name="type.railway.station.subway.beijing">Metro</string>
-    <string name="type.railway.station.subway.bengalore">Metro</string>
-    <string name="type.railway.station.subway.berlin">Metro</string>
-    <string name="type.railway.station.subway.bilbao">Metro</string>
-    <string name="type.railway.station.subway.brasilia">Metro</string>
-    <string name="type.railway.station.subway.brescia">Metro</string>
-    <string name="type.railway.station.subway.brussels">Metro</string>
-    <string name="type.railway.station.subway.bucharest">Metro</string>
-    <string name="type.railway.station.subway.budapest">Metro</string>
-    <string name="type.railway.station.subway.buenos_aires">Metro</string>
-    <string name="type.railway.station.subway.bursa">Metro</string>
-    <string name="type.railway.station.subway.cairo">Metro</string>
-    <string name="type.railway.station.subway.caracas">Metro</string>
-    <string name="type.railway.station.subway.catania">Metro</string>
-    <string name="type.railway.station.subway.changchun">Metro</string>
-    <string name="type.railway.station.subway.chengdu">Metro</string>
-    <string name="type.railway.station.subway.chicago">Metro</string>
-    <string name="type.railway.station.subway.chongqing">Metro</string>
-    <string name="type.railway.station.subway.dalian">Metro</string>
-    <string name="type.railway.station.subway.delhi">Metro</string>
-    <string name="type.railway.station.subway.dnepro">Metro</string>
-    <string name="type.railway.station.subway.dubai">Metro</string>
-    <string name="type.railway.station.subway.ekb">Metro</string>
-    <string name="type.railway.station.subway.fukuoka">Metro</string>
-    <string name="type.railway.station.subway.glasgow">Metro</string>
-    <string name="type.railway.station.subway.guangzhou">Metro</string>
-    <string name="type.railway.station.subway.hamburg">Metro</string>
-    <string name="type.railway.station.subway.helsinki">Metro</string>
-    <string name="type.railway.station.subway.hiroshima">Metro</string>
-    <string name="type.railway.station.subway.hongkong">Metro</string>
-    <string name="type.railway.station.subway.isfahan">Metro</string>
-    <string name="type.railway.station.subway.istanbul">Metro</string>
-    <string name="type.railway.station.subway.izmir">Metro</string>
-    <string name="type.railway.station.subway.kazan">Metro</string>
-    <string name="type.railway.station.subway.kharkiv">Metro</string>
-    <string name="type.railway.station.subway.kiev">Metro</string>
-    <string name="type.railway.station.subway.kobe">Metro</string>
-    <string name="type.railway.station.subway.kolkata">Metro</string>
-    <string name="type.railway.station.subway.kunming">Metro</string>
-    <string name="type.railway.station.subway.kyoto">Metro</string>
-    <string name="type.railway.station.subway.la">Metro</string>
-    <string name="type.railway.station.subway.lausanne">Metro</string>
-    <string name="type.railway.station.subway.lille">Metro</string>
-    <string name="type.railway.station.subway.lima">Metro</string>
-    <string name="type.railway.station.subway.lisboa">Metro</string>
-    <string name="type.railway.station.subway.london">Metro</string>
-    <string name="type.railway.station.subway.lyon">Metro</string>
-    <string name="type.railway.station.subway.madrid">Metro</string>
-    <string name="type.railway.station.subway.malaga">Metro</string>
-    <string name="type.railway.station.subway.manila">Metro</string>
-    <string name="type.railway.station.subway.maracaibo">Metro</string>
-    <string name="type.railway.station.subway.mashhad">Metro</string>
-    <string name="type.railway.station.subway.mecca">Metro</string>
-    <string name="type.railway.station.subway.medellin">Metro</string>
-    <string name="type.railway.station.subway.mexico">Metro</string>
-    <string name="type.railway.station.subway.milan">Metro</string>
-    <string name="type.railway.station.subway.minsk">Metro</string>
-    <string name="type.railway.station.subway.montreal">Metro</string>
-    <string name="type.railway.station.subway.moscow">Metro</string>
-    <string name="type.railway.station.subway.munchen">Metro</string>
-    <string name="type.railway.station.subway.nagoya">Metro</string>
-    <string name="type.railway.station.subway.newyork">Metro</string>
-    <string name="type.railway.station.subway.nnov">Metro</string>
-    <string name="type.railway.station.subway.novosibirsk">Metro</string>
-    <string name="type.railway.station.subway.osaka">Metro</string>
-    <string name="type.railway.station.subway.oslo">Metro</string>
-    <string name="type.railway.station.subway.palma">Metro</string>
-    <string name="type.railway.station.subway.panama">Metro</string>
-    <string name="type.railway.station.subway.paris">Metro</string>
-    <string name="type.railway.station.subway.philadelphia">Metro</string>
-    <string name="type.railway.station.subway.pyongyang">Metro</string>
-    <string name="type.railway.station.subway.rennes">Metro</string>
-    <string name="type.railway.station.subway.rio">Metro</string>
-    <string name="type.railway.station.subway.roma">Metro</string>
-    <string name="type.railway.station.subway.rotterdam">Metro</string>
-    <string name="type.railway.station.subway.samara">Metro</string>
-    <string name="type.railway.station.subway.santiago">Metro</string>
-    <string name="type.railway.station.subway.santo_domingo">Metro</string>
-    <string name="type.railway.station.subway.saopaulo">Metro</string>
-    <string name="type.railway.station.subway.sapporo">Metro</string>
-    <string name="type.railway.station.subway.sendai">Metro</string>
-    <string name="type.railway.station.subway.sf">Metro</string>
-    <string name="type.railway.station.subway.shanghai">Metro</string>
-    <string name="type.railway.station.subway.shenzhen">Metro</string>
-    <string name="type.railway.station.subway.shiraz">Metro</string>
-    <string name="type.railway.station.subway.singapore">Metro</string>
-    <string name="type.railway.station.subway.sofia">Metro</string>
-    <string name="type.railway.station.subway.spb">Metro</string>
-    <string name="type.railway.station.subway.stockholm">Metro</string>
-    <string name="type.railway.station.subway.tabriz">Metro</string>
-    <string name="type.railway.station.subway.taipei">Metro</string>
-    <string name="type.railway.station.subway.taoyuan">Metro</string>
-    <string name="type.railway.station.subway.tashkent">Metro</string>
-    <string name="type.railway.station.subway.tbilisi">Metro</string>
-    <string name="type.railway.station.subway.tehran">Metro</string>
-    <string name="type.railway.station.subway.tianjin">Metro</string>
-    <string name="type.railway.station.subway.tokyo">Metro</string>
-    <string name="type.railway.station.subway.valencia">Metro</string>
-    <string name="type.railway.station.subway.vienna">Metro</string>
-    <string name="type.railway.station.subway.warszawa">Metro</string>
-    <string name="type.railway.station.subway.washington">Metro</string>
-    <string name="type.railway.station.subway.wuhan">Metro</string>
-    <string name="type.railway.station.subway.yerevan">Metro</string>
-    <string name="type.railway.station.subway.yokohama">Metro</string>
+    <string name="type.railway.station.subway">Stacja metra</string>
+    <string name="type.railway.station.subway.adana">Stacja metra</string>
+    <string name="type.railway.station.subway.algiers">Stacja metra</string>
+    <string name="type.railway.station.subway.almaty">Stacja metra</string>
+    <string name="type.railway.station.subway.amsterdam">Stacja metra</string>
+    <string name="type.railway.station.subway.ankara">Stacja metra</string>
+    <string name="type.railway.station.subway.athens">Stacja metra</string>
+    <string name="type.railway.station.subway.baku">Stacja metra</string>
+    <string name="type.railway.station.subway.bangkok">Stacja metra</string>
+    <string name="type.railway.station.subway.barcelona">Stacja metra</string>
+    <string name="type.railway.station.subway.beijing">Stacja metra</string>
+    <string name="type.railway.station.subway.bengalore">Stacja metra</string>
+    <string name="type.railway.station.subway.berlin">Stacja metra</string>
+    <string name="type.railway.station.subway.bilbao">Stacja metra</string>
+    <string name="type.railway.station.subway.brasilia">Stacja metra</string>
+    <string name="type.railway.station.subway.brescia">Stacja metra</string>
+    <string name="type.railway.station.subway.brussels">Stacja metra</string>
+    <string name="type.railway.station.subway.bucharest">Stacja metra</string>
+    <string name="type.railway.station.subway.budapest">Stacja metra</string>
+    <string name="type.railway.station.subway.buenos_aires">Stacja metra</string>
+    <string name="type.railway.station.subway.bursa">Stacja metra</string>
+    <string name="type.railway.station.subway.cairo">Stacja metra</string>
+    <string name="type.railway.station.subway.caracas">Stacja metra</string>
+    <string name="type.railway.station.subway.catania">Stacja metra</string>
+    <string name="type.railway.station.subway.changchun">Stacja metra</string>
+    <string name="type.railway.station.subway.chengdu">Stacja metra</string>
+    <string name="type.railway.station.subway.chicago">Stacja metra</string>
+    <string name="type.railway.station.subway.chongqing">Stacja metra</string>
+    <string name="type.railway.station.subway.dalian">Stacja metra</string>
+    <string name="type.railway.station.subway.delhi">Stacja metra</string>
+    <string name="type.railway.station.subway.dnepro">Stacja metra</string>
+    <string name="type.railway.station.subway.dubai">Stacja metra</string>
+    <string name="type.railway.station.subway.ekb">Stacja metra</string>
+    <string name="type.railway.station.subway.fukuoka">Stacja metra</string>
+    <string name="type.railway.station.subway.glasgow">Stacja metra</string>
+    <string name="type.railway.station.subway.guangzhou">Stacja metra</string>
+    <string name="type.railway.station.subway.hamburg">Stacja metra</string>
+    <string name="type.railway.station.subway.helsinki">Stacja metra</string>
+    <string name="type.railway.station.subway.hiroshima">Stacja metra</string>
+    <string name="type.railway.station.subway.hongkong">Stacja metra</string>
+    <string name="type.railway.station.subway.isfahan">Stacja metra</string>
+    <string name="type.railway.station.subway.istanbul">Stacja metra</string>
+    <string name="type.railway.station.subway.izmir">Stacja metra</string>
+    <string name="type.railway.station.subway.kazan">Stacja metra</string>
+    <string name="type.railway.station.subway.kharkiv">Stacja metra</string>
+    <string name="type.railway.station.subway.kiev">Stacja metra</string>
+    <string name="type.railway.station.subway.kobe">Stacja metra</string>
+    <string name="type.railway.station.subway.kolkata">Stacja metra</string>
+    <string name="type.railway.station.subway.kunming">Stacja metra</string>
+    <string name="type.railway.station.subway.kyoto">Stacja metra</string>
+    <string name="type.railway.station.subway.la">Stacja metra</string>
+    <string name="type.railway.station.subway.lausanne">Stacja metra</string>
+    <string name="type.railway.station.subway.lille">Stacja metra</string>
+    <string name="type.railway.station.subway.lima">Stacja metra</string>
+    <string name="type.railway.station.subway.lisboa">Stacja metra</string>
+    <string name="type.railway.station.subway.london">Stacja metra</string>
+    <string name="type.railway.station.subway.lyon">Stacja metra</string>
+    <string name="type.railway.station.subway.madrid">Stacja metra</string>
+    <string name="type.railway.station.subway.malaga">Stacja metra</string>
+    <string name="type.railway.station.subway.manila">Stacja metra</string>
+    <string name="type.railway.station.subway.maracaibo">Stacja metra</string>
+    <string name="type.railway.station.subway.mashhad">Stacja metra</string>
+    <string name="type.railway.station.subway.mecca">Stacja metra</string>
+    <string name="type.railway.station.subway.medellin">Stacja metra</string>
+    <string name="type.railway.station.subway.mexico">Stacja metra</string>
+    <string name="type.railway.station.subway.milan">Stacja metra</string>
+    <string name="type.railway.station.subway.minsk">Stacja metra</string>
+    <string name="type.railway.station.subway.montreal">Stacja metra</string>
+    <string name="type.railway.station.subway.moscow">Stacja metra</string>
+    <string name="type.railway.station.subway.munchen">Stacja metra</string>
+    <string name="type.railway.station.subway.nagoya">Stacja metra</string>
+    <string name="type.railway.station.subway.newyork">Stacja metra</string>
+    <string name="type.railway.station.subway.nnov">Stacja metra</string>
+    <string name="type.railway.station.subway.novosibirsk">Stacja metra</string>
+    <string name="type.railway.station.subway.osaka">Stacja metra</string>
+    <string name="type.railway.station.subway.oslo">Stacja metra</string>
+    <string name="type.railway.station.subway.palma">Stacja metra</string>
+    <string name="type.railway.station.subway.panama">Stacja metra</string>
+    <string name="type.railway.station.subway.paris">Stacja metra</string>
+    <string name="type.railway.station.subway.philadelphia">Stacja metra</string>
+    <string name="type.railway.station.subway.pyongyang">Stacja metra</string>
+    <string name="type.railway.station.subway.rennes">Stacja metra</string>
+    <string name="type.railway.station.subway.rio">Stacja metra</string>
+    <string name="type.railway.station.subway.roma">Stacja metra</string>
+    <string name="type.railway.station.subway.rotterdam">Stacja metra</string>
+    <string name="type.railway.station.subway.samara">Stacja metra</string>
+    <string name="type.railway.station.subway.santiago">Stacja metra</string>
+    <string name="type.railway.station.subway.santo_domingo">Stacja metra</string>
+    <string name="type.railway.station.subway.saopaulo">Stacja metra</string>
+    <string name="type.railway.station.subway.sapporo">Stacja metra</string>
+    <string name="type.railway.station.subway.sendai">Stacja metra</string>
+    <string name="type.railway.station.subway.sf">Stacja metra</string>
+    <string name="type.railway.station.subway.shanghai">Stacja metra</string>
+    <string name="type.railway.station.subway.shenzhen">Stacja metra</string>
+    <string name="type.railway.station.subway.shiraz">Stacja metra</string>
+    <string name="type.railway.station.subway.singapore">Stacja metra</string>
+    <string name="type.railway.station.subway.sofia">Stacja metra</string>
+    <string name="type.railway.station.subway.spb">Stacja metra</string>
+    <string name="type.railway.station.subway.stockholm">Stacja metra</string>
+    <string name="type.railway.station.subway.tabriz">Stacja metra</string>
+    <string name="type.railway.station.subway.taipei">Stacja metra</string>
+    <string name="type.railway.station.subway.taoyuan">Stacja metra</string>
+    <string name="type.railway.station.subway.tashkent">Stacja metra</string>
+    <string name="type.railway.station.subway.tbilisi">Stacja metra</string>
+    <string name="type.railway.station.subway.tehran">Stacja metra</string>
+    <string name="type.railway.station.subway.tianjin">Stacja metra</string>
+    <string name="type.railway.station.subway.tokyo">Stacja metra</string>
+    <string name="type.railway.station.subway.valencia">Stacja metra</string>
+    <string name="type.railway.station.subway.vienna">Stacja metra</string>
+    <string name="type.railway.station.subway.warszawa">Stacja metra</string>
+    <string name="type.railway.station.subway.washington">Stacja metra</string>
+    <string name="type.railway.station.subway.wuhan">Stacja metra</string>
+    <string name="type.railway.station.subway.yerevan">Stacja metra</string>
+    <string name="type.railway.station.subway.yokohama">Stacja metra</string>
    <string name="type.railway.subway_entrance">Wejście do metra</string>
    <string name="type.railway.subway_entrance.adana">Wejście do metra</string>
    <string name="type.railway.subway_entrance.algiers">Wejście do metra</string>
@@ -1285,7 +1287,7 @@
    <string name="type.wheelchair.yes">Wyposażono dla osób niepełnosprawnych</string>
    <string name="type.piste_type.snow_park">Snow Park</string>
    <string name="type.piste_type.hike">Śnieżny szlak turystyczny</string>
-    <string name="type.piste_type.connection">Piste Connection</string>
+    <string name="type.piste_type.connection">Łącznik stoków</string>
    <string name="type.piste_type.skitour">Szlak Skitour</string>
    <string name="type.amenity.events_venue">Sala bankietowa</string>
    <string name="type.shop.auction">Dom aukcyjny</string>
@@ -1307,7 +1309,7 @@
    <string name="type.fee.yes">$</string>
    <string name="type.leisure.track">Ścieżka</string>
    <string name="type.internet_access">Internet</string>
-    <string name="type.internet_access.wlan">Internet</string>
+    <string name="type.internet_access.wlan">Internet bezprzewodowy</string>
    <string name="type.leisure.marina">Przystań</string>
    <string name="type.cuisine.bubble_tea">Herbata bąbelkowa</string>
    <string name="type.power.pole">Słup elektryczny</string>
@@ -1387,4 +1389,10 @@
    <string name="type.barrier.guard_rail">Barierka ochronna</string>
    <string name="type.railway.station.subway.qingdao">Stacja metra</string>
    <string name="type.amenity.bicycle_parking.covered">Zadaszony parking dla rowerów</string>
+    <string name="type.building.guardhouse">Wartownia</string>
+    <string name="type.amenity.luggage_locker">Skrytka do przechowywania bagażu</string>
+    <string name="type.amenity.animal_shelter">Schronisko dla zwierząt</string>
+    <string name="type.amenity.ranger_station">Budynek obsługi parku</string>
+    <string name="type.power.portal">Portal elektroenergetyczny</string>
+    <string name="type.office.security">Biuro ochrony</string>
 </resources>
--- a/android/sdk/src/main/res/values-pt-rBR/strings.xml
+++ b/android/sdk/src/main/res/values-pt-rBR/strings.xml
@@ -28,7 +28,7 @@
    <!-- Subway exits for public transport marks on the map -->
    <string name="core_exit">Saída</string>
    <string name="core_entrance">Entrada</string>
-    <string name="subway_data_unavailable">Mapa de metrô está indisponível</string>
+    <string name="subway_data_unavailable">O mapa de metrô não está disponível</string>
    <string name="public_access">Acesso público</string>
    <string name="limited_access">Acesso limitado</string>
    <string name="not_shared">Privado</string>
--- a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- SECTION: Types -->
-    <string name="type.addr_interpolation">Endereço/bloco</string>
+    <string name="type.addr_interpolation">Endereço/Bloco</string>
    <string name="type.addr_interpolation.even">Endereço/Bloco</string>
    <string name="type.addr_interpolation.odd">Endereço/Bloco</string>
    <string name="type.aerialway">Transporte aéreo</string>
@@ -58,7 +58,7 @@
    <string name="type.amenity.driving_school">Autoescola</string>
    <string name="type.amenity.money_transfer">Transferência de dinheiro</string>
    <string name="type.office.diplomatic">Embaixada ou consulado</string>
-    <string name="type.amenity.fast_food">Lanchonete</string>
+    <string name="type.amenity.fast_food">Fast food</string>
    <string name="type.amenity.ferry_terminal">Estação de barcas</string>
    <string name="type.amenity.fire_station">Posto de bombeiros</string>
    <string name="type.amenity.food_court">Praça de alimentação</string>
@@ -212,7 +212,7 @@
    <!-- Heating, Ventilation, and Air Conditioning -->
    <string name="type.craft.hvac">Aquecimento, Ventilação e Ar Condicionado</string>
    <string name="type.craft.key_cutter">Chaveiro</string>
-    <string name="type.craft.locksmith">Serralheiro</string>
+    <string name="type.craft.locksmith">Serralheiro (chave)</string>
    <string name="type.shop.camera">Loja de câmeras</string>
    <string name="type.craft.plumber">Encanador</string>
    <string name="type.craft.winery">Vinícola</string>
@@ -222,7 +222,7 @@
    <string name="type.cuisine.argentinian">Cozinha argentina</string>
    <string name="type.cuisine.asian">Cozinha asiática</string>
    <string name="type.cuisine.austrian">Cozinha austríaca</string>
-    <string name="type.cuisine.bagel">Bagel</string>
+    <string name="type.cuisine.bagel">Beiguel</string>
    <string name="type.cuisine.balkan">Cozinha balcânica</string>
    <string name="type.cuisine.barbecue">Churrasco</string>
    <string name="type.cuisine.bavarian">Cozinha bávara</string>
@@ -230,7 +230,7 @@
    <string name="type.cuisine.brazilian">Cozinha brasileira</string>
    <string name="type.cuisine.breakfast">Café da manhã</string>
    <string name="type.cuisine.burger">Hambúrguer</string>
-    <string name="type.cuisine.buschenschank">Adega</string>
+    <string name="type.cuisine.buschenschank">Buschenschank</string>
    <string name="type.cuisine.cake">Bolo</string>
    <string name="type.cuisine.caribbean">Cozinha caribenha</string>
    <string name="type.cuisine.chicken">Frango</string>
@@ -240,7 +240,7 @@
    <string name="type.cuisine.croatian">Cozinha croata</string>
    <string name="type.cuisine.curry">Curry</string>
    <string name="type.cuisine.deli">Iguarias regionais</string>
-    <string name="type.cuisine.diner">Lanchonete</string>
+    <string name="type.cuisine.diner">Diner</string>
    <string name="type.cuisine.donut">Rosquinha</string>
    <string name="type.cuisine.ethiopian">Cozinha etíope</string>
    <string name="type.cuisine.filipino">Cozinha filipina</string>
@@ -253,7 +253,7 @@
    <string name="type.cuisine.german">Cozinha alemã</string>
    <string name="type.cuisine.greek">Cozinha grega</string>
    <string name="type.cuisine.grill">Grelhada</string>
-    <string name="type.cuisine.heuriger">Adega</string>
+    <string name="type.cuisine.heuriger">Heuriger</string>
    <string name="type.cuisine.hotdog">Cachorro-quente</string>
    <string name="type.cuisine.hungarian">Cozinha húngara</string>
    <string name="type.cuisine.ice_cream">Sorvete</string>
@@ -335,7 +335,7 @@
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.busway.tunnel">Túnel</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.construction">Via 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 para ciclistas</string>
@@ -383,6 +383,7 @@
    <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 para pedestres</string>
+    <string name="type.highway.pedestrian.square">Praça ou largo</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Túnel para pedestres</string>
    <string name="type.highway.primary">Estrada</string>
@@ -1122,7 +1123,7 @@
    <string name="type.man_made.survey_point">Marco geodésico</string>
    <string name="type.sport.badminton">Badmínton</string>
    <string name="type.sport.futsal">Futsal</string>
-    <string name="type.amenity.dojo">Dojo</string>
+    <string name="type.amenity.dojo">Dojô</string>
    <string name="type.leisure.resort">Resort</string>
    <string name="type.man_made.mast">Mastro</string>
    <string name="type.historic.memorial.stolperstein">Pedra memorial</string>
@@ -1172,8 +1173,8 @@
    <string name="type.amenity.parking">Estacionamento</string>
    <string name="type.barrier.chain">Corrente</string>
    <string name="type.craft">Artesanato</string>
-    <string name="type.craft.blacksmith">Serralheiro</string>
-    <string name="type.craft.metal_construction">Ferreiro</string>
+    <string name="type.craft.blacksmith">Ferreiro</string>
+    <string name="type.craft.metal_construction">Serralheiro (metal)</string>
    <string name="type.fee.yes">$</string>
    <string name="type.fee.no">Gratuito</string>
    <string name="type.highway.path">Caminho</string>
@@ -1369,17 +1370,21 @@
    <string name="type.railway.station.subway.qingdao">Estação de metrô</string>
    <string name="type.landuse.religious">Local religioso</string>
    <string name="type.natural.wetland.saltmarsh.tidal">Marisma</string>
-    <string name="type.natural.wetland.fen">Fen</string>
+    <string name="type.natural.wetland.fen">Pântano</string>
    <string name="type.natural.wetland.reedbed">Caniçal</string>
    <string name="type.natural.wetland.swamp">Pântano</string>
    <string name="type.natural.wetland.mangrove">Manguezal</string>
    <string name="type.natural.wetland.tidalflat">Planície de maré</string>
    <string name="type.natural.wetland.saltmarsh">Sapal</string>
-    <string name="type.leisure.escape_game">Escape Room</string>
+    <string name="type.leisure.escape_game">Sala de Fuga</string>
    <string name="type.amenity.luggage_locker">Armário guarda-volumes</string>
    <string name="type.amenity.bicycle_parking.covered">Bicicletário coberto</string>
    <string name="type.post_office.post_partner">Parceiro postal</string>
    <string name="type.amenity.ranger_station">Posto de guardas florestais</string>
    <string name="type.barrier.wicket_gate">Postigo</string>
    <string name="type.amenity.animal_shelter">Abrigo de animais</string>
+    <string name="type.building.guardhouse">Guarita</string>
+    <string name="type.office.security">Escritório de segurança privada</string>
+    <string name="type.power.portal">Portal de subestação</string>
+    <string name="type.shop.lighting">Loja de iluminação</string>
 </resources>
--- a/android/sdk/src/main/res/values-pt/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt/types_strings.xml
@@ -418,6 +418,7 @@
    <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.square">Praça ou largo</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Túnel</string>
    <string name="type.highway.primary">Estrada primária</string>
@@ -1394,4 +1395,8 @@
    <string name="type.natural.wetland.tidalflat">Planície de maré</string>
    <string name="type.amenity.animal_shelter">Abrigo Animal</string>
    <string name="type.barrier.wicket_gate">Postigo</string>
+    <string name="type.office.security">Escritório dos Guardas de Segurança</string>
+    <string name="type.building.guardhouse">Cabine de Segurança</string>
+    <string name="type.power.portal">Portal de Energia</string>
+    <string name="type.shop.lighting">Loja de Iluminação</string>
 </resources>
--- a/android/sdk/src/main/res/values-ro/strings.xml
+++ b/android/sdk/src/main/res/values-ro/strings.xml
@@ -24,4 +24,19 @@
    <string name="not_shared">Personal</string>
    <string name="access_rules_author_only">Modifică online</string>
    <string name="today">Azi</string>
+    <string name="yesterday">Ieri</string>
+    <string name="week_ago">Acum %s săptămână</string>
+    <string name="weeks_ago">Acum %s săptămâni</string>
+    <string name="month_ago">Acum %s lună</string>
+    <string name="months_ago">Acum %s luni</string>
+    <string name="year_ago">Acum %s an</string>
+    <string name="years_ago">Acum %s ani</string>
+    <string name="maps_storage_removable">Card SD</string>
+    <string name="maps_storage_external">Stocare externă partajată</string>
+    <string name="ft">ft</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="maps_storage_shared">Stocare internă partajată</string>
+    <string name="maps_storage_internal">Stocare internă privată</string>
+    <string name="days_ago">cu %s zile în urmă</string>
 </resources>
--- a/android/sdk/src/main/res/values-ro/types_strings.xml
+++ b/android/sdk/src/main/res/values-ro/types_strings.xml
@@ -23,8 +23,8 @@
    <string name="type.amenity.cafe">Cafenea</string>
    <string name="type.amenity.car_rental">Închiriere mașini</string>
    <string name="type.amenity.motorcycle_rental">Închiriere motociclete</string>
-    <string name="type.amenity.car_wash">Spălătorie auto</string>
-    <string name="type.amenity.casino">Divertisment</string>
+    <string name="type.amenity.car_wash">Spălătorie Auto</string>
+    <string name="type.amenity.casino">Casinou</string>
    <string name="type.amenity.gambling">Jocuri de noroc</string>
    <string name="type.leisure.adult_gaming_centre">Centru de jocuri pentru adulți</string>
    <string name="type.leisure.amusement_arcade">Arcadă</string>
@@ -129,7 +129,7 @@
    <string name="type.amenity.shelter.basic_hut">Baracă de Bivuac</string>
    <string name="type.amenity.public_bath">Baie publică</string>
    <string name="type.amenity.shower">Duș</string>
-    <string name="type.amenity.stripclub">Stripclub</string>
+    <string name="type.amenity.stripclub">Club de striptease</string>
    <string name="type.amenity.telephone">Telefon</string>
    <string name="type.amenity.theatre">Teatru</string>
    <string name="type.amenity.toilets">Toaletă</string>
@@ -138,7 +138,7 @@
    <string name="type.amenity.university">Universitate</string>
    <string name="type.amenity.vending_machine.cigarettes">Automat de țigări</string>
    <string name="type.amenity.vending_machine.drinks">Automat de băuturi</string>
-    <string name="type.amenity.vending_machine.parking_tickets">Parcomat</string>
+    <string name="type.amenity.vending_machine.parking_tickets">Parcometru</string>
    <string name="type.amenity.vending_machine.public_transport_tickets">Automat de vânzare a biletelor pentru transportul public</string>
    <string name="type.amenity.vehicle_inspection">Inspecția vehiculului</string>
    <string name="type.amenity.veterinary">Cabinet veterinar</string>
@@ -157,7 +157,7 @@
    <string name="type.barrier.gate">Poartă</string>
    <string name="type.barrier.kissing_gate">Poartă</string>
    <string name="type.barrier.lift_gate">Barieră cu braț</string>
-    <string name="type.barrier.stile">Barieră</string>
+    <string name="type.barrier.stile">Podiște</string>
    <string name="type.barrier.turnstile">Turnichet</string>
    <string name="type.barrier.swing_gate">Barieră cu braț</string>
    <string name="type.barrier.toll_booth">Cabină de taxare</string>
@@ -209,7 +209,7 @@
    <string name="type.cuisine.argentinian">Bucătărie argentiniană</string>
    <string name="type.cuisine.asian">Bucătărie asiatică</string>
    <string name="type.cuisine.austrian">Bucătărie austriacă</string>
-    <string name="type.cuisine.bagel">Bagel</string>
+    <string name="type.cuisine.bagel">Covrig</string>
    <string name="type.cuisine.balkan">Bucătărie balcanică</string>
    <string name="type.cuisine.barbecue">Grătar</string>
    <string name="type.cuisine.bavarian">Bucătărie bavareză</string>
@@ -227,8 +227,8 @@
    <string name="type.cuisine.crepe">Clătite</string>
    <string name="type.cuisine.croatian">Bucătărie croată</string>
    <string name="type.cuisine.curry">Curry</string>
-    <string name="type.cuisine.deli">Deli</string>
-    <string name="type.cuisine.diner">Diner</string>
+    <string name="type.cuisine.deli">Magazin de delicatese</string>
+    <string name="type.cuisine.diner">Bufet</string>
    <string name="type.cuisine.donut">Gogoși</string>
    <string name="type.cuisine.ethiopian">Bucătărie etiopiană</string>
    <string name="type.cuisine.filipino">Bucătărie filipineză</string>
@@ -278,7 +278,7 @@
    <string name="type.cuisine.sausage">Cârnați</string>
    <string name="type.cuisine.savory_pancakes">Clătite sărate</string>
    <string name="type.cuisine.seafood">Fructe de mare</string>
-    <string name="type.cuisine.soba">Soba</string>
+    <string name="type.cuisine.soba">Tăiței Soba</string>
    <string name="type.cuisine.spanish">Bucătărie spaniolă</string>
    <string name="type.cuisine.steak_house">Steakhouse</string>
    <string name="type.cuisine.sushi">Sushi</string>
@@ -370,9 +370,10 @@
    <string name="type.highway.pedestrian.area">Stradă</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Pod</string>
+    <string name="type.highway.pedestrian.square">Piață</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.pedestrian.tunnel">Tunel</string>
-    <string name="type.highway.primary">Stradă</string>
+    <string name="type.highway.pedestrian.tunnel">Tunel Pietonal</string>
+    <string name="type.highway.primary">Stradă Principală</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.primary.bridge">Pod</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
@@ -527,9 +528,9 @@
    <string name="type.landuse.forest.deciduous">Pădure</string>
    <string name="type.landuse.forest.mixed">Pădure</string>
    <string name="type.landuse.grass">Gazon</string>
-    <string name="type.landuse.landfill">Gunoiște</string>
-    <string name="type.landuse.railway">Instalații feroviare</string>
-    <string name="type.landuse.reservoir">Apă</string>
+    <string name="type.landuse.landfill">Groapă de gunoi</string>
+    <string name="type.landuse.railway">Domeniul feroviar</string>
+    <string name="type.landuse.reservoir">Bazin de acumulare</string>
    <string name="type.leisure.dog_park">Loc de plimbare a câinilor</string>
    <string name="type.leisure.fitness_centre">Centru fitness</string>
    <string name="type.leisure.fitness_station">Sală de fitness</string>
@@ -548,14 +549,14 @@
    <string name="type.leisure.pitch">Teren de sport</string>
    <string name="type.leisure.playground">Loc de joacă</string>
    <string name="type.leisure.sauna">Saună</string>
-    <string name="type.leisure.sports_centre">Sport</string>
-    <string name="type.sport.climbing">Centru cățărare</string>
+    <string name="type.leisure.sports_centre">Centru de Sporturi</string>
+    <string name="type.sport.climbing">Centru de cățărare</string>
    <string name="type.sport.yoga">Studio yoga</string>
    <string name="type.leisure.stadium">Stadion</string>
    <string name="type.leisure.swimming_pool">Piscină</string>
    <string name="type.leisure.swimming_pool.private">Piscină</string>
    <string name="type.leisure.water_park">Parc acvatic</string>
-    <string name="type.man_made.chimney">Coș de fabrică</string>
+    <string name="type.man_made.chimney">Coș de fum</string>
    <string name="type.man_made.lighthouse">Far</string>
    <string name="type.man_made.surveillance">Cameră de supraveghere</string>
    <string name="type.man_made.tower">Turn</string>
@@ -640,12 +641,12 @@
    <string name="type.place.city.capital.8">Municipiu</string>
    <string name="type.place.city.capital.9">Municipiu</string>
    <string name="type.place.continent">Continent</string>
-    <string name="type.place.country">Continent</string>
+    <string name="type.place.country">Țară</string>
    <string name="type.place.county">Județ</string>
    <string name="type.place.farm">Fermă</string>
    <string name="type.place.hamlet">Cătun</string>
    <string name="type.place.island">Insulă</string>
-    <string name="type.place.islet">Insult</string>
+    <string name="type.place.islet">Insuliță</string>
    <string name="type.place.isolated_dwelling">Locuință izolată</string>
    <string name="type.place.locality">Localitate</string>
    <!-- Named part of a city or town, bigger than place=neighbourhood and smaller than place=suburb (Wiki: https://wiki.openstreetmap.org/wiki/Tag:place%3Dquarter) -->
@@ -674,10 +675,10 @@
    <string name="type.power.plant.wind">Centrală eoliană</string>
    <string name="type.power.substation">Stație subterană</string>
    <!-- A tower or pylon carrying high voltage electricity cables. -->
-    <string name="type.power.tower">Stâlp de electricitate</string>
+    <string name="type.power.tower">Turn de linie electrică</string>
    <string name="type.railway.funicular">Funicular</string>
-    <string name="type.railway.halt">Gară</string>
-    <string name="type.railway.level_crossing">Trecere feroviară</string>
+    <string name="type.railway.halt">Haltă</string>
+    <string name="type.railway.level_crossing">Trecere la nivel cu calea ferată</string>
    <string name="type.railway.monorail">Cale ferată monoșină</string>
    <string name="type.railway.rail">Cale ferată</string>
    <string name="type.railway.rail.highspeed">Calea ferată de mare viteză</string>
@@ -827,32 +828,32 @@
    <string name="type.railway.station.subway.wuhan">Metrou</string>
    <string name="type.railway.station.subway.yerevan">Metrou</string>
    <string name="type.railway.station.subway.yokohama">Metrou</string>
-    <string name="type.railway.subway_entrance">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.adana">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.algiers">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.almaty">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.amsterdam">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.ankara">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.athens">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.baku">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.bangkok">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.barcelona">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.beijing">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.bengalore">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.berlin">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.bilbao">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.brasilia">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.brescia">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.brussels">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.bucharest">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.budapest">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.buenos_aires">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.bursa">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.cairo">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.caracas">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.catania">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.changchun">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.chengdu">Intrare în metro</string>
+    <string name="type.railway.subway_entrance">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.adana">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.algiers">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.almaty">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.amsterdam">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.ankara">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.athens">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.baku">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.bangkok">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.barcelona">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.beijing">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.bengalore">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.berlin">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.bilbao">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.brasilia">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.brescia">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.brussels">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.bucharest">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.budapest">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.buenos_aires">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.bursa">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.cairo">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.caracas">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.catania">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.changchun">Intrare în metrou</string>
+    <string name="type.railway.subway_entrance.chengdu">Intrare în metrou</string>
    <string name="type.railway.subway_entrance.chicago">Intrare în metro</string>
    <string name="type.railway.subway_entrance.chongqing">Intrare în metro</string>
    <string name="type.railway.subway_entrance.dalian">Intrare în metro</string>
@@ -882,7 +883,7 @@
    <string name="type.railway.subway_entrance.lille">Intrare în metro</string>
    <string name="type.railway.subway_entrance.lima">Intrare în metro</string>
    <string name="type.railway.subway_entrance.lisboa">Intrare în metro</string>
-    <string name="type.railway.subway_entrance.london">Intrare în metro</string>
+    <string name="type.railway.subway_entrance.london">Intrare la stația de metrou</string>
    <string name="type.railway.subway_entrance.lyon">Intrare în metro</string>
    <string name="type.railway.subway_entrance.madrid">Intrare în metro</string>
    <string name="type.railway.subway_entrance.malaga">Intrare în metro</string>
@@ -957,8 +958,8 @@
    <string name="type.shop.car_parts">Piese auto</string>
    <string name="type.shop.car_repair">Atelier de reparații auto</string>
    <string name="type.shop.car_repair.tyres">Vulcanizare</string>
-    <string name="type.shop.carpet">Covoare</string>
-    <string name="type.shop.chemist">Mercerie</string>
+    <string name="type.shop.carpet">Magazin de Covoare</string>
+    <string name="type.shop.chemist">Farmacie</string>
    <string name="type.shop.chocolate">Magazin de ciocolată</string>
    <string name="type.shop.clothes">Magazin de haine</string>
    <string name="type.shop.coffee">Magazin de cafea</string>
@@ -966,13 +967,13 @@
    <string name="type.shop.confectionery">Cofetărie</string>
    <string name="type.shop.convenience">Magazin mixt</string>
    <string name="type.shop.copyshop">Centru copiere</string>
-    <string name="type.shop.cosmetics">Cosmetică</string>
-    <string name="type.shop.curtain">Perdele</string>
+    <string name="type.shop.cosmetics">Magazin de Cosmetică</string>
+    <string name="type.shop.curtain">Magazin de Perdele</string>
    <string name="type.shop.deli">Magazin de delicatese</string>
    <string name="type.shop.department_store">Magazin universal</string>
    <string name="type.shop.doityourself">Magazin de bricolaj</string>
    <string name="type.shop.dry_cleaning">Curățătorie chimică</string>
-    <string name="type.shop.electronics">Electronice</string>
+    <string name="type.shop.electronics">Magazin de Electronice</string>
    <string name="type.shop.erotic">Magazin erotic</string>
    <string name="type.shop.fabric">Magazin de țesături</string>
    <string name="type.shop.farm">Magazin alimentar la fermă</string>
@@ -980,10 +981,10 @@
    <string name="type.shop.florist">Florărie</string>
    <string name="type.shop.funeral_directors">Pompe funebre</string>
    <string name="type.shop.furniture">Magazin de mobilă</string>
-    <string name="type.shop.garden_centre">Pepinieră</string>
-    <string name="type.shop.gas">Magazin de gaze</string>
+    <string name="type.shop.garden_centre">Magazin de grădinărit</string>
+    <string name="type.shop.gas">Magazin de carburanți</string>
    <string name="type.shop.gift">Magazin de suveniruri</string>
-    <string name="type.shop.greengrocer">Băcănie</string>
+    <string name="type.shop.greengrocer">Aprozar</string>
    <string name="type.shop.grocery">Băcănie</string>
    <string name="type.shop.hairdresser">Coafor</string>
    <string name="type.shop.hardware">Magazin de hardware</string>
@@ -1085,9 +1086,9 @@
    <string name="type.sport.volleyball">Volei</string>
    <string name="type.sport.10pin">Bowling</string>
    <string name="type.sport.9pin">Bowling</string>
-    <string name="type.sport.padel">Padel</string>
-    <string name="type.sport.futsal">Futsal</string>
-    <string name="type.sport.ice_hockey">Hochei pe gheata</string>
+    <string name="type.sport.padel">Club de padel</string>
+    <string name="type.sport.futsal">Teren de futsal</string>
+    <string name="type.sport.ice_hockey">Hochei pe gheață</string>
    <string name="type.sport.field_hockey">Hochei pe iarbă</string>
    <string name="type.sport.badminton">Badminton</string>
    <string name="type.sport.pelota">Pilota bascilor</string>
@@ -1095,11 +1096,11 @@
    <!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
    <string name="type.tourism.alpine_hut">Cabana de munte</string>
    <string name="type.tourism.apartment">Apartament de vacanță</string>
-    <string name="type.tourism.artwork">Turism</string>
-    <string name="type.tourism.artwork.architecture">Turism</string>
-    <string name="type.tourism.artwork.painting">Turism</string>
-    <string name="type.tourism.artwork.sculpture">Turism</string>
-    <string name="type.tourism.artwork.statue">Turism</string>
+    <string name="type.tourism.artwork">Operă de artă</string>
+    <string name="type.tourism.artwork.architecture">Operă de artă arhitecturală</string>
+    <string name="type.tourism.artwork.painting">Pictură</string>
+    <string name="type.tourism.artwork.sculpture">Sculptură</string>
+    <string name="type.tourism.artwork.statue">Statuie</string>
    <string name="type.tourism.attraction">Punct de atracție</string>
    <string name="type.attraction.amusement_ride">Călătorie de distracție</string>
    <string name="type.attraction.animal">Incintă pentru animale</string>
@@ -1109,7 +1110,7 @@
    <string name="type.attraction.roller_coaster">Rollercoaster</string>
    <string name="type.attraction.water_slide">Tobogan de apă</string>
    <string name="type.tourism.attraction.specified">Punct de atracție</string>
-    <string name="type.tourism.caravan_site">Teren pentru campare</string>
+    <string name="type.tourism.caravan_site">Teren pentru campare cu rulota</string>
    <!-- A rentable countryside vacation house. -->
    <string name="type.tourism.chalet">Cabană de vacanță</string>
    <string name="type.tourism.gallery">Galerie</string>
@@ -1141,11 +1142,11 @@
    <string name="type.waterway.stream.intermittent">Pârâu</string>
    <string name="type.waterway.stream.tunnel">Pârâu</string>
    <string name="type.waterway.waterfall">Cascadă</string>
-    <string name="type.wheelchair.limited">Parțial utilat pentru invalizi</string>
+    <string name="type.wheelchair.limited">Acces limitat pentru persoanele în scaun rulant</string>
    <string name="type.wheelchair.no">Nu este utilat pentru invalizi</string>
    <string name="type.wheelchair.yes">Utilat pentru invalizi</string>
-    <string name="type.piste_type.snow_park">Snow Park</string>
-    <string name="type.piste_type.hike">Zăpadă Hiking Trail</string>
+    <string name="type.piste_type.snow_park">Parc de iarnă</string>
+    <string name="type.piste_type.hike">Traseu montan de iarnă</string>
    <string name="type.piste_type.connection">Conexiune Piste</string>
    <string name="type.piste_type.skitour">Traseul Skitour</string>
    <string name="type.amenity.events_venue">Locul de desfășurare a evenimentelor</string>
@@ -1160,8 +1161,224 @@
    <!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
    <string name="type.emergency.emergency_ward_entrance">Intrarea secției de urgență</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->
-    <string name="type.amenity.dojo">Dojo</string>
+    <string name="type.amenity.dojo">Sală de arte marțiale</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
    <string name="type.leisure.sports_hall">Sală de sport</string>
    <string name="type.man_made.silo">Siloz</string>
+    <string name="type.aerialway">Teleferic</string>
+    <string name="type.aerialway.cable_car">Telecabină</string>
+    <string name="type.aerialway.chair_lift">Telescaun</string>
+    <string name="type.aerialway.drag_lift">Teleschi</string>
+    <string name="type.aerialway.gondola">Gondolă</string>
+    <string name="type.aerialway.mixed_lift">Transport pe cablu mixt</string>
+    <string name="type.aeroway">Infrastructura spațiului aerian</string>
+    <string name="type.aeroway.apron">Parcare aeronave</string>
+    <string name="type.aeroway.gate">Poartă</string>
+    <string name="type.aeroway.runway">Pistă</string>
+    <string name="type.aeroway.taxiway">Cale de rulare</string>
+    <string name="type.aeroway.terminal">Terminal</string>
+    <string name="type.amenity.bar">Bară</string>
+    <string name="type.amenity.bicycle_parking.covered">Parcare acoperită pentru biciclete</string>
+    <string name="type.amenity.love_hotel">Hotel cu ora</string>
+    <string name="type.amenity.studio">Garsonieră</string>
+    <string name="type.amenity.bicycle_repair_station">Stație de Reparații Biciclete</string>
+    <string name="type.amenity.car_sharing">Utilizare comună a mașinii</string>
+    <string name="type.amenity.dentist">Dentist</string>
+    <string name="type.office.security">Biroul agenților de securitate</string>
+    <string name="type.building.guardhouse">Cabină de pază</string>
+    <string name="type.power.portal">Stație de distribuție</string>
+    <string name="type.amenity.food_court">Food Court</string>
+    <string name="type.amenity.luggage_locker">Dulap pentru Bagaje</string>
+    <string name="type.amenity.internet_cafe">Internet Cafe</string>
+    <string name="type.post_office.post_partner">Partener de publicare</string>
+    <string name="type.amenity.animal_shelter">Adăpost pentru Animale</string>
+    <string name="type.barrier.guard_rail">Barieră de protecție</string>
+    <string name="type.amenity.cinema">Cinematograf</string>
+    <string name="type.amenity.pub">Pub</string>
+    <string name="type.highway.elevator">Lift</string>
+    <string name="type.railway">Cale ferată</string>
+    <string name="type.natural.water.drain">Scurgere</string>
+    <string name="type.recycling.cardboard">Carton</string>
+    <string name="type.recycling.cans">Doze</string>
+    <string name="type.recycling.shoes">Papuci</string>
+    <string name="type.recycling.green_waste">Deșeuri organice / Verzi</string>
+    <string name="type.recycling.cartons">Cartoane</string>
+    <string name="type.amenity.shelter.lean_to">Adăpost de tip „lean-to”</string>
+    <string name="type.amenity.taxi">Stație de taxiuri</string>
+    <string name="type.amenity.vending_machine">Automat</string>
+    <string name="type.amenity.vending_machine.coffee">Automat de cafea</string>
+    <string name="type.amenity.vending_machine.condoms">Automat de prezervative</string>
+    <string name="type.amenity.vending_machine.food">Automat de mâncare</string>
+    <string name="type.amenity.vending_machine.newspapers">Automat de ziare</string>
+    <string name="type.amenity.vending_machine.sweets">Automat de dulciuri</string>
+    <string name="type.amenity.parcel_locker">Locker pentru colete</string>
+    <string name="type.amenity.vending_machine.fuel">Pompă de combustibil</string>
+    <string name="type.amenity.waste_transfer_station">Stație de transfer a deșeurilor</string>
+    <string name="type.barrier">Barieră</string>
+    <string name="type.barrier.yes">Barieră</string>
+    <string name="type.barrier.wicket_gate">Poartă secundară</string>
+    <string name="type.barrier.cycle_barrier">Barieră pentru biciclete</string>
+    <string name="type.barrier.fence">Gard</string>
+    <string name="type.barrier.hedge">Gard viu</string>
+    <string name="type.barrier.retaining_wall">Zid de sprijin</string>
+    <string name="type.boundary">Graniță</string>
+    <string name="type.boundary.administrative.2">Frontieră</string>
+    <string name="type.boundary.administrative.3">Graniță Regională</string>
+    <string name="type.boundary.administrative.4">Graniță Regională</string>
+    <string name="type.building.warehouse">Depozit</string>
+    <string name="type.emergency">Urgență</string>
+    <string name="type.highway">Autostradă</string>
+    <string name="type.highway.bridleway">Potecă de cai</string>
+    <string name="type.highway.bridleway.permissive">Potecă de cai</string>
+    <string name="type.highway.cycleway">Pistă de Biciclete</string>
+    <string name="type.highway.cycleway.permissive">Pistă de Biciclete</string>
+    <string name="type.man_made.works">Întreprinderi industriale</string>
+    <string name="type.military">Militară</string>
+    <string name="type.power">Curent</string>
+    <string name="type.power.line.underground">Linie electrică subterană</string>
+    <string name="type.power.minor_line">Linie electrică de mică tensiune</string>
+    <string name="type.public_transport">Transport Public</string>
+    <string name="type.waterway.dock">Doc pe o cale navigabilă</string>
+    <string name="type.highway.ladder">Scară</string>
+    <string name="type.junction">Nod rutier</string>
+    <string name="type.junction.circular">Sens Giratoriu</string>
+    <string name="type.junction.roundabout">Sens Giratoriu</string>
+    <string name="type.landuse">Utilizarea terenului</string>
+    <string name="type.landuse.allotments">Loturi de pământ</string>
+    <string name="type.landuse.plant_nursery">Pepinieră</string>
+    <string name="type.leisure.escape_game">Escape Room</string>
+    <string name="type.landuse.brownfield">Zone industriale dezmembrate</string>
+    <string name="type.landuse.religious">Teren religios</string>
+    <string name="type.landuse.commercial">Zonă Comercială</string>
+    <string name="type.landuse.construction">Șantier de construcții</string>
+    <string name="type.landuse.education">Instituție de învățământ</string>
+    <string name="type.landuse.farmyard">Fermă</string>
+    <string name="type.landuse.garages">Garaje</string>
+    <string name="type.landuse.greenhouse_horticulture">Seră</string>
+    <string name="type.landuse.industrial">Zonă Industrială</string>
+    <string name="type.landuse.meadow">Pajiște</string>
+    <string name="type.landuse.military">Zonă Militară</string>
+    <string name="type.landuse.orchard">Livadă</string>
+    <string name="type.landuse.greenfield">Teren viran</string>
+    <string name="type.landuse.quarry">Carieră</string>
+    <string name="type.landuse.recreation_ground">Teren de recreere</string>
+    <string name="type.landuse.residential">Zonă Rezidențială</string>
+    <string name="type.landuse.retail">Zonă Comercială</string>
+    <string name="type.landuse.salt_pond">Bazin de sare</string>
+    <string name="type.leisure">Timp liber</string>
+    <string name="type.leisure.common">Domeniu public</string>
+    <string name="type.leisure.firepit">Grătar fix</string>
+    <string name="type.leisure.hackerspace">Atelier Comunitar</string>
+    <string name="type.leisure.ice_rink">Patinoar</string>
+    <string name="type.leisure.marina">Marină</string>
+    <string name="type.leisure.recreation_ground">Teren de recreere</string>
+    <string name="type.leisure.slipway">Cală de lansare</string>
+    <string name="type.leisure.track">Pistă de atletism</string>
+    <string name="type.leisure.track.area">Pistă de atletism</string>
+    <string name="type.leisure.beach_resort">Stațiune balneară</string>
+    <string name="type.man_made">Artificial</string>
+    <string name="type.man_made.breakwater">Dig</string>
+    <string name="type.man_made.cairn">Morman de pietre</string>
+    <string name="type.man_made.cutline">Secțiune</string>
+    <string name="type.man_made.survey_point">Punct topografic</string>
+    <string name="type.man_made.flagpole">Catarg</string>
+    <string name="type.man_made.crane">Macara</string>
+    <string name="type.man_made.mast">Stâlp</string>
+    <string name="type.man_made.pier">Chei</string>
+    <string name="type.man_made.pipeline">Conductă</string>
+    <string name="type.man_made.pipeline.overground">Conductă supraterană</string>
+    <string name="type.man_made.storage_tank">Rezervor</string>
+    <string name="type.man_made.wastewater_plant">Stație de epurare a apelor uzate</string>
+    <string name="type.natural.wetland.saltmarsh">Mlaștină sărată</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Mlaștină sărată de maree</string>
+    <string name="type.natural.wetland.fen">Pajiște mlăștinoasă</string>
+    <string name="type.natural.wetland.reedbed">Stufăriș</string>
+    <string name="type.natural.wetland.swamp">Mlaștină</string>
+    <string name="type.natural.wetland.mangrove">Pădure de mangrove</string>
+    <string name="type.natural.wetland.tidalflat">Șes de maree</string>
+    <string name="type.natural.desert">Deșert</string>
+    <string name="type.noexit">Fundătură</string>
+    <string name="type.power.generator">Generator de Curent</string>
+    <string name="type.power.line">Linie electrică</string>
+    <string name="type.power.pole">Stâlp de electricitate</string>
+    <string name="type.public_transport.platform">Platformă</string>
+    <string name="type.railway.abandoned">Linie moartă</string>
+    <string name="type.railway.abandoned.bridge">Pod de cale ferată abandonat</string>
+    <string name="type.railway.abandoned.tunnel">Tunel de cale ferată abandonat</string>
+    <string name="type.railway.construction">Construcții Feroviare</string>
+    <string name="type.railway.crossing">Trecere la nivel cu calea ferată</string>
+    <string name="type.railway.disused">Cale ferată abandonată</string>
+    <string name="type.railway.funicular.bridge">Pod Funicular</string>
+    <string name="type.railway.funicular.tunnel">Tunel Funicular</string>
+    <string name="type.railway.station.subway.qingdao">Stație de Metrou</string>
+    <string name="type.sport.diving">Scufundări de la înălțime</string>
+    <string name="type.amenity.ranger_station">Cabana Pădurarului</string>
+    <string name="type.piste_type.downhill">Pistă de schi alpin</string>
+    <string name="type.piste_type.downhill.area">Pistă de schi alpin</string>
+    <string name="type.piste_type.downhill.advanced.area">Pârtie avansată de schi alpin</string>
+    <string name="type.piste_type.downhill.easy">Pârtie ușoară de schi alpin</string>
+    <string name="type.piste_type.downhill.easy.area">Pârtie ușoară de schi alpin</string>
+    <string name="type.piste_type.downhill.expert">Pârtie expert de schi alpin</string>
+    <string name="type.piste_type.downhill.expert.area">Pârtie expert de schi alpin</string>
+    <string name="type.piste_type.downhill.intermediate">Pârtie de schi medie</string>
+    <string name="type.piste_type.downhill.intermediate.area">Pârtie de schi medie</string>
+    <string name="type.piste_type.downhill.novice">Pârtie de schi începători</string>
+    <string name="type.aerialway.rope_tow">Târâtoare cu funie</string>
+    <string name="type.aerialway.t.bar">Teleschi cu bară</string>
+    <string name="type.waterway.weir">Deversor</string>
+    <string name="type.wheelchair">Scaun rulant</string>
+    <string name="type.aerialway.j.bar">Teleschi cu dispozitiv de tragere tip J</string>
+    <string name="type.aerialway.magic_carpet">Bandă transportoare</string>
+    <string name="type.aerialway.platter">Teleschi cu disc</string>
+    <string name="type.traffic_calming.bump">Denivelare de reducere a vitezei</string>
+    <string name="type.traffic_calming.hump">Denivelare de reducere a vitezei</string>
+    <string name="type.traffic_calming">Domolirea traficului</string>
+    <string name="type.waterway">Cale navigabilă</string>
+    <string name="type.waterway.canal">Canal</string>
+    <string name="type.waterway.canal.tunnel">Tunel de canal</string>
+    <string name="type.barrier.ditch">Șanț</string>
+    <string name="type.waterway.drain">Scurgere</string>
+    <string name="type.piste_type.sled.area">Pistă pentru sanie</string>
+    <string name="type.piste_type.nordic">Traseu de schi fond</string>
+    <string name="type.piste_type.sled">Pistă pentru sanie</string>
+    <string name="type.piste_type.downhill.novice.area">Pârtie de schi începători</string>
+    <string name="type.area_highway.cycleway">Pistă de Biciclete</string>
+    <string name="type.amenity.vending_machine.excrement_bags">Distribuitor de saci pentru excremente</string>
+    <string name="type.landuse.village_green">Pământ</string>
+    <string name="type.boundary.administrative">Frontieră</string>
+    <string name="type.amenity.sanitary_dump_station">Stație de evacuare a apelor uzate</string>
+    <string name="type.piste_type.downhill.advanced">Pârtie avansată de schi alpin</string>
+    <string name="type.barrier.wall">Perete</string>
+    <string name="type.piste_type.downhill.freeride">Pârtie de schi alpin liber</string>
+    <string name="type.organic.only">Organic</string>
+    <string name="type.organic.yes">Organic</string>
+    <string name="type.man_made.utility_pole">Stâlp de utilități</string>
+    <string name="type.railway.tram">Linie de Tramvai</string>
+    <string name="type.railway.subway">Linie de metrou</string>
+    <string name="type.railway.narrow_gauge.bridge">Pod feroviar cu ecartament îngust</string>
+    <string name="type.railway.light_rail">Transport urban pe șine</string>
+    <string name="type.railway.light_rail.bridge">Pod tramvai</string>
+    <string name="type.railway.light_rail.tunnel">Tunel tramvai</string>
+    <string name="type.railway.monorail.bridge">Pod Cale ferată monoșină</string>
+    <string name="type.railway.monorail.tunnel">Tunel Cale ferată monoșină</string>
+    <string name="type.railway.narrow_gauge">Cale ferată cu ecartament îngust</string>
+    <string name="type.railway.narrow_gauge.tunnel">Tunel Cale ferată cu ecartament îngust</string>
+    <string name="type.railway.platform">Peron</string>
+    <string name="type.railway.preserved">Linie feroviară istorică</string>
+    <string name="type.railway.preserved.bridge">Pod Linie feroviară istorică</string>
+    <string name="type.railway.preserved.tunnel">Tunel Linie feroviară istorică</string>
+    <string name="type.railway.subway.bridge">Pod Linie de metrou</string>
+    <string name="type.railway.subway.tunnel">Tunel Linie de metrou</string>
+    <string name="type.railway.tram.bridge">Pod Linie de Tramvai</string>
+    <string name="type.railway.tram.tunnel">Tunel Linie de Tramvai</string>
+    <string name="type.route.ferry">Feribot</string>
+    <string name="type.shop.caravan">Dealer auto de rulote</string>
+    <string name="type.sport.bowls">Bowling</string>
+    <string name="type.sport.cricket">Cricket</string>
+    <string name="type.tourism">Turism</string>
+    <string name="type.attraction.bumper_car">Mașinuțe de distracții</string>
+    <string name="type.attraction.big_wheel">Roată panoramică</string>
+    <string name="type.tourism.camp_site">Loc de campare</string>
+    <string name="type.shop.lighting">Magazin de corpuri de iluminat</string>
+    <string name="type.tourism.hostel">Hostel</string>
 </resources>
--- a/android/sdk/src/main/res/values-ru/types_strings.xml
+++ b/android/sdk/src/main/res/values-ru/types_strings.xml
@@ -437,6 +437,7 @@
    <string name="type.highway.pedestrian.area">Пешеходная зона</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Пешеходный мост</string>
+    <string name="type.highway.pedestrian.square">Площадь</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Пешеходный тоннель</string>
    <string name="type.highway.primary">Шоссе</string>
@@ -1228,6 +1229,7 @@
    <string name="type.shop.trade">Торговые поставки</string>
    <string name="type.shop.watches">Часы</string>
    <string name="type.shop.wholesale">Оптовый магазин</string>
+    <string name="type.shop.lighting">Осветительные приборы</string>
    <string name="type.sport">Спорт</string>
    <string name="type.sport.american_football">Американский футбол</string>
    <string name="type.sport.archery">Стрельба из лука</string>
@@ -1389,9 +1391,12 @@
    <string name="type.man_made.crane">Кран</string>
    <string name="type.landuse.religious">Церковный двор</string>
    <string name="type.railway.station.subway.qingdao">Станция метро</string>
-    <string name="type.amenity.ranger_station">Пост лесников</string>
+    <string name="type.amenity.ranger_station">Пост рейнджеров</string>
    <string name="type.amenity.luggage_locker">Камера хранения</string>
    <string name="type.amenity.bicycle_parking.covered">Крытая велосипедная парковка</string>
    <string name="type.post_office.post_partner">Почтовое отделение</string>
    <string name="type.leisure.escape_game">Квест-комната</string>
+    <string name="type.office.security">Офис охранника</string>
+    <string name="type.building.guardhouse">Будка безопасности</string>
+    <string name="type.power.portal">Портальная опора</string>
 </resources>
--- a/android/sdk/src/main/res/values-sk/strings.xml
+++ b/android/sdk/src/main/res/values-sk/strings.xml
@@ -34,4 +34,5 @@
    <string name="not_shared">Súkromné</string>
    <string name="access_rules_author_only">Online úprava</string>
    <string name="today">Dnes</string>
+    <string name="mb">MB</string>
 </resources>
--- a/android/sdk/src/main/res/values-sk/types_strings.xml
+++ b/android/sdk/src/main/res/values-sk/types_strings.xml
@@ -425,6 +425,8 @@
    <string name="type.highway.pedestrian.area">Pešia zóna</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Most pre chodcov</string>
+
+    <string name="type.highway.pedestrian.square">Námestie</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Tunel pre chodcov</string>
    <string name="type.highway.primary">Cesta I. triedy</string>
--- a/android/sdk/src/main/res/values-sl/strings.xml
+++ b/android/sdk/src/main/res/values-sl/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="core_my_position">Moj položaj</string>
+    <string name="core_my_places">Moji kraji</string>
+</resources>
--- a/android/sdk/src/main/res/values-sl/types_strings.xml
+++ b/android/sdk/src/main/res/values-sl/types_strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="type.addr_interpolation.odd">Naslov/blok</string>
+    <string name="type.aerialway">Žičnica</string>
+</resources>
--- a/android/sdk/src/main/res/values-sr/types_strings.xml
+++ b/android/sdk/src/main/res/values-sr/types_strings.xml
@@ -434,6 +434,7 @@
    <string name="type.highway.pedestrian.area">Пешачка зона</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Пешачки мост</string>
+    <string name="type.highway.pedestrian.square">Трг</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Пешачки тунел</string>
    <string name="type.highway.primary">Пут прве класе</string>
@@ -646,7 +647,7 @@
    <string name="type.leisure.sauna">Сауна</string>
    <string name="type.leisure.slipway">Навоз</string>
    <string name="type.leisure.sports_centre">Спортски центар</string>
-    <string name="type.sport.climbing">Зид за пењање</string>
+    <string name="type.sport.climbing">Вештачка стена</string>
    <string name="type.sport.yoga">Јога студио</string>
    <string name="type.leisure.stadium">Стадион</string>
    <string name="type.leisure.swimming_pool">Базен</string>
@@ -675,7 +676,7 @@
    <!-- A regular telecommunications tower / mast. -->
    <string name="type.man_made.tower.communication">Телекомуникациони торањ</string>
    <!-- A deep hole drilled into the earth to extract oil or gas. -->
-    <string name="type.man_made.petroleum_well">Naftna ili gasna bušotina</string>
+    <string name="type.man_made.petroleum_well">Нафтна или гасна бушотина</string>
    <!-- A tower/mast constructed to burn off excess gas. -->
    <string name="type.man_made.flare">Газни факел</string>
    <string name="type.man_made.wastewater_plant">Пречишћивач отпадних вода</string>
@@ -1370,12 +1371,12 @@
    <string name="type.railway.funicular.tunnel">Тунел успињаче</string>
    <string name="type.railway.narrow_gauge.tunnel">Тунел уског колосека</string>
    <string name="type.sport.diving">Слободни скокови</string>
-    <string name="type.amenity.love_hotel">Ljubavni hotel</string>
-    <string name="type.leisure.firepit">Ognjište</string>
+    <string name="type.amenity.love_hotel">Љубавни хотел</string>
+    <string name="type.leisure.firepit">Огњиште</string>
    <string name="type.landuse.plant_nursery">Расадник</string>
    <string name="type.barrier.guard_rail">Заштитна ограда</string>
    <string name="type.amenity.studio">Студио</string>
-    <string name="type.highway.ladder">Merdevine</string>
+    <string name="type.highway.ladder">Мердевине</string>
    <string name="type.man_made.crane">Кран</string>
    <string name="type.railway.station.subway.qingdao">Метро станица</string>
    <string name="type.landuse.religious">Верско земљиште</string>
@@ -1390,7 +1391,11 @@
    <string name="type.post_office.post_partner">Поштански партнер</string>
    <string name="type.amenity.bicycle_parking.covered">Покривени паркинг за бицикле</string>
    <string name="type.amenity.ranger_station">Станица за ренџер</string>
-    <string name="type.leisure.escape_game">Escape Room</string>
+    <string name="type.leisure.escape_game">Соба за бекство (Escape Room)</string>
    <string name="type.barrier.wicket_gate">Вратница</string>
    <string name="type.amenity.animal_shelter">Волонтирајте и побољшајте CoMaps</string>
+    <string name="type.office.security">Канцеларија обезбеђења</string>
+    <string name="type.building.guardhouse">Кућица обезбеђења</string>
+    <string name="type.power.portal">Носач електричних водова</string>
+    <string name="type.shop.lighting">Продавница расвете</string>
 </resources>
--- a/android/sdk/src/main/res/values-sv/strings.xml
+++ b/android/sdk/src/main/res/values-sv/strings.xml
@@ -16,7 +16,7 @@
    <!-- A unit of measure -->
    <string name="ft">fot</string>
    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Avsluta</string>
+    <string name="core_exit">Utgång</string>
    <string name="core_entrance">Ingång</string>
    <string name="subway_data_unavailable">Tunnelbanekartan är otillgänglig</string>
    <string name="public_access">Allmän åtkomst</string>
@@ -31,4 +31,12 @@
    <string name="gb">GB</string>
    <string name="mb">MB</string>
    <string name="today">Idag</string>
+    <string name="yesterday">Igår</string>
+    <string name="days_ago">för %s dagar sedan</string>
+    <string name="week_ago">för %s vecka sedan</string>
+    <string name="weeks_ago">för %s veckor sedan</string>
+    <string name="month_ago">för %s månad sedan</string>
+    <string name="months_ago">för %s månader sedan</string>
+    <string name="year_ago">för %s år sedan</string>
+    <string name="years_ago">för %s år sedan</string>
 </resources>
--- a/android/sdk/src/main/res/values-sv/types_strings.xml
+++ b/android/sdk/src/main/res/values-sv/types_strings.xml
@@ -373,6 +373,7 @@
    <string name="type.highway.pedestrian.area">Gata</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Bro</string>
+    <string name="type.highway.pedestrian.square">Torg</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Tunnel</string>
    <string name="type.highway.primary">Gata</string>
@@ -1356,4 +1357,5 @@
    <string name="type.sport.diving">Höghöjdsdykning</string>
    <string name="type.amenity.love_hotel">Kärlekshotell</string>
    <string name="type.tourism.zoo.petting">Djurpark för barn</string>
+    <string name="type.amenity.bicycle_parking.covered">Cykelparkering under tak</string>
 </resources>
--- a/android/sdk/src/main/res/values-sw/types_strings.xml
+++ b/android/sdk/src/main/res/values-sw/types_strings.xml
@@ -168,6 +168,8 @@
    <string name="type.highway.path.tunnel">Mtaro</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Daraja</string>
+
+    <string name="type.highway.pedestrian.square">Nafasi</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Mtaro</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
--- a/android/sdk/src/main/res/values-ta/types_strings.xml
+++ b/android/sdk/src/main/res/values-ta/types_strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="type.aeroway.aerodrome">விமான நிலையம்</string>
+    <string name="type.addr_interpolation.odd">முகவரி/சாலைத் தொகுதி</string>
+    <string name="type.aerialway">கம்பிப் போக்குவரத்து</string>
+    <string name="type.aeroway.gate">கேட்</string>
+    <string name="type.amenity.language_school">மொழி பள்ளிக்கூடம்</string>
+    <string name="type.amenity.place_of_worship.christian">தேவாலயம்</string>
+    <string name="type.addr_interpolation">முகவரி/சாலைத் தொகுதி</string>
+    <string name="type.addr_interpolation.even">முகவரி/சாலைத் தொகுதி</string>
+    <string name="type.amenity.music_school">இசை பள்ளிக்கூடம்</string>
+</resources>
--- a/android/sdk/src/main/res/values-th/types_strings.xml
+++ b/android/sdk/src/main/res/values-th/types_strings.xml
@@ -379,6 +379,8 @@
    <string name="type.highway.pedestrian.area">ถนน</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">สะพาน</string>
+
+    <string name="type.highway.pedestrian.square">ช่องว่าง</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">อุโมงค์</string>
    <string name="type.highway.primary">ถนน</string>
--- a/android/sdk/src/main/res/values-tr/strings.xml
+++ b/android/sdk/src/main/res/values-tr/strings.xml
@@ -37,4 +37,12 @@
    <string name="access_rules_author_only">Çevrimiçi düzenleme</string>
    <string name="gb">GB</string>
    <string name="today">Bugün</string>
+    <string name="yesterday">Dün</string>
+    <string name="days_ago">%s gün önce</string>
+    <string name="week_ago">%s hafta önce</string>
+    <string name="weeks_ago">%s hafta önce</string>
+    <string name="month_ago">%s ay önce</string>
+    <string name="months_ago">%s ay önce</string>
+    <string name="year_ago">%s yıl önce</string>
+    <string name="years_ago">%s yıl önce</string>
 </resources>
--- a/android/sdk/src/main/res/values-tr/types_strings.xml
+++ b/android/sdk/src/main/res/values-tr/types_strings.xml
@@ -10,7 +10,7 @@
    <string name="type.aerialway.drag_lift">Kayak Teleferiği</string>
    <string name="type.aerialway.gondola">Telekabin</string>
    <string name="type.aerialway.mixed_lift">Karışık Teleferik</string>
-    <string name="type.aerialway.station">Havayolu İstasyonu</string>
+    <string name="type.aerialway.station">Teleferik İstasyonu</string>
    <string name="type.aeroway">Hava Sahası Altyapısı</string>
    <string name="type.aeroway.aerodrome">Havaalanı</string>
    <string name="type.aeroway.aerodrome.international">Uluslararası Havalimanı</string>
@@ -427,6 +427,7 @@
    <string name="type.highway.pedestrian.area">Yaya Alanı</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Yaya Köprüsü</string>
+    <string name="type.highway.pedestrian.square">Meydan</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Yaya Tüneli</string>
    <string name="type.highway.primary">Ana Yol</string>
@@ -1382,4 +1383,11 @@
    <string name="type.natural.wetland.swamp">Bataklık</string>
    <string name="type.railway.station.subway.qingdao">Metro İstasyonu</string>
    <string name="type.attraction.big_wheel">Dönme Dolap</string>
+    <string name="type.office.security">Güvenlik Görevlisi Ofisi</string>
+    <string name="type.building.guardhouse">Güvenlik Kulübesi</string>
+    <string name="type.power.portal">Elektrik Portalı</string>
+    <string name="type.amenity.luggage_locker">Emanet Eşya Dolabı</string>
+    <string name="type.post_office.post_partner">Posta Ortağı</string>
+    <string name="type.amenity.animal_shelter">Hayvan Barınağı</string>
+    <string name="type.barrier.wicket_gate">Tel Örgü Kapısı</string>
 </resources>
--- a/android/sdk/src/main/res/values-uk/types_strings.xml
+++ b/android/sdk/src/main/res/values-uk/types_strings.xml
@@ -432,6 +432,8 @@
    <string name="type.highway.pedestrian.area">Пішохідна зона</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Міст</string>
+
+    <string name="type.highway.pedestrian.square">Площа</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Тунель</string>
    <string name="type.highway.primary">Шосе</string>
--- a/android/sdk/src/main/res/values-vi/types_strings.xml
+++ b/android/sdk/src/main/res/values-vi/types_strings.xml
@@ -377,6 +377,8 @@
    <string name="type.highway.pedestrian.area">Phố</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Cầu</string>
+
+    <string name="type.highway.pedestrian.square">Quảng trường</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Đường hầm</string>
    <string name="type.highway.primary">Phố</string>
--- a/android/sdk/src/main/res/values-zh-rHK/types_strings.xml
+++ b/android/sdk/src/main/res/values-zh-rHK/types_strings.xml
@@ -430,6 +430,8 @@
    <string name="type.highway.pedestrian.area">路</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">橋</string>
+
+    <string name="type.highway.pedestrian.square">廣場</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">隧道</string>
    <string name="type.highway.primary">主要道路</string>
@@ -1159,7 +1161,7 @@
    <string name="type.shop.tobacco">煙草</string>
    <string name="type.shop.trade">貿易用品</string>
    <string name="type.shop.watches">手錶</string>
-    <string name="type.shop.wholesale">批髮店</string>
+    <string name="type.shop.wholesale">批發店</string>
    <string name="type.sport">體育運動</string>
    <string name="type.sport.american_football">美式足球</string>
    <string name="type.sport.archery">射箭</string>
--- a/android/sdk/src/main/res/values-zh-rTW/types_strings.xml
+++ b/android/sdk/src/main/res/values-zh-rTW/types_strings.xml
@@ -475,4 +475,5 @@
    <string name="type.railway.station.subway.philadelphia">地鐵站</string>
    <string name="type.railway.station.subway.pyongyang">地鐵站</string>
    <string name="type.railway.station.subway.rotterdam">地鐵站</string>
+    <string name="type.shop.wholesale">批發店</string>
 </resources>
--- a/android/sdk/src/main/res/values-zh/types_strings.xml
+++ b/android/sdk/src/main/res/values-zh/types_strings.xml
@@ -431,6 +431,8 @@
    <string name="type.highway.pedestrian.area">步行区</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">人行天桥</string>
+
+    <string name="type.highway.pedestrian.square">广场</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">人行隧道</string>
    <string name="type.highway.primary">主要道路</string>
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -68,6 +68,9 @@
    <string name="type.amenity.music_school">Music School</string>
    <string name="type.amenity.language_school">Language School</string>
    <string name="type.office.diplomatic">Embassy</string>
+    <string name="type.office.security">Security Guards Office</string>
+    <string name="type.building.guardhouse">Security Booth</string>
+    <string name="type.power.portal">Power Portal</string>
    <string name="type.amenity.fast_food">Fast Food</string>
    <string name="type.amenity.ferry_terminal">Ferry</string>
    <string name="type.amenity.fire_station">Fire Station</string>
@@ -444,6 +447,8 @@
    <string name="type.highway.pedestrian.area">Pedestrian Area</string>
    <!-- These translations are used for all type.highway.*.bridge. -->
    <string name="type.highway.pedestrian.bridge">Pedestrian Bridge</string>
+
+    <string name="type.highway.pedestrian.square">Square</string>
    <!-- These translations are used for all type.highway.*.tunnel. -->
    <string name="type.highway.pedestrian.tunnel">Pedestrian Tunnel</string>
    <string name="type.highway.primary">Primary Road</string>
@@ -1246,6 +1251,7 @@
    <string name="type.shop.trade">Trade Supplies</string>
    <string name="type.shop.watches">Watch Store</string>
    <string name="type.shop.wholesale">Wholesale Store</string>
+    <string name="type.shop.lighting">Lighting Shop</string>
    <string name="type.sport">Sport</string>
    <string name="type.sport.american_football">American Football</string>
    <string name="type.sport.archery">Archery</string>