From f843c219ce4f215c7facf7cd65ea4b39e8ffc818 Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Mon, 3 Sep 2018 18:24:26 +0300
Subject: [PATCH 01/13] Add user photo to the "Disable all sharing" dialog

---
 .../layout/bottom_sheet_disable_sharing.xml   | 20 ++++++++++++++++++
 OsmAnd-telegram/res/values/dimens.xml         |  3 +++
 .../telegram/ui/DisableSharingBottomSheet.kt  | 21 +++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/OsmAnd-telegram/res/layout/bottom_sheet_disable_sharing.xml b/OsmAnd-telegram/res/layout/bottom_sheet_disable_sharing.xml
index abf2b7897b..b27c2a5b11 100644
--- a/OsmAnd-telegram/res/layout/bottom_sheet_disable_sharing.xml
+++ b/OsmAnd-telegram/res/layout/bottom_sheet_disable_sharing.xml
@@ -27,6 +27,26 @@
 				android:background="?attr/card_bg_color"
 				android:orientation="vertical">
 
+				<FrameLayout
+					android:layout_width="match_parent"
+					android:layout_height="@dimen/disable_sharing_image_height">
+
+					<ImageView
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:scaleType="center"
+						android:src="@drawable/img_turn_off_sharing"/>
+
+					<ImageView
+						android:id="@+id/user_icon"
+						android:layout_width="@dimen/my_location_user_icon_size"
+						android:layout_height="@dimen/my_location_user_icon_size"
+						android:layout_gravity="center_horizontal"
+						android:layout_marginTop="@dimen/disable_sharing_icon_top_margin"
+						tools:src="@drawable/img_user_picture"/>
+
+				</FrameLayout>
+
 				<net.osmand.telegram.ui.views.TextViewEx
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
diff --git a/OsmAnd-telegram/res/values/dimens.xml b/OsmAnd-telegram/res/values/dimens.xml
index b5b5d471e1..88c224cbb9 100644
--- a/OsmAnd-telegram/res/values/dimens.xml
+++ b/OsmAnd-telegram/res/values/dimens.xml
@@ -46,6 +46,9 @@
 	<dimen name="my_location_text_sides_margin">32dp</dimen>
 	<dimen name="my_location_user_icon_size">60dp</dimen>
 
+	<dimen name="disable_sharing_image_height">132dp</dimen>
+	<dimen name="disable_sharing_icon_top_margin">30dp</dimen>
+
 	<dimen name="search_box_height">48dp</dimen>
 
 	<dimen name="buttons_bottom_bar_height">56dp</dimen>
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/DisableSharingBottomSheet.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/DisableSharingBottomSheet.kt
index d5e0f18ab6..b2fd72dfe1 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/DisableSharingBottomSheet.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/DisableSharingBottomSheet.kt
@@ -1,5 +1,7 @@
 package net.osmand.telegram.ui
 
+import android.graphics.ColorMatrix
+import android.graphics.ColorMatrixColorFilter
 import android.os.Bundle
 import android.support.design.widget.BottomSheetBehavior
 import android.support.v4.app.DialogFragment
@@ -8,12 +10,20 @@ import android.support.v4.app.FragmentManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.TextView
 import net.osmand.telegram.R
