Merge pull request #3665 from bykoianko/release-62-master

release-62 to master
2016-06-27 13:15:15 +03:00 · 2016-06-27 13:15:15 +03:00 · 3238e11b7a
commit 3238e11b7a
parent 8bf95d868d f4cb2f89a9
1456 changed files with 19893 additions and 16067 deletions
--- a/.gitignore
+++ b/.gitignore
@ -130,4 +130,6 @@ tools/android/mapswithme.keystore
 tools/android/yota.keystore
 android/secure.properties
 android/fabric.properties
+android/pushwoosh.properties
+android/res/values/google-service.xml
 server
--- a/3party/opening_hours/opening_hours.cpp
+++ b/3party/opening_hours/opening_hours.cpp
@ -321,6 +321,14 @@ bool Timespan::HasExtendedHours() const
  return endHM.GetDuration() <= startHM.GetDuration();
 }

+void Timespan::ExpandPlus()
+{
+  if (HasPlus())
+  {
+    SetEnd(HourMinutes(24_h));
+  }
+}
+
 std::ostream & operator<<(std::ostream & ost, Timespan const & span)
 {
  ost << span.GetStart();
@ -768,6 +776,7 @@ bool OpeningHours::IsValid() const
 {
  return m_valid;
 }
+
 bool OpeningHours::IsTwentyFourHours() const
 {
  return m_rule.size() == 1 && m_rule[0].IsTwentyFourHours();
--- a/3party/opening_hours/opening_hours.hpp
+++ b/3party/opening_hours/opening_hours.hpp
@ -231,6 +231,8 @@ public:
  void SetPeriod(TimespanPeriod const & period) { m_period = period; }
  void SetPlus(bool const plus) { m_plus = plus; }

+  void ExpandPlus();
+
 private:
  Time m_start;
  Time m_end;
--- a/3party/opening_hours/opening_hours_parsers.hpp
+++ b/3party/opening_hours/opening_hours_parsers.hpp
@ -373,7 +373,8 @@ public:
          [bind(&Timespan::SetStart, _val, _1),
           bind(&Timespan::SetPlus, _val, true)]

-        | time[bind(&Timespan::SetStart, _val, _1)]
+        // This rule is only used for collection_times tag wish is not in our interest.
+        // | time[bind(&Timespan::SetStart, _val, _1)]
        ;

    main %= timespan % ',';
--- a/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp
+++ b/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp
@ -664,11 +664,6 @@ BOOST_AUTO_TEST_CASE(OpeningHours_RuleSequence)

 BOOST_AUTO_TEST_CASE(OpeningHoursTimerange_TestParseUnparse)
 {
-  {
-    auto const rule = "06:00";
-    auto const parsedUnparsed = ParseAndUnparse<osmoh::TTimespans>(rule);
-    BOOST_CHECK_EQUAL(parsedUnparsed, rule);
-  }
  {
    auto const rule = "06:00+";
    auto const parsedUnparsed = ParseAndUnparse<osmoh::TTimespans>(rule);
@ -700,9 +695,9 @@ BOOST_AUTO_TEST_CASE(OpeningHoursTimerange_TestParseUnparse)
    BOOST_CHECK_EQUAL(parsedUnparsed, rule);
  }
  {
-    auto const rule = "dusk";
+    auto const rule = "dusk+";
    auto const parsedUnparsed = ParseAndUnparse<osmoh::TTimespans>(rule);
-    BOOST_CHECK_EQUAL(parsedUnparsed, "sunset");
+    BOOST_CHECK_EQUAL(parsedUnparsed, "sunset+");
  }
  {
    auto const rule = "dawn+";
@ -715,7 +710,7 @@ BOOST_AUTO_TEST_CASE(OpeningHoursTimerange_TestParseUnparse)
    BOOST_CHECK_EQUAL(parsedUnparsed, rule);
  }
  {
-    auto const rule = "(sunset-12:12)";
+    auto const rule = "(sunset-12:12)+";
    auto const parsedUnparsed = ParseAndUnparse<osmoh::TTimespans>(rule);
    BOOST_CHECK_EQUAL(parsedUnparsed, rule);
  }
@ -1005,7 +1000,7 @@ BOOST_AUTO_TEST_CASE(OpeningHoursRuleSequence_TestParseUnparse)
    BOOST_CHECK_EQUAL(parsedUnparsed, rule);
  }
  {
-    auto const rule = "06:00-02:00/21:03, 18:15";
+    auto const rule = "06:00-02:00/21:03, 18:15-sunset";
    auto const parsedUnparsed = ParseAndUnparse<osmoh::TRuleSequences>(rule);
    BOOST_CHECK_EQUAL(parsedUnparsed, rule);
  }
@ -1048,7 +1043,7 @@ BOOST_AUTO_TEST_CASE(OpeningHoursRuleSequence_TestParseUnparse)
    BOOST_CHECK_EQUAL(parsedUnparsed, rule);
  }
  {
-    auto const rule = "Su-Th (sunset-24:00); Fr-Sa (sunrise+12:12)";
+    auto const rule = "Su-Th sunrise-(sunset-24:00); Fr-Sa (sunrise+12:12)-sunset";
    auto const parsedUnparsed = ParseAndUnparse<osmoh::TRuleSequences>(rule);
    BOOST_CHECK_EQUAL(parsedUnparsed, rule);
  }
@ -1504,9 +1499,8 @@ BOOST_AUTO_TEST_CASE(OpeningHours_TestIsOpen)
    BOOST_CHECK(Parse("06:13-15:00; 16:30+", rules));

    BOOST_CHECK(IsOpen(rules, "2013-12-12 7:00"));
+    BOOST_CHECK(IsOpen(rules, "2013-12-12 20:00"));
    BOOST_CHECK(IsClosed(rules, "2013-12-12 16:00"));
-    /// Open end is not supported yet, so evaluate to close
-    BOOST_CHECK(IsClosed(rules, "2013-12-12 20:00"));
  }
  {
    TRuleSequences rules;
@ -1538,6 +1532,15 @@ BOOST_AUTO_TEST_CASE(OpeningHours_TestIsOpen)
    BOOST_CHECK(IsClosed(rules, "2015-04-12 14:15"));
    BOOST_CHECK(IsClosed(rules, "2016-04-12 20:15"));
  }
+  {
+    TRuleSequences rules;
+    BOOST_CHECK(Parse("Mo-Th 15:00+; Fr-Su 13:00+", rules));
+
+    BOOST_CHECK(!IsOpen(rules, "2016-06-06 13:14"));
+    BOOST_CHECK(IsOpen(rules, "2016-06-06 17:06"));
+    BOOST_CHECK(IsOpen(rules, "2016-06-05 13:06"));
+    BOOST_CHECK(IsOpen(rules, "2016-05-31 18:28"));
+  }
 }


@ -1568,4 +1571,18 @@ BOOST_AUTO_TEST_CASE(OpeningHours_TestOpeningHours)
    OpeningHours oh("Nov +1");
    BOOST_CHECK(!oh.IsValid());
  }
+  {
+    OpeningHours oh("Mo-Th 15:00+; Fr-Su 13:00+");
+    BOOST_CHECK(oh.IsValid());
+
+    std::tm time = {};
+    BOOST_CHECK(GetTimeTuple("2016-05-31 18:28", fmt, time));
+    BOOST_CHECK(oh.IsOpen(mktime(&time)));
+
+    BOOST_CHECK(GetTimeTuple("2016-05-31 22:28", fmt, time));
+    BOOST_CHECK(oh.IsOpen(mktime(&time)));
+
+    BOOST_CHECK(GetTimeTuple("2016-05-31 10:30", fmt, time));
+    BOOST_CHECK(oh.IsClosed(mktime(&time)));
+  }
 }
--- a/3party/opening_hours/rules_evaluation.cpp
+++ b/3party/opening_hours/rules_evaluation.cpp
@ -190,12 +190,13 @@ namespace osmoh
 // ADL shadows ::operator==.
 using ::operator==;

