Merge pull request #4090 from bykoianko/release-63-to-master

Release 63 to master

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=625
-propVersionName=6.2.5
+propVersionCode=630
+propVersionName=6.3
 propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
 

android/res/drawable/bg_nav_next_next_turn.xml

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

android/res/drawable/bg_nav_next_next_turn_night.xml

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

android/res/drawable/button_navigation_circle.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+  <item
+    android:drawable="@drawable/bg_circle_pressed"
+    android:state_pressed="true"/>
+
+  <item
+    android:drawable="@drawable/bg_circle"/>
+</selector>

android/res/drawable/button_navigation_circle_night.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  tools:ignore="UnusedAttribute">
+  <item android:drawable="@drawable/bg_circle_pressed_night"
+    android:state_pressed="true"/>
+
+  <item android:drawable="@drawable/bg_circle_night"/>
+</selector>

android/res/drawable/zoom_in.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          tools:ignore="UnusedAttribute">
-  <item android:drawable="@drawable/ic_zoom_in_pressed"
-        android:state_pressed="true"/>
-
-  <item android:drawable="@drawable/ic_zoom_in"/>
-</selector>

android/res/drawable/zoom_in_night.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          tools:ignore="UnusedAttribute">
-  <item android:drawable="@drawable/ic_zoom_in_pressed_night"
-        android:state_pressed="true"/>
-
-  <item android:drawable="@drawable/ic_zoom_in_night"/>
-</selector>

android/res/layout-w1020dp/menu_buttons_line.xml

@@ -3,15 +3,11 @@
   android:layout_width="match_parent"
   android:layout_height="@dimen/menu_line_height"
   android:orientation="horizontal">
-  <!-- Gap for MyPosition button -->
-  <View
-    android:layout_width="@dimen/menu_line_button_width_edge"
-    android:layout_height="match_parent"/>
 
   <!-- Fake view to make layout symmetrical -->
   <Space
     android:id="@+id/symmetrical_gap"
-    android:layout_width="160dp"
+    android:layout_width="228dp"
     android:layout_height="match_parent"/>
 
   <!-- Anchor ID. Disables menu toggle button if present. -->

android/res/layout-w600dp-port/place_page_details.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content">
+<FrameLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content">
   <com.mapswithme.maps.widget.ObservableScrollView
     android:id="@+id/pp__details"
     android:layout_width="match_parent"
@@ -12,22 +13,24 @@
     <RelativeLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:paddingLeft="@dimen/margin_base_plus"
+      android:paddingRight="@dimen/margin_base_plus"
       android:clipChildren="false">
 
-      <View
+      <include
+        layout="@layout/divider_horizontal"/>
+
+      <include
+        layout="@layout/place_page_bookmark_details"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?attr/dividerHorizontal"
-        android:paddingLeft="@dimen/margin_base_plus"
-        android:paddingRight="@dimen/margin_base_plus"/>
+        android:layout_height="wrap_content"/>
 
       <RelativeLayout
         android:id="@+id/rl__details_attrs"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingBottom="@dimen/margin_half"
-        android:paddingLeft="@dimen/margin_base_plus"
-        android:paddingRight="@dimen/margin_base_plus"
+        android:layout_below="@id/bookmark_frame"
         android:paddingTop="@dimen/margin_half">
 
         <View
@@ -83,13 +86,6 @@
         </LinearLayout>
       </RelativeLayout>
 
-      <include
-        layout="@layout/place_page_bookmark_details"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/rl__details_attrs"
-        android:layout_marginLeft="@dimen/margin_base_plus"
-        android:layout_marginRight="@dimen/margin_base_plus"/>
     </RelativeLayout>
   </com.mapswithme.maps.widget.ObservableScrollView>
 

android/res/layout/divider_horizontal.xml

@@ -0,0 +1,5 @@
+<View
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="1dp"
+  android:background="?dividerHorizontal"/>

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_booking"
+      android:src="@drawable/img_whatsnew_booking_improved"
       android:tag="@string/tag_height_limited"/>
 
     <TextView