+import net.osmand.telegram.TelegramApplication
+import net.osmand.telegram.helpers.TelegramUiHelper
 import net.osmand.telegram.ui.views.BottomSheetDialog
 
 class DisableSharingBottomSheet : DialogFragment() {
 
+	private val app: TelegramApplication
+		get() = activity?.application as TelegramApplication
+
+	private val telegramHelper get() = app.telegramHelper
+
 	override fun onCreateDialog(savedInstanceState: Bundle?) = BottomSheetDialog(context!!)
 
 	override fun onCreateView(
@@ -37,6 +47,17 @@ class DisableSharingBottomSheet : DialogFragment() {
 				override fun onSlide(bottomSheet: View, slideOffset: Float) {}
 			})
 
+		mainView.findViewById<ImageView>(R.id.user_icon).apply {
+			colorFilter = ColorMatrixColorFilter(ColorMatrix().apply { setSaturation(0f) })
+			TelegramUiHelper.setupPhoto(
+				app,
+				this,
+				telegramHelper.getUserPhotoPath(telegramHelper.getCurrentUser()),
+				R.drawable.img_user_picture,
+				false
+			)
+		}
+
 		mainView.findViewById<TextView>(R.id.description).text =
 				getString(R.string.disable_all_sharing_desc, arguments?.getInt(CHATS_COUNT_KEY, -1))
 

From 76eb9d3e3243c48d015710a9334357b8e619cc81 Mon Sep 17 00:00:00 2001
From: Alexander Heinlein <alexander.heinlein@web.de>
Date: Mon, 3 Sep 2018 10:39:17 +0000
Subject: [PATCH 02/13] Translated using Weblate (German)

Currently translated at 100.0% (3494 of 3494 strings)
---
 OsmAnd/res/values-de/phrases.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 81d8db29df..e7f878748e 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -27,7 +27,7 @@
 	<string name="poi_ambulance_station">Rettungswache</string>
 	<string name="poi_anime">Anime-Shop</string>
 	<string name="poi_antiques">Antiquitätenhändler</string>
-	<string name="poi_archaeological_site">Aarchäologischer Fundort</string>
+	<string name="poi_archaeological_site">Archäologischer Fundort</string>
 	<string name="poi_archery">Bogenschießen</string>
 	<string name="poi_architect">Architekturbüro</string>
 	<string name="poi_art">Kunsthandlung</string>

From c1fcbbb512a844db1a0d62958b4962ae247a12b3 Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Tue, 4 Sep 2018 07:58:50 +0000
Subject: [PATCH 03/13] Translated using Weblate (French)

Currently translated at 99.9% (2602 of 2603 strings)
---
 OsmAnd/res/values-fr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 9363a0bc6d..00a24f2f63 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1964,7 +1964,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="simulate_your_location_stop_descr">Arrêter de simuler votre position.</string>
     <string name="simulate_your_location_descr">Simulez votre position à partir d\'un fichier GPX ou d\'une route calculée.</string>
     <string name="are_you_sure">Etes-vous certain ?</string>
-    <string name="unsaved_changes_will_be_lost">Les modifications non enregistrées seront perdues. Souhaitez-vous poursuivre ?</string>
+    <string name="unsaved_changes_will_be_lost">Vos modifications non enregistrées seront perdues. Souhaitez-vous continuer ?</string>
     <string name="downloads_left_template">%1$s téléchargement(s) restant(s)</string>
     <string name="roads">Routes</string>
     <string name="favourites_edit_dialog_title">Propriétés du favori</string>

From b830bb7f0d0cd11f7315ce7b313aee063c88d3ba Mon Sep 17 00:00:00 2001
From: Alexander Heinlein <alexander.heinlein@web.de>
Date: Mon, 3 Sep 2018 19:55:13 +0000
Subject: [PATCH 04/13] Translated using Weblate (German)

Currently translated at 100.0% (2603 of 2603 strings)
---
 OsmAnd/res/values-de/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 278f19d6da..34f834f1a7 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -50,7 +50,7 @@
 	<string name="save_track_to_gpx_descrp">Während der Navigation wird automatisch ein GPX-Track im Track-Ordner gespeichert.</string>
 	<string name="save_track_interval_globally">Aufzeichnungsintervall</string>
 	<string name="save_track_interval">Erfassungsintervall während Navigation</string>
-	<string name="save_track_interval_descr">Intervall zwischen zwei erfassten Punkten während Navigation.</string>
+	<string name="save_track_interval_descr">Intervall für Steckenaufzeichnung zwischen zwei erfassten Punkten während Navigation.</string>
 	
 	<string name="rendering_value_browse_map_name">Karte ansehen</string>  
 	<string name="rendering_value_car_name">Auto</string>
@@ -598,7 +598,7 @@
 	<string name="renderer_load_sucess">Renderer geladen</string>
 	<string name="renderer_load_exception">Renderer konnte nicht geladen werden</string>
 	<string name="renderers">Vektor-Renderer</string>
-	<string name="renderers_descr">Wähle Anzeigemodus für Offline-Vektor-Karten.</string>
+	<string name="renderers_descr">Wähle Darstellung für Offline-Vektor-Karten.</string>
 	<string name="poi_context_menu_website">POI-Internetseite anzeigen</string>
 	<string name="poi_context_menu_call">POI-Telefon anzeigen</string>
 	<string name="website">Webseite</string>

From 6ad9b6505b5ea19b6a7ec1c95a8db5ef6b74ab54 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Mon, 3 Sep 2018 21:13:23 +0000
Subject: [PATCH 05/13] Translated using Weblate (Hebrew)

Currently translated at 99.8% (2600 of 2603 strings)
---
 OsmAnd/res/values-he/strings.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 42162460d4..27e4b7736d 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -147,14 +147,14 @@
 	<string name="shared_location">מיקום משותף</string>
 	<string name="osmand_parking_event">איסוף הרכב מהחנייה</string>
 	<string name="osmand_parking_warning">אזהרה</string>
-	<string name="osmand_parking_warning_text">התרעה לאיסוף הרכב שלך נוספה ליומן שלך. ההתרעה תישאר שם עד למחיקתה ידנית.</string>    
+	<string name="osmand_parking_warning_text">נוספה התראה לאיסוף הרכב שלך ליומן שלך. ההתראה תישאר שם עד למחיקתה ידנית.</string>    
 	<string name="osmand_parking_time_limit_title">הגדרת מגבלת זמן לחנייה</string>
 	<string name="osmand_parking_delete_confirm">להסיר את סמן מיקום חניית כלי הרכב?</string>
 	<string name="osmand_parking_delete">מחיקת סמן חנייה</string>
 	<string name="osmand_parking_choose_type">נא לבחור את סוג החנייה</string>
 	<string name="osmand_parking_lim_text">מוגבלת בזמן</string>
 	<string name="osmand_parking_no_lim_text">בלתי מוגבלת בזמן</string>
-	<string name="osmand_parking_add_event">הוספת התרעה ליישומון היומן</string>
+	<string name="osmand_parking_add_event">הוספת התראה ליישומון היומן</string>
 	<string name="osmand_parking_time_limit">חנייה מוגבלת בזמן</string>
 	<string name="osmand_parking_time_no_limit">חנייה בלתי מוגבלת בזמן</string>
 	<string name="osmand_parking_position_description">מיקום חניית הרכב שלך. %1$s</string>
@@ -1231,7 +1231,7 @@
     <string name="gpx_appearance">מראה</string>
     
     <string name="shared_string_trip">נסיעה</string>
-    <string name="shared_string_notifications">הודעות</string>
+    <string name="shared_string_notifications">התראות</string>
     
     <string name="shared_string_pause">הפסקה</string>
     <string name="map_markers_other">סמנים אחרים</string>
@@ -2601,7 +2601,7 @@
     <string name="follow_us">לעקוב אחרינו</string>
     <string name="access_direction_audio_feedback">חיווי כיוון קולי</string>
     <string name="access_disable_wrong_direction_recalc">אין חישוב מסלול מחדש לכיוון ההפוך</string>
-    <string name="access_smart_autoannounce_descr">יש להודיע רק כאשר הכיוון לנקודת היעד משתנה.</string>
+    <string name="access_smart_autoannounce_descr">יש להקפיץ התראה רק כאשר הכיוון לנקודת היעד משתנה.</string>
     <string name="access_autoannounce_period">טווח הכרזה אוטומטית</string>
     <string name="access_autoannounce_period_descr">מרווח הזמן המזערי בין הכרזות.</string>
     <string name="rendering_value_fine_name">עדין</string>
@@ -2712,7 +2712,7 @@
     <string name="track_points_category_name">נקודות דרך, נקודות עניין, תכונות עם שם</string>
     <string name="shared_string_time_span">מסגרת זמן</string>
     <string name="upload_osm_note_description">ניתן להעלות את הערות ה־OSM שלך באופן אנונימי או על ידי שימוש בפרופיל שלך ב־OpenStreetMap.org.</string>
-    <string name="trip_rec_notification_settings_desc">הצגת התרעת מערכת שמאפשרת לך להתחיל הקלטת טיול.</string>
+    <string name="trip_rec_notification_settings_desc">הצגת התראת מערכת שמאפשרת לך להתחיל הקלטת טיול.</string>
     <string name="shared_string_paused">הופסק</string>
     <string name="shared_string_recorded">הוקלט</string>
     <string name="rendering_attr_contourColorScheme_description">ערכת הצבעים של קווי המתאר</string>
@@ -2907,7 +2907,7 @@
     <string name="watch">צפייה</string>
     <string name="save_global_track_interval_descr">נא לבחור מרווח בין הקלטות כלליות של מסלול (מופעל דרך וידג׳ט ה־GPX על המפה).</string>
     <string name="transport_nearby_routes_within">נתיבים קרובים בטווח של עד</string>
-    <string name="disable_recording_once_app_killed_descrp">רישום ה־GPX יושהה כאשר היישומון נסגר (דרך היישומונים האחרונים). (התרעות הרקע של OsmAnd תיעלמנה מסרגל ההודעות של Android.)</string>
+    <string name="disable_recording_once_app_killed_descrp">רישום ה־GPX יושהה כאשר היישומון ייסגר (דרך היישומונים האחרונים). (התראות הרקע של OsmAnd תיעלמנה מסרגל ההודעות של Android.)</string>
     <string name="action_create">פעולת יצירה</string>
     <string name="action_modify">פעולת שינוי</string>
     <string name="action_delete">פעולת מחיקה</string>
@@ -3055,7 +3055,7 @@
     <string name="shared_string_gpx_files">קובצי GPX</string>
     <string name="get_osmand_live">ניתן להירשם ל־OsmAnd חי כדי לקבל גישה לכל התכונות: עדכוני מפה יומיים עם מספר בלתי מוגבל של הורדות, כל התוספים בתשלום ובחינם, ויקיפדיה, ויקימסע ועוד הרבה.</string>
     <string name="quick_action_edit_actions">עריכת פעולות</string>
-    <string name="error_notification_desc">נא לשלוח צילום מסך של ההתרעה הזאת אל support@osmand.net</string>
+    <string name="error_notification_desc">נא לשלוח צילום מסך של ההתראה הזאת אל support@osmand.net</string>
     <string name="coord_input_edit_point">עריכת נקודה</string>
     <string name="coord_input_add_point">הוספת נקודה</string>
     <string name="coord_input_save_as_track">שמירה כמסלול</string>

From 16ced18acb73ba745754278adf9932164fa53da0 Mon Sep 17 00:00:00 2001
From: Hinagiku Zeppeki <Zeppeki.Hinagiku@gmail.com>
Date: Mon, 3 Sep 2018 10:14:01 +0000
Subject: [PATCH 06/13] Translated using Weblate (Japanese)

Currently translated at 96.1% (2504 of 2603 strings)
---
 OsmAnd/res/values-ja/strings.xml | 34 ++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index fd7fdc6ade..fd088ede98 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -3109,4 +3109,38 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
 \n</string>
     <string name="commiting_way">コミットする方法…</string>
     <string name="increase_search_radius_to">検索半径を%1$sに増やす</string>
+    <string name="send_search_query_description"><b>\"%1$s\"</b>とあなたの現在地を検索クエリとして送信します。<br/><br/>我々は検索アルゴリズムを改善するために検索データを必要としており個人情報の収集を目的とはしていません。<br/></string>
+    <string name="shared_string_world">世界規模</string>
+    <string name="point_deleted">%1$s地点を削除しました</string>
+    <string name="how_to_open_link">リンクを開くには？</string>
+    <string name="download_all">全てダウンロード</string>
+    <string name="shared_string_restart">アプリの再起動</string>
+    <string name="show_images">画像の表示</string>
+    <string name="purchase_cancelled_dialog_title">OsmAnd Liveのサブスクリプションを解除しました</string>
+    <string name="purchase_cancelled_dialog_descr">すべての機能を使用し続けるには、サブスクリプションを更新してください:</string>
+
+    <string name="maps_you_need">必要なマップ</string>
+    <string name="osmand_team">OsmAndチーム</string>
+    <string name="paid_app">有料アプリ</string>
+    <string name="paid_plugin">有料プラグイン</string>
+    <string name="travel_card_update_descr">Wikivoyageの最新データが利用可能になりました。更新して有効活用して下さい。</string>
+	<string name="update_is_available">更新が可能です</string>
+	<string name="download_file">ダウンロードファイル</string>
+    <string name="welcome_to_open_beta">オープンβにようこそ</string>
+    <string name="wikivoyage_travel_guide_descr">インターネットへ接続せずにOsmAnd上で地球上のあらゆる興味深いスポットのガイドを利用することができます。</string>
+    <string name="in_app_purchase">アプリ内購入</string>
+    <string name="in_app_purchase_desc">1回払い</string>
+    <string name="in_app_purchase_desc_ex">一度購入すれば、永久に利用できるようになります。</string>
+    <string name="purchase_unlim_title">購入 - %1$s</string>
+    <string name="purchase_subscription_title">サブスクライブ(定期利用契約) - %1$s</string>
+    <string name="wikivoyage_offline">Wikivoyageオフライン</string>
+    <string name="contour_lines_hillshade_maps">等高線と陰影地図</string>
+    <string name="unlock_all_features">OsmAndの全ての機能をアンロック</string>
+    <string name="purchase_dialog_title">プランの選択</string>
+    <string name="purchase_dialog_subtitle">適切な項目を選択してください:</string>
+    <string name="shared_string_do">行動</string>
+    <string name="select_travel_book">旅行ガイドの選択</string>
+    <string name="shared_string_travel_book">旅行ガイド</string>
+    <string name="online_webpage_warning">該当ページはオンラインでしか見ることができません。 ウェブブラウザで開きますか？</string>
+    <string name="shared_string_wikivoyage">Wikivoyage</string>
     </resources>

From 1462a609cc420dc7675aacc91698c013b386707e Mon Sep 17 00:00:00 2001
From: Yunkers <wkulma@onet.eu>
Date: Tue, 4 Sep 2018 09:01:28 +0000
Subject: [PATCH 07/13] Translated using Weblate (Polish)

Currently translated at 100.0% (2603 of 2603 strings)
---
 OsmAnd/res/values-pl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index e83306ff51..b9212e22ab 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -837,7 +837,7 @@
     <string name="osmand_parking_hours">Godziny</string>
     <string name="osmand_parking_minutes">Minuty</string>
     <string name="osmand_parking_position_description_add_time">Zaparkowano samochód o</string>
-    <string name="use_compass_navigation_descr">Użyj kompasu, gdy nie zostanie wykryty inny nagłówek.</string>
+    <string name="use_compass_navigation_descr">Użyj kompasu, gdy nie zostanie wykryty kierunek.</string>
     <string name="use_compass_navigation">Użyj kompasu</string>
     <string name="route_updated_loc_found">Oczekiwanie na aktualne położenie w celu wyznaczenia trasy</string>
     <string name="continue_follow_previous_route_auto">Poprzednia trasa nie została ukończona. Kontynuować ją? (%1$s sekund)</string>

From 05b7d8fb6eb587c43d46ad78f002c4ffbf527a91 Mon Sep 17 00:00:00 2001
From: Branko Kokanovic <branko@kokanovic.org>
Date: Mon, 3 Sep 2018 21:55:34 +0000
Subject: [PATCH 08/13] Translated using Weblate (Serbian)

Currently translated at 100.0% (2603 of 2603 strings)
---
 OsmAnd/res/values-sr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 8686a84774..49328dccab 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -1397,7 +1397,7 @@
     <string name="restart_search">Препокрени претрагу</string>
     <string name="increase_search_radius">Повећај област претраге</string>
     <string name="nothing_found">Нема ничег пронађеног</string>
-    <string name="nothing_found_descr">Преправите упит претраге или увећајте област претраге.</string>
+    <string name="nothing_found_descr">Преправите упит претраге или повећајте област претраге.</string>
     <string name="quick_action_showhide_osmbugs_title">Приказ/скривање белешки ОСМ-а</string>
     <string name="quick_action_osmbugs_show">Прикажи белешке ОСМ-а</string>
     <string name="quick_action_osmbugs_hide">Сакриј белешке ОСМ-а</string>

From 8f15c8e93dc2fa145f2d04d00a021cd16d8b3f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D1=96=D0=B9=20=D0=94=D1=83=D0=B1?=
 =?UTF-8?q?=D0=B8=D0=BA?= <serhijdubyk@gmail.com>
Date: Mon, 3 Sep 2018 20:06:19 +0000
Subject: [PATCH 09/13] Translated using Weblate (Ukrainian)

Currently translated at 88.2% (2297 of 2603 strings)
---
 OsmAnd/res/values-uk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 2cae9e5de6..d5c8467f7e 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -2179,7 +2179,7 @@
     <string name="shared_string_not_selected">Не вибрано</string>
     <string name="rec_split_clip_length">Тривалість кліпу</string>
     <string name="nm">мор.м.</string>
-    <string name="nm_h">вузл</string>
+    <string name="nm_h">вузлів</string>
     <string name="update_time">Час оновлення</string>
     <string name="updates_size">Розмір оновлення</string>
     <string name="weekly">Щотижня</string>

From 0be1de78057bf2e9fb4bb2969e7f51a2db2ffdb6 Mon Sep 17 00:00:00 2001
From: Joaquin Garcia <joaquin.garcima@gmail.com>
Date: Mon, 3 Sep 2018 14:23:33 +0000
Subject: [PATCH 10/13] Translated using Weblate (Catalan)

Currently translated at 81.5% (2851 of 3494 strings)
---
 OsmAnd/res/values-ca/phrases.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index 990d357f0d..bc35f65dd7 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -3143,4 +3143,7 @@
 	<string name="poi_socket_cee_blue_output_filter">Connector CEE blau</string>
 	<string name="poi_socket_schuko_output_filter">Connector Schuko</string>
 	<string name="poi_glacier_type">Tipus de glacera</string>
+	<string name="poi_socket">Endoll</string>
+	<string name="poi_bicycle_parking_stands">Anclatje</string>
+	<string name="poi_bicycle_parking_wall_loops">Anclatje de Pared</string>
 	</resources>

From 2c3f8dcaf3a762ea4e67a9d9e1afae6271f8f135 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Mon, 3 Sep 2018 21:05:56 +0000
Subject: [PATCH 11/13] Translated using Weblate (Hebrew)

Currently translated at 55.7% (1947 of 3494 strings)
---
 OsmAnd/res/values-he/phrases.xml | 34 ++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/OsmAnd/res/values-he/phrases.xml b/OsmAnd/res/values-he/phrases.xml
index 202a5cf452..d654f4d0eb 100644
--- a/OsmAnd/res/values-he/phrases.xml
+++ b/OsmAnd/res/values-he/phrases.xml
@@ -2074,4 +2074,38 @@
 	<string name="poi_shelter_type_lean_to">סככה פתוחה</string>
 	<string name="poi_shelter_type_basic_hut">בקתה בסיסית</string>
 	<string name="poi_shelter_type_building">בניין</string>
+	<string name="poi_leaf_type_broadleaved">רחב עלים</string>
+	<string name="poi_leaf_type_needleleaved">צר עלים</string>
+	<string name="poi_leaf_type_mixed">מעורב</string>
+	<string name="poi_leaf_type_leafless">ללא עלים</string>
+	<string name="poi_species">זן</string>
+	<string name="poi_genus">סוג</string>
+	<string name="poi_taxon">טקסון</string>
+
+	<string name="poi_trees_olive">זית</string>
+	<string name="poi_trees_apple">תפוח</string>
+	<string name="poi_trees_oil">שמן דקלים</string>
+	<string name="poi_trees_orange">תפוז</string>
+	<string name="poi_trees_almond">שקד</string>
+	<string name="poi_trees_banana">בננה</string>
+	<string name="poi_trees_hazel">לוז</string>
+	<string name="poi_trees_coconut">קוקוס</string>
+	<string name="poi_trees_persimmon">אפרסמון</string>
+	<string name="poi_trees_cherry">דובדבן</string>
+	<string name="poi_trees_walnut">אגוז מלך</string>
+	<string name="poi_trees_plum">שזיף</string>
+	<string name="poi_trees_peach">אפרסק</string>
+	<string name="poi_trees_tea">תה</string>
+	<string name="poi_trees_coca">קוקה</string>
+	<string name="poi_trees_kiwi">קיוי</string>
+	<string name="poi_trees_nectorine">נקטרינה</string>
+	<string name="poi_trees_mango">מנגו</string>
+	<string name="poi_trees_rubber">גומי</string>
+	<string name="poi_trees_date">תמר</string>
+	<string name="poi_trees_coffea">קפה</string>
+	<string name="poi_trees_pomegranate">רימון</string>
+
+	<string name="poi_enforcement_traffic_signals">אכיפה: רמזור</string>
+	<string name="poi_enforcement_maxspeed">אכיפה: מהירות מרבית</string>
+	<string name="poi_enforcement_maxheight">אכיפה: גובה מרבי</string>
 	</resources>

From 0d954bac118f17662038774ac6d76a2ab4e03d01 Mon Sep 17 00:00:00 2001
From: iman <if90@chmail.ir>
Date: Mon, 3 Sep 2018 20:19:11 +0000
Subject: [PATCH 12/13] Translated using Weblate (Persian)

Currently translated at 27.0% (945 of 3494 strings)
---
 OsmAnd/res/values-fa/phrases.xml | 72 +++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-fa/phrases.xml b/OsmAnd/res/values-fa/phrases.xml
index 7bba9b84ee..0af3a82479 100644
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@@ -768,7 +768,7 @@
 	<string name="poi_fireplace">شومینه</string>
 	<string name="poi_seasonal">فصلی</string>
 	<string name="poi_water_characteristic">مشخصات آب</string>
-	<string name="poi_beach_surface_type">نوع سطح ساحل</string>
+	<string name="poi_beach_surface_type">سطح</string>
 	<string name="poi_diet">نوع خوراک</string>
 	<string name="poi_massage_type">نوع ماساژ</string>
 	<string name="poi_tents">چادر</string>
@@ -1018,4 +1018,74 @@
 
 	<string name="poi_start_date">تاریخ شروع</string>
 	<string name="poi_stars_2">۲ (استاندارد)</string>
+	<string name="poi_bench">نیمکت</string>
+	<string name="poi_fee_yes">بله</string>
+	<string name="poi_drinking_water_yes">بله</string>
+	<string name="poi_seasonal_yes">بله</string>
+	<string name="poi_seasonal_spring">چشمه</string>
+	<string name="poi_pump_yes">بله</string>
+
+	<string name="poi_fireplace_yes">بله</string>
+	<string name="poi_covered_yes">بله</string>
+	<string name="poi_covered_no">سرنپوشیده</string>
+
+	<string name="poi_tactile_paving_yes">بله</string>
+	<string name="poi_traffic_signals_sound_yes">بله</string>
+	<string name="poi_capacity_disabled_yes">بله</string>
+	<string name="poi_drive_in_yes">بله</string>
+	<string name="poi_drive_through_yes">بله</string>
+	<string name="poi_takeaway_filter_yes">بله</string>
+	<string name="poi_delivery_filter_yes">بله</string>
+	<string name="poi_outdoor_seating_filter_yes">بله</string>
+	<string name="poi_cocktails_yes">بله</string>
+
+	<string name="poi_self_service_yes">بله</string>
+	<string name="poi_automated_yes">بله</string>
+	<string name="poi_brushless_yes">بله</string>
+	<string name="poi_toilets_yes">بله</string>
+	<string name="poi_maxstay">محدودیت زمانی پارکینگ</string>
+
+	<string name="poi_vending_parking_tickets">بلیت‌های پارکینگ</string>
+	<string name="poi_bench_yes">بله</string>
+	<string name="poi_bench_no">بدون نیمکت</string>
+	<string name="poi_surface_unpaved">سطح: روسازی‌نشده</string>
+	<string name="poi_surface_paved">سطح: روسازی‌شده</string>
+	<string name="poi_surface_asphalt">سطح: آسفالت</string>
+	<string name="poi_surface_concrete">سطح: بتن</string>
+	<string name="poi_surface_sett">سطح: پاره‌سنگ</string>
+	<string name="poi_surface_cobblestone">سطح: قلوه‌سنگ</string>
+	<string name="poi_surface_paving_stones">سطح: سنگ‌فرش</string>
+	<string name="poi_surface_pebblestone">سطح: ریگ</string>
+	<string name="poi_surface_metal">سطح: فلز</string>
+	<string name="poi_surface_wood">سطح: چوب</string>
+	<string name="poi_surface_gravel">سطح: شن</string>
+	<string name="poi_surface_compacted">سطح: فشرده</string>
+	<string name="poi_surface_sand">سطح: ماسه</string>
+	<string name="poi_surface_grass">سطح: علف</string>
+	<string name="poi_surface_ground">سطح: زمین</string>
+	<string name="poi_surface_dirt">سطح: خاک</string>
+	<string name="poi_surface_mud">سطح: گِل</string>
+	<string name="poi_surface_ice">سطح: یخ</string>
+	<string name="poi_surface_salt">سطح: نمک</string>
+	<string name="poi_surface_snow">سطح: برف</string>
+
+	<string name="poi_backcountry_yes">بله</string>
+	<string name="poi_scout_yes">بله</string>
+	<string name="poi_washing_machine_yes">بله</string>
+	<string name="poi_shower_filter_yes">بله</string>
+	<string name="poi_caravans_yes">بله</string>
+	<string name="poi_power_supply_yes">بله</string>
+	<string name="poi_parking_surface">نوع: سطح</string>
+	<string name="poi_compressed_air_yes">بله</string>
+	<string name="poi_car_wash_yes">بله</string>
+
+	<string name="poi_vacuum_cleaner_yes">بله</string>
+	<string name="poi_home_visit_yes">بله</string>
+	<string name="poi_dispensing_yes">بله</string>
+	<string name="poi_fast_food_cafeteria">بله</string>
+
+	<string name="poi_parking_fee_yes">پارکینگ پولی: بله</string>
+	<string name="poi_parking_fee_no">پارکینگ پولی: خیر</string>
+	<string name="poi_parking_fee">هزینهٔ پارکینگ</string>
+
 	</resources>

From 8ad828886500dc64f67c000043d9eac0e5851162 Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Tue, 4 Sep 2018 16:57:19 +0300
Subject: [PATCH 13/13] Change defValue for appToConnectPackage

---
 OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt b/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
index 07fa540e83..5c03c7ab5e 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
@@ -245,9 +245,7 @@ class TelegramSettings(private val app: TelegramApplication) {
 		val locHistoryDef = LOC_HISTORY_VALUES_SEC[LOC_HISTORY_DEFAULT_INDEX]
 		locHistoryTime = prefs.getLong(LOC_HISTORY_TIME_KEY, locHistoryDef)
 
-		appToConnectPackage = prefs.getString(
-			APP_TO_CONNECT_PACKAGE_KEY, OsmandAidlHelper.OSMAND_PLUS_PACKAGE_NAME
-		)
+		appToConnectPackage = prefs.getString(APP_TO_CONNECT_PACKAGE_KEY, "")
 	}
 
 	private fun updatePrefs() {