-bool IsActive(Timespan const & span, std::tm const & time)
+bool IsActive(Timespan span, std::tm const & time)
 {
  // Timespan with e.h. should be split into parts with no e.h.
  // before calling IsActive().
  // TODO(mgsergio): set assert(!span.HasExtendedHours())

+  span.ExpandPlus();
  if (span.HasStart() && span.HasEnd())
  {
    THourMinutes start;
@ -331,7 +332,6 @@ bool IsActive(RuleSequence const & rule, time_t const timestamp)

  if (checkIsActive(rule, dateTimeTMShifted) &&
      IsActive(additionalSpan, dateTimeTMShifted))
-
  {
    return true;
  }
--- a/3party/opening_hours/rules_evaluation_private.hpp
+++ b/3party/opening_hours/rules_evaluation_private.hpp
@ -6,7 +6,7 @@

 namespace osmoh
 {
-bool IsActive(Timespan const & spsn, std::tm const & date);
+bool IsActive(Timespan span, std::tm const & date);
 bool IsActive(WeekdayRange const & range, std::tm const & date);
 bool IsActive(Holiday const & holiday, std::tm const & date);
 bool IsActive(Weekdays const & weekdays, std::tm const & date);
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@ -65,14 +65,22 @@
        android:name="com.facebook.sdk.ApplicationId"
        android:value="@string/fb_app_id"/>

-    <meta-data
-        android:name="com.parse.push.notification_icon"
-        android:resource="@drawable/ic_notification"/>
-
    <meta-data
        android:name="io.fabric.ApiKey"
        android:value="${FABRIC_API_KEY}"/>

+    <meta-data
+        android:name="PW_APPID"
+        android:value="${PW_APPID}" />
+
+    <meta-data
+        android:name="PW_PROJECT_ID"
+        android:value="${PW_PROJECT_ID}" />
+
+    <!--meta-data
+        android:name="PW_LOG_LEVEL"
+        android:value="ERROR" /-->
+
    <activity
        android:name="com.mapswithme.maps.DownloadResourcesActivity"
        android:configChanges="orientation|screenLayout|screenSize"
@ -337,34 +345,43 @@
      </intent-filter>
    </receiver>

-    <!-- Parse -->
-    <service android:name="com.parse.PushService"/>
+    <!-- PushWoosh -->
+    <activity android:name="com.pushwoosh.richpages.RichPageActivity" />
+    <activity android:name="com.pushwoosh.MessageActivity" />
+    <activity android:name="com.pushwoosh.PushHandlerActivity" />

-    <receiver android:name="com.parse.ParseBroadcastReceiver">
+    <receiver
+        android:name="com.google.android.gms.gcm.GcmReceiver"
+        android:exported="true"
+        android:permission="com.google.android.c2dm.permission.SEND" >
      <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED"/>
-        <action android:name="android.intent.action.USER_PRESENT"/>
+        <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+        <category android:name="${applicationId}" />
      </intent-filter>
    </receiver>
-    <receiver
-        android:name="com.parse.ParsePushBroadcastReceiver"
+
+    <service
+        android:name="com.pushwoosh.GCMListenerService"
        android:exported="false">
-      <intent-filter>
-        <action android:name="com.parse.push.intent.RECEIVE"/>
-        <action android:name="com.parse.push.intent.DELETE"/>
-        <action android:name="com.parse.push.intent.OPEN"/>
-      </intent-filter>
-    </receiver>
-    <receiver
-        android:name="com.parse.GcmBroadcastReceiver"
-        android:permission="com.google.android.c2dm.permission.SEND">
      <intent-filter>
        <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
-        <action android:name="com.google.android.c2dm.intent.REGISTRATION"/>
-
-        <category android:name="${applicationId}"/>
      </intent-filter>
-    </receiver>
+    </service>
+
+    <service
+        android:name="com.pushwoosh.GCMInstanceIDListenerService"
+        android:exported="false">
+      <intent-filter>
+        <action android:name="com.google.android.gms.iid.InstanceID"/>
+      </intent-filter>
+    </service>
+
+    <service
+        android:name="com.pushwoosh.GCMRegistrationService"
+        android:exported="false" />
+
+    <service
+        android:name="com.pushwoosh.location.GeoLocationService" />

    <!-- Catches app upgraded intent -->
    <receiver android:name=".background.UpgradeReceiver">
--- a/android/build.gradle
+++ b/android/build.gradle
@ -40,15 +40,15 @@ dependencies {
  compile 'com.google.android.gms:play-services-location:8.4.0'
  compile 'com.google.android.gms:play-services-analytics:8.4.0'
  compile 'com.google.android.gms:play-services-plus:8.4.0'
+  compile 'com.google.android.gms:play-services-gcm:8.4.0'
  // crash reporting
  compile 'net.hockeyapp.android:HockeySDK:3.7.1'
  compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true }
  compile('com.crashlytics.sdk.android:crashlytics-ndk:1.1.2@aar') { transitive = true }
  // 3-party
  compile 'com.facebook.android:facebook-android-sdk:4.8.0'
-  compile 'com.parse.bolts:bolts-android:1.4.0'
-  compile 'com.parse:parse-android:1.13.0'
  compile 'com.google.code.gson:gson:2.6.1'
+  compile 'com.pushwoosh:pushwoosh:4.1.3'
  compile fileTree(dir: '3rd_party', include: '*.jar')
  // BottomSheet
  compile project(":3rd_party:BottomSheet")
@ -94,6 +94,13 @@ android {
    props.load(new FileInputStream("${projectDir}/fabric.properties"));
    manifestPlaceholders = [ 'FABRIC_API_KEY': props['apiKey'] ]
    buildConfigField 'String', 'FABRIC_API_KEY', /"${props['apiKey']}"/
+
+    // PushWoosh keys
+    Properties pwProps = new Properties()
+    pwProps.load(new FileInputStream("${projectDir}/pushwoosh.properties"));
+    manifestPlaceholders += [ 'PW_APPID': pwProps['pwAppId'] ]
+    buildConfigField 'String', 'PW_APPID', /"${pwProps['pwAppId']}"/
+    manifestPlaceholders += [ 'PW_PROJECT_ID': pwProps['pwProjectId'] ]
  }

  sourceSets.main {
--- a/android/gradle.properties
+++ b/android/gradle.properties
@ -3,8 +3,8 @@ propMinSdkVersion=15
 # https://code.google.com/p/android/issues/detail?id=184567
 propTargetSdkVersion=22
 propBuildToolsVersion=22.0.1
-propVersionCode=615
-propVersionName=6.1.5
+propVersionCode=620
+propVersionName=6.2.0
 propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1

--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \
 	com/mapswithme/maps/SearchEngine.cpp \
 	com/mapswithme/maps/SearchRecents.cpp \
 	com/mapswithme/maps/UserMarkHelper.cpp \
+	com/mapswithme/maps/SponsoredHotel.cpp \
 	com/mapswithme/maps/settings/UnitLocale.cpp \
 	com/mapswithme/platform/Platform.cpp \
 	com/mapswithme/platform/HttpThread.cpp \
--- a/android/jni/com/mapswithme/core/jni_helper.cpp
+++ b/android/jni/com/mapswithme/core/jni_helper.cpp
@ -60,19 +60,26 @@ JavaVM * GetJVM()
  return g_jvm;
 }

-jmethodID GetMethodID(JNIEnv * env, jobject obj, char const * fn, char const * sig)
+jmethodID GetMethodID(JNIEnv * env, jobject obj, char const * name, char const * signature)
 {
  TScopedLocalClassRef clazz(env, env->GetObjectClass(obj));
  ASSERT(clazz.get(), ("Can't get class: ", DescribeException()));

-  jmethodID mid = env->GetMethodID(clazz.get(), fn, sig);
-  ASSERT(mid, ("Can't get methodID", fn, sig, DescribeException()));
+  jmethodID mid = env->GetMethodID(clazz.get(), name, signature);
+  ASSERT(mid, ("Can't get method ID", name, signature, DescribeException()));
  return mid;
 }

-jmethodID GetConstructorID(JNIEnv * env, jclass clazz, char const * sig)
+jmethodID GetStaticMethodID(JNIEnv * env, jclass clazz, char const * name, char const * signature)
 {
-  jmethodID const ctorID = env->GetMethodID(clazz, "<init>", sig);
+  jmethodID mid = env->GetStaticMethodID(clazz, name, signature);
+  ASSERT(mid, ("Can't get static method ID", name, signature, DescribeException()));
+  return mid;
+}
+
+jmethodID GetConstructorID(JNIEnv * env, jclass clazz, char const * signature)
+{
+  jmethodID const ctorID = env->GetMethodID(clazz, "<init>", signature);
  ASSERT(ctorID, (DescribeException()));
  return ctorID;
 }
--- a/android/jni/com/mapswithme/core/jni_helper.hpp
+++ b/android/jni/com/mapswithme/core/jni_helper.hpp
@ -17,8 +17,9 @@ namespace jni
 JNIEnv * GetEnv();
 JavaVM * GetJVM();

-jmethodID GetMethodID(JNIEnv * env, jobject obj, char const * fn, char const * sig);
-jmethodID GetConstructorID(JNIEnv * env, jclass clazz, char const * sig);
+jmethodID GetMethodID(JNIEnv * env, jobject obj, char const * name, char const * signature);
+jmethodID GetStaticMethodID(JNIEnv * env, jclass clazz, char const * name, char const * signature);
+jmethodID GetConstructorID(JNIEnv * env, jclass clazz, char const * signature);

 // Result value should be DeleteGlobalRef`ed by caller
 jclass GetGlobalClassRef(JNIEnv * env, char const * s);
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@ -458,6 +458,11 @@ place_page::Info & Framework::GetPlacePageInfo()
  return m_info;
 }

+void Framework::RequestBookingMinPrice(string const & hotelId, string const & currencyCode, function<void(string const &, string const &)> const & callback)
+{
+  return m_work.GetBookingApi().GetMinPrice(hotelId, currencyCode, callback);
+}
+
 bool Framework::HasSpaceForMigration()
 {
  return m_work.IsEnoughSpaceForMigrate();
@ -722,7 +727,7 @@ Java_com_mapswithme_maps_Framework_nativeSetWritableDir(JNIEnv * env, jclass, js
 {
  string newPath = jni::ToNativeString(env, jNewPath);
  g_framework->RemoveLocalMaps();
-  android::Platform::Instance().SetStoragePath(newPath);
+  android::Platform::Instance().SetWritableDir(newPath);
  g_framework->AddLocalMaps();
 }

@ -1048,31 +1053,4 @@ Java_com_mapswithme_maps_Framework_nativeGetActiveObjectFormattedCuisine(JNIEnv
  return jni::ToJavaString(env, g_framework->GetPlacePageInfo().FormatCuisines());
 }

-JNIEXPORT jboolean JNICALL
-Java_com_mapswithme_maps_Framework_nativeIsActiveObjectABuilding(JNIEnv * env, jclass)
-{
-  return g_framework->GetPlacePageInfo().IsBuilding();
-}
-
-JNIEXPORT jboolean JNICALL
-Java_com_mapswithme_maps_Framework_nativeCanAddPlaceFromPlacePage(JNIEnv * env, jclass clazz)
-{
-  return g_framework->GetPlacePageInfo().ShouldShowAddPlace();
-}
-
-JNIEXPORT jobject JNICALL
-Java_com_mapswithme_maps_Framework_nativeGetSponsoredHotelInfo(JNIEnv * env, jclass clazz)
-{
-  place_page::Info const & ppInfo = g_framework->GetPlacePageInfo();
-  if (!ppInfo.m_isSponsoredHotel)
-    return nullptr;
-
-  static jclass const infoClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/widget/placepage/SponsoredHotelInfo");
-  static jmethodID const infoCtor = jni::GetConstructorID(env, infoClass, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-
-  return env->NewObject(infoClass, infoCtor, jni::ToJavaString(env, ppInfo.GetRatingFormatted()),
-                                             jni::ToJavaString(env, ppInfo.GetApproximatePricing()),
-                                             jni::ToJavaString(env, ppInfo.GetWebsite()));
-}
-
 } // extern "C"
--- a/android/jni/com/mapswithme/maps/Framework.hpp
+++ b/android/jni/com/mapswithme/maps/Framework.hpp
@ -152,6 +152,7 @@ namespace android

    void SetPlacePageInfo(place_page::Info const & info);
    place_page::Info & GetPlacePageInfo();
+    void RequestBookingMinPrice(string const & hotelId, string const & currency, function<void(string const &, string const &)> const & callback);

    bool HasSpaceForMigration();
    storage::TCountryId PreMigrate(ms::LatLon const & position, storage::Storage::TChangeCountryFunction const & statusChangeListener,
--- a/android/jni/com/mapswithme/maps/MapManager.cpp
+++ b/android/jni/com/mapswithme/maps/MapManager.cpp
@ -243,7 +243,7 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeGetUpdateInfo(JNIEnv * env,

  static jclass const infoClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/downloader/UpdateInfo");
  ASSERT(infoClass, (jni::DescribeException()));
-  static jmethodID const ctor = jni::GetConstructorID(env, infoClass, "(II)V");
+  static jmethodID const ctor = jni::GetConstructorID(env, infoClass, "(IJ)V");
  ASSERT(ctor, (jni::DescribeException()));

  return env->NewObject(infoClass, ctor, info.m_numberOfMwmFilesToUpdate, info.m_totalUpdateSizeInBytes);
--- a/android/jni/com/mapswithme/maps/MwmApplication.cpp
+++ b/android/jni/com/mapswithme/maps/MwmApplication.cpp
@ -9,6 +9,14 @@ crashlytics_context_t * g_crashlytics;

 extern "C"
 {
+  // static void nativePreparePlatform(String settingsPath);
+  JNIEXPORT void JNICALL
+  Java_com_mapswithme_maps_MwmApplication_nativePreparePlatform(JNIEnv * env, jclass clazz, jstring settingsPath)
+  {
+    android::Platform::Instance().SetSettingsDir(jni::ToNativeString(env, settingsPath));
+  }
+
+  // void nativeInitPlatform(String apkPath, String storagePath, String tmpPath, String obbGooglePath, String flavorName, String buildType, boolean isTablet);
  JNIEXPORT void JNICALL
  Java_com_mapswithme_maps_MwmApplication_nativeInitPlatform(JNIEnv * env, jobject thiz, jstring apkPath, jstring storagePath, jstring tmpPath,
                                                             jstring obbGooglePath, jstring flavorName, jstring buildType, jboolean isTablet)
@ -16,6 +24,7 @@ extern "C"
    android::Platform::Instance().Initialize(env, thiz, apkPath, storagePath, tmpPath, obbGooglePath, flavorName, buildType, isTablet);
  }

+  // static void nativeInitFramework();
  JNIEXPORT void JNICALL
  Java_com_mapswithme_maps_MwmApplication_nativeInitFramework(JNIEnv * env, jclass clazz)
  {
@ -23,12 +32,14 @@ extern "C"
      g_framework = new android::Framework();
  }

+  // static void nativeProcessFunctor(long functorPointer);
  JNIEXPORT void JNICALL
  Java_com_mapswithme_maps_MwmApplication_nativeProcessFunctor(JNIEnv * env, jclass clazz, jlong functorPointer)
  {
    android::Platform::Instance().ProcessFunctor(functorPointer);
  }

+  // static void nativeAddLocalization(String name, String value);
  JNIEXPORT void JNICALL
  Java_com_mapswithme_maps_MwmApplication_nativeAddLocalization(JNIEnv * env, jclass clazz, jstring name, jstring value)
  {
@ -36,6 +47,8 @@ extern "C"
                           jni::ToNativeString(env, value));
  }

+  // @UiThread
+  // static void nativeInitCrashlytics();
  JNIEXPORT void JNICALL
  Java_com_mapswithme_maps_MwmApplication_nativeInitCrashlytics(JNIEnv * env, jclass clazz)
  {
--- a/android/jni/com/mapswithme/maps/PrivateVariables.cpp
+++ b/android/jni/com/mapswithme/maps/PrivateVariables.cpp
@ -22,18 +22,6 @@ extern "C"
    return env->NewStringUTF(MY_TRACKER_KEY);
  }

-  JNIEXPORT jstring JNICALL
-  Java_com_mapswithme_maps_PrivateVariables_parseApplicationId(JNIEnv * env, jclass clazz)
-  {
-    return env->NewStringUTF(PARSE_APPLICATION_ID);
-  }
-
-  JNIEXPORT jstring JNICALL
-  Java_com_mapswithme_maps_PrivateVariables_parseClientKey(JNIEnv * env, jclass clazz)
-  {
-    return env->NewStringUTF(PARSE_CLIENT_KEY);
-  }
-
  JNIEXPORT jstring JNICALL
  Java_com_mapswithme_maps_PrivateVariables_myTargetSlot(JNIEnv * env, jclass clazz)
  {
--- a/android/jni/com/mapswithme/maps/SponsoredHotel.cpp
+++ b/android/jni/com/mapswithme/maps/SponsoredHotel.cpp
@ -0,0 +1,71 @@
+#include "Framework.hpp"
+
+#include "../core/jni_helper.hpp"
+#include "../platform/Platform.hpp"
+#include "map/place_page_info.hpp"
+
+#include "std/bind.hpp"
+
+namespace
+{
+
+jclass g_hotelClass;
+jmethodID g_hotelClassCtor;
+jmethodID g_priceCallback;
+
+void PrepareClassRefs(JNIEnv * env, jclass hotelClass)
+{
+  if (g_hotelClass)
+    return;
+
+  g_hotelClass = static_cast<jclass>(env->NewGlobalRef(hotelClass));
+
+  // SponsoredHotel(String rating, String price, String urlBook, String urlDescription)
+  g_hotelClassCtor = jni::GetConstructorID(env, g_hotelClass, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+  // static void onPriceReceived(final String id, final String price, final String currency)
+  g_priceCallback = jni::GetStaticMethodID(env, g_hotelClass, "onPriceReceived", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+}
+
+} // namespace
+
+extern "C"
+{
+
+// static SponsoredHotel nativeGetCurrent();
+JNIEXPORT jobject JNICALL
+Java_com_mapswithme_maps_widget_placepage_SponsoredHotel_nativeGetCurrent(JNIEnv * env, jclass clazz)
+{
+  PrepareClassRefs(env, clazz);
+
+  place_page::Info const & ppInfo = g_framework->GetPlacePageInfo();
+  if (!ppInfo.m_isSponsoredHotel)
+    return nullptr;
+
+  return env->NewObject(g_hotelClass, g_hotelClassCtor, jni::ToJavaString(env, ppInfo.GetRatingFormatted()),
+                                                        jni::ToJavaString(env, ppInfo.GetApproximatePricing()),
+                                                        jni::ToJavaString(env, ppInfo.GetSponsoredBookingUrl()),
+                                                        jni::ToJavaString(env, ppInfo.GetSponsoredDescriptionUrl()));
+}
+
+// static void nativeRequestPrice(String id, String currencyCode);
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_widget_placepage_SponsoredHotel_nativeRequestPrice(JNIEnv * env, jclass clazz, jstring id, jstring currencyCode)
+{
+  PrepareClassRefs(env, clazz);
+
+  string const hotelId = jni::ToNativeString(env, id);
+  string const code = jni::ToNativeString(env, currencyCode);
+
+  g_framework->RequestBookingMinPrice(hotelId, code, [hotelId](string const & price, string const & currency)
+  {
+    GetPlatform().RunOnGuiThread([=]()
+    {
+      JNIEnv * env = jni::GetEnv();
+      env->CallStaticVoidMethod(g_hotelClass, g_priceCallback, jni::ToJavaString(env, hotelId),
+                                                               jni::ToJavaString(env, price),
+                                                               jni::ToJavaString(env, currency));
+    });
+  });
+}
+
+} // extern "C"
--- a/android/jni/com/mapswithme/maps/editor/Editor.cpp
+++ b/android/jni/com/mapswithme/maps/editor/Editor.cpp
@ -244,9 +244,21 @@ Java_com_mapswithme_maps_editor_Editor_nativeSaveEditedFeature(JNIEnv *, jclass)
 }

 JNIEXPORT jboolean JNICALL
-Java_com_mapswithme_maps_editor_Editor_nativeIsFeatureEditable(JNIEnv *, jclass)
+Java_com_mapswithme_maps_editor_Editor_nativeShouldShowEditPlace(JNIEnv *, jclass)
 {
-  return g_framework->GetPlacePageInfo().IsEditable();
+  return g_framework->GetPlacePageInfo().ShouldShowEditPlace();
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeShouldShowAddPlace(JNIEnv *, jclass)
+{
+  return g_framework->GetPlacePageInfo().ShouldShowAddPlace();
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeShouldShowAddBusiness(JNIEnv *, jclass)
+{
+  return g_framework->GetPlacePageInfo().ShouldShowAddBusiness();
 }

 JNIEXPORT jintArray JNICALL
@ -517,6 +529,41 @@ Java_com_mapswithme_maps_editor_Editor_nativeIsLevelValid(JNIEnv * env, jclass c
  return osm::EditableMapObject::ValidateBuildingLevels(jni::ToNativeString(env, level));
 }

+// static boolean nativeIsFlatValid(String flats)
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeIsFlatValid(JNIEnv * env, jclass clazz, jstring flats)
+{
+  return osm::EditableMapObject::ValidateFlats(jni::ToNativeString(env, flats));
+}
+
+// static boolean nativeIsPostCodeValid(String zipCode)
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeIsZipcodeValid(JNIEnv * env, jclass clazz, jstring zipCode)
+{
+  return osm::EditableMapObject::ValidatePostCode(jni::ToNativeString(env, zipCode));
+}
+
+// static boolean nativeIsPhoneValid(String phone)
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeIsPhoneValid(JNIEnv * env, jclass clazz, jstring phone)
+{
+  return osm::EditableMapObject::ValidatePhone(jni::ToNativeString(env, phone));
+}
+
+// static boolean nativeIsWebsiteValid(String website)
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeIsWebsiteValid(JNIEnv * env, jclass clazz, jstring website)
+{
+  return osm::EditableMapObject::ValidateWebsite(jni::ToNativeString(env, website));
+}
+
+// static boolean nativeIsEmailValid(String email)
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeIsEmailValid(JNIEnv * env, jclass clazz, jstring email)
+{
+  return osm::EditableMapObject::ValidateEmail(jni::ToNativeString(env, email));
+}
+
 JNIEXPORT jstring JNICALL
 Java_com_mapswithme_maps_editor_Editor_nativeGetCategory(JNIEnv * env, jclass clazz)
 {
--- a/android/jni/com/mapswithme/maps/editor/OsmOAuth.cpp
+++ b/android/jni/com/mapswithme/maps/editor/OsmOAuth.cpp
@ -1,11 +1,15 @@
 #include <jni.h>

 #include "com/mapswithme/core/jni_helper.hpp"
+#include "com/mapswithme/maps/Framework.hpp"

 #include "base/logging.hpp"
+#include "base/string_utils.hpp"
+#include "base/timer.hpp"

 #include "editor/osm_auth.hpp"
 #include "editor/server_api.hpp"
+#include "editor/user_stats.hpp"

 namespace
 {
@ -115,4 +119,33 @@ Java_com_mapswithme_maps_editor_OsmOAuth_nativeGetOsmUsername(JNIEnv * env, jcla
    return nullptr;
  }
 }
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_OsmOAuth_nativeUpdateOsmUserStats(JNIEnv * env, jclass clazz, jstring jUsername, jboolean forceUpdate)
+{
+  static jclass const statsClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/editor/data/UserStats");
+  static jmethodID const statsCtor = jni::GetConstructorID(env, statsClazz, "(IILjava/lang/String;J)V");
+  static jclass const osmAuthClazz = static_cast<jclass>(env->NewGlobalRef(clazz));
+  // static void onUserStatsUpdated(UserStats stats)
+  static jmethodID const listenerId = jni::GetStaticMethodID(env, osmAuthClazz, "onUserStatsUpdated", "(Lcom/mapswithme/maps/editor/data/UserStats;)V");
+
+  string const username = jni::ToNativeString(env, jUsername);
+  auto const policy = forceUpdate ? editor::UserStatsLoader::UpdatePolicy::Force
+                                  : editor::UserStatsLoader::UpdatePolicy::Lazy;
+  g_framework->NativeFramework()->UpdateUserStats(username, policy, [username]()
+  {
+    editor::UserStats const & userStats = g_framework->NativeFramework()->GetUserStats(username);
+    if (!userStats.IsValid())
+      return;
+    int32_t count, rank;
+    string levelUp;
+    userStats.GetChangesCount(count);
+    userStats.GetRank(rank);
+    userStats.GetLevelUpRequiredFeat(levelUp);
+    JNIEnv * env = jni::GetEnv();
+    env->CallStaticVoidMethod(osmAuthClazz, listenerId,
+                              env->NewObject(statsClazz, statsCtor, count, rank, jni::ToJavaString(env, levelUp),
+                                             my::TimeTToSecondsSinceEpoch(userStats.GetLastUpdate())));
+  });
+}
 } // extern "C"
--- a/android/jni/com/mapswithme/platform/Language.cpp
+++ b/android/jni/com/mapswithme/platform/Language.cpp
@ -34,10 +34,8 @@ string GetAndroidSystemLanguage()
  }

  static jclass const localeClass = jni::GetGlobalClassRef(env, "java/util/Locale");
-  static jmethodID const localeGetDefaultId = env->GetStaticMethodID(localeClass, "getDefault", "()Ljava/util/Locale;");
-  ASSERT(localeGetDefaultId, ());
+  static jmethodID const localeGetDefaultId = jni::GetStaticMethodID(env, localeClass, "getDefault", "()Ljava/util/Locale;");
  static jmethodID const localeToStringId = env->GetMethodID(localeClass, "toString", "()Ljava/lang/String;");
-  ASSERT(localeToStringId, ());

  jni::TScopedLocalRef localeInstance(env, env->CallStaticObjectMethod(localeClass, localeGetDefaultId));
  jni::TScopedLocalRef langString(env, env->CallObjectMethod(localeInstance.get(), localeToStringId));
--- a/android/jni/com/mapswithme/platform/Platform.cpp
+++ b/android/jni/com/mapswithme/platform/Platform.cpp
@ -22,9 +22,7 @@ string Platform::UniqueClientId() const
    jclass uuidClass = env->FindClass("java/util/UUID");
    ASSERT(uuidClass, ("Can't find java class java/util/UUID"));

-    jmethodID randomUUIDId = env->GetStaticMethodID(uuidClass, "randomUUID", "()Ljava/util/UUID;");
-    ASSERT(randomUUIDId, ("Can't find static java/util/UUID.randomUUIDId() method"));
-
+    jmethodID randomUUIDId = jni::GetStaticMethodID(env, uuidClass, "randomUUID", "()Ljava/util/UUID;");
    jobject uuidInstance = env->CallStaticObjectMethod(uuidClass, randomUUIDId);
    ASSERT(uuidInstance, ("UUID.randomUUID() returned NULL"));

@ -59,9 +57,7 @@ string Platform::GetMemoryInfo() const
  static shared_ptr<jobject> classMemLogging = jni::make_global_ref(env->FindClass("com/mapswithme/util/log/MemLogging"));
  ASSERT(classMemLogging, ());

-  static jmethodID const getMemoryInfoId = env->GetStaticMethodID(static_cast<jclass>(*classMemLogging), "getMemoryInfo", "()Ljava/lang/String;");
-  ASSERT(getMemoryInfoId, ());
-
+  static jmethodID const getMemoryInfoId = jni::GetStaticMethodID(env, static_cast<jclass>(*classMemLogging), "getMemoryInfo", "()Ljava/lang/String;");
  jstring const memInfoString = (jstring)env->CallStaticObjectMethod(static_cast<jclass>(*classMemLogging), getMemoryInfoId);
  ASSERT(memInfoString, ());

@ -82,9 +78,7 @@ Platform::EConnectionType Platform::ConnectionStatus()
  static shared_ptr<jobject> clazzConnectionState = jni::make_global_ref(env->FindClass("com/mapswithme/util/ConnectionState"));
  ASSERT(clazzConnectionState, ());

-  static jmethodID const getConnectionMethodId = env->GetStaticMethodID(static_cast<jclass>(*clazzConnectionState), "getConnectionState", "()B");
-  ASSERT(getConnectionMethodId, ());
-
+  static jmethodID const getConnectionMethodId = jni::GetStaticMethodID(env, static_cast<jclass>(*clazzConnectionState), "getConnectionState", "()B");
  return static_cast<Platform::EConnectionType>(env->CallStaticByteMethod(static_cast<jclass>(*clazzConnectionState), getConnectionMethodId));
 }

@ -117,13 +111,8 @@ namespace android

    m_isTablet = isTablet;
    m_resourcesDir = jni::ToNativeString(env, apkPath);
-    // Settings file should be in a one place always (default external storage).
-    m_settingsDir = jni::ToNativeString(env, storagePath);
    m_tmpDir = jni::ToNativeString(env, tmpPath);
-
-    // Custom storage isn't set. Use primary storage.
-    if (!settings::Get("StoragePath", m_writableDir))
-      m_writableDir = m_settingsDir;
+    m_writableDir = jni::ToNativeString(env, storagePath);

    string const obbPath = jni::ToNativeString(env, obbGooglePath);
    Platform::FilesList files;
@ -135,7 +124,6 @@ namespace android
    LOG(LINFO, ("Apk path = ", m_resourcesDir));
    LOG(LINFO, ("Writable path = ", m_writableDir));
    LOG(LINFO, ("Temporary path = ", m_tmpDir));
-    LOG(LINFO, ("Settings path = ", m_settingsDir));
    LOG(LINFO, ("OBB Google path = ", obbPath));
    LOG(LINFO, ("OBB Google files = ", files));

@ -165,10 +153,17 @@ namespace android
    return m_writableDir.substr(0, i);
  }

-  void Platform::SetStoragePath(string const & path)
+  void Platform::SetWritableDir(string const & dir)
  {
-    m_writableDir = path;
+    m_writableDir = dir;
    settings::Set("StoragePath", m_writableDir);
+    LOG(LINFO, ("Writable path = ", m_writableDir));
+  }
+
+  void Platform::SetSettingsDir(string const & dir)
+  {
+    m_settingsDir = dir;
+    LOG(LINFO, ("Settings path = ", m_settingsDir));
  }

  bool Platform::HasAvailableSpaceForWriting(uint64_t size) const
--- a/android/jni/com/mapswithme/platform/Platform.hpp
+++ b/android/jni/com/mapswithme/platform/Platform.hpp
@ -23,7 +23,8 @@ namespace android
    /// get storage path without ending "/MapsWithMe/"
    string GetStoragePathPrefix() const;
    /// assign storage path (should contain ending "/MapsWithMe/")
-    void SetStoragePath(string const & path);
+    void SetWritableDir(string const & dir);
+    void SetSettingsDir(string const & dir);

    bool HasAvailableSpaceForWriting(uint64_t size) const;
    void RunOnGuiThread(TFunctor const & fn);
--- a/android/proguard-mwm.txt
+++ b/android/proguard-mwm.txt
@ -12,6 +12,12 @@
 -dontwarn okio.**
 -dontwarn com.facebook.**

+# pushwoosh
+-keep class com.pushwoosh.** { *; }
+-keep class com.arellomobile.** { *; }
+-dontwarn com.pushwoosh.**
+-dontwarn com.arellomobile.**
+
 # myTarget
 -dontwarn ru.mail.android.mytarget.**
 -dontwarn com.mopub.**
--- a/android/res/drawable-hdpi/ic_bicycle_beta.png
+++ b/android/res/drawable-hdpi/ic_bicycle_beta.png
--- a/android/res/drawable-hdpi/ic_leaderboard.png
+++ b/android/res/drawable-hdpi/ic_leaderboard.png
--- a/android/res/drawable-hdpi/ic_more.png
+++ b/android/res/drawable-hdpi/ic_more.png
--- a/android/res/drawable-hdpi/img_news_migration.png
+++ b/android/res/drawable-hdpi/img_news_migration.png
--- a/android/res/drawable-hdpi/img_news_bicycle.png
+++ b/android/res/drawable-hdpi/img_news_bicycle.png
--- a/android/res/drawable-hdpi/img_news_booking.png
+++ b/android/res/drawable-hdpi/img_news_booking.png
--- a/android/res/drawable-hdpi/img_news_editor.png
+++ b/android/res/drawable-hdpi/img_news_editor.png
--- a/android/res/drawable-hdpi/img_news_search.png
+++ b/android/res/drawable-hdpi/img_news_search.png
--- a/android/res/drawable-ldpi/ic_leadreboard.png
+++ b/android/res/drawable-ldpi/ic_leadreboard.png
--- a/android/res/drawable-ldpi/ic_more.png
+++ b/android/res/drawable-ldpi/ic_more.png
--- a/android/res/drawable-mdpi/ic_bicycle_beta.png
+++ b/android/res/drawable-mdpi/ic_bicycle_beta.png
--- a/android/res/drawable-mdpi/ic_leaderboard.png
+++ b/android/res/drawable-mdpi/ic_leaderboard.png
--- a/android/res/drawable-mdpi/ic_more.png
+++ b/android/res/drawable-mdpi/ic_more.png
--- a/android/res/drawable-mdpi/img_news_migration.png
+++ b/android/res/drawable-mdpi/img_news_migration.png
--- a/android/res/drawable-mdpi/img_news_bicycle.png
+++ b/android/res/drawable-mdpi/img_news_bicycle.png
--- a/android/res/drawable-mdpi/img_news_booking.png
+++ b/android/res/drawable-mdpi/img_news_booking.png
--- a/android/res/drawable-mdpi/img_news_editor.png
+++ b/android/res/drawable-mdpi/img_news_editor.png
--- a/android/res/drawable-mdpi/img_news_search.png
+++ b/android/res/drawable-mdpi/img_news_search.png
--- a/android/res/drawable-xhdpi/ic_bicycle_beta.png
+++ b/android/res/drawable-xhdpi/ic_bicycle_beta.png
--- a/android/res/drawable-xhdpi/ic_leaderboard.png
+++ b/android/res/drawable-xhdpi/ic_leaderboard.png
--- a/android/res/drawable-xhdpi/ic_more.png
+++ b/android/res/drawable-xhdpi/ic_more.png
--- a/android/res/drawable-xhdpi/img_news_migration.png
+++ b/android/res/drawable-xhdpi/img_news_migration.png
--- a/android/res/drawable-xhdpi/img_news_bicycle.png
+++ b/android/res/drawable-xhdpi/img_news_bicycle.png
--- a/android/res/drawable-xhdpi/img_news_booking.png
+++ b/android/res/drawable-xhdpi/img_news_booking.png
--- a/android/res/drawable-xhdpi/img_news_editor.png
+++ b/android/res/drawable-xhdpi/img_news_editor.png
--- a/android/res/drawable-xhdpi/img_news_search.png
+++ b/android/res/drawable-xhdpi/img_news_search.png
--- a/android/res/drawable-xxhdpi/ic_bicycle_beta.png
+++ b/android/res/drawable-xxhdpi/ic_bicycle_beta.png
--- a/android/res/drawable-xxhdpi/ic_leaderboard.png
+++ b/android/res/drawable-xxhdpi/ic_leaderboard.png
--- a/android/res/drawable-xxhdpi/ic_more.png
+++ b/android/res/drawable-xxhdpi/ic_more.png
--- a/android/res/drawable-xxhdpi/img_news_migration.png
+++ b/android/res/drawable-xxhdpi/img_news_migration.png
--- a/android/res/drawable-xxhdpi/img_news_bicycle.png
+++ b/android/res/drawable-xxhdpi/img_news_bicycle.png
--- a/android/res/drawable-xxhdpi/img_news_booking.png
+++ b/android/res/drawable-xxhdpi/img_news_booking.png
--- a/android/res/drawable-xxhdpi/img_news_editor.png
+++ b/android/res/drawable-xxhdpi/img_news_editor.png
--- a/android/res/drawable-xxhdpi/img_news_search.png
+++ b/android/res/drawable-xxhdpi/img_news_search.png
--- a/android/res/drawable-xxxhdpi/ic_bicycle_beta.png
+++ b/android/res/drawable-xxxhdpi/ic_bicycle_beta.png
--- a/android/res/drawable-xxxhdpi/img_news_migration.png
+++ b/android/res/drawable-xxxhdpi/img_news_migration.png
--- a/android/res/drawable-xxxhdpi/img_news_bicycle.png
+++ b/android/res/drawable-xxxhdpi/img_news_bicycle.png
--- a/android/res/drawable-xxxhdpi/img_news_booking.png
+++ b/android/res/drawable-xxxhdpi/img_news_booking.png
--- a/android/res/drawable-xxxhdpi/img_news_editor.png
+++ b/android/res/drawable-xxxhdpi/img_news_editor.png
--- a/android/res/drawable-xxxhdpi/img_news_search.png
+++ b/android/res/drawable-xxxhdpi/img_news_search.png
--- a/android/res/layout/dialog_edit_text.xml
+++ b/android/res/layout/dialog_edit_text.xml
@ -23,6 +23,8 @@
      style="@style/MwmWidget.PlacePage.EditText"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
+      android:inputType="text"
+      android:maxLength="100"
      android:singleLine="true"/>

  </android.support.design.widget.TextInputLayout>
--- a/android/res/layout/fragment_auth_editor.xml
+++ b/android/res/layout/fragment_auth_editor.xml
@ -5,7 +5,6 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:orientation="vertical">
-
  <android.support.v7.widget.Toolbar
    android:id="@+id/toolbar"
    style="@style/MwmWidget.ToolbarStyle"
@ -15,65 +14,92 @@
    android:gravity="end|center_vertical"
    android:theme="@style/MwmWidget.ToolbarTheme"
    tools:ignore="UnusedAttribute">
-
    <ImageView
-      android:id="@+id/logout"
+      android:id="@+id/more"
      android:layout_width="?actionBarSize"
      android:layout_height="?actionBarSize"
      android:layout_gravity="end|center_vertical"
      android:background="?selectableItemBackgroundBorderless"
      android:scaleType="center"
-      android:src="@drawable/ic_logout"
+      android:src="@drawable/ic_more"
      android:visibility="gone"/>
-
  </android.support.v7.widget.Toolbar>

  <ScrollView
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?colorPrimary"
-    android:fillViewport="true"
-    tools:ignore="DuplicateIds">
-
+    android:fillViewport="true">
    <LinearLayout
      android:layout_width="match_parent"
      android:layout_height="match_parent"
-      android:orientation="vertical"
-      android:padding="@dimen/margin_half_plus"
-      android:clipToPadding="false"
      android:clipChildren="false"
+      android:clipToPadding="false"
+      android:orientation="vertical"
      tools:ignore="ScrollViewSize">
-
      <LinearLayout
        android:id="@+id/block_edits"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:animateLayoutChanges="true"
+        android:background="?colorPrimary"
        android:orientation="vertical"
+        android:padding="@dimen/margin_base"
        android:visibility="visible">
+        <LinearLayout
+          android:id="@+id/sent_edits"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:paddingBottom="@dimen/margin_base"
+          android:orientation="vertical">
+          <TextView
+            android:id="@+id/edits_count"
+            android:layout_width="match_parent"
+            android:layout_height="112dp"
+            android:gravity="center"
+            android:textColor="@color/text_light"
+            android:textSize="96sp"
+            android:textStyle="bold"
+            tools:text="244"/>
+
+          <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/editor_profile_changes"
+            android:textAppearance="@style/MwmTextAppearance.Body1.Light"
+            android:textStyle="bold"/>
+
+          <TextView
+            android:id="@+id/date_sent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:textAppearance="@style/MwmTextAppearance.Body3.Light"
+            tools:text="Last sent: 12.01.2015"/>
+        </LinearLayout>

        <include
          android:id="@+id/local_edits"
          layout="@layout/item_osm_edits"
          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="@dimen/margin_half"/>
-
-        <include
-          android:id="@+id/sent_edits"
-          layout="@layout/item_osm_edits"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="@dimen/margin_half"/>
-
+          android:layout_height="wrap_content"/>
      </LinearLayout>

      <LinearLayout
        android:id="@+id/block_auth"
        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="?colorPrimary"
+        android:clipChildren="false"
        android:clipToPadding="false"
-        android:clipChildren="false">
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/margin_base"
+        android:paddingStart="@dimen/margin_base"
+        android:paddingRight="@dimen/margin_base"
+        android:paddingEnd="@dimen/margin_base"
+        tools:visibility="gone">

        <TextView
          android:id="@+id/first_osm_edit"
@ -87,9 +113,9 @@
        <LinearLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
-          android:orientation="horizontal"
-          android:clipToPadding="false"
          android:clipChildren="false"
+          android:clipToPadding="false"
+          android:orientation="horizontal"
          tools:ignore="ButtonStyle">

          <Button
@ -104,10 +130,10 @@
            android:drawableLeft="@drawable/ic_login_google"
            android:drawableStart="@drawable/ic_login_google"
            android:fontFamily="@string/robotoMedium"
-            android:paddingEnd="@dimen/margin_half"
            android:paddingLeft="@dimen/margin_half"
-            android:paddingRight="@dimen/margin_half"
            android:paddingStart="@dimen/margin_half"
+            android:paddingRight="@dimen/margin_half"
+            android:paddingEnd="@dimen/margin_half"
            android:text="@string/google"
            android:textAppearance="@style/MwmTextAppearance.Body1"
            android:textColor="@color/text_dark"
@ -123,10 +149,10 @@
            android:drawableLeft="@drawable/ic_login_fb"
            android:drawableStart="@drawable/ic_login_fb"
            android:fontFamily="@string/robotoMedium"
-            android:paddingEnd="@dimen/margin_half"
            android:paddingLeft="@dimen/margin_half"
-            android:paddingRight="@dimen/margin_half"
            android:paddingStart="@dimen/margin_half"
+            android:paddingRight="@dimen/margin_half"
+            android:paddingEnd="@dimen/margin_half"
            android:text="@string/facebook"
            android:textAppearance="@style/MwmTextAppearance.Body1.Light"
            android:textColor="@color/text_light"
@ -159,7 +185,8 @@
          android:layout_height="wrap_content"
          android:layout_marginTop="@dimen/margin_half"
          android:background="?clickableBackground"
-          android:padding="@dimen/margin_half"
+          android:paddingTop="@dimen/margin_half"
+          android:paddingBottom="@dimen/margin_half"
          android:text="@string/register_at_openstreetmap"
          android:textAllCaps="true"
          android:textAppearance="@style/MwmTextAppearance.Body1.Light"
@ -167,8 +194,85 @@

      </LinearLayout>

+      <RelativeLayout
+        android:id="@+id/block_rating"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:padding="@dimen/margin_base">
+
+        <android.support.v7.widget.CardView
+          style="@style/MwmWidget.Editor.CardView"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content">
+
+          <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingLeft="@dimen/margin_half"
+            android:paddingStart="@dimen/margin_half"
+            android:paddingRight="@dimen/margin_half"
+            android:paddingEnd="@dimen/margin_half"
+            android:paddingTop="@dimen/margin_base"
+            android:paddingBottom="@dimen/margin_base">
+
+            <ImageView
+              android:id="@+id/image"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="@dimen/margin_half"
+              android:layout_marginStart="@dimen/margin_half"
+              android:scaleType="center"
+              android:src="@drawable/ic_leaderboard"
+              android:tint="?iconTint"/>
+
+            <LinearLayout
+              android:layout_width="0dp"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="@dimen/margin_base"
+              android:layout_marginStart="@dimen/margin_base"
+              android:layout_weight="1"
+              android:orientation="vertical"
+              tools:ignore="NestedWeights">
+
+              <TextView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:text="@string/editor_profile_rating_place"
+                android:textAppearance="@style/MwmTextAppearance.Body3"/>
+
+              <TextView
+                android:id="@+id/rating"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:fontFamily="@string/robotoMedium"
+                android:gravity="center_vertical"
+                android:textAppearance="@style/MwmTextAppearance.Headline"
+                tools:ignore="UnusedAttribute"
+                tools:text="-42"/>
+            </LinearLayout>
+          </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+        <TextView
+          android:id="@+id/about_osm"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_alignParentBottom="true"
+          android:background="?clickableBackground"
+          android:gravity="center"
+          android:paddingBottom="@dimen/margin_half"
+          android:paddingTop="@dimen/margin_half"
+          android:text="@string/editor_more_about_osm"
+          android:textAppearance="@style/MwmTextAppearance.Body4"
+          android:textColor="?colorAccent"
+          android:textSize="@dimen/text_size_body_4"/>
+      </RelativeLayout>
    </LinearLayout>
-
  </ScrollView>
-
-</LinearLayout>
+</LinearLayout>
--- a/android/res/layout/fragment_migrate.xml
+++ b/android/res/layout/fragment_migrate.xml
@ -17,7 +17,7 @@
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_marginBottom="@dimen/margin_base"
-      android:src="@drawable/img_news_migration"
+      android:src="@drawable/img_migration"
      android:tag="@string/tag_height_limited"/>

    <TextView
--- a/android/res/layout/fragment_news.xml
+++ b/android/res/layout/fragment_news.xml
@ -74,7 +74,7 @@
      android:id="@+id/done"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
-      android:layout_gravity="right"
+      android:layout_gravity="end"
      android:text="@string/done"
      android:textAppearance="@style/MwmTextAppearance.Body3"
      android:textColor="?colorAccent"
--- a/android/res/layout/fragment_news_single.xml
+++ b/android/res/layout/fragment_news_single.xml
@ -25,7 +25,7 @@
      android:layout_height="wrap_content"
      android:layout_marginBottom="@dimen/margin_base"
      android:layout_gravity="center_horizontal"
-      android:src="@drawable/img_news_editor"
+      android:src="@drawable/img_news_booking"
      android:tag="@string/tag_height_limited"/>

    <TextView
--- a/android/res/layout/item_osm_edits.xml
+++ b/android/res/layout/item_osm_edits.xml
@ -46,16 +46,7 @@
        android:gravity="center_vertical"
        android:textAppearance="@style/MwmTextAppearance.Body1"
        tools:ignore="UnusedAttribute"
-        tools:text="Edits : 4"/>
-
-      <TextView
-        android:id="@+id/subtitle"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        tools:text="Last sent 12.01.2015"/>
+        tools:text="Not sent : 4"/>

    </LinearLayout>

--- a/android/res/layout/news_page.xml
+++ b/android/res/layout/news_page.xml
@ -17,6 +17,15 @@
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:layout_gravity="center">
+        <ImageView
+          android:id="@+id/image"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="@dimen/margin_base"
+          android:layout_gravity="center_horizontal"
+          android:tag="@string/tag_height_limited"
+          tools:src="@drawable/img_news_booking"/>
+
        <TextView
          android:id="@+id/title"
          android:layout_width="wrap_content"
@ -30,22 +39,13 @@
          android:fontFamily="@string/robotoMedium"
          tools:text="Whats new feature!"/>

-        <ImageView
-          android:id="@+id/image"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="@dimen/margin_base"
-          android:layout_gravity="center_horizontal"
-          android:tag="@string/tag_height_limited"
-          tools:src="@drawable/img_news_night"/>
-
        <TextView
          android:id="@+id/subtitle"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:layout_marginLeft="@dimen/margin_base"
          android:layout_marginRight="@dimen/margin_base"
-          android:textAppearance="@style/MwmTextAppearance.Body1"
+          android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
          android:layout_gravity="center_horizontal"
          android:gravity="center_horizontal"
          tools:text="We\'ve made some cool stuff!\nSit down and be happy now, man."/>
--- a/android/res/layout/place_page_more.xml
+++ b/android/res/layout/place_page_more.xml
@ -4,17 +4,19 @@
  android:id="@+id/ll__more"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:orientation="vertical"
-  android:background="?clickableBackground">
+  android:orientation="vertical">
  <View
    android:layout_width="match_parent"
    android:layout_height="1dp"
+    android:layout_marginTop="@dimen/margin_half"
+    android:layout_marginBottom="@dimen/margin_half"
    android:layout_marginLeft="@dimen/margin_base"
    android:layout_marginRight="@dimen/margin_base"
    android:background="?dividerHorizontal"/>

  <TextView
    style="@style/PlacePageMetadataText.Button"
+    android:background="?clickableBackground"
    android:padding="@dimen/margin_half"
    android:text="@string/details"
    android:gravity="center"/>
--- a/android/res/layout/routing_plan_details.xml
+++ b/android/res/layout/routing_plan_details.xml
@ -2,7 +2,6 @@
 <RelativeLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
-  xmlns:wheel="http://schemas.android.com/apk/res-auto"
  android:id="@+id/planning_frame"
  style="@style/MwmWidget.Floating.Panel"
  android:layout_width="match_parent"
@ -64,6 +63,13 @@
      tools:buttonTint="?iconTintLight"/>
  </RadioGroup>

+  <ImageView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignTop="@id/route_type"
+    android:layout_alignRight="@id/route_type"
+    android:src="@drawable/ic_bicycle_beta"/>
+
  <LinearLayout
    android:id="@+id/numbers"
    android:layout_width="wrap_content"
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@ -101,7 +101,7 @@
 	<string name="connection_settings">اعدادات الاتصال</string>
 	<string name="download_mb_or_kb">تنزيل %s</string>
 	<string name="close">اغلاق</string>
-	<string name="unsupported_phone">أنت بحاجة الى OpenGL بأجهزة تسريع . لسوء الحظ جهازك لا يدعم هذه الخاصية.</string>
+	<string name="unsupported_phone">أنت بحاجة الى OpenGL بأجهزة تسريع. لسوء الحظ جهازك لا يدعم هذه الخاصية.</string>
 	<string name="download">تنزيل</string>
 	<string name="external_storage_is_not_available">خاصية التخزين بواسطة البطاقة الرقمية الآمنة\الناقل التسلسلي الشامل غير متاحة مع الخرائط التي تم تنزيلها.</string>
 	<string name="disconnect_usb_cable">الرجاء فصل كابل الناقل التسلسلي الشامل أو إدخال بطاقة الذاكرة من أجل استخدام MAPS.ME.</string>
@ -681,6 +681,7 @@
 	<string name="download_all">تنزيل الكل</string>
 	<string name="delete_all">حذف الكل</string>
 	<string name="autodownload">التنزيل التلقائي</string>
+	<string name="disable_autodownload">تعطيل التنزيل التلقائي</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">مغلق الآن</string>
 	<!-- Place Page opening hours text -->
@ -755,7 +756,7 @@
 	<string name="editor_username_error_dialog">اسم المستخدم غير صحيح</string>
 	<string name="editor_place_edited_dialog">لقد قمت بتعديل هدف!</string>
 	<string name="editor_login_with_osm">تسجيل الدخول عبر OpenStreetMap</string>
-	<string name="editor_profile_changes">التغيرات:</string>
+	<string name="editor_profile_changes">التغييرات التي تم التحقق منها</string>
 	<string name="editor_profile_unsent_changes">لم ترسل:</string>
 	<string name="editor_focus_map_on_location">اسحب الخريطة لتحدد الموقع الصحيح للهدف.</string>
 	<string name="editor_add_select_category">اختر الفئة</string>
@ -853,7 +854,7 @@
 	<string name="placepage_entrance_type">المدخل</string>
 	<string name="placepage_flat">تطبيق</string>
 	<string name="placepage_open_24_7">24 / 7</string>
-	<string name="placepage_place_rating">التصنيف:</string>
+	<string name="place_page_booking_rating">التصنيف: %s</string>
 	<string name="place_page_starting_from">من%s</string>
 	<string name="meter">متر</string>
 	<string name="kilometer">كم</string>
@ -873,4 +874,19 @@
 	<string name="editor_remove_place_button">إزالة</string>
 	<string name="editor_status_sending">جارِ الإرسال…</string>
 	<string name="editor_place_doesnt_exist">المكان غير موجود</string>
+	<string name="text_more_button">…المزيد</string>
+	<string name="error_enter_correct_phone">أدحل رقم الهاتف دون أحرف</string>
+	<string name="error_enter_correct_web">أدخل عنوان ويب صالح</string>
+	<string name="error_enter_correct_email">أدخل بريدا إلكترونيا صالحا</string>
+	<string name="error_enter_correct">أدخل قيمة صالحة</string>
+	<string name="editor_profile_changes_for_next_place">التغييرات في المكان التالي: %d</string>
+	<string name="editor_profile_rating_place">المركز في التصنيف</string>
+	<string name="booking_dialog_not_connect_header">لحجز الفندق، يُرجى تمكين الاتصال بالإنترنت</string>
+	<string name="whatsnew_booking_header">حجز فندق من التطبيق</string>
+	<string name="whatsnew_booking_message">عندما تبحث عن فندق، ستعرض لك الخريطة فئة أسعار وتصنيف الفندق.</string>
+	<string name="button_try">جربه</string>
+	<string name="whatsnew_cycle_navigation_header">التوجيه الملاحي مع الدراجات (إصدار تجريبي)</string>
+	<string name="whatsnew_cycle_navigation_message">نختبر الآن التوجيه الملاحي مع الدراجات للموسم الجديد. جرب طريق الدراجات المفضل لديك باستخدام MAPS.ME، واطلعنا على رأيك.</string>
+	<string name="refresh">تحديث</string>
+	<string name="last_update">أخر تحديث: %s</string>
 </resources>
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@ -682,6 +682,7 @@
 	<string name="download_all">Stáhnout vše</string>
 	<string name="delete_all">Odstranit vše</string>
 	<string name="autodownload">Automaticky stahovat</string>
+	<string name="disable_autodownload">Zakázat automatické stahování</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Nyní je zavřeno</string>
 	<!-- Place Page opening hours text -->
@ -756,7 +757,7 @@
 	<string name="editor_username_error_dialog">Uživatelské jméno není platné</string>
 	<string name="editor_place_edited_dialog">Upravili jste objekt!</string>
 	<string name="editor_login_with_osm">Přihlásit se pomocí OpenStreetMap</string>
-	<string name="editor_profile_changes">Změny:</string>
+	<string name="editor_profile_changes">Oveřené změny</string>
 	<string name="editor_profile_unsent_changes">Neodesláno:</string>
 	<string name="editor_focus_map_on_location">Táhněte mapu, abyste vybrali správné umístění objektu.</string>
 	<string name="editor_add_select_category">Vyberte kategorii</string>
@ -854,7 +855,7 @@
 	<string name="placepage_entrance_type">Vchod</string>
 	<string name="placepage_flat">byt</string>
 	<string name="placepage_open_24_7">Nonstop</string>
-	<string name="placepage_place_rating">Hodnocení:</string>
+	<string name="place_page_booking_rating">Hodnocení: %s</string>
 	<string name="place_page_starting_from">od %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -874,4 +875,19 @@
 	<string name="editor_remove_place_button">Odstranit</string>
 	<string name="editor_status_sending">Odesílání…</string>
 	<string name="editor_place_doesnt_exist">Místo neexistuje</string>
+	<string name="text_more_button">…dále</string>
+	<string name="error_enter_correct_phone">Zadat telefonní číslo bez písmen</string>
+	<string name="error_enter_correct_web">Zadat platnou webovou adresu</string>
+	<string name="error_enter_correct_email">Zadat platný email</string>
+	<string name="error_enter_correct">Zadat platnou hodnotu</string>
+	<string name="editor_profile_changes_for_next_place">Změny v dalším místě: %d</string>
+	<string name="editor_profile_rating_place">Pořadí v hodnocení</string>
+	<string name="booking_dialog_not_connect_header">Chcete-li si rezervovat hotel, aktivujte připojení k internetu</string>
+	<string name="whatsnew_booking_header">Rezervujte si hotel přímo v aplikaci</string>
+	<string name="whatsnew_booking_message">Aplikace vám k výsledkům vyhledávání hotelů ukáže jejich cenovou skupinu a hodnocení.</string>
+	<string name="button_try">Vyzkoušet</string>
+	<string name="whatsnew_cycle_navigation_header">Navigace pro kola (beta verze)</string>
+	<string name="whatsnew_cycle_navigation_message">Tuto sezónu testujeme novou navigaci pro kola. Projeďte si svou oblíbenou trasu s MAPS.ME a podělte se s námi o svůj názor.</string>
+	<string name="refresh">Aktualizovat</string>
+	<string name="last_update">Poslední aktualizace: %s</string>
 </resources>
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@ -679,6 +679,7 @@
 	<string name="download_all">Download alle</string>
 	<string name="delete_all">Slet alle</string>
 	<string name="autodownload">Automatisk download</string>
+	<string name="disable_autodownload">Deaktiver automatisk download</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Lukket nu</string>
 	<!-- Place Page opening hours text -->
@ -753,7 +754,7 @@
 	<string name="editor_username_error_dialog">Ugyldigt brugernavn</string>
 	<string name="editor_place_edited_dialog">Du har redigeret et objekt!</string>
 	<string name="editor_login_with_osm">Login med OpenStreetMap</string>
-	<string name="editor_profile_changes">Ændringer:</string>
+	<string name="editor_profile_changes">Bekræftede ændringer</string>
 	<string name="editor_profile_unsent_changes">Ikke sendt:</string>
 	<string name="editor_focus_map_on_location">Træk kortet for at vælge objektets korrekte placering.</string>
 	<string name="editor_add_select_category">Vælg kategori</string>
@ -851,7 +852,7 @@
 	<string name="placepage_entrance_type">Indgang</string>
 	<string name="placepage_flat">app.</string>
 	<string name="placepage_open_24_7">24 / 7</string>
-	<string name="placepage_place_rating">Bedømmelse:</string>
+	<string name="place_page_booking_rating">Bedømmelse: %s</string>
 	<string name="place_page_starting_from">fra %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -871,4 +872,19 @@
 	<string name="editor_remove_place_button">Fjern</string>
 	<string name="editor_status_sending">Send…</string>
 	<string name="editor_place_doesnt_exist">Stedet eksisterer ikke</string>
+	<string name="text_more_button">…mere</string>
+	<string name="error_enter_correct_phone">Indtast telefonnummer uden bogstaver</string>
+	<string name="error_enter_correct_web">Indtast en gyldig webadresse</string>
+	<string name="error_enter_correct_email">Indtast en gyldig e-mailadresse</string>
+	<string name="error_enter_correct">Indtast en gyldig værdi</string>
+	<string name="editor_profile_changes_for_next_place">Ændringer for næste sted: %d</string>
+	<string name="editor_profile_rating_place">Rangorden</string>
+	<string name="booking_dialog_not_connect_header">For at booke hotellet, bedes du aktivere din internetforbindelse</string>
+	<string name="whatsnew_booking_header">Book et hotel fra appen</string>
+	<string name="whatsnew_booking_message">Når du leder efter et hotel, vil kortet vise hotellernes priskategori og vurdering.</string>
+	<string name="button_try">Prøv det</string>
+	<string name="whatsnew_cycle_navigation_header">Cykelnavigation (beta-version)</string>
+	<string name="whatsnew_cycle_navigation_message">Vi tester cykelnavigation til den nye sæson. Prøv din favoritcykelrute med MAPS.ME, og del dine kommentarer med os.</string>
+	<string name="refresh">Opdater</string>
+	<string name="last_update">Sidste opdatering: %s</string>
 </resources>
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@ -701,6 +701,7 @@
 	<string name="download_all">Alle herunterladen</string>
 	<string name="delete_all">Alle löschen</string>
 	<string name="autodownload">Automatisch herunterladen</string>
+	<string name="disable_autodownload">Automatischen Download deaktivieren</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Jetzt geschlossen</string>
 	<!-- Place Page opening hours text -->
@ -779,7 +780,7 @@
 	<string name="editor_username_error_dialog">Benutzername ist ungültig</string>
 	<string name="editor_place_edited_dialog">Sie haben ein Objekt bearbeitet!</string>
 	<string name="editor_login_with_osm">Mit OpenStreetMap anmelden</string>
-	<string name="editor_profile_changes">Änderungen:</string>
+	<string name="editor_profile_changes">Bestätigte Änderungen der Karte</string>
 	<string name="editor_profile_unsent_changes">Nicht gesendet:</string>
 	<string name="editor_focus_map_on_location">Ziehen Sie die Karte, um den Standort des Objektes zu korrigieren.</string>
 	<string name="editor_add_select_category">Kategorie auswählen</string>
@ -877,7 +878,7 @@
 	<string name="placepage_entrance_type">Typ der Einfahrt</string>
 	<string name="placepage_flat">Wohnung</string>
 	<string name="placepage_open_24_7">Durchgehend geöffnet</string>
-	<string name="placepage_place_rating">Rating:</string>
+	<string name="place_page_booking_rating">Rating: %s</string>
 	<string name="place_page_starting_from">ab %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -897,4 +898,19 @@
 	<string name="editor_remove_place_button">Löschen</string>
 	<string name="editor_status_sending">Senden…</string>
 	<string name="editor_place_doesnt_exist">Dieser Ort existiert nicht</string>
+	<string name="text_more_button">…Mehr</string>
+	<string name="error_enter_correct_phone">Geben Sie die Telefonnummer ohne Buchstaben ein</string>
+	<string name="error_enter_correct_web">Geben Sie eine gültige Internetadresse ein</string>
+	<string name="error_enter_correct_email">Geben Sie eine gültige E-Mail-Adresse ein</string>
+	<string name="error_enter_correct">Geben Sie einen gültigen Wert ein</string>
+	<string name="editor_profile_changes_for_next_place">Erforderliche Änderungen für den nächsten Platz: %d</string>
+	<string name="editor_profile_rating_place">Platz im Rating</string>
+	<string name="booking_dialog_not_connect_header">Für die Hotelbuchung benötigen Sie eine Internetverbindung</string>
+	<string name="whatsnew_booking_header">Buchung von Hotels über die App</string>
+	<string name="whatsnew_booking_message">Wenn Sie nach einem Hotel suchen, werden in der Karte die Preiskategorie und die Bewertung des Hotels angezeigt.</string>
+	<string name="button_try">Probieren Sie es aus</string>
+	<string name="whatsnew_cycle_navigation_header">Fahrradnavigation (Betaversion)</string>
+	<string name="whatsnew_cycle_navigation_message">Wir testen die Fahrradnavigation für die neue Saison. Testen Sie Ihre Lieblings-Fahrradroute mit MAPS.ME und teilen Sie Ihre Meinung mit uns.</string>
+	<string name="refresh">Aktualisieren</string>
+	<string name="last_update">Letzte Aktualisierung: %s</string>
 </resources>
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@ -670,6 +670,7 @@
 	<string name="download_all">Descargar todos</string>
 	<string name="delete_all">Eliminar todos</string>
 	<string name="autodownload">Descarga automática</string>
+	<string name="disable_autodownload">Inhabilitar descarga automática</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Cerrado ahora</string>
 	<!-- Place Page opening hours text -->
@ -744,7 +745,7 @@
 	<string name="editor_username_error_dialog">Usuario no válido</string>
 	<string name="editor_place_edited_dialog">¡Has editado un objeto!</string>
 	<string name="editor_login_with_osm">Iniciar sesión con OpenStreetMap</string>
-	<string name="editor_profile_changes">Cambios:</string>
+	<string name="editor_profile_changes">Cambios verificados</string>
 	<string name="editor_profile_unsent_changes">No enviado:</string>
 	<string name="editor_focus_map_on_location">Arrastra el mapa para seleccionar la ubicación correcta del objeto.</string>
 	<string name="editor_add_select_category">Seleccionar categoría</string>
@ -842,7 +843,7 @@
 	<string name="placepage_entrance_type">Entrada</string>
 	<string name="placepage_flat">aplicación</string>
 	<string name="placepage_open_24_7">24 / 7</string>
-	<string name="placepage_place_rating">Valoración:</string>
+	<string name="place_page_booking_rating">Valoración: %s</string>
 	<string name="place_page_starting_from">desde %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -862,4 +863,19 @@
 	<string name="editor_remove_place_button">Eliminar</string>
 	<string name="editor_status_sending">Enviando…</string>
 	<string name="editor_place_doesnt_exist">El lugar no existe</string>
+	<string name="text_more_button">…más</string>
+	<string name="error_enter_correct_phone">Introduce el número de teléfono sin letras</string>
+	<string name="error_enter_correct_web">Introduce una dirección web válida</string>
+	<string name="error_enter_correct_email">Introduce un email válido</string>
+	<string name="error_enter_correct">Introduce un valor válido</string>
+	<string name="editor_profile_changes_for_next_place">Cambios para la próxima posición: %d</string>
+	<string name="editor_profile_rating_place">Posición en la clasificación</string>
+	<string name="booking_dialog_not_connect_header">Para reservar el hotel, habilita tu conexión a Internet</string>
+	<string name="whatsnew_booking_header">Reserva un hotel desde la aplicación</string>
+	<string name="whatsnew_booking_message">Cuando busques un hotel, el mapa mostrará la categoría de precio y clasificación de los hoteles.</string>
+	<string name="button_try">Pruébalo</string>
+	<string name="whatsnew_cycle_navigation_header">Navegación en bici (versión beta)</string>
+	<string name="whatsnew_cycle_navigation_message">Estamos probando la navegación en bici para la nueva temporada. Prueba tu ruta favorita en bicicleta con MAPS.ME y comparte tu opinión con nosotros.</string>
+	<string name="refresh">Actualizar</string>
+	<string name="last_update">Última actualización: %s</string>
 </resources>
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@ -675,6 +675,7 @@
 	<string name="download_all">Lataa kaikki</string>
 	<string name="delete_all">Poista kaikki</string>
 	<string name="autodownload">Lataa automaattisesti</string>
+	<string name="disable_autodownload">Poista käytöstä automaattinen lataus</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Suljettu nyt</string>
 	<!-- Place Page opening hours text -->
@ -749,7 +750,7 @@
 	<string name="editor_username_error_dialog">Käyttäjätunnus on virheellinen</string>
 	<string name="editor_place_edited_dialog">Olet muokannut kohdetta!</string>
 	<string name="editor_login_with_osm">Kirjaudu sisään OpenStreetMapissa</string>
-	<string name="editor_profile_changes">Muutokset:</string>
+	<string name="editor_profile_changes">Vahvistetut karttamuutokset</string>
 	<string name="editor_profile_unsent_changes">Ei lähetetty:</string>
 	<string name="editor_focus_map_on_location">Vedä karttaa valitaksesi kohteelle oikean sijainnin.</string>
 	<string name="editor_add_select_category">Valitse kategoria</string>
@ -847,7 +848,7 @@
 	<string name="placepage_entrance_type">Sisäänkäynti</string>
 	<string name="placepage_flat">sov.</string>
 	<string name="placepage_open_24_7">24_7</string>
-	<string name="placepage_place_rating">Luokitus</string>
+	<string name="place_page_booking_rating">Luokitus: %s</string>
 	<string name="place_page_starting_from">%s:stä</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -867,4 +868,19 @@
 	<string name="editor_remove_place_button">Poista</string>
 	<string name="editor_status_sending">Lähetetään…</string>
 	<string name="editor_place_doesnt_exist">Paikkaa ei ole</string>
+	<string name="text_more_button">…Näytä</string>
+	<string name="error_enter_correct_phone">Syötä puhelinnumero ilman kirjaimia</string>
+	<string name="error_enter_correct_web">Syötä kelvollinen verkko-osoite</string>
+	<string name="error_enter_correct_email">Syötä kelvollinen sähköpostiosoite</string>
+	<string name="error_enter_correct">Syötä kelvollinen arvo</string>
+	<string name="editor_profile_changes_for_next_place">Muutokset paikkaan: %d</string>
+	<string name="editor_profile_rating_place">Luokitussija</string>
+	<string name="booking_dialog_not_connect_header">Ota käyttöön internet-yhteytesi varataksesi hotellin</string>
+	<string name="whatsnew_booking_header">Varaa hotelli sovelluksesta</string>
+	<string name="whatsnew_booking_message">Etsiessäsi hotellia kartta näyttää hotellien hintaluokan ja luokituksen.</string>
+	<string name="button_try">Kokeile sitä</string>
+	<string name="whatsnew_cycle_navigation_header">Polkupyöränavigointi (betaversio)</string>
+	<string name="whatsnew_cycle_navigation_message">Testaamme polkupyöränavigointia uudelle kaudelle. Kokeile suosikkipyöräilyreittiäsi MAPS.ME-sovelluksella ja jaa mielipiteesi kanssamme.</string>
+	<string name="refresh">Päivitetäänkö</string>
+	<string name="last_update">Viimeisin päivitys: %s</string>
 </resources>
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@ -686,6 +686,7 @@
 	<string name="download_all">Tout télécharger</string>
 	<string name="delete_all">Supprimer tout</string>
 	<string name="autodownload">Téléchargement automatique</string>
+	<string name="disable_autodownload">Désactiver téléchargement automatique</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Fermé actuellement</string>
 	<!-- Place Page opening hours text -->
@ -760,7 +761,7 @@
 	<string name="editor_username_error_dialog">Le nom d\&#39;utilisateur est invalide</string>
 	<string name="editor_place_edited_dialog">Vous avez modifié un objet !</string>
 	<string name="editor_login_with_osm">Connexion avec OpenStreetMap</string>
-	<string name="editor_profile_changes">Modifications :</string>
+	<string name="editor_profile_changes">Modifications vérifiées</string>
 	<string name="editor_profile_unsent_changes">Non envoyé :</string>
 	<string name="editor_focus_map_on_location">Tirez la carte pour sélectionner la bonne position de l\&#39;objet.</string>
 	<string name="editor_add_select_category">Sélectionner une catégorie</string>
@ -858,7 +859,7 @@
 	<string name="placepage_entrance_type">Entrée</string>
 	<string name="placepage_flat">app.</string>
 	<string name="placepage_open_24_7">24h/24 et 7j/7</string>
-	<string name="placepage_place_rating">Notation</string>
+	<string name="place_page_booking_rating">Notation: %s</string>
 	<string name="place_page_starting_from">à partir de %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -878,4 +879,19 @@
 	<string name="editor_remove_place_button">Supprimer</string>
 	<string name="editor_status_sending">Envoyer…</string>
 	<string name="editor_place_doesnt_exist">La place n\&#39;existe pas</string>
+	<string name="text_more_button">…Afficher la suite</string>
+	<string name="error_enter_correct_phone">Saisir un numéro de téléphone sans lettres</string>
+	<string name="error_enter_correct_web">Saisir une adresse Internet valide</string>
+	<string name="error_enter_correct_email">Saisir un e-mail valide</string>
+	<string name="error_enter_correct">Saisir une valeur correcte</string>
+	<string name="editor_profile_changes_for_next_place">Modifications vers le prochain lieu: %d</string>
+	<string name="editor_profile_rating_place">Notation position</string>
+	<string name="booking_dialog_not_connect_header">Pour réserver l\&#39;hôtel, veuillez activer votre connexion Internet</string>
+	<string name="whatsnew_booking_header">Réservez un hôtel depuis l\&#39;application</string>
+	<string name="whatsnew_booking_message">Lorsque vous recherchez un hôtel, la carte indiquera le prix, la catégorie et l\&#39;évaluation des hôtels disponibles.</string>
+	<string name="button_try">Essayer</string>
+	<string name="whatsnew_cycle_navigation_header">Navigation à vélo (version bêta)</string>
+	<string name="whatsnew_cycle_navigation_message">Nous testons la navigation à vélo pour la nouvelle saison. Essayez votre parcours préféré à vélo avec MAPS.ME, et n\&#39;hésitez pas à nous partager vos impressions.</string>
+	<string name="refresh">Mettre à jour</string>
+	<string name="last_update">Dernière mise à jour à %s</string>
 </resources>
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@ -676,6 +676,7 @@
 	<string name="download_all">Összes letöltése</string>
 	<string name="delete_all">Összes térkép törlése</string>
 	<string name="autodownload">Automatikus letöltés</string>
+	<string name="disable_autodownload">Automatikus letöltés tiltása</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Most zárva</string>
 	<!-- Place Page opening hours text -->
@ -750,7 +751,7 @@
 	<string name="editor_username_error_dialog">Érvénytelen felhasználónév</string>
 	<string name="editor_place_edited_dialog">Szerkesztettél egy objektumot!</string>
 	<string name="editor_login_with_osm">Bejelentkezés OpenStreetMappel</string>
-	<string name="editor_profile_changes">Változások:</string>
+	<string name="editor_profile_changes">Jóváhagyott változtatások</string>
 	<string name="editor_profile_unsent_changes">Nincs elküldve:</string>
 	<string name="editor_focus_map_on_location">Húzd a térképet a megfelelő helyre az objektum helyes helyszínének kiválasztásához.</string>
 	<string name="editor_add_select_category">Válassz kategóriát</string>
@ -847,7 +848,7 @@
 	<string name="placepage_entrance_type">Bejárat</string>
 	<string name="placepage_flat">lakás</string>
 	<string name="placepage_open_24_7">24 órás</string>
-	<string name="placepage_place_rating">Kategória</string>
+	<string name="place_page_booking_rating">Kategória: %s</string>
 	<string name="place_page_starting_from">kezdőár %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -867,4 +868,19 @@
 	<string name="editor_remove_place_button">Eltávolítás</string>
 	<string name="editor_status_sending">Küldés…</string>
 	<string name="editor_place_doesnt_exist">A hely nem létezik</string>
+	<string name="text_more_button">…tovább</string>
+	<string name="error_enter_correct_phone">Adj meg egy telefonszámot betűk nélkül</string>
+	<string name="error_enter_correct_web">Adj meg egy érvényes weboldalcímet</string>
+	<string name="error_enter_correct_email">Adj meg egy érvényes e-mail-címet</string>
+	<string name="error_enter_correct">Adj meg egy érvényes értéket</string>
+	<string name="editor_profile_changes_for_next_place">Változtatások a jobb helyért: %d</string>
+	<string name="editor_profile_rating_place">Ranglista helyezés</string>
+	<string name="booking_dialog_not_connect_header">A szálloda lefoglalásához csatlakozzon az internethez</string>
+	<string name="whatsnew_booking_header">Szálloda foglalása az alkalmazásból</string>
+	<string name="whatsnew_booking_message">Amikor szállodát keresel, az alkalmazás megjeleníti a hotel árkategóriáját és értékelését.</string>
+	<string name="button_try">Próbáld ki</string>
+	<string name="whatsnew_cycle_navigation_header">Kerékpáros navigáció (béta verzió)</string>
+	<string name="whatsnew_cycle_navigation_message">Most teszteljük a kerékpáros navigációt a következő évszakra. Próbáld ki kedvenc kerékpáros útvonalad a MAPS.ME-vel és oszd meg velünk véleményedet.</string>
+	<string name="refresh">Frissítés</string>
+	<string name="last_update">Utolsó frissítés: %s</string>
 </resources>
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@ -674,6 +674,7 @@
 	<string name="download_all">Unduh semua</string>
 	<string name="delete_all">Hapus semua</string>
 	<string name="autodownload">Unduhan otomatis</string>
+	<string name="disable_autodownload">Nonaktifkan unduh otomatis</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Sekarang Tutup</string>
 	<!-- Place Page opening hours text -->
@ -748,7 +749,7 @@
 	<string name="editor_username_error_dialog">Nama pengguna tidak benar</string>
 	<string name="editor_place_edited_dialog">Anda telah mengedit sebuah obyek!</string>
 	<string name="editor_login_with_osm">Masuk dengan OpenStreetMap</string>
-	<string name="editor_profile_changes">Perubahan:</string>
+	<string name="editor_profile_changes">Perubahan Terverifikasi</string>
 	<string name="editor_profile_unsent_changes">Tidak terkirim:</string>
 	<string name="editor_focus_map_on_location">Tarik peta untuk memilih lokasi yang benar dari obyek.</string>
 	<string name="editor_add_select_category">Pilih kategori</string>
@ -846,7 +847,7 @@
 	<string name="placepage_entrance_type">Gerbang Masuk</string>
 	<string name="placepage_flat">persegi</string>
 	<string name="placepage_open_24_7">24 jam sehari, 7 hari seminggu</string>
-	<string name="placepage_place_rating">Nilai:</string>
+	<string name="place_page_booking_rating">Nilai: %s</string>
 	<string name="place_page_starting_from">dari %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -866,4 +867,19 @@
 	<string name="editor_remove_place_button">Hapus</string>
 	<string name="editor_status_sending">Mengirim…</string>
 	<string name="editor_place_doesnt_exist">Tempat tidak ada</string>
+	<string name="text_more_button">…selebihnya</string>
+	<string name="error_enter_correct_phone">Masukkan nomor telepon tanpa huruf</string>
+	<string name="error_enter_correct_web">Masukkan alamat web valid</string>
+	<string name="error_enter_correct_email">Masukkan surel valid</string>
+	<string name="error_enter_correct">Masukkan nilai valid</string>
+	<string name="editor_profile_changes_for_next_place">Perubahan terhadap tempat selanjutnya: %d</string>
+	<string name="editor_profile_rating_place">Posisi peringkat</string>
+	<string name="booking_dialog_not_connect_header">Untuk memesan hotel, aktifkan koneksi internet Anda</string>
+	<string name="whatsnew_booking_header">Pesan hotel dari aplikasi</string>
+	<string name="whatsnew_booking_message">Saat Anda mencari hotel, peta akan menampilkan kategori harga dan nilai hotel.</string>
+	<string name="button_try">Cobalah</string>
+	<string name="whatsnew_cycle_navigation_header">Navigasi bersepeda (versi beta)</string>
+	<string name="whatsnew_cycle_navigation_message">Kami sedang menguji navigasi bersepeda untuk musim baru. Coba rute bersepeda favorit Anda dengan MAPS.ME dan sampaikan pendapat Anda.</string>
+	<string name="refresh">Memperbarui</string>
+	<string name="last_update">Pembaruan terakhir: %s</string>
 </resources>
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@ -674,6 +674,7 @@
 	<string name="download_all">Scarica tutto</string>
 	<string name="delete_all">Elimina tutti</string>
 	<string name="autodownload">Scaricamento automatico</string>
+	<string name="disable_autodownload">Disattiva download automatico</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Ora chiuso</string>
 	<!-- Place Page opening hours text -->
@ -748,7 +749,7 @@
 	<string name="editor_username_error_dialog">Nome utente non valido</string>
 	<string name="editor_place_edited_dialog">Hai modificato un oggetto!</string>
 	<string name="editor_login_with_osm">Accedi con OpenStreetMap</string>
-	<string name="editor_profile_changes">Modifiche:</string>
+	<string name="editor_profile_changes">Modifiche approvate</string>
 	<string name="editor_profile_unsent_changes">Non inviato:</string>
 	<string name="editor_focus_map_on_location">Sposta la mappa per selezionare l’esatta posizione dell’oggetto.</string>
 	<string name="editor_add_select_category">Seleziona categoria</string>
@ -846,7 +847,7 @@
 	<string name="placepage_entrance_type">Ingresso</string>
 	<string name="placepage_flat">app.</string>
 	<string name="placepage_open_24_7">24 / 7</string>
-	<string name="placepage_place_rating">Valutazione:</string>
+	<string name="place_page_booking_rating">Valutazione: %s</string>
 	<string name="place_page_starting_from">da %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -866,4 +867,19 @@
 	<string name="editor_remove_place_button">Rimuovi</string>
 	<string name="editor_status_sending">Invio…</string>
 	<string name="editor_place_doesnt_exist">Luogo inesistente</string>
+	<string name="text_more_button">…continua</string>
+	<string name="error_enter_correct_phone">Inserisci un numero di telefono senza lettere</string>
+	<string name="error_enter_correct_web">Inserisci un indirizzo web valido</string>
+	<string name="error_enter_correct_email">Inserisci un\&#39;email valida</string>
+	<string name="error_enter_correct">Inserisci un valore valido</string>
+	<string name="editor_profile_changes_for_next_place">Modifiche per posizione successiva: %d</string>
+	<string name="editor_profile_rating_place">Posizione in classifica</string>
+	<string name="booking_dialog_not_connect_header">Per prenotare l\&#39;hotel, attivare la connessione Internet</string>
+	<string name="whatsnew_booking_header">Prenota un hotel tramite l\&#39;app</string>
+	<string name="whatsnew_booking_message">Quando cerchi un hotel, la mappa li visualizza mostrando le categorie di prezzo e le recensioni.</string>
+	<string name="button_try">Provalo</string>
+	<string name="whatsnew_cycle_navigation_header">Navigazione in bici (versione beta)</string>
+	<string name="whatsnew_cycle_navigation_message">Stiamo collaudando la navigazione in bici per la nuova stagione. Prova il tuo itinerario ciclistico preferito con MAPS.ME e condividi con noi le tue opinioni.</string>
+	<string name="refresh">Aggiornare</string>
+	<string name="last_update">Ultimo aggiornamento: %s</string>
 </resources>
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@ -674,6 +674,7 @@
 	<string name="download_all">全てをダウンロード</string>
 	<string name="delete_all">すべて削除</string>
 	<string name="autodownload">自動ダウンロード</string>
+	<string name="disable_autodownload">自動ダウンロードを無効にする</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">現在閉店</string>
 	<!-- Place Page opening hours text -->
@ -748,7 +749,7 @@
 	<string name="editor_username_error_dialog">ユーザー名が無効です</string>
 	<string name="editor_place_edited_dialog">オブジェクトを編集しました!</string>
 	<string name="editor_login_with_osm">OpenStreetMapを使ってログイン</string>
-	<string name="editor_profile_changes">変更回数：</string>
+	<string name="editor_profile_changes">確認された変更</string>
 	<string name="editor_profile_unsent_changes">未送信：</string>
 	<string name="editor_focus_map_on_location">地図をプルしてオブジェクトの正しい場所を選択します。</string>
 	<string name="editor_add_select_category">カテゴリを選択</string>
@ -846,7 +847,7 @@
 	<string name="placepage_entrance_type">エントランス</string>
 	<string name="placepage_flat">アプリ</string>
 	<string name="placepage_open_24_7">24時間体制</string>
-	<string name="placepage_place_rating">評価：</string>
+	<string name="place_page_booking_rating">評価：%s</string>
 	<string name="place_page_starting_from">%sから</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -866,4 +867,19 @@
 	<string name="editor_remove_place_button">削除</string>
 	<string name="editor_status_sending">送信中…</string>
 	<string name="editor_place_doesnt_exist">存在しない場所</string>
+	<string name="text_more_button">…続き</string>
+	<string name="error_enter_correct_phone">文字なしで電話番号を入力してください</string>
+	<string name="error_enter_correct_web">有効なウェブアドレスを入力してください</string>
+	<string name="error_enter_correct_email">有効なメールアドレスを入力してください</string>
+	<string name="error_enter_correct">有効な値を入力してください</string>
+	<string name="editor_profile_changes_for_next_place">次の場所への変更：%d</string>
+	<string name="editor_profile_rating_place">ランキングポジション</string>
+	<string name="booking_dialog_not_connect_header">ホテルを予約するには、インターネット接続を有効にしてください</string>
+	<string name="whatsnew_booking_header">アプリからホテルを予約する</string>
+	<string name="whatsnew_booking_message">ホテルを探すと、地図にホテルの価格帯と評価が表示されます。</string>
+	<string name="button_try">試してみる</string>
+	<string name="whatsnew_cycle_navigation_header">バイクナビゲーション（ベータ版）</string>
+	<string name="whatsnew_cycle_navigation_message">新シーズンに向けてバイクナビゲーションをテスト中です。MAPS.MEで、お気に入りのサイクリングルートを試してみませんか。ご感想をお待ちしています。</string>
+	<string name="refresh">更新</string>
+	<string name="last_update">最終更新日: %s</string>
 </resources>
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@ -671,6 +671,7 @@
 	<string name="download_all">모두 다운로드</string>
 	<string name="delete_all">모두 삭제</string>
 	<string name="autodownload">자동 다운로드</string>
+	<string name="disable_autodownload">자동 다운로드 해제</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">지금 닫힘</string>
 	<!-- Place Page opening hours text -->
@ -745,7 +746,7 @@
 	<string name="editor_username_error_dialog">잘못된 사용자 이름</string>
 	<string name="editor_place_edited_dialog">개체를 편집했습니다!</string>
 	<string name="editor_login_with_osm">OpenStreetMap으로 로그인</string>
-	<string name="editor_profile_changes">변경 사항:</string>
+	<string name="editor_profile_changes">변경사항 승인</string>
 	<string name="editor_profile_unsent_changes">전송되지 않음:</string>
 	<string name="editor_focus_map_on_location">개체의 정확한 위치를 선택하려면 지도를 당깁니다.</string>
 	<string name="editor_add_select_category">범주 선택</string>
@ -843,7 +844,7 @@
 	<string name="placepage_entrance_type">입구</string>
 	<string name="placepage_flat">앱</string>
 	<string name="placepage_open_24_7">연중무휴</string>
-	<string name="placepage_place_rating">평가:</string>
+	<string name="place_page_booking_rating">평가: %s</string>
 	<string name="place_page_starting_from">%s에서</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -863,4 +864,19 @@
 	<string name="editor_remove_place_button">삭제</string>
 	<string name="editor_status_sending">보내는 중…</string>
 	<string name="editor_place_doesnt_exist">존재하지 않는 장소입니다.</string>
+	<string name="text_more_button">…기타</string>
+	<string name="error_enter_correct_phone">문자없이 전화 번호 입력</string>
+	<string name="error_enter_correct_web">유효한 웹 주소 입력</string>
+	<string name="error_enter_correct_email">유효한 이메일 주소 입력</string>
+	<string name="error_enter_correct">유효한 값 입력</string>
+	<string name="editor_profile_changes_for_next_place">다음 장소 변경: %d</string>
+	<string name="editor_profile_rating_place">평가 순위</string>
+	<string name="booking_dialog_not_connect_header">호텔을 예약하려면 인터넷에 연결하세요</string>
+	<string name="whatsnew_booking_header">앱에서 호텔 예약하기</string>
+	<string name="whatsnew_booking_message">호텔을 검색하면 가격대와 등급이 함께 표시됩니다.</string>
+	<string name="button_try">시도해보세요</string>
+	<string name="whatsnew_cycle_navigation_header">자전거 네비게이션 (베타 버전)</string>
+	<string name="whatsnew_cycle_navigation_message">저희는 새로운 시즌을 맞이하여 자전거 네비게이션을 테스트하고 있습니다. MAPS.ME에서 귀하가 자주 이용하는 자전거 경로를 사용해 보고, 사용 소감을 알려주세요.</string>
+	<string name="refresh">최신 정보</string>
+	<string name="last_update">마지막 업데이트: %s</string>
 </resources>
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@ -675,6 +675,7 @@
 	<string name="download_all">Last ned alle</string>
 	<string name="delete_all">Slett alle</string>
 	<string name="autodownload">Automatisk nedlasting</string>
+	<string name="disable_autodownload">Deaktiver automatisk nedlasting</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Lukket nå</string>
 	<!-- Place Page opening hours text -->
@ -749,7 +750,7 @@
 	<string name="editor_username_error_dialog">Brukernavnet er ugyldig</string>
 	<string name="editor_place_edited_dialog">Du har redigert et objekt!</string>
 	<string name="editor_login_with_osm">Logg inn med OpenStreetMat</string>
-	<string name="editor_profile_changes">Endringer:</string>
+	<string name="editor_profile_changes">Bekreftede endringer</string>
 	<string name="editor_profile_unsent_changes">Ikke sendt:</string>
 	<string name="editor_focus_map_on_location">Dra kartet for å velge riktig beliggenhet for objektet.</string>
 	<string name="editor_add_select_category">Velg kategori</string>
@ -845,7 +846,7 @@
 	<string name="placepage_entrance_type">Vindfang</string>
 	<string name="placepage_flat">leil.</string>
 	<string name="placepage_open_24_7">Døgnåpen</string>
-	<string name="placepage_place_rating">Rangering:</string>
+	<string name="place_page_booking_rating">Rangering: %s</string>
 	<string name="place_page_starting_from">fra %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -865,4 +866,19 @@
 	<string name="editor_remove_place_button">Fjern</string>
 	<string name="editor_status_sending">Sender…</string>
 	<string name="editor_place_doesnt_exist">Sted finnes ikke</string>
+	<string name="text_more_button">…mer</string>
+	<string name="error_enter_correct_phone">Oppgi telefonnummer uten bokstaver</string>
+	<string name="error_enter_correct_web">Oppgi en gyldig nettadresse</string>
+	<string name="error_enter_correct_email">Oppgi en gyldig epostadresse</string>
+	<string name="error_enter_correct">Oppgi en gyldig verdi</string>
+	<string name="editor_profile_changes_for_next_place">Endringer på neste sted: %d</string>
+	<string name="editor_profile_rating_place">Rangeringsplassering</string>
+	<string name="booking_dialog_not_connect_header">Aktiver Internett-tilkoblingen din for å bestille hotellet</string>
+	<string name="whatsnew_booking_header">Reserver hotellrom fra appen</string>
+	<string name="whatsnew_booking_message">Når du leter etter hotell, vil kartet fortelle deg hotellenes priskategori og rangering.</string>
+	<string name="button_try">Prøv det</string>
+	<string name="whatsnew_cycle_navigation_header">Sykkelnavigering (betaversjon)</string>
+	<string name="whatsnew_cycle_navigation_message">Vi tester sykkelnavigering for den nye sesongen. Prøv din favorittrute med MAPS.ME, og del din vurdering med oss.</string>
+	<string name="refresh">Oppdatere</string>
+	<string name="last_update">Sist oppdatert: %s</string>
 </resources>
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@ -675,6 +675,7 @@
 	<string name="download_all">Alles downloaden</string>
 	<string name="delete_all">Alles verwijderen</string>
 	<string name="autodownload">Automatische download</string>
+	<string name="disable_autodownload">Automatisch downloaden uitschakelen</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Nu gesloten</string>
 	<!-- Place Page opening hours text -->
@ -749,7 +750,7 @@
 	<string name="editor_username_error_dialog">Gebruikersnaam is ongeldig</string>
 	<string name="editor_place_edited_dialog">Je hebt een object bewerkt!</string>
 	<string name="editor_login_with_osm">Log in met OpenStreetMap</string>
-	<string name="editor_profile_changes">Wijzigingen:</string>
+	<string name="editor_profile_changes">Gecontroleerde wijzigingen</string>
 	<string name="editor_profile_unsent_changes">Niet verzonden:</string>
 	<string name="editor_focus_map_on_location">Trek aan de kaart om de juiste locatie van het object te selecteren.</string>
 	<string name="editor_add_select_category">Selecteer categorie</string>
@ -847,7 +848,7 @@
 	<string name="placepage_entrance_type">Ingang</string>
 	<string name="placepage_flat">app.</string>
 	<string name="placepage_open_24_7">Dag en nacht</string>
-	<string name="placepage_place_rating">Cijfer:</string>
+	<string name="place_page_booking_rating">Cijfer: %s</string>
 	<string name="place_page_starting_from">van %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -867,4 +868,19 @@
 	<string name="editor_remove_place_button">Verwijderen</string>
 	<string name="editor_status_sending">Verzenden…</string>
 	<string name="editor_place_doesnt_exist">Locatie bestaat niet</string>
+	<string name="text_more_button">…meer</string>
+	<string name="error_enter_correct_phone">Voer een telefoonnummer in zonder letters</string>
+	<string name="error_enter_correct_web">Voer een geldig webadres in</string>
+	<string name="error_enter_correct_email">Voer een geldig e-mailadres in</string>
+	<string name="error_enter_correct">Voer een geldige waarde in</string>
+	<string name="editor_profile_changes_for_next_place">Wijzigingen tot de volgende positie: %d</string>
+	<string name="editor_profile_rating_place">Positie in klassement</string>
+	<string name="booking_dialog_not_connect_header">Maak verbinding met internet om het hotel te boeken</string>
+	<string name="whatsnew_booking_header">Boek een hotel via de app</string>
+	<string name="whatsnew_booking_message">Als u een hotel zoekt, toont de kaart de prijscategorie en de beoordeling.</string>
+	<string name="button_try">Proberen</string>
+	<string name="whatsnew_cycle_navigation_header">Fietsnavigatie (bèta-versie)</string>
+	<string name="whatsnew_cycle_navigation_message">We testen de fietsnavigatie voor het nieuwe seizoen. Probeer uw favoriete fietsroute met MAPS.ME en deel uw ervaringen met ons.</string>
+	<string name="refresh">Updaten</string>
+	<string name="last_update">Laatste update: %s</string>
 </resources>
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@ -24,14 +24,14 @@
 	<!-- Settings/Downloader - Download confirmation button -->
 	<string name="download_x_mb">Pobierz %qu MB</string>
 	<!-- Settings/Downloader - info for country when download fails -->
-	<string name="download_has_failed">Pobieranie nie powiodło się. Naciśnij, aby spróbować ponownie.</string>
+	<string name="download_has_failed">Nie udało się pobrać. Proszę nacisnąć, aby spróbować ponownie.</string>
 	<!-- Settings/Downloader - info for downloaded country -->
-	<string name="downloaded_x_y_touch_to_delete">Pobrano (%1$qu %2$s). Naciśnij, aby usunąć.</string>
+	<string name="downloaded_x_y_touch_to_delete">Pobrano (%1$qu %2$s). Proszę nacisnąć, aby usunąć.</string>
 	<!-- Settings/Downloader - country info current download progress -->
-	<string name="downloading_x_touch_to_cancel">Pobieranie %qu%%. Naciśnij, aby anulować.</string>
+	<string name="downloading_x_touch_to_cancel">Pobieranie %qu%%. Proszę nacisnąć, aby anulować.</string>
 	<!-- Settings/Downloader - info for country which started downloading -->
 	<string name="downloading">Pobieranie…</string>
-	<string name="get_it_now">Pobierz teraz</string>
+	<string name="get_it_now">Pobierz</string>
 	<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
 	<string name="share_on_facebook_text">Dziękujemy za korzystanie z MAPS.ME! Czy podoba Ci się nasza aplikacja? Opowiedz o niej swoim znajomym! W taki sposób najlepiej nam podziękujesz.</string>
 	<!-- Settings/Downloader - size string, only strings different from English should be translated -->
@ -45,15 +45,15 @@
 	<!-- View and button titles for accessibility -->
 	<string name="downloader_maps">Mapy:</string>
 	<!-- Settings/Downloader - info for country in the download queue -->
-	<string name="marked_for_downloading">Oznaczono jako do pobrania. Naciśnij, aby anulować</string>
+	<string name="marked_for_downloading">Oznaczono do pobrania. Proszę nacisnąć, aby anulować</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Mile</string>
 	<!-- View and button titles for accessibility -->
-	<string name="my_position">Moja pozycja</string>
+	<string name="my_position">Moje położenie</string>
 	<!-- Settings/Downloader - No free space dialog message -->
 	<string name="free_disk_space_for_country_x">Aby pobrać %s, musisz najpierw zwolnić nieco miejsca na swoim urządzeniu.</string>
 	<!-- Leave Review dialog - Not now button (remind me later) -->
-	<string name="remind_me_later">Przypomnij mi później</string>
+	<string name="remind_me_later">Przypomnij później</string>
 	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Później</string>
 	<!-- Don't show some dialog any more -->
@ -61,21 +61,21 @@
 	<!-- Leave Review dialog - Complain button (goes to support site) -->
 	<string name="report_an_issue">Zgłoś błąd</string>
 	<!-- View and button titles for accessibility -->
-	<string name="search">Szukaj</string>
+	<string name="search">Wyszukaj</string>
 	<!-- Search box placeholder text -->
-	<string name="search_map">Szukaj mapy</string>
+	<string name="search_map">Wyszukaj mapy</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
-	<string name="touch_to_download">Naciśnij, aby pobrać.</string>
+	<string name="touch_to_download">Proszę nacisnąć, aby pobrać.</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
 	<string name="use_cellular_data">Tak</string>
 	<!-- Settings/Downloader - No internet connection dialog message -->
-	<string name="use_wifi_recommendation_text">Zalecamy korzystanie z WiFi przy pobieraniu dużych map</string>
+	<string name="use_wifi_recommendation_text">Zaleca się korzystanie z WiFi przy pobieraniu dużych map</string>
 	<!-- Choose measurement on first launch alert - title -->
-	<string name="which_measurement_system">Który system miar bardziej ci odpowiada?</string>
+	<string name="which_measurement_system">Który system miar jest najbardziej dogodny?</string>
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Usługi lokalizacji są aktualnie wyłączone dla tego urządzenia lub aplikacji. Proszę włączyć je w ustawieniach.</string>
 	<!-- Location Services are not available on the device alert - message -->
-	<string name="device_doesnot_support_location_services">Twoje urządzenie nie wspiera usług lokalizacji</string>
+	<string name="device_doesnot_support_location_services">Urządzenie nie obsługuje usług lokalizacji</string>
 	<!-- View and button titles for accessibility -->
 	<string name="zoom_to_country">Wyświetl na mapie</string>
 	<!-- Message to display at the center of the screen when the country is added to the downloading queue -->
@ -89,54 +89,54 @@
 	<!-- Button text for the button at the center of the screen when the country is not downloaded -->
 	<string name="country_status_download_without_routing">Pobierz mapę bez\noznaczania tras (^ ^)</string>
 	<!-- Message to display at the center of the screen when the country download has failed -->
-	<string name="country_status_download_failed">Pobieranie nie powiodło się</string>
+	<string name="country_status_download_failed">Nie udało się pobrać</string>
 	<!-- Button text for the button under the country_status_download_failed message -->
 	<string name="try_again">Spróbuj ponownie</string>
 	<string name="about_menu_title">O aplikacji MAPS.ME</string>
-	<string name="downloading_touch_to_cancel">Pobieranie %d%%. Naciśnij, aby anulować.</string>
-	<string name="downloaded_touch_to_delete">Pobrano (%s). Naciśnij, aby usunąć.</string>
+	<string name="downloading_touch_to_cancel">Pobieranie %d%%. Proszę nacisnąć, aby anulować.</string>
+	<string name="downloaded_touch_to_delete">Pobrano (%s). Proszę nacisnąć, aby usunąć.</string>
 	<string name="connection_settings">Ustawienia połączenia</string>
 	<string name="download_mb_or_kb">Pobierz %s</string>
 	<string name="close">Zamknij</string>
-	<string name="unsupported_phone">OpenGL wymaga odpowiedniego urządzenia. Niestety twoje urządzenie nie wspiera tej technologii.</string>
+	<string name="unsupported_phone">Wymagana jest sprzętowa akceleracja OpenGL. Aktualne urządzenie nie jest obsługiwane.</string>
 	<string name="download">Pobierz</string>
 	<string name="external_storage_is_not_available">Karta SD/Pamięć USB z pobranymi mapami nie jest dostępna</string>
-	<string name="disconnect_usb_cable">Proszę odłączyć kabel USB albo włożyć kartę pamięci by korzystać z MAPS.ME</string>
+	<string name="disconnect_usb_cable">Proszę odłączyć kabel USB albo włożyć kartę pamięci, aby korzystać z MAPS.ME</string>
 	<string name="not_enough_free_space_on_sdcard">Proszę zwolnić trochę pamięci na karcie SD/pamięci USB, aby korzystać z aplikacji</string>
-	<string name="not_enough_memory">Za mało pamięci by uruchomić aplikację</string>
-	<string name="free_space_for_country">Proszę zwolnić %1$s na swoim urządzeniu zanim rozpoczniesz pobieranie %2$s</string>
-	<string name="download_resources">Zanim rozpoczniesz pozwól nam na pobranie ogólnej mapy świata na swoje urządzenie.\nWymaga to %s danych.</string>
-	<string name="getting_position">Otrzymywanie informacji o aktualnej pozycji</string>
-	<string name="download_resources_continue">Idź do mapy</string>
-	<string name="downloading_country_can_proceed">Pobieranie %s. Możesz teraz\notworzyć mapę.</string>
+	<string name="not_enough_memory">Za mało pamięci, aby uruchomić aplikację</string>
+	<string name="free_space_for_country">Proszę zwolnić %1$s na urządzeniu, aby pobrać %2$s</string>
+	<string name="download_resources">Przed rozpoczęciem prosimy o pobranie ogólnej mapy świata na urządzenie.\nWymaga to %s danych.</string>
+	<string name="getting_position">Określanie aktualnego położenia</string>
+	<string name="download_resources_continue">Przejdź do mapy</string>
+	<string name="downloading_country_can_proceed">Pobieranie %s. Można teraz\nprzejść do mapy.</string>
 	<string name="download_country_ask">Pobrać %s?</string>
-	<string name="update_country_ask">Zaktualizować %s?</string>
+	<string name="update_country_ask">Uaktualnić %s?</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="download_location_map_proposal">Możesz pobrać mapę terenu\nwokół twojej aktualnej pozycji.</string>
+	<string name="download_location_map_proposal">Można pobrać mapę terenu\nwokół bieżącego położenia.</string>
 	<!-- REMOVE THIS_STRING AFTER REFACTORING -->
-	<string name="download_location_update_map_proposal">Możesz zaktualizować mapę terenu\nwokół twojej aktualnej pozycji.</string>
+	<string name="download_location_update_map_proposal">Można uaktualnić mapę terenu\nwokół bieżącego położenia.</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="download_location_map_up_to_date">Mapa wokół twojej aktualnej\npozycji (%s) jest aktualna</string>
+	<string name="download_location_map_up_to_date">Mapa wokół bieżącego\npołożenia (%s) jest aktualna</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
-	<string name="pause">Pauza</string>
+	<string name="pause">Wstrzymaj</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
 	<string name="continue_download">Kontynuuj</string>
-	<string name="downloaded_touch_to_update">Pobrano (%s). Naciśnij, aby zaktualizować lub usunąć.</string>
+	<string name="downloaded_touch_to_update">Pobrano (%s). Proszę nacisnąć, aby uaktualnić lub usunąć.</string>
 	<string name="update_mb_or_kb">Aktualizacja %s</string>
 	<!-- Show popup notification when we have downloaded countries without search (from Lite version) -->
-	<string name="search_update_maps">Musisz posiadać zaktualizowane mapy, aby korzystać z funkcji szukania</string>
+	<string name="search_update_maps">Aby korzystać z funkcji wyszukiwania, należy posiadać aktualne mapy:</string>
 	<!-- Show popup notification on app start when we have out-of-date maps -->
-	<string name="advise_update_maps">Aktualizacja dostępna dla tych map:</string>
+	<string name="advise_update_maps">Dostępne uaktualnienia dla tych map:</string>
 	<!-- Show popup notification in Pro version that Lite can be deleted -->
-	<string name="suggest_uninstall_lite">Nie potrzebujesz już więcej MAPS.ME Lite, więc możesz je usunąć.</string>
+	<string name="suggest_uninstall_lite">Nie potrzeba już więcej MAPS.ME Lite, więc można je usunąć.</string>
 	<!-- Show popup notification on top of the map when country was downloaded. -->
-	<string name="download_country_success">%s pobrano pomyślnie</string>
+	<string name="download_country_success">Pobrano %s</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
-	<string name="download_country_failed">%s pobieranie nie powiodło się</string>
+	<string name="download_country_failed">Nie udało się pobrać %s</string>
 	<!-- Add New Bookmark Set dialog title -->
 	<string name="add_new_set">Dodaj nowy zestaw</string>
 	<!-- Place Page - Add To Bookmarks button -->
-	<string name="add_to_bookmarks">Dodaj do zakładek</string>
+	<string name="add_to_bookmarks">Dodaj zakładkę</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Kolor zakładki</string>
 	<!-- Add Bookmark Set dialog - hint when set name is empty -->
@ -158,19 +158,19 @@
 	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
 	<string name="set">Zestaw</string>
 	<!-- Text hint in Bookmarks dialog when no any bookmarks are added -->
-	<string name="bookmarks_usage_hint">Nie masz jeszcze żadnych zakładek.\nDotknij dowolnego miejsca na mapie, aby dodać zakładkę.\nZakładki z innych źródeł mogą również być importowane i wyświetlane w aplikacji MAPS.ME. Otwieraj pliki KML/KMZ z zapisanymi szpilkami poczty, Dropboxa lub linków internetowych.</string>
+	<string name="bookmarks_usage_hint">Nie oznaczono jeszcze żadnych zakładek.\nProszę dotknąć dowolnego miejsca na mapie, aby dodać zakładkę.\nMożna importować i wyświetlać zakładki z innych zasobów. Program otwiera pliki KML/KMZ z zapisanymi zakładkami, pochodzące z wiadomości e-mail, Dropboxa lub odnośników internetowych.</string>
 	<!-- Text hint in Bookmarks dialog when at least one bookmark is added -->
-	<string name="bookmarks_usage_hint_import_only">Zakładki z innych źródeł mogą być importowane i wyświetlane w aplikacji MAPS.ME. Otwieraj pliki KML/KMZ z zapisanymi szpilkami poczty, Dropboxa lub linków internetowych.</string>
+	<string name="bookmarks_usage_hint_import_only">Można importować i wyświetlać zakładki z innych zasobów. Program otwiera pliki KML/KMZ z zapisanymi zakładkami, pochodzące z wiadomości e-mail, Dropboxa lub odnośników internetowych.</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Ustawienia</string>
 	<!-- Header of settings activity where user defines storage path -->
 	<string name="maps_storage">Pamięć map</string>
 	<!-- Detailed description of Maps Storage settings button -->
-	<string name="maps_storage_summary">Wybierz lokalizację, w której mają być zapisywane pobierane mapy</string>
+	<string name="maps_storage_summary">Określa położenie przechowywania pobranych map</string>
 	<!-- Question dialog for transferring maps from one storage to another -->
 	<string name="move_maps">Przenieść mapy?</string>
 	<!-- Ask to wait user several minutes (some long process in modal dialog). -->
-	<string name="wait_several_minutes">TO może zająć kilka minut.\nProszę czekać…</string>
+	<string name="wait_several_minutes">To może zająć kilka minut.\nProszę czekać…</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">Widoczne</string>
 	<!-- Toast which is displayed when GPS has been deactivated -->
@ -178,7 +178,7 @@
 	<!-- Measurement units title in settings activity -->
 	<string name="measurement_units">Jednostki miary</string>
 	<!-- Detailed description of Measurement Units settings button -->
-	<string name="measurement_units_summary">Wybierz pomiędzy milami, a kilometrami</string>
+	<string name="measurement_units_summary">Wybiera pomiędzy milami, a kilometrami</string>
 	<!-- Do search in all sources -->
 	<string name="search_mode_all">Wszędzie</string>
 	<!-- Do search near my position only -->
@ -197,7 +197,7 @@
 	<string name="shop">Sklep</string>
 	<string name="hotel">Hotel</string>
 	<!-- Search Suggestion -->
-	<string name="tourism">Osobliwości miasta</string>
+	<string name="tourism">Atrakcje turystyczne</string>
 	<!-- Search Suggestion -->
 	<string name="entertainment">Rozrywka</string>
 	<!-- Search Suggestion -->
@ -215,25 +215,25 @@
 	<!-- Search Suggestion -->
 	<string name="police">Policja</string>
 	<!-- String in search result list, when nothing found -->
-	<string name="no_search_results_found">Nie znaleziono</string>
+	<string name="no_search_results_found">Nie odnaleziono</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notatki</string>
 	<!-- Button text -->
 	<string name="share_by_email">Udostępnij przez email</string>
 	<!-- Email Subject when sharing bookmarks category -->
-	<string name="share_bookmarks_email_subject">Udostępniono ci zakładkę z MAPS.ME</string>
+	<string name="share_bookmarks_email_subject">Udostępnione zakładki z MAPS.ME</string>
 	<!-- Email text when sharing bookmarks category -->
-	<string name="share_bookmarks_email_body">Cześć,\n\nOto moje zakładki pochodzące z aplikacji MAPS.ME wraz z załączonymi mapami offline w pliku \&quot;%s.kmz\&quot;. Proszę otwórz to jeśli posiadasz zainstalowaną aplikację MAPS.ME. Jeśli nie, najpierw pobierz ją na swoje urządzenie z systemem iOS lub Android pod tym linkiem: http://maps.me/get?kmz\n\nBaw się dobrze z MAPS.ME!</string>
+	<string name="share_bookmarks_email_body">Cześć,\n\nOto moje zakładki pochodzące z aplikacji MAPS.ME wraz z załączonymi mapami offline w pliku „%s.kmz”. Proszę otwórz je jeśli posiadasz zainstalowaną aplikację MAPS.ME. Jeśli nie, najpierw pobierz ją na swoje urządzenie z systemem iOS lub Android pod tym odnośnikiem: http://maps.me/get?kmz\n\nBaw się dobrze z MAPS.ME!</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Wczytywanie zakładek</string>
 	<!-- Kmz file successful loading -->
-	<string name="load_kmz_successful">Zakładki wczytane pomyślnie! Możesz znaleźć je na mapie lub w menedżerze zakładek.</string>
+	<string name="load_kmz_successful">Wczytano zakładki! Można odnaleźć je na mapie lub na ekranie menedżera zakładek.</string>
 	<!-- Kml file loading failed -->
-	<string name="load_kmz_failed">Przesyłanie zakładek nie powiodło się. Plik może być uszkodzony lub posiadać defekty.</string>
+	<string name="load_kmz_failed">Nieudane wczytywanie zakładek. Plik może być uszkodzony lub posiadać defekty.</string>
 	<!-- resource for context menu -->
 	<string name="edit">Edytuj</string>
 	<!-- Warning message when doing search around current position -->
-	<string name="unknown_current_position">Twoja lokalizacja nie została jeszcze określona</string>
+	<string name="unknown_current_position">Nie określono jeszcze aktualnego położenia</string>
 	<!-- Warning message when location country isn't downloaded during search (see also download_location_map_proposal). -->
 	<string name="download_location_country">Pobierz mapę kraju, w którym aktualnie przebywasz (%s)</string>
 	<!-- Warning message when viewport country isn't downloaded during search -->
@ -241,9 +241,9 @@
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Przepraszamy, ustawienia pamięci mapy są aktualnie wyłączone.</string>
 	<!-- Alert message that downloading is in progress. -->
-	<string name="downloading_is_active">Pobieranie mapy kraju jest w toku.</string>
+	<string name="downloading_is_active">Trwa pobieranie mapy kraju.</string>
 	<!-- Message that will be shown in alert view, when we ask user to leave review on App Store -->
-	<string name="appStore_message">Mamy nadzieję, że podoba ci się aplikacja MAPS.ME! Jeśli tak to proszę oceń ją lub napisz recenzję w AppStore. To zajmie ci mniej niż minutę, a bardzo nam pomoże. Dziękujemy za wsparcie!</string>
+	<string name="appStore_message">Mamy nadzieję, że podoba ci się aplikacja MAPS.ME! Jeśli tak to proszę oceń ją lub napisz recenzję w AppStore. To zajmie mniej niż minutę, a bardzo nam pomoże. Dziękujemy za wsparcie!</string>
 	<!-- No, thanks -->
 	<string name="no_thanks">Nie, dziękuję</string>
 	<!-- Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 -->
@ -267,19 +267,19 @@
 	<!-- Share by email button text, also used in editor. -->
 	<string name="email">E-mail</string>
 	<!-- Copy Link -->
-	<string name="copy_link">Kopiuj link</string>
+	<string name="copy_link">Skopiuj odnośnik</string>
 	<!-- Text for the button that returns to caller application -->
 	<string name="more_info">Pokaż więcej informacji</string>
 	<!-- Text for message when used successfully copied something -->
 	<string name="copied_to_clipboard">Skopiowano do schowka: %1$s</string>
 	<!-- Setting label for statistics turn on/off -->
-	<string name="allow_statistics">Prześlij statystyki</string>
+	<string name="allow_statistics">Przesyłanie statystyk</string>
 	<!-- Hint near allow statictics checkbox -->
-	<string name="allow_statistics_hint">Pozwól nam na zbieranie statystyk dotyczących używania aplikacji, abyśmy mogli ją udoskonalić</string>
+	<string name="allow_statistics_hint">Zezwala na zbieranie statystyk używania aplikacji, w celu jej dalszego doskonalenia</string>
 	<!-- place preview title -->
 	<string name="info">Informacje</string>
 	<!-- Used for bookmark editing -->
-	<string name="done">Zrobione</string>
+	<string name="done">Gotowe</string>
 	<!-- Summary for preferences in MWM -->
 	<string name="yopme_pref_summary">Wybierz ustawienia tylnego ekranu</string>
 	<!-- Title for yopme preferences in MWM -->
@ -289,20 +289,20 @@
 	<!-- Prints version number in About dialog -->
 	<string name="version">Wersja: %s</string>
 	<!-- Confirmation in downloading countries dialog -->
-	<string name="are_you_sure">Czy na pewno kontynuować?</string>
+	<string name="are_you_sure">Kontynuować?</string>
 	<!-- Title for tracks category in bookmarks manager -->
 	<string name="tracks">Trasy</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Długość</string>
-	<string name="share_my_location">Udostępnij moją lokalizację</string>
-	<string name="menu_search">Szukaj</string>
+	<string name="share_my_location">Udostępnij aktualne położenie</string>
+	<string name="menu_search">Wyszukaj</string>
 	<!-- Settings screen: "Map" category title -->
 	<string name="prefs_group_map">Mapa</string>
 	<!-- Settings screen: "Miscellaneous" category title -->
 	<string name="prefs_group_misc">Różne</string>
 	<string name="prefs_group_route">Nawigacja</string>
-	<string name="pref_zoom_title">Przyciski powiększania</string>
-	<string name="pref_zoom_summary">Wyświetl na ekranie</string>
+	<string name="pref_zoom_title">Przyciski przybliżania</string>
+	<string name="pref_zoom_summary">Wyświetla na ekranie</string>
 	<!-- Settings «Map» category: «Night style» title -->
 	<string name="pref_map_style_title">Tryb nocny</string>
 	<!-- «Map style» entry value -->
@ -310,7 +310,7 @@
 	<!-- «Map style» entry value -->
 	<string name="pref_map_style_night">Włączony</string>
 	<!-- «Map style» entry value -->
-	<string name="pref_map_style_auto">Automatyczny</string>
+	<string name="pref_map_style_auto">Automatycznie</string>
 	<!-- Settings «Map» category: «Perspective view» title -->
 	<string name="pref_map_3d_title">Widok z perspektywy</string>
 	<!-- Settings «Map» category: «3D buildings» title -->
@ -318,9 +318,9 @@
 	<!-- Settings «Map» category: «3D buildings» summary -->
 	<string name="pref_map_3d_buildings_subtitle">Wpływa na czas pracy baterii</string>
 	<!-- Settings «Route» category: «Tts enabled» title -->
-	<string name="pref_tts_enable_title">Instrukcje głosowe</string>
+	<string name="pref_tts_enable_title">Komunikaty głosowe</string>
 	<!-- Settings «Route» category: «Tts language» title -->
-	<string name="pref_tts_language_title">Język instrukcji</string>
+	<string name="pref_tts_language_title">Język komunikatów</string>
 	<!-- Settings «Route» category: «Tts unavailable» subtitle -->
 	<string name="pref_tts_unavailable">Niedostępne</string>
 	<!-- Title for "Other" section in TTS settings. -->
@ -328,7 +328,7 @@
 	<string name="pref_tts_how_to_set_up_voice">Jak skonfigurować usługę głosową</string>
 	<!-- Settings «Map» category: «Record track» title -->
 	<string name="pref_track_record_title">Ostatnia trasa</string>
-	<string name="duration_disabled">Wyłącz</string>
+	<string name="duration_disabled">Wyłączona</string>
 	<string name="duration_1_hour">1 godzina</string>
 	<string name="duration_2_hours">2 godziny</string>
 	<string name="duration_6_hours">6 godzin</string>
@ -340,7 +340,7 @@
 	<string name="placepage_distance">Dystans</string>
 	<string name="placepage_coordinates">Współrzędne</string>
 	<string name="placepage_unsorted">Niesklasyfikowane</string>
-	<string name="search_show_on_map">Zobacz na mapie</string>
+	<string name="search_show_on_map">Wyświetl na mapie</string>
 	<!-- Used to warn user when fixing KitKat issue -->
 	<string name="kitkat_migrate_ok">Przechowywanie danych mapy zostało zoptymalizowane. Prosimy zrestartować aplikację.\n\nFolder MapsWithMe w katalogu głównym karty SD nie jest już potrzebny, można go usunąć.</string>
 	<!-- Used to warn user when fixing KitKat issue -->
@ -383,20 +383,32 @@
 	<string name="follow_on_twitter">Sledź nas na Twitterze</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Skontaktuj się z nami</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Zgłoś opinię</string>
+	<!-- Settings: "Send general feedback" button -->
+	<string name="feedback_general">Ogólne opinie</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Subskrybuj nasze wiadomości</string>
 	<!-- Text in menu -->
 	<string name="rate_the_app">Oceń aplikację</string>
+	<!-- Rate in Google Play (Android only) -->
+	<string name="rate_gp">Oceń w Google Play</string>
+	<!-- Share with friends: menu item title -->
+	<string name="tell_friends">Powiadom znajomego</string>
+	<!-- Share with friends: sharing text -->
+	<string name="tell_friends_text">Cześć! Zainstaluj Maps.me!</string>
 	<!-- Text in menu -->
 	<string name="help">Pomoc</string>
 	<!-- Text in menu -->
-	<string name="copyright">Prawo autorskie</string>
+	<string name="copyright">Prawa autorskie</string>
 	<!-- Text in menu -->
 	<string name="report_a_bug">Zgłoś błąd</string>
 	<!-- Email subject -->
 	<string name="subscribe_me_subject">Chcę subskrybować biuletyn MAPS.ME</string>
 	<!-- Email body -->
 	<string name="subscribe_me_body">Chcę w pierwszej kolejności otrzymywać powiadomienia o nowościach aktualizacjach i promocjach. Mogę w każdej chwili anulować swoją subskrypcję.</string>
+	<!-- About short text (below logo) -->
+	<string name="about_description">Najbardziej użyteczna aplikacja dla podróżników, powstała przy udziale zespołów Mail.Ru i OpenStreetMap.</string>
 	<!-- About text -->
 	<string name="about_text">MAPS.ME oferuje najszybsze mapy offline wszystkich miast we wszystkich krajach świata. Podróżuj bez obaw: gdziekolwiek jesteś, MAPS.ME pomoże Ci odszukać się na mapie, znaleźć najbliższą restaurację, hotel, bank, stację benzynową itp. Aplikacja nie wymaga połączenia z Internetem.\n\nNieustannie pracujemy nad nowymi funkcjami i chcielibyśmy dowiedzieć się, jak Twoim zdaniem moglibyśmy poprawić MAPS.ME. Jeśli masz jakieś problemy z aplikacją, skontaktuj się z nami, pisząc na adres support@maps.me. Odpowiemy na każde zapytanie!\n\nLubisz aplikację MAPS.ME i chcesz udzielić nam wsparcia? Istnieje kilka prostych i absolutnie darmowych sposobów, jak to zrobić:\n\n- napisz recenzję w swoim sklepie z aplikacjami\n- polub naszą stronę na Facebooku: http://www.facebook.com/mapswithme\n- albo po prostu opowiedz o MAPS.ME swojej mamie, znajomym i kolegom :)\n\nDziękujemy, że jesteś z nami. Jesteśmy bardzo wdzięczni za Twoje wsparcie!\n\nP.S. Dane mapy pochodzą z OpenStreetMap, projektu kartograficznego podobnego do Wikipedii, który umożliwia użytkownikom tworzenie i edytowanie map. Jeśli zauważysz, że na mapie czegoś brakuje albo jest błąd, możesz nanieść poprawki bezpośrednio na stronie http://openstreetmap.org, a Twoje zmiany pojawią się w aplikacji MAPS.ME po wydaniu kolejnej wersji.</string>
 	<!-- Alert text -->
@ -478,7 +490,7 @@
 	<!-- Toolbar title -->
 	<string name="toolbar_application_menu">Menu aplikacji</string>
 	<!-- Preference text -->
-	<string name="pref_use_google_play">Użyj Usług Google Play do ustalenia swojej bieżącej lokalizacji</string>
+	<string name="pref_use_google_play">Używa usług Google Play do ustalenia aktualnego położenia</string>
 	<!-- Text for rating dialog -->
 	<string name="rating_just_rated">Właśnie oceniłem Waszą aplikację</string>
 	<!-- Text for rating dialog -->
@ -632,7 +644,9 @@
 	<string name="search_history_text">Uzyskaj szybki dostęp do ostatniego hasła wyszukiwania.</string>
 	<string name="clear_search">Wyczyść historię wyszukiwania</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
-	<string name="showcase_settings_title">Pokaż oferty</string>
+	<string name="showcase_settings_title">Oferty</string>
+	<!-- Showcase menu item. -->
+	<string name="showcase_plan_your_trip">Zaplanuj podróż</string>
 	<string name="showcase_more_apps">Więcej aplikacji My.com</string>
 	<string name="p2p_route_planning">Planowanie trasy</string>
 	<string name="p2p_your_location">Twoja lokalizacja</string>
@ -678,6 +692,7 @@
 	<string name="download_all">Pobierz wszystko</string>
 	<string name="delete_all">Usuń wszystkie</string>
 	<string name="autodownload">Automatyczne pobieranie</string>
+	<string name="disable_autodownload">Wyłącz automatyczne pobieranie</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Nieczynne</string>
 	<!-- Place Page opening hours text -->
@ -752,7 +767,7 @@
 	<string name="editor_username_error_dialog">Nieprawidłowa nazwa użytkownika</string>
 	<string name="editor_place_edited_dialog">Obiekt był edytowany!</string>
 	<string name="editor_login_with_osm">Zaloguj się z OpenStreetMap</string>
-	<string name="editor_profile_changes">Zmiany:</string>
+	<string name="editor_profile_changes">Zmiany zweryfikowane</string>
 	<string name="editor_profile_unsent_changes">Nie wysłano:</string>
 	<string name="editor_focus_map_on_location">Przeciągnij mapę, aby wybrać poprawną lokalizację obiektu.</string>
 	<string name="editor_add_select_category">Wybierz kategorię</string>
@ -834,8 +849,8 @@
 	<string name="location_services_disabled_header">Identyfikacja lokalizacji jest wyłączona</string>
 	<string name="location_services_disabled_message">Włącz dostęp do geolokalizacji w ustawieniach urządzenia</string>
 	<string name="location_services_disabled_1">1. Uruchom ustawienia</string>
-	<string name="location_services_disabled_2">2. Dotknij \&#39;Lokalizacja\&#39;</string>
-	<string name="location_services_disabled_3">3. Wybierz \&#39;Zawsze\&#39;</string>
+	<string name="location_services_disabled_2">2. Dotknij „Lokalizacja”</string>
+	<string name="location_services_disabled_3">3. Wybierz „Zawsze”</string>
 	<string name="placepage_parking_surface">Powierzchnia</string>
 	<string name="placepage_parking_multistorey">Wielopoziomowy</string>
 	<string name="placepage_parking_underground">Podziemny</string>
@ -850,13 +865,13 @@
 	<string name="placepage_entrance_type">Wejście</string>
 	<string name="placepage_flat">Mieszkanie</string>
 	<string name="placepage_open_24_7">24 / 7</string>
-	<string name="placepage_place_rating">Ocena:</string>
+	<string name="place_page_booking_rating">Ocena: %s</string>
 	<string name="place_page_starting_from">od %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
 	<string name="placepage_place_description">Opis</string>
 	<string name="placepage_more_button">Więcej</string>
-	<string name="bookingcom_book_button">Książka</string>
+	<string name="bookingcom_book_button">Zarezerwuj</string>
 	<string name="placepage_call_button">Zadzwoń</string>
 	<string name="placepage_edit_bookmark_button">Edytuj zakładkę</string>
 	<string name="placepage_bookmark_name_hint">Nazwa zakładki</string>
@ -864,10 +879,25 @@
 	<string name="placepage_delete_bookmark_button">Usuń zakładkę</string>
 	<string name="editor_edits_sent_message">Twoje sugestie zostały wysłane</string>
 	<string name="editor_comment_hint">Komentarz…</string>
-	<string name="editor_reset_edits_message">Skasować wszystkie lokalne zmiany?</string>
-	<string name="editor_reset_edits_button">Skasuj</string>
+	<string name="editor_reset_edits_message">Usunąć wszystkie lokalne zmiany?</string>
+	<string name="editor_reset_edits_button">Usuń</string>
 	<string name="editor_remove_place_message">Usunąć dodane miejsce?</string>
 	<string name="editor_remove_place_button">Usuń</string>
 	<string name="editor_status_sending">Wysyłanie…</string>
 	<string name="editor_place_doesnt_exist">Takie miejsce nie istnieje</string>
+	<string name="text_more_button">…więcej</string>
+	<string name="error_enter_correct_phone">Wpisz numer telefonu bez liter</string>
+	<string name="error_enter_correct_web">Wpisz prawidłowy adres strony internetowej</string>
+	<string name="error_enter_correct_email">Wpisz prawidłowy e-mail</string>
+	<string name="error_enter_correct">Wpisz prawidłową wartość</string>
+	<string name="editor_profile_changes_for_next_place">Zmiany w następnym miejscu: %d</string>
+	<string name="editor_profile_rating_place">Pozycja w rankingu</string>
+	<string name="booking_dialog_not_connect_header">Aby zarezerwować pokój w hotelu, włącz połączenia internetowe</string>
+	<string name="whatsnew_booking_header">Zarezerwuj pokój w hotelu za pomocą aplikacji</string>
+	<string name="whatsnew_booking_message">Podczas wyszukiwania hoteli mapa pokazuje cenę, kategorię i ocenę hotelu.</string>
+	<string name="button_try">Wypróbuj</string>
+	<string name="whatsnew_cycle_navigation_header">Nawigacja rowerowa (wersja beta)</string>
+	<string name="whatsnew_cycle_navigation_message">Testujemy nawigację rowerową na nowy sezon. Wypróbuj swoją ulubioną trasę z MAPS.ME i napisz nam, co myślisz o naszej nawigacji.</string>
+	<string name="refresh">Uaktualnić</string>
+	<string name="last_update">Ostatnia aktualizacja: %s</string>
 </resources>
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@ -674,6 +674,7 @@
 	<string name="download_all">Baixar tudo</string>
 	<string name="delete_all">Excluir todos</string>
 	<string name="autodownload">Download automático</string>
+	<string name="disable_autodownload">Desativar o download automático</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Fechado agora</string>
 	<!-- Place Page opening hours text -->
@ -748,7 +749,7 @@
 	<string name="editor_username_error_dialog">O nome de utilizador é inválido</string>
 	<string name="editor_place_edited_dialog">Editou um objeto!</string>
 	<string name="editor_login_with_osm">Iniciar sessão com a OpenStreetMap</string>
-	<string name="editor_profile_changes">Alterações:</string>
+	<string name="editor_profile_changes">Alterações verificadas</string>
 	<string name="editor_profile_unsent_changes">Não enviado:</string>
 	<string name="editor_focus_map_on_location">Puxe o mapa para selecionar o lugar correto do objeto.</string>
 	<string name="editor_add_select_category">Selecionar a categoria</string>
@ -846,7 +847,7 @@
 	<string name="placepage_entrance_type">Entrada</string>
 	<string name="placepage_flat">apto.</string>
 	<string name="placepage_open_24_7">24 / 7</string>
-	<string name="placepage_place_rating">Classificação</string>
+	<string name="place_page_booking_rating">Classificação: %s</string>
 	<string name="place_page_starting_from">a partir de %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -866,4 +867,19 @@
 	<string name="editor_remove_place_button">Remover</string>
 	<string name="editor_status_sending">A enviar…</string>
 	<string name="editor_place_doesnt_exist">O local não existe</string>
+	<string name="text_more_button">…mais</string>
+	<string name="error_enter_correct_phone">Preencha com o número de telefone sem letras</string>
+	<string name="error_enter_correct_web">Preencha com um endereço válido na internet</string>
+	<string name="error_enter_correct_email">Preencha com um endereço válido de e-mail</string>
+	<string name="error_enter_correct">Preencha com um valor válido</string>
+	<string name="editor_profile_changes_for_next_place">Alterações para o próximo lugar: %d</string>
+	<string name="editor_profile_rating_place">Posição na classificação</string>
+	<string name="booking_dialog_not_connect_header">Para reservar o hotel, ative a sua ligação à Internet</string>
+	<string name="whatsnew_booking_header">Reservar um hotel a partir da aplicação</string>
+	<string name="whatsnew_booking_message">Quando procurar um hotel, o mapa irá exibir a categoria de preço e a classificação do hotel.</string>
+	<string name="button_try">Experimente</string>
+	<string name="whatsnew_cycle_navigation_header">Navegação para bicicleta (versão beta)</string>
+	<string name="whatsnew_cycle_navigation_message">Estamos a testar a navegação para bicicleta para a nova temporada. Experimente o seu trilho preferido em bicicleta com a MAPS.ME e partilhe a sua opinião connosco.</string>
+	<string name="refresh">Atualizar</string>
+	<string name="last_update">Última atualização: %s</string>
 </resources>
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@ -96,7 +96,7 @@
 	<!-- Button text for the button under the country_status_download_failed message -->
 	<string name="try_again">Încercați din nou</string>
 	<string name="about_menu_title">Despre MAPS.ME</string>
-	<string name="downloading_touch_to_cancel">Se descarcă %d%% . Atingeți pentru a anula.</string>
+	<string name="downloading_touch_to_cancel">Se descarcă %d%%. Atingeți pentru a anula.</string>
 	<string name="downloaded_touch_to_delete">Descărcat (%s). Atingeți pentru a șterge.</string>
 	<string name="connection_settings">Setări conexiune</string>
 	<string name="download_mb_or_kb">Descărcare %s</string>
@ -672,6 +672,7 @@
 	<string name="download_all">Descarcă toate</string>
 	<string name="delete_all">Ștergere toate</string>
 	<string name="autodownload">Descărcare automată</string>
+	<string name="disable_autodownload">Dezactivare descărcare automată</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Închis acum</string>
 	<!-- Place Page opening hours text -->
@ -746,7 +747,7 @@
 	<string name="editor_username_error_dialog">Nume de utilizator nevalid</string>
 	<string name="editor_place_edited_dialog">Ați editat un obiect!</string>
 	<string name="editor_login_with_osm">Conectați-vă cu OpenStreetMap</string>
-	<string name="editor_profile_changes">Modificări:</string>
+	<string name="editor_profile_changes">Modificări confirmate</string>
 	<string name="editor_profile_unsent_changes">Netrimis:</string>
 	<string name="editor_focus_map_on_location">Trageți de hartă pentru a selecta locația corectă a obiectului.</string>
 	<string name="editor_add_select_category">Selectați categoria</string>
@ -843,7 +844,7 @@
 	<string name="placepage_entrance_type">Intrare</string>
 	<string name="placepage_flat">ap.</string>
 	<string name="placepage_open_24_7">24 / 7</string>
-	<string name="placepage_place_rating">Evaluare:</string>
+	<string name="place_page_booking_rating">Evaluare: %s</string>
 	<string name="place_page_starting_from">din %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -863,4 +864,19 @@
 	<string name="editor_remove_place_button">Eliminare</string>
 	<string name="editor_status_sending">Se trimite…</string>
 	<string name="editor_place_doesnt_exist">Locul nu există</string>
+	<string name="text_more_button">…mai multe</string>
+	<string name="error_enter_correct_phone">Introduceți numărul de telefon fără litere</string>
+	<string name="error_enter_correct_web">Introduceți o adresă web validă</string>
+	<string name="error_enter_correct_email">Introduceți o adresă de e-mail validă</string>
+	<string name="error_enter_correct">Introduceți o valoare validă</string>
+	<string name="editor_profile_changes_for_next_place">Modificări necesare pentru următoarea poziţie: %d</string>
+	<string name="editor_profile_rating_place">Poziţie în clasament</string>
+	<string name="booking_dialog_not_connect_header">Pentru a face o rezervare la un hotel, activaţi conexiunea la Internet</string>
+	<string name="whatsnew_booking_header">Rezervare hotel din aplicaţie</string>
+	<string name="whatsnew_booking_message">Dacă sunteţi în căutarea unui hotel, harta vă va arăta categoriile de preţuri practicate de hoteluri şi evaluarea lor.</string>
+	<string name="button_try">Încercaţi-o</string>
+	<string name="whatsnew_cycle_navigation_header">Navigaţie pentru biciclete (versiune beta)</string>
+	<string name="whatsnew_cycle_navigation_message">În prezent testăm navigaţia pentru biciclete pentru noul sezon. Încercaţi traseul dvs. favorit cu MAPS.ME şi împărtăşiţi-ne opinia dvs.</string>
+	<string name="refresh">Actualizați</string>
+	<string name="last_update">Ultima actualizare: %s</string>
 </resources>
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@ -705,6 +705,7 @@
 	<string name="download_all">Загрузить все</string>
 	<string name="delete_all">Удалить все</string>
 	<string name="autodownload">Автоматическая загрузка</string>
+	<string name="disable_autodownload">Запретить автозагрузку</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Сейчас закрыто</string>
 	<!-- Place Page opening hours text -->
@ -783,7 +784,7 @@
 	<string name="editor_username_error_dialog">Неверное имя пользователя</string>
 	<string name="editor_place_edited_dialog">Вы отредактировали объект!</string>
 	<string name="editor_login_with_osm">Войти через OpenStreetMap</string>
-	<string name="editor_profile_changes">Правки:</string>
+	<string name="editor_profile_changes">Учтённые правки</string>
 	<string name="editor_profile_unsent_changes">Не отправлено:</string>
 	<string name="editor_focus_map_on_location">Потяните карту, чтобы выбрать правильное местоположение объекта.</string>
 	<string name="editor_add_select_category">Выбрать категорию</string>
@ -881,7 +882,7 @@
 	<string name="placepage_entrance_type">Подъезд</string>
 	<string name="placepage_flat">кв.</string>
 	<string name="placepage_open_24_7">Круглосуточно</string>
-	<string name="placepage_place_rating">Рейтинг:</string>
+	<string name="place_page_booking_rating">Рейтинг: %s</string>
 	<string name="place_page_starting_from">от %s</string>
 	<string name="meter">м</string>
 	<string name="kilometer">км</string>
@ -901,10 +902,19 @@
 	<string name="editor_remove_place_button">Удалить</string>
 	<string name="editor_status_sending">Отправка…</string>
 	<string name="editor_place_doesnt_exist">Места не существует</string>
-	<string name="place_page_booking_rating">Рейтинг: %s</string>
-	<string name="text_more_button">… еще</string>
-	<string name="error_enter_correct_phone">Введите корректный номер телефона</string>
-	<string name="error_enter_correct_web">Введите корректный веб-сайт</string>
+	<string name="text_more_button">…ещё</string>
+	<string name="error_enter_correct_phone">Введите номер телефона без букв</string>
+	<string name="error_enter_correct_web">Введите корректный веб-адрес</string>
 	<string name="error_enter_correct_email">Введите корректный email</string>
 	<string name="error_enter_correct">Введите корректное значение</string>
+	<string name="editor_profile_changes_for_next_place">Правок до следующего места: %d</string>
+	<string name="editor_profile_rating_place">Место в рейтинге</string>
+	<string name="booking_dialog_not_connect_header">Для бронирования отелей необходим доступ в интернет</string>
+	<string name="whatsnew_booking_header">Бронируй отель из приложения</string>
+	<string name="whatsnew_booking_message">При выборе отелей на карте будут отображаться ценовая категория и рейтинг заведения.</string>
+	<string name="button_try">Попробовать</string>
+	<string name="whatsnew_cycle_navigation_header">Велонавигация (бета-версия)</string>
+	<string name="whatsnew_cycle_navigation_message">К открытию сезона мы тестируем велонавигацию. Прокатитесь по своему любимому вело маршруту с MAPS.ME и поделитесь с нами впечатлениями.</string>
+	<string name="refresh">Обновить</string>
+	<string name="last_update">Последнее обновление: %s</string>
 </resources>
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@ -678,6 +678,7 @@
 	<string name="download_all">Stiahnuť všetko</string>
 	<string name="delete_all">Vymazať všetky</string>
 	<string name="autodownload">Automaticky stiahnuť</string>
+	<string name="disable_autodownload">Zrušiť automatické preberanie</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Teraz zatvorené</string>
 	<!-- Place Page opening hours text -->
@ -752,7 +753,7 @@
 	<string name="editor_username_error_dialog">Používateľské meno je neplatné</string>
 	<string name="editor_place_edited_dialog">Práve ste upravili objekt!</string>
 	<string name="editor_login_with_osm">Prihlásiť sa prostredníctvom OpenStreetMap</string>
-	<string name="editor_profile_changes">Zmeny:</string>
+	<string name="editor_profile_changes">Overené zmeny</string>
 	<string name="editor_profile_unsent_changes">Neodoslané:</string>
 	<string name="editor_focus_map_on_location">Ak chcete nastaviť správnu polohu objektu, posuňte mapu.</string>
 	<string name="editor_add_select_category">Vybrať kategóriu</string>
@ -850,7 +851,7 @@
 	<string name="placepage_entrance_type">Vstup</string>
 	<string name="placepage_flat">Byt</string>
 	<string name="placepage_open_24_7">24 / 7</string>
-	<string name="placepage_place_rating">Hodnotenie:</string>
+	<string name="place_page_booking_rating">Hodnotenie: %s</string>
 	<string name="place_page_starting_from">od %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -870,4 +871,19 @@
 	<string name="editor_remove_place_button">Odstrániť</string>
 	<string name="editor_status_sending">Odosiela sa…</string>
 	<string name="editor_place_doesnt_exist">Miesto neexistuje</string>
+	<string name="text_more_button">…viac</string>
+	<string name="error_enter_correct_phone">Zadajte telefónne číslo bez písmen</string>
+	<string name="error_enter_correct_web">Zadajte platnú webovú adresu</string>
+	<string name="error_enter_correct_email">Zadajte platný e-mail</string>
+	<string name="error_enter_correct">Zadajte platnú hodnotu</string>
+	<string name="editor_profile_changes_for_next_place">Zmeny pre ďalšie miesto: %d</string>
+	<string name="editor_profile_rating_place">Hodnotiaca pozícia</string>
+	<string name="booking_dialog_not_connect_header">Rezervácia hotela vyžaduje aktiváciu pripojenia k Internetu</string>
+	<string name="whatsnew_booking_header">Rezervujte si hotel z aplikácie</string>
+	<string name="whatsnew_booking_message">Keď hľadáte hotel, na mape sa zobrazia cenové kategórie a hodnotenia hotelov.</string>
+	<string name="button_try">Vyskúšajte to</string>
+	<string name="whatsnew_cycle_navigation_header">Navigácia pre cyklistov (beta verzia)</string>
+	<string name="whatsnew_cycle_navigation_message">Testujeme navigáciu pre cyklistov na novú sezónu. Vyskúšajte svoju obľúbenú cyklotrasu s aplikáciou MAPS.ME a podeľte sa s nami o svoj názor.</string>
+	<string name="refresh">Aktualizovať</string>
+	<string name="last_update">Naposledy aktualizované: %s</string>
 </resources>
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@ -679,6 +679,7 @@
 	<string name="download_all">Ladda ner alla</string>
 	<string name="delete_all">Radera alla</string>
 	<string name="autodownload">Automatisk nedladdning</string>
+	<string name="disable_autodownload">Avaktivera automatisk nedladdning</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Stängt just nu</string>
 	<!-- Place Page opening hours text -->
@ -753,7 +754,7 @@
 	<string name="editor_username_error_dialog">Användarnamnet är ogiltigt</string>
 	<string name="editor_place_edited_dialog">Du har redigerat ett objekt!</string>
 	<string name="editor_login_with_osm">Logga in med OpenStreetMap</string>
-	<string name="editor_profile_changes">Ändringar:</string>
+	<string name="editor_profile_changes">Verifierade ändringar</string>
 	<string name="editor_profile_unsent_changes">Inte skickade:</string>
 	<string name="editor_focus_map_on_location">Dra på kartan för att välja objektets rätta plats.</string>
 	<string name="editor_add_select_category">Välj kategori</string>
@ -851,7 +852,7 @@
 	<string name="placepage_entrance_type">Entré</string>
 	<string name="placepage_flat">lgh</string>
 	<string name="placepage_open_24_7">Døgnet rundt</string>
-	<string name="placepage_place_rating">Betyg:</string>
+	<string name="place_page_booking_rating">Betyg: %s</string>
 	<string name="place_page_starting_from">från %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -871,4 +872,19 @@
 	<string name="editor_remove_place_button">Ta bort</string>
 	<string name="editor_status_sending">Skickar…</string>
 	<string name="editor_place_doesnt_exist">Platsen finns inte</string>
+	<string name="text_more_button">…mer</string>
+	<string name="error_enter_correct_phone">Ange telefonnummer utan bokstäver</string>
+	<string name="error_enter_correct_web">Ange en giltig webadress</string>
+	<string name="error_enter_correct_email">Ange en giltig e-postadress</string>
+	<string name="error_enter_correct">Ange ett giltigt värde</string>
+	<string name="editor_profile_changes_for_next_place">Ändringar av nästa plats: %d</string>
+	<string name="editor_profile_rating_place">Rankning</string>
+	<string name="booking_dialog_not_connect_header">Var vänlig aktivera din internetanslutning för att göra hotellbokningen</string>
+	<string name="whatsnew_booking_header">Boka ett hotell från appen</string>
+	<string name="whatsnew_booking_message">När du letar efter ett hotell kommer kartan visa hotellets priskategori och bedömning.</string>
+	<string name="button_try">Prova det</string>
+	<string name="whatsnew_cycle_navigation_header">Cykelnavigering (betaversion)</string>
+	<string name="whatsnew_cycle_navigation_message">Vi testar cykelnavigeringen för den nya säsongen. Testa din favoritcykelrutt med MAPS.ME och berätta för oss vad du tycker.</string>
+	<string name="refresh">Uppdatera</string>
+	<string name="last_update">Senast uppdaterad: %s</string>
 </resources>
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@ -681,6 +681,7 @@
 	<string name="download_all">ดาวน์โหลดทั้งหมด</string>
 	<string name="delete_all">ลบทั้งหมด</string>
 	<string name="autodownload">ดาวน์โหลดอัตโนมัติ</string>
+	<string name="disable_autodownload">หยุดการดาวน์โหลดแบบอัตโนมัติ</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">ปิดตอนนี้</string>
 	<!-- Place Page opening hours text -->
@ -755,7 +756,7 @@
 	<string name="editor_username_error_dialog">ชื่อผู้ใช้ไม่ถูกต้อง</string>
 	<string name="editor_place_edited_dialog">คุณได้แก้ไขวัตถุ!</string>
 	<string name="editor_login_with_osm">ล็อกอินด้วย OpenStreetMap</string>
-	<string name="editor_profile_changes">การเปลี่ยนแปลง:</string>
+	<string name="editor_profile_changes">การเปลี่ยนแปลงที่อนุมัติแล้ว</string>
 	<string name="editor_profile_unsent_changes">ไม่ได้ส่ง:</string>
 	<string name="editor_focus_map_on_location">ดึงแผนที่เพื่อเลือกตำแหน่งวัตถุที่ถูกต้อง</string>
 	<string name="editor_add_select_category">เลือกหมวดหมู่</string>
@ -853,7 +854,7 @@
 	<string name="placepage_entrance_type">ทางเข้า</string>
 	<string name="placepage_flat">ห้อง</string>
 	<string name="placepage_open_24_7">24 ชั่วโมง</string>
-	<string name="placepage_place_rating">เรทติ้ง</string>
+	<string name="place_page_booking_rating">เรทติ้ง: %s</string>
 	<string name="place_page_starting_from">จาก %s</string>
 	<string name="meter">ม.</string>
 	<string name="kilometer">กม.</string>
@ -873,4 +874,19 @@
 	<string name="editor_remove_place_button">ลบออก</string>
 	<string name="editor_status_sending">กำลังส่ง…</string>
 	<string name="editor_place_doesnt_exist">ไม่พบสถานที่นี้</string>
+	<string name="text_more_button">…เพิ่มเติม</string>
+	<string name="error_enter_correct_phone">กรอกหมายเลขโทรศัพท์โดยไม่ใช้ตัวอักษร</string>
+	<string name="error_enter_correct_web">กรอกที่อยู่เว็บที่ถูกต้อง</string>
+	<string name="error_enter_correct_email">กรอกอีเมลที่ถูกต้อง</string>
+	<string name="error_enter_correct">กรอกค่าที่ถูกต้อง</string>
+	<string name="editor_profile_changes_for_next_place">เปลี่ยนไปยังสถานที่ถัดไป: %d</string>
+	<string name="editor_profile_rating_place">ลำดับของตำแหน่ง</string>
+	<string name="booking_dialog_not_connect_header">โปรดเชื่อมต่อกับอินเตอร์เน็ตเพื่อจองโรงแรมนี้</string>
+	<string name="whatsnew_booking_header">จองโรงแรมจากแอพ</string>
+	<string name="whatsnew_booking_message">หากคุณกำลังมองหาโรงแรมอยู่ แผนที่จะแสดงหมวดหมู่ราคา และเรตติ้งของโรงแรม</string>
+	<string name="button_try">ลองดู</string>
+	<string name="whatsnew_cycle_navigation_header">การนำทางจักรยาน (beta-version)</string>
+	<string name="whatsnew_cycle_navigation_message">เรากำลังทดสอบการนำทางจักรยานในฤดูกาลใหม่ ลองเส้นทางการขี่จักรยานด้วย MAPS.ME และแชร์ความคิดเห็นของคุณมาให้เรา</string>
+	<string name="refresh">อัปเดต</string>
+	<string name="last_update">การอัปเดตล่าสุด: %s</string>
 </resources>
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@ -681,6 +681,7 @@
 	<string name="download_all">Tümünü indir</string>
 	<string name="delete_all">Tümünü sil</string>
 	<string name="autodownload">Otomatik indir</string>
+	<string name="disable_autodownload">Otomatik indirmeyi devre dışı bırak</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Şu anda kapalı</string>
 	<!-- Place Page opening hours text -->
@ -755,7 +756,7 @@
 	<string name="editor_username_error_dialog">Kullanıcı adı geçersiz</string>
 	<string name="editor_place_edited_dialog">Bir objeyi düzenlediniz\&#39;!</string>
 	<string name="editor_login_with_osm">OpenStreetMap ile giriş yapın</string>
-	<string name="editor_profile_changes">Değişiklikler:</string>
+	<string name="editor_profile_changes">Doğrulanan Değişiklikler</string>
 	<string name="editor_profile_unsent_changes">Gönderilmedi:</string>
 	<string name="editor_focus_map_on_location">Objenin doğru konumunu seçmek için haritayı çekin.</string>
 	<string name="editor_add_select_category">Kategori seç</string>
@ -853,7 +854,7 @@
 	<string name="placepage_entrance_type">Giriş</string>
 	<string name="placepage_flat">uygulama</string>
 	<string name="placepage_open_24_7">24 / 7</string>
-	<string name="placepage_place_rating">Derecelendirme:</string>
+	<string name="place_page_booking_rating">Derecelendirme: %s</string>
 	<string name="place_page_starting_from">%s’dan</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -873,4 +874,19 @@
 	<string name="editor_remove_place_button">Kaldır</string>
 	<string name="editor_status_sending">Gönderiliyor…</string>
 	<string name="editor_place_doesnt_exist">Bu yer mevcut değil</string>
+	<string name="text_more_button">…daha fazla</string>
+	<string name="error_enter_correct_phone">Telefon numarasını harf olmadan girin</string>
+	<string name="error_enter_correct_web">Geçerli bir web adresi girin</string>
+	<string name="error_enter_correct_email">Geçerli bir e-posta girin</string>
+	<string name="error_enter_correct">Geçerli bir değer girin</string>
+	<string name="editor_profile_changes_for_next_place">Sonraki yerdeki değişiklikler: %d</string>
+	<string name="editor_profile_rating_place">Sıralamadaki yeri</string>
+	<string name="booking_dialog_not_connect_header">Bunlar, onaylanmış harita değişiklikleridir</string>
+	<string name="whatsnew_booking_header">Uygulama üzerinden otel rezervasyonu yapın</string>
+	<string name="whatsnew_booking_message">Bir otel aradığınızda, harita otellerin fiyat kategorisini ve puanlarını gösterir.</string>
+	<string name="button_try">Deneyin</string>
+	<string name="whatsnew_cycle_navigation_header">Bisiklet navigasyonu (beta sürüm)</string>
+	<string name="whatsnew_cycle_navigation_message">Yeni sezon için bisiklet navigasyonu özelliğini test ediyoruz. En sık kullandığınız bisiklet rotasını MAPS.ME ile deneyin ve görüşlerinizi bizimle paylaşın.</string>
+	<string name="refresh">Güncelleştirme</string>
+	<string name="last_update">Son güncelleme: %s</string>
 </resources>
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@ -679,6 +679,7 @@
 	<string name="download_all">Завантажити всі</string>
 	<string name="delete_all">Видалити всі</string>
 	<string name="autodownload">Автоматичне завантаження</string>
+	<string name="disable_autodownload">Заборонити автозавантаження</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Зараз закрито</string>
 	<!-- Place Page opening hours text -->
@ -753,7 +754,7 @@
 	<string name="editor_username_error_dialog">Ім\&#39;я користувача є недійсним</string>
 	<string name="editor_place_edited_dialog">Ви відредагували об’єкт!</string>
 	<string name="editor_login_with_osm">Увійти через OpenStreetMap</string>
-	<string name="editor_profile_changes">Правки:</string>
+	<string name="editor_profile_changes">Виправлення, що ураховані</string>
 	<string name="editor_profile_unsent_changes">Не відправлено:</string>
 	<string name="editor_focus_map_on_location">Потягніть мапу, щоб вибрати правильне місцезнаходження об’єкту.</string>
 	<string name="editor_add_select_category">Вибрати категорію</string>
@ -851,7 +852,7 @@
 	<string name="placepage_entrance_type">Під\&#39;їзд</string>
 	<string name="placepage_flat">кв.</string>
 	<string name="placepage_open_24_7">Цілодобово</string>
-	<string name="placepage_place_rating">Рейтинг:</string>
+	<string name="place_page_booking_rating">Рейтинг: %s</string>
 	<string name="place_page_starting_from">від %s</string>
 	<string name="meter">м</string>
 	<string name="kilometer">км</string>
@ -871,4 +872,19 @@
 	<string name="editor_remove_place_button">Видалити</string>
 	<string name="editor_status_sending">Відправка…</string>
 	<string name="editor_place_doesnt_exist">Місце не існує</string>
+	<string name="text_more_button">…більше</string>
+	<string name="error_enter_correct_phone">Введіть номер телефону без літер</string>
+	<string name="error_enter_correct_web">Введіть вірну адресу веб-сайту</string>
+	<string name="error_enter_correct_email">Введіть вірниу адресу електронної пошти</string>
+	<string name="error_enter_correct">Введіть вірне значення</string>
+	<string name="editor_profile_changes_for_next_place">Виправлень до наступного місця: %d</string>
+	<string name="editor_profile_rating_place">Місце у рейтингу</string>
+	<string name="booking_dialog_not_connect_header">Для бронювання готелів потрібен доступ до інтернету</string>
+	<string name="whatsnew_booking_header">Бронюй готель з додатку</string>
+	<string name="whatsnew_booking_message">Під час вибору готелів на карті буде відображено цінову категорію та рейтинг закладу.</string>
+	<string name="button_try">Спробувати</string>
+	<string name="whatsnew_cycle_navigation_header">Велонавігація (бета-версія)</string>
+	<string name="whatsnew_cycle_navigation_message">До відкриття сезону ми тестуємо велонавігацію. Проїдьтесь за своїм улюбленим маршрутом з MAPS.ME та поділіться враженнями з нами.</string>
+	<string name="refresh">Обновити</string>
+	<string name="last_update">Останнє оновлення: %s</string>
 </resources>
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@ -675,6 +675,7 @@
 	<string name="download_all">Tải về tất cả</string>
 	<string name="delete_all">Xóa tất cả</string>
 	<string name="autodownload">Tự động tải về</string>
+	<string name="disable_autodownload">Tắt chế độ tự động tải xuống</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">Hiện đã đóng</string>
 	<!-- Place Page opening hours text -->
@ -749,7 +750,7 @@
 	<string name="editor_username_error_dialog">Tên đăng nhập không hợp lệ</string>
 	<string name="editor_place_edited_dialog">Bạn đã chỉnh sửa một đối tượng!</string>
 	<string name="editor_login_with_osm">Đăng nhập với OpenStreetMap</string>
-	<string name="editor_profile_changes">Những thay đổi:</string>
+	<string name="editor_profile_changes">Các thay đổi đã được xác thực</string>
 	<string name="editor_profile_unsent_changes">Không gửi được:</string>
 	<string name="editor_focus_map_on_location">Kéo bản đồ để chọn vị trí chính xác của đối tượng</string>
 	<string name="editor_add_select_category">Chọn thể loại</string>
@ -847,7 +848,7 @@
 	<string name="placepage_entrance_type">Lối vào</string>
 	<string name="placepage_flat">áp dụng</string>
 	<string name="placepage_open_24_7">24 / 7</string>
-	<string name="placepage_place_rating">Xếp hạng:</string>
+	<string name="place_page_booking_rating">Xếp hạng: %s</string>
 	<string name="place_page_starting_from">từ %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -867,4 +868,19 @@
 	<string name="editor_remove_place_button">Xóa</string>
 	<string name="editor_status_sending">Đang gửi …</string>
 	<string name="editor_place_doesnt_exist">Địa điểm không tồn tại</string>
+	<string name="text_more_button">…thêm</string>
+	<string name="error_enter_correct_phone">Nhập số điện thoại không có chữ cái</string>
+	<string name="error_enter_correct_web">Nhập địa chỉ trang web hợp lệ</string>
+	<string name="error_enter_correct_email">Nhập email hợp lệ</string>
+	<string name="error_enter_correct">Nhập giá trị hợp lệ</string>
+	<string name="editor_profile_changes_for_next_place">Các thay đổi tới địa điểm tiếp theo: %d</string>
+	<string name="editor_profile_rating_place">Vị trí thứ hạng</string>
+	<string name="booking_dialog_not_connect_header">Để đặt khách sạn, vui lòng bật kết nối Internet</string>
+	<string name="whatsnew_booking_header">Đặt khách sạn từ ứng dụng</string>
+	<string name="whatsnew_booking_message">Khi tìm khách sạn, bản đồ sẽ hiển thị đánh giá và giá của các khách sạn.</string>
+	<string name="button_try">Hãy thử xem</string>
+	<string name="whatsnew_cycle_navigation_header">Định vị xe đạp (phiên bản beta)</string>
+	<string name="whatsnew_cycle_navigation_message">Chúng tôi đang thử nghiệm định vị xe đạp cho mùa mới. Hãy thử tuyến đường xe đạp ưa thích của bạn với MAPS.ME, và chia sẻ ý kiến của bạn với chúng tôi.</string>
+	<string name="refresh">Cập nhật</string>
+	<string name="last_update">Cập nhật cuối cùng: %s</string>
 </resources>
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@ -691,6 +691,7 @@
 	<string name="download_all">全部下載</string>
 	<string name="delete_all">刪除全部</string>
 	<string name="autodownload">自動下載</string>
+	<string name="disable_autodownload">停用自動下載</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">現在關門</string>
 	<!-- Place Page opening hours text -->
@ -769,7 +770,7 @@
 	<string name="editor_username_error_dialog">使用者名稱不存在</string>
 	<string name="editor_place_edited_dialog">您已編輯了一個物件！</string>
 	<string name="editor_login_with_osm">使用 OpenStreetMap 進行登入</string>
-	<string name="editor_profile_changes">更改：</string>
+	<string name="editor_profile_changes">已驗證的變更</string>
 	<string name="editor_profile_unsent_changes">未發送：</string>
 	<string name="editor_focus_map_on_location">拖動地圖以選擇此物件的正確位置。</string>
 	<string name="editor_add_select_category">選擇類別</string>
@ -867,8 +868,8 @@
 	<string name="placepage_entrance_type">入口</string>
 	<string name="placepage_flat">公寓</string>
 	<string name="placepage_open_24_7">全天候</string>
-	<string name="placepage_place_rating">評價：</string>
-	<string name="place_page_starting_from">從 %s</string>
+	<string name="place_page_booking_rating">評分： %s</string>
+	<string name="place_page_starting_from">從%s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
 	<string name="placepage_place_description">說明</string>
@ -887,4 +888,19 @@
 	<string name="editor_remove_place_button">移除</string>
 	<string name="editor_status_sending">正在傳送…</string>
 	<string name="editor_place_doesnt_exist">位置不存在</string>
+	<string name="text_more_button">…更多</string>
+	<string name="error_enter_correct_phone">輸入無字母的電話號碼</string>
+	<string name="error_enter_correct_web">輸入有效網址</string>
+	<string name="error_enter_correct_email">輸入有效電子郵箱</string>
+	<string name="error_enter_correct">輸入有效值</string>
+	<string name="editor_profile_changes_for_next_place">對下一個地點的變更：%d</string>
+	<string name="editor_profile_rating_place">排名位置</string>
+	<string name="booking_dialog_not_connect_header">要預訂酒店，請啟用您的網際網路連線</string>
+	<string name="whatsnew_booking_header">從應用程式預訂酒店</string>
+	<string name="whatsnew_booking_message">當您尋找酒店時，此地圖可以顯示該酒店的價格類型與評比。</string>
+	<string name="button_try">試用</string>
+	<string name="whatsnew_cycle_navigation_header">自行車導航（beta 版）</string>
+	<string name="whatsnew_cycle_navigation_message">我們正在為新的一季測試自行車導航功能。請使用 MAPS.ME 嘗試您最喜愛的自行車路徑，並將您的意見與我們分享。</string>
+	<string name="refresh">更新</string>
+	<string name="last_update">上次更新於：%s</string>
 </resources>
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@ -681,6 +681,7 @@
 	<string name="download_all">下载所有</string>
 	<string name="delete_all">删除全部</string>
 	<string name="autodownload">自动下载</string>
+	<string name="disable_autodownload">禁用自动下载</string>
 	<!-- Place Page opening hours text -->
 	<string name="closed_now">现在关门</string>
 	<!-- Place Page opening hours text -->
@ -755,7 +756,7 @@
 	<string name="editor_username_error_dialog">用户名不存在</string>
 	<string name="editor_place_edited_dialog">您已编辑了一个对象！</string>
 	<string name="editor_login_with_osm">使用OpenStreetMap进行登录</string>
-	<string name="editor_profile_changes">更改数目：</string>
+	<string name="editor_profile_changes">已验证的更改</string>
 	<string name="editor_profile_unsent_changes">未发送：</string>
 	<string name="editor_focus_map_on_location">拖动地图以选择此对象的正确位置。</string>
 	<string name="editor_add_select_category">选择类别</string>
@ -853,7 +854,7 @@
 	<string name="placepage_entrance_type">入口</string>
 	<string name="placepage_flat">公寓</string>
 	<string name="placepage_open_24_7">24 / 7</string>
-	<string name="placepage_place_rating">评价</string>
+	<string name="place_page_booking_rating">评价: %s</string>
 	<string name="place_page_starting_from">从 %s</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
@ -873,4 +874,19 @@
 	<string name="editor_remove_place_button">删除</string>
 	<string name="editor_status_sending">正在发送…</string>
 	<string name="editor_place_doesnt_exist">位置不存在</string>
+	<string name="text_more_button">…更多</string>
+	<string name="error_enter_correct_phone">输入无字母的电话号码</string>
+	<string name="error_enter_correct_web">输入有效网址</string>
+	<string name="error_enter_correct_email">输入有效电子邮箱</string>
+	<string name="error_enter_correct">输入有效值</string>
+	<string name="editor_profile_changes_for_next_place">升到下一级所需更改: %d</string>
+	<string name="editor_profile_rating_place">排名位置</string>
+	<string name="booking_dialog_not_connect_header">要预订酒店，请启用互联网连接</string>
+	<string name="whatsnew_booking_header">使用应用程序订房间</string>
+	<string name="whatsnew_booking_message">当您查找酒店时，地图能够显示酒店价格类别和评价。</string>
+	<string name="button_try">试一试</string>
+	<string name="whatsnew_cycle_navigation_header">自行车导航 (beta 版)</string>
+	<string name="whatsnew_cycle_navigation_message">正在测试自行车导航。试一下使用 MAPS.ME 寻找您最喜爱的自行车路线并与我们分享您的意见。</string>
+	<string name="refresh">更新</string>
+	<string name="last_update">上次更新于：%s</string>
 </resources>
--- a/Show more
+++ b/Show more