android/res/layout/layout_nav_top.xml

@@ -81,6 +81,7 @@
     android:layout_below="@id/nav_next_turn_frame"
     android:layout_alignLeft="@id/nav_next_turn_frame"
     android:layout_alignRight="@id/nav_next_turn_frame"
+    android:layout_alignEnd="@id/nav_next_turn_frame"
     android:background="?navNextNextTurnFrame"
     android:elevation="@dimen/nav_elevation"
     android:visibility="gone"
@@ -90,6 +91,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center"
-      tools:src="@drawable/ic_close"/>
+      android:tint="?iconTint"
+      tools:src="@drawable/ic_then_left_sharp"/>
   </FrameLayout>
 </RelativeLayout>

android/res/layout/map_navigation_buttons.xml

@@ -1,26 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:layout_marginBottom="@dimen/nav_menu_height"
   android:padding="@dimen/nav_frame_padding"
-  android:layout_marginBottom="@dimen/nav_menu_height">
+  android:theme="?navButtonsTheme">
+
   <ImageButton
     android:id="@+id/nav_zoom_out"
     style="@style/MwmWidget.MapButton"
-    android:layout_marginBottom="@dimen/nav_zoom_bottom"
-    android:layout_alignParentRight="true"
-    android:layout_alignParentEnd="true"
     android:layout_alignParentBottom="true"
-    tools:src="@drawable/zoom_out"/>
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:layout_marginBottom="@dimen/nav_zoom_bottom"
+    android:background="?nav_background"
+    android:src="@drawable/ic_zoom_out"/>
 
   <ImageButton
     android:id="@+id/nav_zoom_in"
     style="@style/MwmWidget.MapButton"
-    android:layout_marginBottom="@dimen/nav_frame_padding"
     android:layout_above="@id/nav_zoom_out"
-    android:layout_alignParentRight="true"
     android:layout_alignParentEnd="true"
-    tools:src="@drawable/zoom_in"/>
+    android:layout_alignParentRight="true"
+    android:background="?nav_background"
+    android:src="@drawable/ic_zoom_in"/>
+
+  <ImageButton
+    android:id="@+id/my_position"
+    style="@style/MwmWidget.MapButton"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:layout_marginBottom="@dimen/margin_base"
+    android:background="?nav_background"
+    android:contentDescription="@string/my_position"
+    android:tint="@null"/>
 </RelativeLayout>

android/res/layout/menu.xml

@@ -21,17 +21,6 @@
       android:id="@+id/line_frame"
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
-      <ImageView
-        android:id="@+id/my_position"
-        style="@style/MwmTheme.Menu.Line.Button"
-        android:tint="@null"
-        android:background="@drawable/menu_button_left"
-        android:layout_width="@dimen/menu_line_button_width_edge"
-        android:layout_height="@dimen/menu_line_height"
-        android:paddingLeft="@dimen/margin_half"
-        android:paddingRight="@dimen/margin_half_plus"
-        tools:src="@drawable/anim_myposition_pending"
-        tools:layout_marginTop="60dp"/>
 
       <ImageView
         android:id="@+id/toggle"

android/res/layout/menu_buttons_line.xml

@@ -9,10 +9,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
-    <!-- Gap for MyPosition button -->
-    <Space
-      android:layout_width="@dimen/menu_line_button_width_edge"
-      android:layout_height="match_parent"/>
+
+    <ImageView
+      android:id="@+id/search"
+      style="@style/MwmTheme.Menu.Line.Button"
+      android:src="@drawable/ic_menu_search"
+      android:tag="@string/tag_menu_collapse"/>
 
     <Space
       android:layout_width="0dp"
@@ -30,17 +32,6 @@
       android:layout_height="match_parent"
       android:layout_weight="1"/>
 
-    <ImageView
-      android:id="@+id/search"
-      style="@style/MwmTheme.Menu.Line.Button"
-      android:src="@drawable/ic_menu_search"
-      android:tag="@string/tag_menu_collapse"/>
-
-    <Space
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_weight="1"/>
-
     <ImageView
       android:id="@+id/bookmarks"
       style="@style/MwmTheme.Menu.Line.Button"

android/res/layout/place_page_bookmark_details.xml

@@ -2,21 +2,15 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  android:id="@+id/rl__bookmark_details"
+  android:id="@+id/bookmark_frame"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:clipChildren="false"
   android:orientation="vertical"
-  android:paddingBottom="@dimen/margin_base"
   android:visibility="invisible"
   tools:visibility="visible">
 
-  <View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="?dividerHorizontal"/>
-
-  <com.mapswithme.maps.widget.CustomTextInputLayout
+  <TextView
+    android:id="@+id/tv__bookmark_notes"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/margin_half"
@@ -24,129 +18,21 @@
     android:layout_marginLeft="@dimen/margin_base"
     android:layout_marginRight="@dimen/margin_base"
     android:layout_marginStart="@dimen/margin_base"
-    android:layout_marginTop="@dimen/margin_base">
-
-    <EditText
-      android:id="@+id/et__bookmark_name"
-      style="@style/MwmWidget.PlacePage.EditText"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:hint="@string/name"
-      android:inputType="textCapWords"
-      android:singleLine="true"/>
-  </com.mapswithme.maps.widget.CustomTextInputLayout>
+    android:layout_marginTop="@dimen/margin_base"
+    android:textAppearance="@style/MwmTextAppearance.Body1"
+    tools:text="Long, long text Long, long text Long, long text Long, long text Long, long text Long, long text "/>
 
   <TextView
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginEnd="@dimen/margin_base"
-    android:layout_marginLeft="@dimen/margin_base"
-    android:layout_marginRight="@dimen/margin_base"
-    android:layout_marginStart="@dimen/margin_base"
-    android:layout_marginTop="@dimen/margin_base_plus"
-    android:lineSpacingMultiplier="1.67"
-    android:text="@string/set"
-    android:textAppearance="@style/MwmTextAppearance.Caption"/>
+    android:id="@+id/tv__bookmark_edit"
+    style="@style/PlacePageMetadataText.Button"
+    android:layout_height="@dimen/height_block_base"
+    android:background="?clickableBackground"
+    android:paddingEnd="@dimen/margin_base"
+    android:paddingLeft="@dimen/margin_base"
+    android:paddingRight="@dimen/margin_base"
+    android:paddingStart="@dimen/margin_base"
+    android:text="@string/placepage_edit_bookmark_button"/>
 
-  <RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginEnd="@dimen/margin_base"
-    android:layout_marginLeft="@dimen/margin_base"
-    android:layout_marginRight="@dimen/margin_base"
-    android:layout_marginStart="@dimen/margin_base">
-
-    <TextView
-      android:id="@+id/tv__bookmark_group"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_centerVertical="true"
-      android:layout_toLeftOf="@+id/iv__bookmark_color"
-      android:layout_toStartOf="@id/iv__bookmark_color"
-      android:background="?clickableBackground"
-      android:drawableEnd="@drawable/ic_arrow_down"
-      android:drawableRight="@drawable/ic_arrow_down"
-      android:lineSpacingMultiplier="1.43"
-      android:paddingBottom="@dimen/margin_half"
-      android:paddingEnd="@dimen/margin_half"
-      android:paddingRight="@dimen/margin_half"
-      android:paddingTop="@dimen/margin_half"
-      android:textAppearance="@style/MwmTextAppearance.PlacePage"
-      tools:ignore="RtlSymmetry"/>
-
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:layout_below="@id/tv__bookmark_group"
-      android:layout_marginTop="@dimen/margin_quarter"
-      android:layout_toLeftOf="@id/iv__bookmark_color"
-      android:layout_toStartOf="@id/iv__bookmark_color"
-      android:background="?attr/dividerHorizontal"/>
-
-    <ImageView
-      android:id="@+id/iv__bookmark_color"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentEnd="true"
-      android:layout_alignParentRight="true"
-      android:layout_centerVertical="true"
-      android:background="?clickableBackground"
-      android:padding="@dimen/margin_half"
-      tools:src="@drawable/ic_bookmark_marker_red_on"/>
-  </RelativeLayout>
-
-  <TextView
-    android:id="@+id/tv__bookmark_notes"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginEnd="@dimen/margin_base"
-    android:layout_marginLeft="@dimen/margin_base"
-    android:layout_marginRight="@dimen/margin_base"
-    android:layout_marginStart="@dimen/margin_base"
-    android:lineSpacingMultiplier="1.67"
-    android:paddingBottom="@dimen/margin_half"
-    android:paddingTop="@dimen/margin_base"
-    android:text="@string/description"
-    android:textAppearance="@style/MwmTextAppearance.Caption"/>
-
-  <FrameLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginEnd="@dimen/margin_base"
-    android:layout_marginLeft="@dimen/margin_base"
-    android:layout_marginRight="@dimen/margin_base"
-    android:layout_marginStart="@dimen/margin_base">
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:orientation="vertical">
-
-      <WebView
-        android:id="@+id/wv__description"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-      <Button
-        android:id="@+id/btn__edit_html_bookmark"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:background="?attr/selectableItemBackground"
-        android:text="@string/edit"
-        android:textAppearance="@style/MwmTextAppearance.Button"/>
-    </LinearLayout>
-
-    <TextView
-      android:id="@+id/tv__description"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textAppearance="@style/MwmTextAppearance.Body1"/>
-  </FrameLayout>
-
-  <View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:layout_marginTop="@dimen/margin_half"
-    android:background="?dividerHorizontal"/>
+  <include
+    layout="@layout/divider_horizontal"/>
 </LinearLayout>

android/res/layout/place_page_details.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 
@@ -16,11 +17,15 @@
       android:layout_height="wrap_content"
       android:orientation="vertical">
 
-      <View
+      <include
+        layout="@layout/divider_horizontal"/>
+
+      <include
+        layout="@layout/place_page_bookmark_details"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_half"
-        android:background="?dividerHorizontal"/>
+        tools:visibility="gone"/>
 
       <include layout="@layout/place_page_placename"/>
 
@@ -46,12 +51,7 @@
 
       <include layout="@layout/place_page_more"/>
 
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginBottom="@dimen/margin_half"
-        android:layout_marginTop="@dimen/margin_half"
-        android:background="?dividerHorizontal"/>
+      <include layout="@layout/divider_horizontal"/>
 
       <include layout="@layout/place_page_editor"/>
 
@@ -59,15 +59,6 @@
 
       <include layout="@layout/place_page_add"/>
 
-      <Space
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/margin_half"/>
-
-      <include
-        layout="@layout/place_page_bookmark_details"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
     </LinearLayout>
 
   </com.mapswithme.maps.widget.ObservableScrollView>

android/res/layout/place_page_more.xml

@@ -5,19 +5,14 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   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"/>
+
+  <include
+    layout="@layout/divider_horizontal"/>
 
   <TextView
     style="@style/PlacePageMetadataText.Button"
+    android:height="@dimen/height_block_base"
     android:background="?clickableBackground"
-    android:padding="@dimen/margin_half"
-    android:text="@string/details"
-    android:gravity="center"/>
+    android:gravity="center"
+    android:text="@string/details"/>
 </LinearLayout>

android/res/layout/place_page_placename.xml

@@ -4,7 +4,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/ll__place_name"
   style="@style/PlacePageItemFrame"
-  android:minHeight="72dp"
+  android:layout_width="match_parent"
+  android:layout_height="72dp"
   tools:background="#2000FF00"
   tools:visibility="visible">
 
@@ -14,10 +15,10 @@
     android:layout_centerVertical="true"
     android:src="@drawable/ic_address"/>
 
-   <Space
+  <Space
     android:id="@+id/anchor_center"
     android:layout_width="0dp"
-    android:layout_height="0dp"
+    android:layout_height="4dp"
     android:layout_centerVertical="true"/>
 
   <TextView
@@ -34,7 +35,7 @@
     android:layout_height="wrap_content"
     android:layout_alignLeft="@id/tv__place_address"
     android:layout_alignStart="@id/tv__place_address"
-    android:layout_below="@id/tv__place_address"
+    android:layout_below="@id/anchor_center"
     android:textAppearance="@style/MwmTextAppearance.Body3"
     tools:text="Post address"/>
 </RelativeLayout>

android/res/layout/place_page_preview.xml

@@ -7,13 +7,15 @@
   android:gravity="center_vertical"
   android:orientation="horizontal"
   android:padding="@dimen/margin_base">
+
   <include
     android:id="@+id/downloader_status_frame"
     layout="@layout/downloader_status"
     android:layout_width="@dimen/downloader_status_size"
     android:layout_height="@dimen/downloader_status_size"
-    android:layout_marginTop="@dimen/margin_half"
+    android:layout_marginEnd="@dimen/margin_base"
     android:layout_marginRight="@dimen/margin_base"
+    android:layout_marginTop="@dimen/margin_half"
     android:visibility="gone"
     tools:visibility="visible"/>
 
@@ -21,68 +23,74 @@
     android:id="@+id/tv__title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_quarter"
-    android:layout_toRightOf="@id/downloader_status_frame"
     android:layout_alignWithParentIfMissing="true"
+    android:layout_marginTop="@dimen/margin_quarter"
+    android:layout_toEndOf="@id/downloader_status_frame"
+    android:layout_toRightOf="@id/downloader_status_frame"
+    android:ellipsize="end"
     android:fontFamily="@string/robotoMedium"
     android:maxLines="@integer/pp_title_lines"
     android:textAppearance="@style/MwmTextAppearance.Title"
-    android:ellipsize="end"
     tools:background="#C0800000"
+    tools:ignore="UnusedAttribute"
     tools:text="Title"/>
 
-  <LinearLayout
-    android:id="@+id/subtitle_frame"
+  <TextView
+    android:id="@+id/tv__subtitle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:minHeight="@dimen/direction_frame_min_height"
-    android:layout_below="@id/tv__title"
-    android:layout_toRightOf="@id/downloader_status_frame"
     android:layout_alignWithParentIfMissing="true"
+    android:layout_below="@id/tv__title"
+    android:layout_marginTop="@dimen/margin_quarter"
+    android:layout_toEndOf="@id/downloader_status_frame"
+    android:layout_toLeftOf="@+id/direction_frame"
+    android:layout_toRightOf="@id/downloader_status_frame"
+    android:layout_toStartOf="@+id/direction_frame"
+    android:lines="1"
+    android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
+    tools:background="#300000F0"
+    tools:text="Subtitle, very very very very very very very long"/>
+
+  <LinearLayout
+    android:id="@+id/direction_frame"
+    android:layout_width="wrap_content"
+    android:layout_height="@dimen/direction_frame_min_height"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:layout_alignWithParentIfMissing="true"
+    android:layout_below="@id/tv__title"
+    android:background="?selectableItemBackground"
     android:gravity="center_vertical"
-    tools:background="#300000F0">
-    <TextView
-      android:id="@+id/tv__subtitle"
-      android:layout_width="0dp"
-      android:layout_weight="1"
-      android:layout_height="wrap_content"
-      android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
-      tools:text="Subtitle"/>
+    android:minHeight="@dimen/direction_frame_min_height"
+    android:orientation="horizontal"
+    tools:background="#111111F0">
 
-    <LinearLayout
-      android:id="@+id/direction_frame"
+    <com.mapswithme.maps.widget.ArrowView
+      android:id="@+id/av__direction"
       android:layout_width="wrap_content"
-      android:layout_height="@dimen/direction_frame_min_height"
-      android:orientation="horizontal"
-      android:gravity="center_vertical"
-      android:background="?selectableItemBackground"
-      tools:ignore="UselessParent">
-      <com.mapswithme.maps.widget.ArrowView
-        android:id="@+id/av__direction"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:layout_marginRight="@dimen/margin_half"
-        android:scaleType="center"
-        android:src="?ppArrowDrawable"/>
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="@dimen/margin_half"
+      android:layout_marginRight="@dimen/margin_half"
+      android:scaleType="center"
+      android:src="?ppArrowDrawable"/>
 
-      <TextView
-        android:id="@+id/tv__straight_distance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"
-        tools:text="2000 km"/>
-    </LinearLayout>
+    <TextView
+      android:id="@+id/tv__straight_distance"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"
+      tools:text="2000 km"/>
   </LinearLayout>
 
   <TextView
     android:id="@+id/tv__downloader_details"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_below="@id/subtitle_frame"
-    android:layout_toRightOf="@id/downloader_status_frame"
     android:layout_alignWithParentIfMissing="true"
+    android:layout_below="@id/tv__subtitle"
+    android:layout_marginTop="@dimen/margin_quarter"
+    android:layout_toEndOf="@id/downloader_status_frame"
+    android:layout_toRightOf="@id/downloader_status_frame"
     android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
     android:visibility="gone"
     tools:background="#8000F000"
@@ -94,9 +102,9 @@
     android:id="@+id/tv__opened_till"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half"
-    android:layout_below="@id/tv__downloader_details"
     android:layout_alignWithParentIfMissing="true"
+    android:layout_below="@id/tv__downloader_details"
+    android:layout_marginTop="@dimen/margin_quarter"
     android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
     android:visibility="gone"
     tools:background="#80FFF000"
@@ -107,10 +115,11 @@
     android:id="@+id/hotel_info_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half"
-    android:layout_below="@id/tv__opened_till"
     android:layout_alignWithParentIfMissing="true"
+    android:layout_below="@id/tv__opened_till"
+    android:layout_marginTop="@dimen/margin_quarter"
     tools:background="#8000FFFF">
+
     <TextView
       android:id="@+id/tv__hotel_rating"
       android:layout_width="0dp"
@@ -134,9 +143,9 @@
     android:id="@+id/tv__address"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half"
-    android:layout_below="@id/hotel_info_frame"
     android:layout_alignWithParentIfMissing="true"
+    android:layout_below="@id/hotel_info_frame"
+    android:layout_marginTop="@dimen/margin_half"
     android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
     tools:background="#60000000"
     tools:text="Lenina str, 10"/>

android/res/values-ar/strings.xml

@@ -888,11 +888,7 @@
 	<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>
 	<string name="booking_checkin">موجود في: %s</string>
@@ -928,4 +924,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• تضع ملاحة الدراجات بيانات التضاريس في الاعتبار.\n• نحن نخلق طرق أسهل مع الأخذ بعين الاعتبار منحدرات الطريق.</string>
 	<string name="whatsnew_booking_2_header">البحث بسهولة عن فندق</string>
 	<string name="whatsnew_booking_2_message">تظهر نتائج البحث التقييم والفئة السعرية للفندق.</string>
+	<string name="whatsnew_cycle_navigation_header">التوجيه الملاحي مع الدراجات (إصدار تجريبي)</string>
+	<string name="whatsnew_cycle_navigation_message">نختبر الآن التوجيه الملاحي مع الدراجات للموسم الجديد. جرب طريق الدراجات المفضل لديك باستخدام MAPS.ME، واطلعنا على رأيك.</string>
 </resources>

android/res/values-cs/strings.xml

@@ -889,11 +889,7 @@
 	<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>
 	<string name="booking_checkin">příjezd: %s</string>
@@ -929,4 +925,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• Navigace pro kola bere v potaz data o terénu.\n• Bereme v úvahu sklon cesty a vytváříme snazší trasy.</string>
 	<string name="whatsnew_booking_2_header">Snadné hledání hotelu</string>
 	<string name="whatsnew_booking_2_message">Výsledky hledání zobrazují hodnocení a cenovou kategorii hotelu.</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>
 </resources>

android/res/values-da/strings.xml

@@ -886,11 +886,7 @@
 	<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>
 	<string name="booking_checkin">tjek ind: %s</string>
@@ -926,4 +922,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• Cykelnavigation tager forbehold for terrænet.\n• Vi opretter lettere ruter baseret på vejens hældning.</string>
 	<string name="whatsnew_booking_2_header">Enkel hotelsøgning</string>
 	<string name="whatsnew_booking_2_message">Søgeresultaterne viser hotelbedømmelser og priskategori.</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>
 </resources>

android/res/values-de/strings.xml

@@ -912,11 +912,7 @@
 	<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>
 	<string name="booking_checkin">Einchecken: %s</string>
@@ -952,4 +948,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• Fahrrad-Navigation berechnet jetzt auch Geländedaten.\n• Wir erstellen weniger anstrengende Routen, um Gefälle zu berücksichtigen.</string>
 	<string name="whatsnew_booking_2_header">Einfache Hotelsuche</string>
 	<string name="whatsnew_booking_2_message">Die Suchergebnisse zeigen die Bewertung und die Preiskategorie des Hotels.</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>
 </resources>

android/res/values-es/strings.xml

@@ -877,11 +877,7 @@
 	<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>
 	<string name="booking_checkin">hora de llegada: %s</string>
@@ -917,4 +913,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• La navegación en bicicleta tiene en cuenta la información del terreno.\n• Hemos creado rutas más fáciles basándonos en las inclinaciones de carretera.</string>
 	<string name="whatsnew_booking_2_header">Búsqueda de hoteles fácil</string>
 	<string name="whatsnew_booking_2_message">Los resultados de búsqueda muestran la valoración del hotel y la categoría de precios.</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>
 </resources>

android/res/values-fi/strings.xml

@@ -882,11 +882,7 @@
 	<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>
 	<string name="booking_checkin">kirjaudu sisään: %s</string>
@@ -922,4 +918,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• Pyörän navigointi ottaa maaperän huomioon.\n• Loimme helpompia reittejä huomioiden mäet.</string>
 	<string name="whatsnew_booking_2_header">Helppo hotellihaku</string>
 	<string name="whatsnew_booking_2_message">Hakutulokset näyttävät hotellin arvostelut ja hintaluokan.</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>
 </resources>

android/res/values-fr/strings.xml

@@ -893,11 +893,7 @@
 	<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>
 	<string name="booking_checkin">enregistrement : %s</string>
@@ -933,4 +929,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• Prise en compte des données de terrain dans les paramètres de navigation.\n• Prise en compte des pentes facilitant la création d\&#39;itinéraires.</string>
 	<string name="whatsnew_booking_2_header">Recherche d\&#39;hôtel simplifiée</string>
 	<string name="whatsnew_booking_2_message">Affichage des évaluations et catégorie de prix des hôtels dans les résultats de recherche.</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>
 </resources>

android/res/values-hu/strings.xml

@@ -882,11 +882,7 @@
 	<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>
 	<string name="booking_checkin">bejelentkezés: %s</string>
@@ -922,4 +918,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• A biciklinavigáció figyelembe veszi a terepadatokat.\n• Az út meredekségét figyelembe véve alakítjuk ki az könnyebb útvonalat.</string>
 	<string name="whatsnew_booking_2_header">Könnyű szállodakeresés</string>
 	<string name="whatsnew_booking_2_message">A keresési eredmények megjelenítik a szálloda értékelését és árkategóriáját.</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>
 </resources>

android/res/values-in/strings.xml

@@ -881,11 +881,7 @@
 	<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>
 	<string name="booking_checkin">check-in: %s</string>
@@ -921,4 +917,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• Navigasi sepeda menghitung data medan\n• Kami membuat rute lebih mudah dengan menghitung kemiringan jalan</string>
 	<string name="whatsnew_booking_2_header">Pencarian hotel mudah</string>
 	<string name="whatsnew_booking_2_message">Hasil pencarian menampilkan kategori peringkat dan harga hotel</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>
 </resources>

android/res/values-it/strings.xml

@@ -881,11 +881,7 @@
 	<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>
 	<string name="booking_checkin">check in: %s</string>
@@ -921,4 +917,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• La navigazione con biciclette prende in considerazione i dati sul terreno.\n• Abbiamo creato dei percorsi più semplici che prendono in considerazione le pendenze del terreno.</string>
 	<string name="whatsnew_booking_2_header">Ricerca di hotel semplificata</string>
 	<string name="whatsnew_booking_2_message">I risultati di ricerca mostrano la valutazione dell\&#39;hotel e la categoria del prezzo.</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>
 </resources>

android/res/values-ja/strings.xml

@@ -881,11 +881,7 @@
 	<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>
 	<string name="booking_checkin">チェックイン：%s</string>
@@ -921,4 +917,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• 自転車用ナビゲーションはサイクリングコースのデータも使用します。\n• 道の傾斜を考え、最も走りやすいルートを作成します。</string>
 	<string name="whatsnew_booking_2_header">簡単ホテル検索</string>
 	<string name="whatsnew_booking_2_message">検索結果にホテルの評価と宿泊料カテゴリーが表示されます。</string>
+	<string name="whatsnew_cycle_navigation_header">バイクナビゲーション（ベータ版）</string>
+	<string name="whatsnew_cycle_navigation_message">新シーズンに向けてバイクナビゲーションをテスト中です。MAPS.MEで、お気に入りのサイクリングルートを試してみませんか。ご感想をお待ちしています。</string>
 </resources>

android/res/values-ko/strings.xml

@@ -878,11 +878,7 @@
 	<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>
 	<string name="booking_checkin">체크인: %s</string>
@@ -918,4 +914,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• 자전거 탐색은 계정 지형 데이터를 고려합니다.\n• 저희는 계정 도로 경사를 고려하여 쉽게 경로를 만들 수 있습니다.</string>
 	<string name="whatsnew_booking_2_header">쉬운 호텔 검색</string>
 	<string name="whatsnew_booking_2_message">검색 결과는 호텔 평가 및 가격 범주를 표시합니다.</string>
+	<string name="whatsnew_cycle_navigation_header">자전거 네비게이션 (베타 버전)</string>
+	<string name="whatsnew_cycle_navigation_message">저희는 새로운 시즌을 맞이하여 자전거 네비게이션을 테스트하고 있습니다. MAPS.ME에서 귀하가 자주 이용하는 자전거 경로를 사용해 보고, 사용 소감을 알려주세요.</string>
 </resources>

android/res/values-nb/strings.xml

@@ -880,11 +880,7 @@
 	<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>
 	<string name="booking_checkin">sjekk inn: %s</string>
@@ -920,4 +916,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• Sykkelnavigasjon medberegner informasjon om terrenget.\n• Programmet viser hvilke stier som er enklere og mindre bratt.</string>
 	<string name="whatsnew_booking_2_header">Forenkelt hotellsøk</string>
 	<string name="whatsnew_booking_2_message">Søkeresultatene rangerer hotellene etter omdømme og priskategorier.</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>
 </resources>

android/res/values-nl/strings.xml

@@ -882,11 +882,7 @@
 	<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>
 	<string name="booking_checkin">inchecken: %s</string>
@@ -922,4 +918,6 @@
 	<string name="whatsnew_cycle_navigation_2_message">• Fietsnavigatie houdt rekening met terreingegevens.\n• We maken eenvoudigere routes waarbij rekening wordt gehouden met hellingen.</string>
 	<string name="whatsnew_booking_2_header">Eenvoudig zoeken naar hotels</string>
 	<string name="whatsnew_booking_2_message">De zoekresultaten voor hotels tonen de hotelbeoordeling en prijscategorie.</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>
 </resources>